diff --git a/config/acl.yaml b/config/acl.yaml index 1d1a0c74..8eeae664 100644 --- a/config/acl.yaml +++ b/config/acl.yaml @@ -272,6 +272,14 @@ access_keys: label: Hub View - id: jo_behind_schedule.list label: View Behind Schedule + - id: jo_advance_order.form + label: New Advance Order + - id: jo_advance_order.edit + label: New Advance Order Edit + - id: jo_assign_advance_order.list + label: Assign Advance Order + - id: jo_assign_advance_order.form + label: Edit Assign Advance Order - id: support label: Customer Support Access diff --git a/config/cmb.menu.yaml b/config/cmb.menu.yaml index ca756046..3b9b92b1 100644 --- a/config/cmb.menu.yaml +++ b/config/cmb.menu.yaml @@ -106,6 +106,14 @@ main_menu: acl: jo_onestep.form label: One-step Process parent: joborder + - id: jo_advance_order_form + acl: jo_advance_order.form + label: New Advance Order + parent: joborder + - id: jo_assign_advance_order + acl: jo_assign_advance_order.list + label: Assign Advance Order + parent: joborder - id: jo_walkin_form acl: jo_walkin.form label: Walk-in diff --git a/config/menu.yaml b/config/menu.yaml index ca756046..3b9b92b1 100644 --- a/config/menu.yaml +++ b/config/menu.yaml @@ -106,6 +106,14 @@ main_menu: acl: jo_onestep.form label: One-step Process parent: joborder + - id: jo_advance_order_form + acl: jo_advance_order.form + label: New Advance Order + parent: joborder + - id: jo_assign_advance_order + acl: jo_assign_advance_order.list + label: Assign Advance Order + parent: joborder - id: jo_walkin_form acl: jo_walkin.form label: Walk-in diff --git a/config/routes/job_order.yaml b/config/routes/job_order.yaml index 4ec4279e..57f58fdf 100644 --- a/config/routes/job_order.yaml +++ b/config/routes/job_order.yaml @@ -264,3 +264,46 @@ jo_behind_schedule_rows: methods: [POST] defaults: tier: "behind_schedule" + +jo_advance_order_form: + path: /job-order/advance-order + controller: App\Controller\JobOrderController::advanceOrderForm + methods: [GET] + +jo_advance_order_submit: + path: /job-order/advance-order + controller: App\Controller\JobOrderController::advanceOrderSubmit + methods: [POST] + +jo_advance_order_edit_form: + path: /job-order/advance-order/{id}/edit + controller: App\Controller\JobOrderController::advanceOrderEditForm + methods: [GET] + +jo_advance_order_edit_submit: + path: /job-order/advance-order/{id}/edit + controller: App\Controller\JobOrderController::advanceOrderEditSubmit + methods: [POST] + +jo_assign_advance_order: + path: /job-order/assign-advance-order + controller: App\Controller\JobOrderController::listAssignAdvanceOrder + methods: [GET] + +jo_assign_advance_order_rows: + path: /job-order/assign-advance-joborder-rows + controller: App\Controller\JobOrderController::getRows + methods: [POST] + defaults: + tier: "assign_advance_order" + +jo_assign_advance_order_form: + path: /job-order/assign-advance-order/{id} + controller: App\Controller\JobOrderController::assignAdvanceOrderForm + methods: [GET] + +jo_assign_advance_order_submit: + path: /job-order/assign-advance-order/{id} + controller: App\Controller\JobOrderController::assignAdvanceOrderSubmit + methods: [POST] + diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index 1b7a451f..592c175e 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -228,7 +228,7 @@ class JobOrderController extends Controller } /** - * @Menu(selected="jo_all") + * @Menu(selected="jo_/viewall") */ public function listAll(JobOrderHandlerInterface $jo_handler) { @@ -284,18 +284,18 @@ class JobOrderController extends Controller $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($jo_id, $tier_params['edit_route']), ['id' => $jo_id]); - $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); + //$rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); } else if ($tier == 'behind_schedule') { $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['id' => $jo_id]); - $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['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($jo_id, $tier_params['edit_route']), ['id' => $jo_id]); - $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); + $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['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]); } @@ -1073,6 +1073,157 @@ class JobOrderController extends Controller ]); } + /** + * @Menu(selected="jo_advance_order_form") + */ + public function advanceOrderForm(EntityManagerInterface $em, JobOrderHandlerInterface $jo_handler, + GISManagerInterface $gis) + { + $this->denyAccessUnlessGranted('jo_advance_order.form', null, 'No access.'); + + $params = $jo_handler->initializeAdvanceOrderForm(); + $params['submit_url'] = $this->generateUrl('jo_advance_order_submit'); + $params['return_url'] = $this->generateUrl('jo_advance_order_form'); + $params['map_js_file'] = $gis->getJSJOFile(); + $params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll(); + $params['vmakes'] = $em->getRepository(Vehicle::class)->findAll(); + $params['hubs'] = $em->getRepository(Hub::class)->findAll(); + + $template = $params['template']; + + // response + return $this->render($template, $params); + } + + public function advanceOrderSubmit(Request $req, JobOrderHandlerInterface $jo_handler, MQTTClient $mclient) + { + $this->denyAccessUnlessGranted('jo_advance_order.form', null, 'No access.'); + + // initialize error list + $error_array = []; + $id = -1; + $error_array = $jo_handler->processAdvanceOrderJobOrder($req, $id, $mclient); + + // check if any errors were found + if (!empty($error_array)) { + // return validation failure response + return $this->json([ + 'success' => false, + 'errors' => $error_array + ], 422); + } + + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + + /** + * @Menu(selected="jo_advance_order_edit_form") + */ + public function advanceOrderEditForm($id, EntityManagerInterface $em, JobOrderHandlerInterface $jo_handler, + GISManagerInterface $gis, MapTools $map_tools) + { + $this->denyAccessUnlessGranted('jo_advance_order.edit', null, 'No access.'); + + $params = $jo_handler->initializeAdvanceOrderEditForm($id, $map_tools); + $params['submit_url'] = $this->generateUrl('jo_advance_order_edit_submit', ['id' => $id]); + $params['return_url'] = $this->generateUrl('jo_open'); + $params['map_js_file'] = $gis->getJSJOFile(); + $params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll(); + $params['vmakes'] = $em->getRepository(Vehicle::class)->findAll(); + + $template = $params['template']; + + // response + return $this->render($template, $params); + } + + public function advanceOrderEditSubmit(Request $req, JobOrderHandlerInterface $jo_handler, $id, MQTTClient $mclient) + { + $this->denyAccessUnlessGranted('jo_advance_order.edit', null, 'No access.'); + + $error_array = []; + $error_array = $jo_handler->processAdvanceOrderJobOrder($req, $id, $mclient); + + // check if any errors were found + if (!empty($error_array)) { + // return validation failure response + return $this->json([ + 'success' => false, + 'errors' => $error_array + ], 422); + } + + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + + /** + * @Menu(selected="jo_assign_advance_order") + */ + public function listAssignAdvanceOrder(JobOrderHandlerInterface $jo_handler) + { + $this->denyAccessUnlessGranted('jo_assign_advance_order.list', null, 'No access.'); + + $template = $jo_handler->getTwigTemplate('jo_list_assign_advanceorder'); + + $params = $jo_handler->getOtherParameters(); + $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval'); + + return $this->render($template, $params); + } + + /** + * @Menu(selected="jo_assign_advance_order_form") + */ + public function assignAdvanceOrderForm($id, EntityManagerInterface $em, JobOrderHandlerInterface $jo_handler, + GISManagerInterface $gis, MapTools $map_tools) + { + $this->denyAccessUnlessGranted('jo_assign_advance_order.form', null, 'No access.'); + + $params = $jo_handler->initializeAssignAdvanceOrderForm($id, $map_tools); + $params['submit_url'] = $this->generateUrl('jo_assign_advance_order_submit', ['id' => $id]); + $params['return_url'] = $this->generateUrl('jo_assign_advance_order'); + $params['map_js_file'] = $gis->getJSJOFile(); + $params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll(); + $params['vmakes'] = $em->getRepository(Vehicle::class)->findAll(); + $params['hubs'] = $em->getRepository(Hub::class)->findAll(); + + $template = $params['template']; + + // response + return $this->render($template, $params); + } + + public function assignAdvanceOrderSubmit(Request $req, JobOrderHandlerInterface $jo_handler, $id, MQTTClient $mclient) + { + $this->denyAccessUnlessGranted('jo_assign_advance_order.form', null, 'No access.'); + + // initialize error list + $error_array = []; + $error_array = $jo_handler->processAssignAdvanceOrderJobOrder($req, $id, $mclient); + + // check if any errors were found + if (!empty($error_array)) { + // return validation failure response + return $this->json([ + 'success' => false, + 'errors' => $error_array + ], 422); + } + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + /** * @Menu(selected="jo_hub_view") */ diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 1f6250f0..05d9ce45 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -449,10 +449,12 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $jo = $em->getRepository(JobOrder::class)->find($id); $old_jo_status = null; $old_rider = null; + $event_type = CMBJOEventType::OPEN_EDIT; if (empty($jo)) { // new job order $jo = new JobOrder(); + $event_type = CMBJOEventType::CREATE; } else { @@ -715,7 +717,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface // the event $event = new JOEvent(); $event->setDateHappen(new DateTime()) - ->setTypeID(CMBJOEventType::CREATE) + ->setTypeID($event_type) ->setJobOrder($jo); if ($user != null) @@ -2881,6 +2883,814 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface return $params; } + public function initializeAdvanceOrderForm() + { + $new_jo = new JobOrder(); + + // set time schedule + $date_schedule = new DateTime(); + + // add 45 minutes to time + $date_schedule->add(new DateInterval('PT45M')); + $new_jo->setDateSchedule($date_schedule); + + $params['obj'] = $new_jo; + $params['mode'] = 'advanceorder'; + $params['jo_service_charges'] = []; + $params['current_date'] = new DateTime(); + + $this->fillDropdownParameters($params); + $this->fillFormTags($params); + + // get template to display + $params['template'] = $this->getTwigTemplate('jo_advanceorder_form'); + + // return params + return $params; + } + + public function processAdvanceOrderJobOrder(Request $req, $id, MQTTClient $mclient) + { + // initialize error list + $error_array = []; + + $em = $this->em; + + $jo = $em->getRepository(JobOrder::class)->find($id); + $event_type = CMBJOEventType::OPEN_EDIT; + if (empty($jo)) + { + // new job order + $jo = new JobOrder(); + $event_type = CMBJOEventType::CREATE; + } + + // check if lat and lng are provided + if (empty($req->request->get('coord_lng')) || empty($req->request->get('coord_lat'))) { + $error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.'; + } + + // check if responsible party is present + if (empty($req->request->get('responsible_party'))) + $error_array['responsible_party'] = 'Responsible party is required.'; + + // check if new customer + if ($req->request->get('new_customer', false)) + { + // validate mobile phone + $valid_mobile = $this->cust_handler->validateMobileNumber($req->request->get('phone_mobile')); + if (!($valid_mobile)) + $error_array['phone_mobile'] = 'Invalid mobile phone number.'; + + // check if plate number is in request + if (empty(trim($req->request->get('plate_number')))) + $error_array['plate_number'] = 'Plate number is required.'; + + // find the vehicle using vid + $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); + if (empty($new_vehicle)) + { + $error_array['cv_mfg'] = 'Invalid manufacturer specified.'; + $error_array['cv_make'] = 'Invalid make specified.'; + } + + if (empty($error_array)) + { + $new_cust = new Customer(); + $new_cv = new CustomerVehicle(); + + $new_cust->setLastName($req->request->get('last_name')) + ->setFirstName($req->request->get('first_name')) + ->setPhoneMobile($req->request->get('phone_mobile')) + ->setPhoneLandline($req->request->get('phone_landline')) + ->setPhoneOffice($req->request->get('phone_office')) + ->setCustomerNotes($req->request->get('customer_notes')); + + $new_cv->setCustomer($new_cust) + ->setVehicle($new_vehicle) + ->setPlateNumber(trim($req->request->get('plate_number'))) + ->setModelYear($req->request->get('cv_year')) + ->setColor('') + ->setStatusCondition('') + ->setFuelType('') + ->setActive() + ->setWarrantyCode($req->request->get('warranty_code')); + + if (($req->request->get('service_type')) == CMBServiceType::BATTERY_REPLACEMENT_NEW) + { + $new_cv->setHasMotoliteBattery(true); + } + else + { + $new_cv->setHasMotoliteBattery(false); + } + + // link JO to new customer + $jo->setCustomer($new_cust); + $jo->setCustomerVehicle($new_cv); + + $em->persist($new_cust); + $em->persist($new_cv); + } + } + else + { + // check if customer vehicle is set + if (empty($req->request->get('customer_vehicle'))) { + $error_array['customer_vehicle'] = 'No vehicle selected.'; + } else + { + // get customer vehicle + $cust_vehicle = $em->getRepository(CustomerVehicle::class)->find($req->request->get('customer_vehicle')); + + if (empty($cust_vehicle)) { + $error_array['customer_vehicle'] = 'Invalid vehicle specified.'; + } + else + { + $jo->setCustomerVehicle($cust_vehicle); + $jo->setCustomer($cust_vehicle->getCustomer()); + + // save serial into cv + $cust_vehicle->setWarrantyCode($req->request->get('warranty_code')); + + $em->persist($cust_vehicle); + } + } + } + + // check if hub is selected + if (empty($req->request->get('hub_id'))) + $error_array['hub'] = 'No hub selected.'; + else + { + // get hub + $hub = $em->getRepository(Hub::class)->find($req->request->get('hub_id')); + + if (empty($hub)) + $error_array['hub'] = 'Invalid hub specified.'; + } + + // delivery address + if (empty($req->request->get('delivery_address'))) + $error_array['delivery_address'] = 'Delivery address is required.'; + + // get discount and set to meta + $discount = $req->request->get('invoice_discount'); + + if (($discount > 60) || ($discount < 0)) + { + $error_array['invoice_discount'] = 'Invalid discount specified'; + } + + // get list of service charges + $service_charges = $req->request->get('service_charges', []); + + if (empty($error_array)) + { + // get current user + $user = $this->security->getUser(); + + // coordinates + $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat')); + + $stype = $req->request->get('service_type'); + + // set and save values + $jo->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time'))) + ->setCoordinates($point) + ->setAdvanceOrder($req->request->get('flag_advance') ?? false) + ->setServiceType($stype) + ->setWarrantyClass($req->request->get('warranty_class')) + ->setSource($req->request->get('source')) + ->setDeliveryInstructions($req->request->get('delivery_instructions')) + ->setDeliveryAddress($req->request->get('delivery_address')) + ->setORName($req->request->get('or_name')) + ->setPromoDetail($req->request->get('promo_detail', '')) + ->setModeOfPayment($req->request->get('mode_of_payment')) + ->setLandmark($req->request->get('landmark')) + ->setHub($hub) + ->setResponsibleParty($req->request->get('responsible_party', '')) + ->setStatus(JOStatus::RIDER_ASSIGN); + + $jo->addMeta('discount', $discount); + $jo->addMeta('service_charges', $service_charges); + + // check if user is null, meaning call to create came from API + if ($user != null) + { + $jo->setCreatedBy($user); + } + + // check if reference JO is set and validate + if (!empty($req->request->get('ref_jo'))) { + // get reference JO + $ref_jo = $em->getRepository(JobOrder::class)->find($req->request->get('ref_jo')); + + if (empty($ref_jo)) { + $error_array['ref_jo'] = 'Invalid reference job order specified.'; + } else { + $jo->setReferenceJO($ref_jo); + } + } + + // call service to generate invoice + $invoice_items = $req->request->get('invoice_items', []); + $discount = $req->request->get('invoice_discount'); + $invoice_change = $req->request->get('invoice_change', 0); + + // check if invoice changed + if ($invoice_change) + { + $this->ic->generateInvoiceCriteria($jo, $discount, $invoice_items, $error_array); + } + + // validate + $errors = $this->validator->validate($jo); + + // add errors to list + foreach ($errors as $error) { + $error_array[$error->getPropertyPath()] = $error->getMessage(); + } + + // check if errors are found + if (empty($error_array)) + { + // validated, no error. save the job order + $em->persist($jo); + + // the event + $event = new JOEvent(); + $event->setDateHappen(new DateTime()) + ->setTypeID($event_type) + ->setJobOrder($jo); + + if ($user != null) + { + $event->setUser($user); + } + + $em->persist($event); + $em->flush(); + } + } + + return $error_array; + } + + public function initializeAdvanceOrderEditForm($id, $map_tools) + { + $em = $this->em; + $obj = $em->getRepository(JobOrder::class)->find($id); + + $params['obj'] = $obj; + $params['mode'] = 'advanceorder-edit'; + $params['cvid'] = $obj->getCustomerVehicle()->getID(); + $params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID(); + $params['current_date'] = new DateTime(); + + // 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; + + // get odometer + $odometer = $obj->getMeta('odometer'); + + $params['odometer'] = $odometer; + + // get customer email used in JO + $email = $obj->getMeta('customer_email'); + + $params['email'] = $email; + + // get images if any + $jo_extra = $obj->getJOExtra(); + $pic_array = []; + $params['signature'] = null; + if ($jo_extra != null) + { + $img_1 = $jo_extra->getImage1Filename(); + $img_2 = $jo_extra->getImage2Filename(); + $img_3 = $jo_extra->getImage3Filename(); + $img_4 = $jo_extra->getImage4Filename(); + + $other_images = $jo_extra->getOtherImages(); + + $cust_signature = $jo_extra->getCustomerSignature(); + + if ($img_1 != null) + $pic_array['image_1'] = $img_1; + if ($img_2 != null) + $pic_array['image_2'] = $img_2; + if ($img_3 != null) + $pic_array['image_3'] = $img_3; + if ($img_4 != null) + $pic_array['image_4'] = $img_4; + + if ($other_images != null) + { + foreach ($other_images as $img) + { + $pic_array['other_images'][] = $img; + } + } + + $params['signature'] = $cust_signature; + } + + $params['jo_pictures'] = $pic_array; + + $this->fillDropdownParameters($params); + $this->fillFormTags($params); + + // get the hubs + // TODO: move this snippet to a function + $hubs = $map_tools->getClosestHubs($obj->getCoordinates(), 50, date("H:i:s")); + + $params['hubs'] = []; + + // format duration and distance into friendly time + foreach ($hubs as $hub) { + // duration + $seconds = $hub['duration']; + + if (!empty($seconds) && $seconds > 0) { + $hours = floor($seconds / 3600); + $minutes = ceil(($seconds / 60) % 60); + + $hub['duration'] = ($hours > 0 ? number_format($hours) . " hr" . ($hours > 1 ? "s" : '') . ($minutes > 0 ? ", " : '') : '') . ($minutes > 0 ? number_format($minutes) . " min" . ($minutes > 1 ? "s" : '') : ''); + } else { + $hub['duration'] = false; + } + + // distance + $meters = $hub['distance']; + + if (!empty($meters) && $meters > 0) { + $hub['distance'] = round($meters / 1000) . " km"; + } else { + $hub['distance'] = false; + } + + // counters + $hub['rider_count'] = count($hub['hub']->getAvailableRiders()); + $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); + + // check for rejection + $hub['flag_rejected'] = false; + $hub_id = $hub['hub']->getID(); + + $params['hubs'][] = $hub; + } + + // get template to display + $params['template'] = $this->getTwigTemplate('jo_advanceorder_edit_form'); + + return $params; + } + + public function initializeAssignAdvanceOrderForm($id, $map_tools) + { + $em = $this->em; + $obj = $em->getRepository(JobOrder::class)->find($id); + + $params['obj'] = $obj; + $params['mode'] = 'assign-advanceorder'; + $params['cvid'] = $obj->getCustomerVehicle()->getID(); + $params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID(); + $params['current_date'] = new DateTime(); + + // 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; + + // get odometer + $odometer = $obj->getMeta('odometer'); + + $params['odometer'] = $odometer; + + // get customer email used in JO + $email = $obj->getMeta('customer_email'); + + $params['email'] = $email; + + // get images if any + $jo_extra = $obj->getJOExtra(); + $pic_array = []; + $params['signature'] = null; + if ($jo_extra != null) + { + $img_1 = $jo_extra->getImage1Filename(); + $img_2 = $jo_extra->getImage2Filename(); + $img_3 = $jo_extra->getImage3Filename(); + $img_4 = $jo_extra->getImage4Filename(); + + $other_images = $jo_extra->getOtherImages(); + + $cust_signature = $jo_extra->getCustomerSignature(); + + if ($img_1 != null) + $pic_array['image_1'] = $img_1; + if ($img_2 != null) + $pic_array['image_2'] = $img_2; + if ($img_3 != null) + $pic_array['image_3'] = $img_3; + if ($img_4 != null) + $pic_array['image_4'] = $img_4; + + if ($other_images != null) + { + foreach ($other_images as $img) + { + $pic_array['other_images'][] = $img; + } + } + + $params['signature'] = $cust_signature; + } + + $params['jo_pictures'] = $pic_array; + + $this->fillDropdownParameters($params); + $this->fillFormTags($params); + + // get the hubs + // TODO: move this snippet to a function + $hubs = $map_tools->getClosestHubs($obj->getCoordinates(), 50, date("H:i:s")); + + $params['hubs'] = []; + + // format duration and distance into friendly time + foreach ($hubs as $hub) { + // duration + $seconds = $hub['duration']; + + if (!empty($seconds) && $seconds > 0) { + $hours = floor($seconds / 3600); + $minutes = ceil(($seconds / 60) % 60); + + $hub['duration'] = ($hours > 0 ? number_format($hours) . " hr" . ($hours > 1 ? "s" : '') . ($minutes > 0 ? ", " : '') : '') . ($minutes > 0 ? number_format($minutes) . " min" . ($minutes > 1 ? "s" : '') : ''); + } else { + $hub['duration'] = false; + } + + // distance + $meters = $hub['distance']; + + if (!empty($meters) && $meters > 0) { + $hub['distance'] = round($meters / 1000) . " km"; + } else { + $hub['distance'] = false; + } + + // counters + $hub['rider_count'] = count($hub['hub']->getAvailableRiders()); + $hub['jo_count'] = count($hub['hub']->getForAssignmentJobOrders()); + + // check for rejection + $hub['flag_rejected'] = false; + $hub_id = $hub['hub']->getID(); + + $params['hubs'][] = $hub; + } + + // get template to display + $params['template'] = $this->getTwigTemplate('jo_assign_advanceorder_form'); + + return $params; + } + + public function processAssignAdvanceOrderJobOrder(Request $req, $id, MQTTClient $mclient) + { + // initialize error list + $error_array = []; + + $em = $this->em; + + $jo = $em->getRepository(JobOrder::class)->find($id); + $old_jo_status = null; + $old_rider = null; + $event_type = CMBJOEventType::OPEN_EDIT; + if (empty($jo)) + { + // new job order + $jo = new JobOrder(); + $event_type = CMBJOEventType::CREATE; + } + else + { + // need to get old values of rider and status to see if we need to change JO status or not + $old_rider = $jo->getRider(); + $old_jo_status = $jo->getStatus(); + } + + // check if lat and lng are provided + if (empty($req->request->get('coord_lng')) || empty($req->request->get('coord_lat'))) { + $error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.'; + } + + // check if responsible party is present + if (empty($req->request->get('responsible_party'))) + $error_array['responsible_party'] = 'Responsible party is required.'; + + // check if new customer + if ($req->request->get('new_customer', false)) + { + // validate mobile phone + $valid_mobile = $this->cust_handler->validateMobileNumber($req->request->get('phone_mobile')); + if (!($valid_mobile)) + $error_array['phone_mobile'] = 'Invalid mobile phone number.'; + + // check if plate number is in request + if (empty(trim($req->request->get('plate_number')))) + $error_array['plate_number'] = 'Plate number is required.'; + + // find the vehicle using vid + $new_vehicle = $em->getRepository(Vehicle::class)->find($req->request->get('vid')); + if (empty($new_vehicle)) + { + $error_array['cv_mfg'] = 'Invalid manufacturer specified.'; + $error_array['cv_make'] = 'Invalid make specified.'; + } + + if (empty($error_array)) + { + $new_cust = new Customer(); + $new_cv = new CustomerVehicle(); + + $new_cust->setLastName($req->request->get('last_name')) + ->setFirstName($req->request->get('first_name')) + ->setPhoneMobile($req->request->get('phone_mobile')) + ->setPhoneLandline($req->request->get('phone_landline')) + ->setPhoneOffice($req->request->get('phone_office')) + ->setCustomerNotes($req->request->get('customer_notes')); + + $new_cv->setCustomer($new_cust) + ->setVehicle($new_vehicle) + ->setPlateNumber(trim($req->request->get('plate_number'))) + ->setModelYear($req->request->get('cv_year')) + ->setColor('') + ->setStatusCondition('') + ->setFuelType('') + ->setActive() + ->setWarrantyCode($req->request->get('warranty_code')); + + if (($req->request->get('service_type')) == CMBServiceType::BATTERY_REPLACEMENT_NEW) + { + $new_cv->setHasMotoliteBattery(true); + } + else + { + $new_cv->setHasMotoliteBattery(false); + } + + // link JO to new customer + $jo->setCustomer($new_cust); + $jo->setCustomerVehicle($new_cv); + + $em->persist($new_cust); + $em->persist($new_cv); + } + } + else + { + // check if customer vehicle is set + if (empty($req->request->get('customer_vehicle'))) { + $error_array['customer_vehicle'] = 'No vehicle selected.'; + } else + { + // get customer vehicle + $cust_vehicle = $em->getRepository(CustomerVehicle::class)->find($req->request->get('customer_vehicle')); + + if (empty($cust_vehicle)) { + $error_array['customer_vehicle'] = 'Invalid vehicle specified.'; + } + else + { + $jo->setCustomerVehicle($cust_vehicle); + $jo->setCustomer($cust_vehicle->getCustomer()); + + // save serial into cv + $cust_vehicle->setWarrantyCode($req->request->get('warranty_code')); + + $em->persist($cust_vehicle); + } + } + } + + // check if hub AND rider is selected + $rider_plate_number = ''; + if ((empty($req->request->get('hub_id'))) && + (empty($req->request->get('rider_id')))) { + $error_array['hub'] = 'No hub selected.'; + } else { + if (empty($req->request->get('rider_id'))) { + $error_array['rider'] = 'No rider selected.'; + } else { + // get hub + $hub = $em->getRepository(Hub::class)->find($req->request->get('hub_id')); + + if (empty($hub)) { + $error_array['hub'] = 'Invalid hub specified.'; + } else { + // get rider + $rider = $em->getRepository(Rider::class)->find($req->request->get('rider_id')); + + if (empty($rider)) { + $error_array['rider'] = 'Invalid rider specified.'; + } else { + // check if rider is still available + if (!($rider->isAvailable())) + $error_array['rider'] = 'Selected rider is unavailable.'; + + $rider_plate_number = $rider->getPlateNumber(); + } + } + } + } + + // delivery address + if (empty($req->request->get('delivery_address'))) + $error_array['delivery_address'] = 'Delivery address is required.'; + + // get discount and set to meta + $discount = $req->request->get('invoice_discount'); + + if (($discount > 60) || ($discount < 0)) + { + $error_array['invoice_discount'] = 'Invalid discount specified'; + } + + // get list of service charges + $service_charges = $req->request->get('service_charges', []); + + if (empty($error_array)) + { + // set priority based on rider's existing open job orders + $rider_jos = $rider->getOpenJobOrders(); + + // get maximum priority then add 1 + // NOTE: this can be a bit buggy due to concurrency issues + // ideally have to lock jo table, but that isn't feasible right now + $priority = 0; + foreach ($rider_jos as $rider_jo) + { + if ($priority < $rider_jo->getPriority()) + $priority = $rider_jo->getPriority() + 1; + } + + // get current user + $user = $this->security->getUser(); + + // coordinates + $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat')); + + $stype = $req->request->get('service_type'); + + // set and save values + $jo->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time'))) + ->setCoordinates($point) + ->setAdvanceOrder($req->request->get('flag_advance') ?? false) + ->setServiceType($stype) + ->setWarrantyClass($req->request->get('warranty_class')) + ->setSource($req->request->get('source')) + ->setDeliveryInstructions($req->request->get('delivery_instructions')) + ->setDeliveryAddress($req->request->get('delivery_address')) + ->setORName($req->request->get('or_name')) + ->setPromoDetail($req->request->get('promo_detail', '')) + ->setModeOfPayment($req->request->get('mode_of_payment')) + ->setLandmark($req->request->get('landmark')) + ->setHub($hub) + ->setRider($rider) + ->setPriority($priority) + ->setResponsibleParty($req->request->get('responsible_party', '')) + ->setRiderPlateNum($rider_plate_number); + + $jo->addMeta('discount', $discount); + $jo->addMeta('service_charges', $service_charges); + + // retain old jo status if it's an update JO + // check old rider if it is also a reassignment + // old_rider should be null if JO has been rejected + if (($old_rider == null) && ($old_jo_status == null)) + $jo->setStatus(JOStatus::ASSIGNED); + else + { + $new_rider = $jo->getRider(); + if ($new_rider != $old_rider) + { + // reassignment + $jo->setStatus(JOStatus::ASSIGNED); + $event_type = CMBJOEventType::RIDER_ASSIGN; + } + else + { + if ($old_jo_status != null) + $jo->setStatus($old_jo_status); + } + } + + // check if user is null, meaning call to create came from API + if ($user != null) + { + $jo->setCreatedBy($user); + } + + // check if reference JO is set and validate + if (!empty($req->request->get('ref_jo'))) { + // get reference JO + $ref_jo = $em->getRepository(JobOrder::class)->find($req->request->get('ref_jo')); + + if (empty($ref_jo)) { + $error_array['ref_jo'] = 'Invalid reference job order specified.'; + } else { + $jo->setReferenceJO($ref_jo); + } + } + + // call service to generate job order and invoice + $invoice_items = $req->request->get('invoice_items', []); + $discount = $req->request->get('invoice_discount'); + $invoice_change = $req->request->get('invoice_change', 0); + + // check if invoice changed + if ($invoice_change) + { + $this->ic->generateInvoiceCriteria($jo, $discount, $invoice_items, $error_array); + } + + // validate + $errors = $this->validator->validate($jo); + + // add errors to list + foreach ($errors as $error) { + $error_array[$error->getPropertyPath()] = $error->getMessage(); + } + + // check if errors are found + if (empty($error_array)) + { + // validated, no error. save the job order + $em->persist($jo); + + // the event + $event = new JOEvent(); + $event->setDateHappen(new DateTime()) + ->setTypeID($event_type) + ->setJobOrder($jo); + + if ($user != null) + { + $event->setUser($user); + } + + $em->persist($event); + $em->flush(); + + // check if JO has been reassigned + if ($old_rider != $jo->getRider()) + //if ($old_jo_status != $jo->getStatus()) + { + error_log('JO has been reassigned'); + // TODO: refactor later + $channel = 'rider/' . $rider->getID() . '/events'; + $payload = [ + 'event' => 'new_jo', + 'jo_id' => $jo->getID(), + ]; + + $mclient->publish($channel, json_encode($payload)); + } + } + } + + return $error_array; + } + protected function fillDropdownParameters(&$params) { $em = $this->em; @@ -2973,6 +3783,21 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $params['ftags']['invoice_edit'] = true; $params['ftags']['preset_vehicle'] = true; break; + case 'advanceorder': + $params['ftags']['vehicle_dropdown'] = true; + $params['ftags']['set_map_coordinate'] = false; + $params['ftags']['invoice_edit'] = true; + $params['ftags']['ticket_table'] = false; + $params['ftags']['cancel_button'] = false; + break; + case 'advanceorder-edit': + $params['ftags']['invoice_edit'] = true; + $params['ftags']['preset_vehicle'] = true; + break; + case 'assign-advanceorder': + $params['ftags']['invoice_edit'] = true; + $params['ftags']['preset_vehicle'] = true; + break; } } @@ -2998,6 +3823,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $this->template_hash['jo_walkin_edit_form'] = 'job-order/cmb.form.walkin.html.twig'; $this->template_hash['jo_popup'] = 'job-order/cmb.popup.html.twig'; $this->template_hash['jo_behind_schedule'] = 'job-order/cmb.list.behindschedule.html.twig'; + $this->template_hash['jo_advanceorder_form'] = 'job-order/cmb.form.advanceorder.html.twig'; + $this->template_hash['jo_advanceorder_edit_form'] = 'job-order/cmb.form.advanceorder.html.twig'; + $this->template_hash['jo_list_assign_advanceorder'] = 'job-order/cmb.list.assignadvanceorder.html.twig'; + $this->template_hash['jo_assign_advanceorder_form'] = 'job-order/cmb.form.assignadvanceorder.html.twig'; } protected function checkTier($tier) @@ -3063,6 +3892,14 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $unlock_route = ''; $jo_status = JOStatus::ASSIGNED; break; + case 'assign_advance_order': + $tier_key = 'jo_assign_advance_order'; + $tier_name = 'Assign Advance Order'; + $rows_route = 'jo_assign_advance_order_rows'; + $edit_route = ''; + $unlock_route = ''; + $jo_status = JOStatus::RIDER_ASSIGN; + break; default: throw new AccessDeniedHttpException('No access.'); } @@ -3253,11 +4090,22 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface if (empty($jo)) throw new NotFoundHttpException('The item does not exist'); + $edit_route = ''; // check transaction origin if ($jo->getSource() == CMBTransactionOrigin::WALK_IN) - return 'jo_walkin_edit_form'; + $edit_route = 'jo_walkin_edit_form'; else - return 'jo_onestep_edit_form'; + { + // need to check if onestep or assign advance order + if ($jo->getStatus() == JOStatus::ASSIGNED) + $edit_route = 'jo_onestep_edit_form'; + else if ($jo->getStatus() == JOStatus::RIDER_ASSIGN) + $edit_route = 'jo_assign_advance_order_form'; + else + $edit_route = 'jo_advance_order_edit_form'; + } + + return $edit_route; } protected function generateDiscountOptions() diff --git a/templates/job-order/cmb.form.advanceorder.html.twig b/templates/job-order/cmb.form.advanceorder.html.twig new file mode 100644 index 00000000..e480fa20 --- /dev/null +++ b/templates/job-order/cmb.form.advanceorder.html.twig @@ -0,0 +1,1656 @@ +{% extends 'base.html.twig' %} + +{% block body %} + + + +
+ +
+
+
+
+
+
+ + + + {% if mode == "advanceorder" %} +

+ Advance Order Job Order +

+ {% else %} +

+ Advance Order Job Order #{{ obj.getID }} - {{ obj.getStatusText }} +

+ {% endif %} +
+
+
+
+ + +
+ {%if ftags.vehicle_dropdown %} +
+
+
+ + + +
+ +
+
+
+
+
+ + + +
+
+
+ {% else %} + + {% endif %} + {% if obj.getReferenceJO %} +
+
+
+ + + +
+
+
+ {% endif %} + +
+
+

+ Customer Details +

+ + + +
+
+
+ + + +
+
+ + + +
+
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+
+
+
+
+ + + +
+
+
+
+
+

+ Vehicle Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+ +
+
+
+
+

+ Battery Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+
+
+

+ Transaction Details +

+ + + +
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ +
+ + + + +
+ +
+
+ +
+ + + + +
+ +
+
+
+
+
+ + + +
+
+
+ + +
+
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+ + + +
+
+
+ + + +
+
+
+
+
+
+
+

+ Location +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ + + + +
+ + + + +
+
+
+
+
+ +
+
+

+ {% if mode in ['view-all'] %} + Assigned Hub + {% else %} + Nearest Hubs + {% endif %} +

+
+
+
+ {% if mode != 'view-all' %} + + {% endif %} + + +
+ + + + + + + + + + + + +
HubBranchContact NumbersDistance in KM
+
+
+
+
+ + {% if mode in ['advanceorder-edit'] %} +
+
+
+

+ Other Information +

+
+
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+ +
+ {% for key, picture in jo_pictures %} + {% if key == 'image_1' %} +
+ + + +
+ +
+ {% endif %} + {% if key == 'image_2' %} +
+ + + +
+ +
+ {% endif %} + {% if key == 'image_3' %} +
+ + + +
+ +
+ {% endif %} + {% if key == 'image_4' %} +
+ + + +
+ +
+ {% endif %} + + {% endfor %} +
+ +
+ + + {% endif %} + +
+
+
+

+ Service Charges +

+
+
+ {% if mode != 'view-all' %} +
+ +
+ {% endif %} +
+ + {% for jo_sc in jo_service_charges %} +
+
+
+ +
+
+
+ +
+
+ +
+
+ {% endfor %} +
+ +
+
+
+

+ Invoice +

+
+
+
+ + + +
+ +
+
+
+ + {% if ftags.invoice_edit %} + + + {% else %} + + + {% endif %} +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + {% if not obj.getInvoice or (obj.getInvoice and obj.getInvoice.getItems|length == 0) %} + + + + {% else %} + {% for item in obj.getInvoice.getItems %} + + + + + + + {% endfor %} + {% endif %} + +
ItemQuantityUnit PriceAmount
+ No items to display. +
{{ item.getTitle }}{{ item.getQuantity|number_format }}{{ item.getPrice|number_format(2) }}{{ (item.getPrice * item.getQuantity)|number_format(2) }}
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+
+
+
+
+
+
+ {% if mode != 'view-all' %} + + {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %} + Cancel Job Order + {% endif %} + {% endif %} + Back +
+
+
+
+ +
+
+
+
+{% endblock %} + +{% block scripts %} +{{ include('map/' ~ map_js_file) }} + + + + +{% endblock %} diff --git a/templates/job-order/cmb.form.assignadvanceorder.html.twig b/templates/job-order/cmb.form.assignadvanceorder.html.twig new file mode 100644 index 00000000..52d323b3 --- /dev/null +++ b/templates/job-order/cmb.form.assignadvanceorder.html.twig @@ -0,0 +1,1960 @@ +{% extends 'base.html.twig' %} + +{% block body %} + + + +
+ +
+
+
+
+
+
+ + + +

+ Assign Advance Job Order #{{ obj.getID }} - {{ obj.getStatusText }} +

+
+
+
+
+ + +
+ {%if ftags.vehicle_dropdown %} +
+
+
+ + + +
+ +
+
+
+
+
+ + + +
+
+
+ {% else %} + + {% endif %} + {% if obj.getReferenceJO %} +
+
+
+ + + +
+
+
+ {% endif %} + +
+
+

+ Customer Details +

+ + + +
+
+
+ + + +
+
+ + + +
+
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+
+
+
+
+ + + +
+
+
+
+
+

+ Vehicle Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+ +
+
+
+
+

+ Battery Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+
+
+

+ Transaction Details +

+ + + +
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ +
+ + + + +
+ +
+
+ +
+ + + + +
+ +
+
+
+
+
+ + + +
+
+
+ + +
+
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+ + + +
+
+
+ + + +
+
+
+
+
+
+
+

+ Location +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ + + + +
+ + + + +
+
+
+
+
+ +
+
+

+ {% if mode in ['view-all', 'assign-advanceorder'] %} + Assigned Hub + {% else %} + Nearest Hubs + {% endif %} +

+
+
+
+ + +
+ + + + + + + + + + + +
HubBranchContact NumbersDistance in KM
+
+
+
+
+
+
+

+ {% if mode in ['view-all', 'update-fulfillment'] %} + Assigned Rider + {% else %} + Rider Assignment + {% endif %} +

+
+
+
+ {% if mode != 'view-all' %} + + {% endif %} + + +
+ + + + + + + + + + + {% if mode in ['onestep-edit', 'view-all'] %} + {% set avail_riders = obj.getHub.getAvailableRiders|default([]) %} + + + + + {% if obj.getHub %} + {% for rider in avail_riders %} + {% if mode in ['view-all', 'update-fulfillment'] %} + + {% else %} + + {% endif %} + + + + + {% endfor %} + {% endif %} + {% endif %} + +
First NameLast NameContact No.Plate Number
+ No riders available. +
{{ rider.getFirstName }}{{ rider.getLastName }}{{ rider.getContactNumber }}{{ rider.getPlateNumber }}
+
+
+
+
+ + {% if mode in ['onestep-edit'] %} +
+
+
+

+ Other Information +

+
+
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+ +
+ {% for key, picture in jo_pictures %} + {% if key == 'image_1' %} +
+ + + +
+ +
+ {% endif %} + {% if key == 'image_2' %} +
+ + + +
+ +
+ {% endif %} + {% if key == 'image_3' %} +
+ + + +
+ +
+ {% endif %} + {% if key == 'image_4' %} +
+ + + +
+ +
+ {% endif %} + + {% endfor %} +
+ +
+ + + {% endif %} + +
+
+
+

+ Service Charges +

+
+
+ {% if mode != 'view-all' %} +
+ +
+ {% endif %} +
+ + {% for jo_sc in jo_service_charges %} +
+
+
+ +
+
+
+ +
+
+ +
+
+ {% endfor %} +
+ +
+
+
+

+ Invoice +

+
+
+
+ + + +
+ +
+
+
+ + {% if ftags.invoice_edit %} + + + {% else %} + + + {% endif %} +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + {% if not obj.getInvoice or (obj.getInvoice and obj.getInvoice.getItems|length == 0) %} + + + + {% else %} + {% for item in obj.getInvoice.getItems %} + + + + + + + {% endfor %} + {% endif %} + +
ItemQuantityUnit PriceAmount
+ No items to display. +
{{ item.getTitle }}{{ item.getQuantity|number_format }}{{ item.getPrice|number_format(2) }}{{ (item.getPrice * item.getQuantity)|number_format(2) }}
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+
+
+
+
+
+
+ {% if mode != 'view-all' %} + + {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %} + Cancel Job Order + {% endif %} + {% endif %} + Back +
+
+
+
+ +
+
+
+
+{% endblock %} + +{% block scripts %} +{{ include('map/' ~ map_js_file) }} + + + + +{% endblock %} + diff --git a/templates/job-order/cmb.list.all.html.twig b/templates/job-order/cmb.list.all.html.twig index 17c7be16..49d04ae2 100644 --- a/templates/job-order/cmb.list.all.html.twig +++ b/templates/job-order/cmb.list.all.html.twig @@ -115,7 +115,7 @@ sortable: false, overflow: 'visible', template: function (row, index, datatable) { - var actions = ''; + var actions = ''; actions += ''; return actions; diff --git a/templates/job-order/cmb.list.assignadvanceorder.html.twig b/templates/job-order/cmb.list.assignadvanceorder.html.twig new file mode 100644 index 00000000..26baeaba --- /dev/null +++ b/templates/job-order/cmb.list.assignadvanceorder.html.twig @@ -0,0 +1,210 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

+ Advanced Order Job Orders +

+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+ +
+
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+{% endblock %} + +{% block scripts %} + +{% endblock %} diff --git a/templates/job-order/cmb.list.behindschedule.html.twig b/templates/job-order/cmb.list.behindschedule.html.twig index 2ed1bbeb..5f9a9c57 100644 --- a/templates/job-order/cmb.list.behindschedule.html.twig +++ b/templates/job-order/cmb.list.behindschedule.html.twig @@ -103,8 +103,8 @@ sortable: false, overflow: 'visible', template: function (row, index, datatable) { - {% if is_granted('jo_onestep.edit') %} - var actions = ''; + {% if is_granted('jo_onestep.edit') or is_granted('jo_advance_order.edit') or is_granted('jo_assign_advance_order.edit') %} + var actions = ''; {% endif %} return actions; diff --git a/templates/job-order/cmb.list.open.html.twig b/templates/job-order/cmb.list.open.html.twig index aac00d65..21669275 100644 --- a/templates/job-order/cmb.list.open.html.twig +++ b/templates/job-order/cmb.list.open.html.twig @@ -114,8 +114,8 @@ sortable: false, overflow: 'visible', template: function (row, index, datatable) { - {% if is_granted('jo_onestep.edit') %} - var actions = ''; + {% if is_granted('jo_onestep.edit') or is_granted('jo_advance_order.edit') or is_granted('jo_assign_advance_order.edit') %} + var actions = ''; {% endif %} return actions;