From 524378f6e03fb7703a18d98d2ea0d0d2eb42f021 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 19 Feb 2020 04:21:34 +0000 Subject: [PATCH 1/7] Add dashboard_enable to .env.dist. #334 --- .env.dist | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.env.dist b/.env.dist index b0392b88..30f9a925 100644 --- a/.env.dist +++ b/.env.dist @@ -15,7 +15,7 @@ APP_SECRET=b344cd6cd151ae1d61403ed55806c5ce # Configure your db driver and server_version in config/packages/doctrine.yaml DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name ###< doctrine/doctrine-bundle ### -GMAPS_API_KEY=insertgmapsapikeyhere +GMAPS_API_KEY=insert_gmapsapikey_here # rising tide sms gateway RT_USER=rt_user @@ -28,7 +28,7 @@ RT_SHORTCODE=1234 MQTT_IP_ADDRESS=localhost MQTT_PORT=8883 MQTT_CERT=/location/of/cert/file.crt -MQTT_WS_HOST=insertiphere +MQTT_WS_HOST=insert_ip_here MQTT_WS_PORT=8083 # redis client @@ -38,20 +38,22 @@ REDIS_CLIENT_PORT=6379 REDIS_CLIENT_PASSWORD=foobared # privacy policy ids -POLICY_PROMO=insertpromopolicyidhere -POLICY_THIRD_PARTY=insertthirdpartypolicyidhere -POLICY_MOBILE=insertmobilepolicyidhere +POLICY_PROMO=insert_promopolicyid_here +POLICY_THIRD_PARTY=insert_thirdpartypolicyid_here +POLICY_MOBILE=insert_mobilepolicyid_here # OTP -OTP_MODE=settotestorrandom +OTP_MODE=set_to_test_or_random # geofence -GEOFENCE_ENABLE=settotrueorfalse +GEOFENCE_ENABLE=set_to_true_or_false # unknown manufacturer and vehicle ids -CVU_MFG_ID=insertmfgidforunknownvehicles -CVU_BRAND_ID=insertbrandidforunknownvehicles +CVU_MFG_ID=insert_mfgid_for_unknown_vehicles +CVU_BRAND_ID=insert_brandid_for_unknown_vehicles # country code prefix -COUNTRY_CODE=+insertcountrycodehere +COUNTRY_CODE=+insert_country_code_here +# dashboard +DASHBOARD_ENABLE=set_to_true_or_false From 7b5239e5487ada81a63c5b36c8dfb8b35e06541e Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 19 Feb 2020 05:22:57 +0000 Subject: [PATCH 2/7] Add checking for dashboard_enable. #334 --- config/packages/twig.yaml | 1 + templates/home.html.twig | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index d912927a..cb90797b 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -6,3 +6,4 @@ twig: gmaps_api_key: "%env(GMAPS_API_KEY)%" mqtt_host: "%env(MQTT_WS_HOST)%" mqtt_port: "%env(MQTT_WS_PORT)%" + dashboard_enable: "%env(DASHBOARD_ENABLE)%" diff --git a/templates/home.html.twig b/templates/home.html.twig index 975b0ea5..b7ac2c24 100644 --- a/templates/home.html.twig +++ b/templates/home.html.twig @@ -15,7 +15,9 @@ -{{ include('map/' ~ map_js_file) }} +{% if dashboard_enable == 'true' %} + {{ include('map/' ~ map_js_file) }} +{% endif %} {% endblock %} From 4b9b3622d5232a6647b0d90685e5dfb588f7bde4 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 24 Feb 2020 03:06:47 +0000 Subject: [PATCH 3/7] Fix to display service charge amount when loading an existing JO. #355 --- .../JobOrderHandler/CMBJobOrderHandler.php | 17 ++++++++++++++++- templates/job-order/cmb.form.onestep.html.twig | 6 +++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 06f1fb72..e61108bf 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -1407,7 +1407,22 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $params['mode'] = 'onestep-edit'; $params['cvid'] = $obj->getCustomerVehicle()->getID(); $params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID(); - $params['jo_service_charges'] = $obj->getMeta('service_charges'); + + // get service charges + $sc_array = []; + $jo_service_charges = $obj->getMeta('service_charges'); + if (!(empty($jo_service_charges))) + { + foreach ($jo_service_charges as $jo_sc_id) + { + // find service charge + $sc_obj = $em->getRepository(ServiceCharge::class)->find($jo_sc_id); + + $sc_array[] = $sc_obj; + } + } + + $params['jo_service_charges'] = $sc_array; $this->fillDropdownParameters($params); $this->fillFormTags($params); diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index 4c913bca..c5246ddb 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -508,19 +508,19 @@ {% endif %} - {% for jo_sc_key, jo_sc in obj.getMeta('service_charges')|default([]) %} + {% for jo_sc in jo_service_charges %}
- +
From 230dd4105545079b6df93405936092e7bfe98525 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 24 Feb 2020 07:57:43 +0000 Subject: [PATCH 4/7] Add jo_service_charges to one step form. #355 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index e61108bf..3e2d85b1 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -1387,6 +1387,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface { $params['obj'] = new JobOrder(); $params['mode'] = 'onestep'; + $params['jo_service_charges'] = []; $this->fillDropdownParameters($params); $this->fillFormTags($params); From 1a0fb13268addf1d9a41c1720c9b69f37099676b Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Mon, 24 Feb 2020 16:43:27 +0800 Subject: [PATCH 5/7] Fix view all edit button to use one step edit for CMB #270 --- src/Controller/JobOrderController.php | 6 ++++-- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 5 +++++ src/Service/JobOrderHandler/ResqJobOrderHandler.php | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index c06383c7..f04ba047 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -276,12 +276,14 @@ class JobOrderController extends Controller { $rows[$key]['meta']['reassign_hub_url'] = $this->generateUrl('jo_open_hub_form', ['id' => $jo_id]); $rows[$key]['meta']['reassign_rider_url'] = $this->generateUrl('jo_open_rider_form', ['id' => $jo_id]); - $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]); + // $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]); + $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute(), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); } else { - $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]); + // $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]); + $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute(), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]); } diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 36062f7e..7e4c9bb6 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2984,4 +2984,9 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface ->setParameter('status', $status); } } + + public function getEditRoute() + { + return 'jo_onestep_edit_form'; + } } diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index c6a6fa01..12995e56 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -2587,4 +2587,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface ->setParameter('status', $status); } } + + public function getEditRoute() + { + } } From 4700d2b84035597828d90a4b1e103832aa7fa0ec Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 24 Feb 2020 09:28:38 +0000 Subject: [PATCH 6/7] Remove link to list of JOs ready to be fulfilled. #270 --- config/cmb.menu.yaml | 4 ---- config/menu.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/config/cmb.menu.yaml b/config/cmb.menu.yaml index 7c6b4d82..9f28b315 100644 --- a/config/cmb.menu.yaml +++ b/config/cmb.menu.yaml @@ -110,10 +110,6 @@ main_menu: acl: jo_walkin.form label: Walk-in parent: joborder - - id: jo_fulfill - acl: jo_fulfill.list - label: Fulfillment - parent: joborder - id: jo_open acl: jo_open.list label: Open diff --git a/config/menu.yaml b/config/menu.yaml index 7c6b4d82..9f28b315 100644 --- a/config/menu.yaml +++ b/config/menu.yaml @@ -110,10 +110,6 @@ main_menu: acl: jo_walkin.form label: Walk-in parent: joborder - - id: jo_fulfill - acl: jo_fulfill.list - label: Fulfillment - parent: joborder - id: jo_open acl: jo_open.list label: Open From 22be1eaf5a29938d9fda1348a79d456935abe874 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 24 Feb 2020 10:33:13 +0000 Subject: [PATCH 7/7] Fix edit for walkin JOs. #270 --- src/Controller/JobOrderController.php | 8 ++++---- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 12 ++++++++++-- templates/job-order/cmb.form.walkin.html.twig | 9 ++------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index edddc3f1..dad6a8d4 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -277,13 +277,13 @@ class JobOrderController extends Controller $rows[$key]['meta']['reassign_hub_url'] = $this->generateUrl('jo_open_hub_form', ['id' => $jo_id]); $rows[$key]['meta']['reassign_rider_url'] = $this->generateUrl('jo_open_rider_form', ['id' => $jo_id]); // $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]); - $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute(), ['id' => $jo_id]); + $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); } else { // $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]); - $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute(), ['id' => $jo_id]); + $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]); } @@ -1037,12 +1037,12 @@ class JobOrderController extends Controller return $this->render($template, $params); } - public function walkInEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler) + public function walkInEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler, $id) { $this->denyAccessUnlessGranted('jo_walkin.edit', null, 'No access.'); $error_array = []; - $error_array = $jo_handler->processOneStepJobOrder($req, $id); + $error_array = $jo_handler->processWalkinJobOrder($req, $id); // check if any errors were found if (!empty($error_array)) { diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index d109d4c3..2e16f2e9 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2997,8 +2997,16 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface } } - public function getEditRoute() + public function getEditRoute($jo_id) { - return 'jo_onestep_edit_form'; + $jo = $this->em->getRepository(JobOrder::class)->find($jo_id); + if (empty($jo)) + throw new NotFoundHttpException('The item does not exist'); + + // check transaction origin + if ($jo->getSource() == TransactionOrigin::WALK_IN) + return 'jo_walkin_edit_form'; + else + return 'jo_onestep_edit_form'; } } diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig index f2e02e44..667d84e3 100644 --- a/templates/job-order/cmb.form.walkin.html.twig +++ b/templates/job-order/cmb.form.walkin.html.twig @@ -347,7 +347,7 @@ {% endif %} - +
@@ -557,7 +557,7 @@ function get_vehicle_makes(mfg_id, vid = 0) { $(function() { var form_in_process = false; - var selected_hub = ''; + var selected_hub = '{{ obj.getHub ? obj.getHub.getID : "" }}'; $(function() { $('#hubs-table').on('click', 'tr', function() { @@ -592,11 +592,6 @@ $(function() { // add invoice items to data fields['invoice_items'] = invoiceItems; - {% if mode in ['update-processing', 'update-reassign-hub'] %} - // add selected hub to data - fields['hub'] = selectedHub; - {% endif %} - e.preventDefault(); $.ajax({