Skip to content

fix: Preventing Overflow #3217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2019
Merged

fix: Preventing Overflow #3217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a5051
Preventing Overflow and Company Descriptions can be optional
Jun 28, 2019
5211ebc
Removing unrelated changes
Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions app/components/modals/tax-info-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,56 +49,6 @@ export default ModalBase.extend(FormMixin, {
prompt : this.l10n.t('Please give us your tax ID')
}
]
},
taxInvoiceCompany: {
Copy link
Contributor

@uds5501 uds5501 Jun 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kushthedude I don't think that the issue specified anywhere to remove the validations.

Copy link
Member Author

@kushthedude kushthedude Jun 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@uds5501 The validations which I removed were of optional fields of which tick box was recently removed, I dont think this fields should be mandatory unless and until event organiser is a firm.
@shreyanshdwivedi @mrsaicharan1 Your views ?

identifier : 'tax_invoice_company',
depends : 'send_tax_invoices',
rules : [
{
type : 'empty',
prompt : this.l10n.t('Please give us your company name')
}
]
},
taxInvoiceAddress: {
identifier : 'tax_invoice_address',
depends : 'send_tax_invoices',
rules : [
{
type : 'empty',
prompt : this.l10n.t('Please give us your address')
}
]
},

taxInvoiceCity: {
identifier : 'tax_invoice_city',
rules : [
{
type : 'empty',
prompt : this.l10n.t('Please give a city')
}
]
},

taxInvoiceState: {
identifier : 'tax_invoice_state',
rules : [
{
type : 'empty',
prompt : this.l10n.t('Please give a state')
}
]
},

taxInvoiceZipCode: {
identifier : 'tax_invoice_zipcode',
rules : [
{
type : 'empty',
prompt : this.l10n.t('Please provide a zip code')
}
]
}
}
};
Expand Down
12 changes: 6 additions & 6 deletions app/templates/components/modals/tax-info-modal.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="header">
{{t 'Add tax information'}}
</div>
<div class="{{if tax.shouldSendInvoice "y-scrollable scrollable-"}}modal content">
<div class="y-scrollable scrollable-modal content">
<form class="ui form" autocomplete="off" {{action 'updateTaxInfo' on='submit' preventDefault=true}}>
<div class="field">
<label class="required">{{t 'Choose country'}}</label>
Expand Down Expand Up @@ -45,23 +45,23 @@
</div>
</div>
<div class="field">
<label class="required">{{t 'Registered Company'}}</label>
<label>{{t 'Registered Company'}}</label>
{{input type='text' id='tax_invoice_company' value=tax.registeredCompany}}
</div>
<div class="field">
<label class="required">{{t 'Business Address'}}</label>
<label>{{t 'Business Address'}}</label>
{{textarea rows=3 id='tax_invoice_address' value=tax.address}}
</div>
<div class="field">
<label class="required">{{t 'City'}}</label>
<label>{{t 'City'}}</label>
{{input type='text' id='tax_invoice_city' value=tax.city}}
</div>
<div class="field">
<label class="required">{{t 'State'}}</label>
<label>{{t 'State'}}</label>
{{input type='text' id='tax_invoice_state' value=tax.state}}
</div>
<div class="field">
<label class="required">{{t 'Zipcode'}}</label>
<label>{{t 'Zipcode'}}</label>
{{input type='text' id='tax_invoice_zipcode' value=tax.zip}}
</div>
<div class="field">
Expand Down