Skip to content

Commit af16a90

Browse files
authored
feat: make billing fields mandatory for paid orders (#3264)
1 parent f83afc8 commit af16a90

File tree

1 file changed

+38
-44
lines changed

1 file changed

+38
-44
lines changed

app/templates/components/forms/orders/order-form.hbs

Lines changed: 38 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -81,51 +81,45 @@
8181
{{/each}}
8282
{{#if isPaidOrder}}
8383
<div class="field">
84-
{{ui-checkbox label=(t 'Enable Billing Information') checked=data.isBillingEnabled
85-
onChange=(action (mut data.isBillingEnabled))}}
84+
<label class="required" for="company">{{t 'Company'}}</label>
85+
{{input type='text' id='company' value=data.company}}
86+
</div>
87+
<div class="field">
88+
<label for="taxBusinessInfo">{{t 'Tax ID or Business ID'}}</label>
89+
{{input type='text' id='taxBusinessInfo' value=data.taxBusinessInfo}}
90+
</div>
91+
<div class="field">
92+
<label class="required" for="address">{{t 'Address'}}</label>
93+
{{textarea rows='2' id='address' value=data.address}}
94+
</div>
95+
<div class="field">
96+
<label class="required" for="city">{{t 'City'}}</label>
97+
{{input type='text' id='city' value=data.city}}
98+
</div>
99+
<div class="field">
100+
<label for="state">{{t 'State/Province'}}</label>
101+
{{input type='text' id='state' value=data.state}}
102+
</div>
103+
<div class="field">
104+
<label class="required" for="zipcode">{{t 'Zip Code'}}</label>
105+
{{input type='text' id='zip_code' value=data.zipcode}}
106+
</div>
107+
<div class="field">
108+
<label class="required">{{t 'Select country'}}</label>
109+
{{#ui-dropdown class="search selection" selected=data.country
110+
onChange=(action (mut data.country)) as |execute mapper|}}
111+
<div class="default text">{{t 'Select country'}}</div>
112+
<i class="dropdown icon"></i>
113+
<div class="menu">
114+
{{#each countries as |country|}}
115+
<div data-value="{{map-value mapper country.name}}" class="item">
116+
<i class="{{lowercase country.code}} flag"></i>
117+
{{country.name}}
118+
</div>
119+
{{/each}}
120+
</div>
121+
{{/ui-dropdown}}
86122
</div>
87-
{{#if data.isBillingEnabled}}
88-
<div class="field">
89-
<label class="required" for="company">{{t 'Company'}}</label>
90-
{{input type='text' id='company' value=data.company}}
91-
</div>
92-
<div class="field">
93-
<label for="taxBusinessInfo">{{t 'Tax ID or Business ID'}}</label>
94-
{{input type='text' id='taxBusinessInfo' value=data.taxBusinessInfo}}
95-
</div>
96-
<div class="field">
97-
<label class="required" for="address">{{t 'Address'}}</label>
98-
{{textarea rows='2' id='address' value=data.address}}
99-
</div>
100-
<div class="field">
101-
<label class="required" for="city">{{t 'City'}}</label>
102-
{{input type='text' id='city' value=data.city}}
103-
</div>
104-
<div class="field">
105-
<label for="state">{{t 'State/Province'}}</label>
106-
{{input type='text' id='state' value=data.state}}
107-
</div>
108-
<div class="field">
109-
<label class="required" for="zipcode">{{t 'Zip Code'}}</label>
110-
{{input type='text' id='zip_code' value=data.zipcode}}
111-
</div>
112-
<div class="field">
113-
<label class="required">{{t 'Select country'}}</label>
114-
{{#ui-dropdown class="search selection" selected=data.country
115-
onChange=(action (mut data.country)) as |execute mapper|}}
116-
<div class="default text">{{t 'Select country'}}</div>
117-
<i class="dropdown icon"></i>
118-
<div class="menu">
119-
{{#each countries as |country|}}
120-
<div data-value="{{map-value mapper country.name}}" class="item">
121-
<i class="{{lowercase country.code}} flag"></i>
122-
{{country.name}}
123-
</div>
124-
{{/each}}
125-
</div>
126-
{{/ui-dropdown}}
127-
</div>
128-
{{/if}}
129123
<h4 class="ui horizontal divider header">
130124
<i class="ticket icon"></i>
131125
{{t 'Payment Method'}}

0 commit comments

Comments
 (0)