rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Bug fixes from merge. Remove hardcoded country code prefixes from onestep form. #309

Browse source
This commit is contained in:
Korina Cordero 2020-01-24 06:22:12 +00:00
parent 5a138ce09f
commit 8e613a43b1
5 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.dist
View file

@ -28,6 +28,8 @@ RT_SHORTCODE=1234
MQTT_IP_ADDRESS=localhost MQTT_IP_ADDRESS=localhost
MQTT_PORT=8883 MQTT_PORT=8883
MQTT_CERT=/location/of/cert/file.crt MQTT_CERT=/location/of/cert/file.crt
MQTT_WS_HOST=insertiphere
MQTT_WS_PORT=8083
# redis client # redis client
REDIS_CLIENT_SCHEME=tcp REDIS_CLIENT_SCHEME=tcp

6
src/Controller/RAPIController.php
View file

@ -931,7 +931,6 @@ class RAPIController extends Controller
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
<<<<<<< HEAD
protected function updateVehicleBattery(JobOrder $jo) protected function updateVehicleBattery(JobOrder $jo)
{ {
// check if new battery // check if new battery
@ -983,7 +982,7 @@ class RAPIController extends Controller
->setHasMotoliteBattery(true) ->setHasMotoliteBattery(true)
->setWarrantyExpiration($warr_date); ->setWarrantyExpiration($warr_date);
} }
=======
protected function createWarranty($jo) protected function createWarranty($jo)
{ {
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
@ -1057,7 +1056,4 @@ class RAPIController extends Controller
$expire_date->add(new DateInterval('P'.$warranty_period.'M')); $expire_date->add(new DateInterval('P'.$warranty_period.'M'));
return $expire_date; return $expire_date;
} }
>>>>>>> 0297d66dd56b2b01db9c618c32e2367223048a56
} }

8
templates/job-order/cmb.form.onestep.html.twig
View file

@ -96,7 +96,7 @@
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_mobile">Mobile Phone</label> <label data-field="customer_phone_mobile">Mobile Phone</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">+63</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_mobile" id="customer-phone-mobile" class="form-control m-input" value="{{ obj.getCustomer.getPhoneMobile|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_mobile" id="customer-phone-mobile" class="form-control m-input" value="{{ obj.getCustomer.getPhoneMobile|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="customer_phone_mobile"></div> <div class="form-control-feedback hide" data-field="customer_phone_mobile"></div>
</div> </div>
@ -104,7 +104,7 @@
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_landline">Landline</label> <label data-field="customer_phone_landline">Landline</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">+63</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_landline" id="customer-phone-landline" class="form-control m-input" value="{{ obj.getCustomer.getPhoneLandline|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_landline" id="customer-phone-landline" class="form-control m-input" value="{{ obj.getCustomer.getPhoneLandline|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="customer_phone_landline"></div> <div class="form-control-feedback hide" data-field="customer_phone_landline"></div>
</div> </div>
@ -114,7 +114,7 @@
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_office">Office Phone</label> <label data-field="customer_phone_office">Office Phone</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">+63</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_office" id="customer-phone-office" class="form-control m-input" value="{{ obj.getCustomer.getPhoneOffice|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_office" id="customer-phone-office" class="form-control m-input" value="{{ obj.getCustomer.getPhoneOffice|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="customer_phone_office"></div> <div class="form-control-feedback hide" data-field="customer_phone_office"></div>
</div> </div>
@ -122,7 +122,7 @@
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_fax">Fax</label> <label data-field="customer_phone_fax">Fax</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">+63</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="customer_phone_fax"></div> <div class="form-control-feedback hide" data-field="customer_phone_fax"></div>
</div> </div>

8
templates/job-order/form.onestep.html.twig
View file

@ -94,7 +94,7 @@
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_mobile">Mobile Phone</label> <label data-field="customer_phone_mobile">Mobile Phone</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">+63</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_mobile" id="customer-phone-mobile" class="form-control m-input" value="{{ obj.getCustomer.getPhoneMobile|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_mobile" id="customer-phone-mobile" class="form-control m-input" value="{{ obj.getCustomer.getPhoneMobile|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="customer_phone_mobile"></div> <div class="form-control-feedback hide" data-field="customer_phone_mobile"></div>
</div> </div>
@ -102,7 +102,7 @@
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_landline">Landline</label> <label data-field="customer_phone_landline">Landline</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">+63</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_landline" id="customer-phone-landline" class="form-control m-input" value="{{ obj.getCustomer.getPhoneLandline|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_landline" id="customer-phone-landline" class="form-control m-input" value="{{ obj.getCustomer.getPhoneLandline|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="customer_phone_landline"></div> <div class="form-control-feedback hide" data-field="customer_phone_landline"></div>
</div> </div>
@ -112,7 +112,7 @@
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_office">Office Phone</label> <label data-field="customer_phone_office">Office Phone</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">+63</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_office" id="customer-phone-office" class="form-control m-input" value="{{ obj.getCustomer.getPhoneOffice|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_office" id="customer-phone-office" class="form-control m-input" value="{{ obj.getCustomer.getPhoneOffice|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="customer_phone_office"></div> <div class="form-control-feedback hide" data-field="customer_phone_office"></div>
</div> </div>
@ -120,7 +120,7 @@
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="customer_phone_fax">Fax</label> <label data-field="customer_phone_fax">Fax</label>
<div class="input-group m-input-group"> <div class="input-group m-input-group">
<span class="input-group-addon">+63</span> <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
<input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled> <input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled>
<div class="form-control-feedback hide" data-field="customer_phone_fax"></div> <div class="form-control-feedback hide" data-field="customer_phone_fax"></div>
</div> </div>

5
translations/messages.en.yaml
View file

@ -9,14 +9,9 @@ battery_size_tradein_brand: Trade-in Motolite
battery_size_tradein_premium: Trade-in Premium battery_size_tradein_premium: Trade-in Premium
battery_size_tradein_other: Trade-in Other 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
<<<<<<< HEAD
jo_title_pdf: Motolite Res-Q Job Order
country_code_prefix: '+63'
=======
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: 'Delivery Instructions - CarFix Job Order No.'
>>>>>>> 0297d66dd56b2b01db9c618c32e2367223048a56
# images # images
image_logo_login: /assets/images/black-text-logo-01.png image_logo_login: /assets/images/black-text-logo-01.png