From c4da604ac83a3506ba51dd9403505bd359d984c3 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 10 Mar 2020 06:07:29 +0000 Subject: [PATCH 1/5] Made plate number a required field if new customer. #367 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 8 ++++++++ templates/job-order/cmb.form.onestep.html.twig | 4 +++- templates/job-order/cmb.form.walkin.html.twig | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index f0c4437a..4d9d5cab 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -448,6 +448,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface if (!($valid_mobile)) $error_array['customer_phone_mobile'] = 'Invalid mobile phone number.'; + // check if plate number is in request + if (empty($req->request->get('cv_plate'))) + $error_array['cv_plate'] = 'Plate number is required.'; + // find the vehicle using vid $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); if (empty($new_vehicle)) @@ -2463,6 +2467,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface if (!($valid_mobile)) $error_array['customer_phone_mobile'] = 'Invalid mobile phone number.'; + // check if plate number is in request + if (empty($req->request->get('cv_plate'))) + $error_array['cv_plate'] = 'Plate number is required.'; + // find the vehicle using vid $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); if (empty($new_vehicle)) diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index acd88d56..0285813f 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -184,7 +184,9 @@
- +
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig index a72973bd..e628d93b 100644 --- a/templates/job-order/cmb.form.walkin.html.twig +++ b/templates/job-order/cmb.form.walkin.html.twig @@ -184,7 +184,9 @@
- +
From d61d82b6e7d233d02adcd2ca49c855850f6c3930 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 10 Mar 2020 06:22:25 +0000 Subject: [PATCH 2/5] Add default value false to checking for new customer. #367 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 4d9d5cab..d490ce56 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -436,7 +436,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface } // check if new customer - if ($req->request->get('new_customer')) + if ($req->request->get('new_customer', false)) { if (empty($req->request->get('customer_customer_notes'))) { @@ -2455,7 +2455,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface } // check if new customer - if ($req->request->get('new_customer')) + if ($req->request->get('new_customer', false)) { if (empty($req->request->get('customer_customer_notes'))) { From 63210ab4639bfa645978607e2b00eafe3c996aa1 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 10 Mar 2020 08:16:53 +0000 Subject: [PATCH 3/5] Rename Delivery Instructions to CarFix Details. #369 --- templates/job-order/cmb.form.onestep.html.twig | 2 +- translations/cmb.messages.en.yaml | 2 +- translations/messages.en.yaml | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index 0285813f..7d2344f2 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -321,7 +321,7 @@

- +
diff --git a/translations/cmb.messages.en.yaml b/translations/cmb.messages.en.yaml index 7856b0c8..3e12543b 100644 --- a/translations/cmb.messages.en.yaml +++ b/translations/cmb.messages.en.yaml @@ -11,7 +11,7 @@ battery_size_tradein_other: Trade-in Other add_cust_vehicle_battery_info: This vehicle is using a Motolite battery jo_title_pdf: Res-Q for CMB Job Order country_code_prefix: '+60' -delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.' +delivery_instructions_label: 'CarFix Details' # images image_logo_login: /assets/images/black-text-logo-01.png diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index 992f8de9..3e12543b 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -11,7 +11,7 @@ battery_size_tradein_other: Trade-in Other add_cust_vehicle_battery_info: This vehicle is using a Motolite battery jo_title_pdf: Res-Q for CMB Job Order country_code_prefix: '+60' -delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.' +delivery_instructions_label: 'CarFix Details' # images 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 # default point for maps -default_lat: 14.6091 -default_long: 121.0223 -#default_lat: 3.084216 -#default_long: 101.6129996 -default_region: ph +default_lat: 3.084216 +default_long: 101.6129996 +default_region: my From 9327f02623c5e8e0a07c92f7d17a1182a5b9061d Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 10 Mar 2020 09:07:01 +0000 Subject: [PATCH 4/5] Display active job orders of rider. #368 --- templates/rider/popup.html.twig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/rider/popup.html.twig b/templates/rider/popup.html.twig index 13b201d0..1a9f6e09 100644 --- a/templates/rider/popup.html.twig +++ b/templates/rider/popup.html.twig @@ -1,13 +1,13 @@ {{ rider.getFullName }} -{% set jo = rider.getActiveJobOrder %} -{% if jo is not null %} -{% set cust = jo.getCustomer %} -{% set cv = jo.getCustomerVehicle %} -
-Job Order #{{ jo.getID }}
-{{ jo.getServiceTypeName }}
-{{ jo.getStatusText }}

-{{ cust.getNameDisplay }}
-{{ cv.getPlateNumber }} +{% set job_orders = rider.getOpenJobOrders %} +{% if job_orders is not empty %} + {% for jo in job_orders %} + {% set cust = jo.getCustomer %} + {% set cv = jo.getCustomerVehicle %} +
+ Job Order #{{ jo.getID }}
+ {{ cust.getNameDisplay }}
+ {{ cv.getPlateNumber }} + {% endfor %} {% endif %} From a3c9c16d51344571c9db9c3931228c08f9012e21 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 10 Mar 2020 09:15:11 +0000 Subject: [PATCH 5/5] Restore active job order for rider. #368 --- templates/rider/popup.html.twig | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/templates/rider/popup.html.twig b/templates/rider/popup.html.twig index 1a9f6e09..15cdc26a 100644 --- a/templates/rider/popup.html.twig +++ b/templates/rider/popup.html.twig @@ -1,13 +1,25 @@ {{ rider.getFullName }} +{% set jo = rider.getActiveJobOrder %} +{% if jo is not null %} +{% set cust = jo.getCustomer %} +{% set cv = jo.getCustomerVehicle %} +
+Job Order #{{ jo.getID }}
+{{ jo.getServiceTypeName }}
+{{ jo.getStatusText }}

+{{ cust.getNameDisplay }}
+{{ cv.getPlateNumber }} +{% endif %} +
{% set job_orders = rider.getOpenJobOrders %} {% if job_orders is not empty %} - {% for jo in job_orders %} - {% set cust = jo.getCustomer %} - {% set cv = jo.getCustomerVehicle %} + {% for job_order in job_orders %} + {% set customer = job_order.getCustomer %} + {% set cust_vehicle = job_order.getCustomerVehicle %}
- Job Order #{{ jo.getID }}
- {{ cust.getNameDisplay }}
- {{ cv.getPlateNumber }} + Job Order #{{ job_order.getID }}
+ {{ customer.getNameDisplay }}
+ {{ cust_vehicle.getPlateNumber }} {% endfor %} {% endif %}