Merge branch '369-cmb-rename-delivery-instructions-in-one-step-and-walk-in-form-to-carfix-details' into '270-final-cmb-fixes'

Resolve "CMB - rename delivery instructions in one-step and walk-in form to "CarFix Details""

See merge request jankstudio/resq!413
This commit is contained in:
Kendrick Chan 2020-03-10 08:23:00 +00:00
commit 4f8568fe04
3 changed files with 6 additions and 8 deletions

View file

@ -321,7 +321,7 @@
</div> </div>
<br> <br>
<div class="col-lg-12 form-group-inner"> <div class="col-lg-12 form-group-inner">
<label data-field="delivery_instructions">Delivery Instructions</label> <label data-field="delivery_instructions">{% trans %}delivery_instructions_label{% endtrans %}</label>
<textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea> <textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
</div> </div>
</div> </div>

View file

@ -11,7 +11,7 @@ battery_size_tradein_other: Trade-in Other
add_cust_vehicle_battery_info: This vehicle is using a Motolite battery add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
jo_title_pdf: Res-Q for CMB Job Order jo_title_pdf: Res-Q for CMB Job Order
country_code_prefix: '+60' country_code_prefix: '+60'
delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.' delivery_instructions_label: 'CarFix Details'
# images # images
image_logo_login: /assets/images/black-text-logo-01.png image_logo_login: /assets/images/black-text-logo-01.png

View file

@ -11,7 +11,7 @@ battery_size_tradein_other: Trade-in Other
add_cust_vehicle_battery_info: This vehicle is using a Motolite battery add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
jo_title_pdf: Res-Q for CMB Job Order jo_title_pdf: Res-Q for CMB Job Order
country_code_prefix: '+60' country_code_prefix: '+60'
delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.' delivery_instructions_label: 'CarFix Details'
# images # images
image_logo_login: /assets/images/black-text-logo-01.png image_logo_login: /assets/images/black-text-logo-01.png
@ -22,8 +22,6 @@ image_dashboard: /assets/images/century_logo.png
image_jo_pdf: /public/assets/images/black-text-logo-01-115x115.png image_jo_pdf: /public/assets/images/black-text-logo-01-115x115.png
# default point for maps # default point for maps
default_lat: 14.6091 default_lat: 3.084216
default_long: 121.0223 default_long: 101.6129996
#default_lat: 3.084216 default_region: my
#default_long: 101.6129996
default_region: ph