Add assign advance order screens. #509
This commit is contained in:
Korina Cordero
parent
c4bf772f70
commit
931a212005
7 changed files with 1098 additions and 397 deletions
|
|
@ -278,6 +278,8 @@ access_keys:
|
|||
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
|
||||
|
|
|
|||
|
|
@ -106,12 +106,12 @@ main_menu:
|
|||
acl: jo_onestep.form
|
||||
label: One-step Process
|
||||
parent: joborder
|
||||
- id: jo_advance_order
|
||||
- id: jo_advance_order_form
|
||||
acl: jo_advance_order.form
|
||||
label: New Advance Order
|
||||
parent: joborder
|
||||
- id: jo_advance_order_assign
|
||||
acl: jo_assign_advance_order.form
|
||||
- id: jo_assign_advance_order
|
||||
acl: jo_assign_advance_order.list
|
||||
label: Assign Advance Order
|
||||
parent: joborder
|
||||
- id: jo_walkin_form
|
||||
|
|
|
|||
|
|
@ -307,12 +307,3 @@ jo_assign_advance_order_submit:
|
|||
controller: App\Controller\JobOrderController::assignAdvanceOrderSubmit
|
||||
methods: [POST]
|
||||
|
||||
jo_assign_advance_order_edit_form:
|
||||
path: /job-order/assign-advance-order/{id}/edit
|
||||
controller: App\Controller\JobOrderController::assignAdvanceOrderEditForm
|
||||
methods: [GET]
|
||||
|
||||
jo_assign_advance_order_edit_submit:
|
||||
path: /job-order/assign-advance-order/{id}/edit
|
||||
controller: App\Controller\JobOrderController::assignAdvanceOrderEditSubmit
|
||||
methods: [POST]
|
||||
|
|
|
|||
|
|
@ -1164,17 +1164,32 @@ class JobOrderController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @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(EntityManagerInterface $em, JobOrderHandlerInterface $jo_handler,
|
||||
GISManagerInterface $gis)
|
||||
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();
|
||||
$params['submit_url'] = $this->generateUrl('jo_assign_advance_order_submit');
|
||||
$params['return_url'] = $this->generateUrl('jo_assign_advance_order_form');
|
||||
$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();
|
||||
|
|
@ -1186,13 +1201,12 @@ class JobOrderController extends Controller
|
|||
return $this->render($template, $params);
|
||||
}
|
||||
|
||||
public function assignAdvanceOrderSubmit(Request $req, JobOrderHandlerInterface $jo_handler, MQTTClient $mclient)
|
||||
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 = [];
|
||||
$id = -1;
|
||||
$error_array = $jo_handler->processAssignAdvanceOrderJobOrder($req, $id, $mclient);
|
||||
|
||||
// check if any errors were found
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -3259,8 +3261,434 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
return $params;
|
||||
}
|
||||
|
||||
public function initializeAssignAdvanceOrderForm()
|
||||
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)
|
||||
|
|
@ -3366,6 +3794,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
$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;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -3393,6 +3825,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
$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)
|
||||
|
|
@ -3662,9 +4096,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
|||
$edit_route = 'jo_walkin_edit_form';
|
||||
else
|
||||
{
|
||||
// need to check if onestep or not
|
||||
// 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';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,15 +23,9 @@
|
|||
<span class="m-portlet__head-icon">
|
||||
<i class="flaticon-transport"></i>
|
||||
</span>
|
||||
{% if mode == "assignadvanceorder" %}
|
||||
<h3 class="m-portlet__head-text">
|
||||
Assign Advance Order Job Order
|
||||
Assign Advance Job Order #{{ obj.getID }} - {{ obj.getStatusText }}
|
||||
</h3>
|
||||
{% else %}
|
||||
<h3 class="m-portlet__head-text">
|
||||
Assign Advance Order Job Order #{{ obj.getID }} - {{ obj.getStatusText }}
|
||||
</h3>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -170,6 +164,7 @@
|
|||
<option value="">Select a make</option>
|
||||
{% for make in vmakes %}
|
||||
{% set vmake_id = obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getID : 0 %}
|
||||
|
||||
<option value="{{ make.getID() }}" {% if vmake_id == make.getID %}selected{% endif %}>{{ make.getMake() }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
|
|
@ -239,7 +234,7 @@
|
|||
</h3>
|
||||
<span class="m-switch m-switch--icon block-switch">
|
||||
<label>
|
||||
<input type="checkbox" name="flag_advance" id="flag-advance" value="1"{{ obj.isAdvanceOrder ? ' checked' }}>
|
||||
<input type="checkbox" name="flag_advance" id="flag-advance" value="1"{{ obj.isAdvanceOrder ? ' checked' }} disabled>
|
||||
<label class="switch-label">This is an advance order</label>
|
||||
<span></span>
|
||||
</label>
|
||||
|
|
@ -401,7 +396,7 @@
|
|||
<div class="m-form__section">
|
||||
<div class="m-form__heading">
|
||||
<h3 class="m-form__heading-title">
|
||||
{% if mode in ['view-all', 'assign-advance-order', 'assign-advance-order-edit'] %}
|
||||
{% if mode in ['view-all', 'assign-advanceorder'] %}
|
||||
Assigned Hub
|
||||
{% else %}
|
||||
Nearest Hubs
|
||||
|
|
@ -410,11 +405,6 @@
|
|||
</div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-12">
|
||||
{% if mode != 'view-all' %}
|
||||
<label name="hub" data-field="hub">Click on a row to select a hub
|
||||
<span style="color:red"> *</span>
|
||||
</label>
|
||||
{% endif %}
|
||||
<div class="form-control-feedback hide" data-field="hub"></div>
|
||||
<input type="hidden" id="hub-field" name="hub_id" value="">
|
||||
<div class="table-frame" data-name="hub">
|
||||
|
|
@ -428,15 +418,6 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody id="nearest_hubs">
|
||||
<!-- {% if mode in ['onestep-edit'] %}
|
||||
{% for hub in hubs %}
|
||||
<tr data-id="{{ hub.hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.hub.getID ? ' class="m-table__row--primary"' }}>
|
||||
<td>{{ hub.hub.getName }}</td>
|
||||
<td>{{ hub.hub.getBranch }}</td>
|
||||
<td>{{ hub.hub.getContactNumbers }}</td>
|
||||
<td></td>
|
||||
{% endfor %}
|
||||
{% endif %} -->
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
|
@ -446,7 +427,7 @@
|
|||
<div class="m-form__section">
|
||||
<div class="m-form__heading">
|
||||
<h3 class="m-form__heading-title">
|
||||
{% if mode in ['view-all', 'assign-advance-order-edit'] %}
|
||||
{% if mode in ['view-all', 'update-fulfillment'] %}
|
||||
Assigned Rider
|
||||
{% else %}
|
||||
Rider Assignment
|
||||
|
|
@ -473,7 +454,7 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody id="riders">
|
||||
{% if mode in ['onestep-edit', 'view-all', 'assign-advance-order', 'assign-advance-order-edit'] %}
|
||||
{% if mode in ['onestep-edit', 'view-all'] %}
|
||||
{% set avail_riders = obj.getHub.getAvailableRiders|default([]) %}
|
||||
<tr class="placeholder-row{{ obj.getHub and avail_riders|length > 0 ? ' hide' }}">
|
||||
<td colspan="4">
|
||||
|
|
@ -483,7 +464,7 @@
|
|||
|
||||
{% if obj.getHub %}
|
||||
{% for rider in avail_riders %}
|
||||
{% if mode in ['view-all', 'assign-advance-order', 'assign-advance-order-edit'] %}
|
||||
{% if mode in ['view-all', 'update-fulfillment'] %}
|
||||
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' ' }}">
|
||||
{% else %}
|
||||
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' class="m-table__row--primary"' }}">
|
||||
|
|
@ -502,7 +483,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{% if mode in ['assign-advance-order-edit'] %}
|
||||
{% if mode in ['onestep-edit'] %}
|
||||
<div class="m-form__seperator m-form__seperator--dashed"></div>
|
||||
<div class="m-form__section">
|
||||
<div class="m-form__heading">
|
||||
|
|
@ -775,7 +756,7 @@
|
|||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
{% if mode != 'view-all' %}
|
||||
<button type="submit" class="btn btn-success"> Submit </button>
|
||||
<button type="submit" class="btn btn-success">{{ mode == 'update-fulfillment' ? 'Fulfill' : 'Submit' }}</button>
|
||||
{% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
|
||||
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</a>
|
||||
{% endif %}
|
||||
|
|
@ -870,7 +851,96 @@ $(function() {
|
|||
|
||||
var marker = L.marker([lat, lng], { icon: icon_customer });
|
||||
|
||||
{% if mode in ['view-all', 'assign-advance-joborder', 'assign-advance-job-order-edit'] %}
|
||||
{% if mode in ['onestep'] %}
|
||||
// get nearest hubs ajax
|
||||
var hub_table = '';
|
||||
var rider_table = '';
|
||||
$.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
|
||||
var hubs = data['hubs'];
|
||||
for (i in hubs) {
|
||||
var hub = hubs[i];
|
||||
var hub_marker = L.marker([hub['lat'], hub['long']], { icon: icon_hub });
|
||||
hubLayerGroup.addLayer(hub_marker);
|
||||
|
||||
hub_table += '<tr data-id=' + hub['id'] + '>';
|
||||
hub_table += '<td>' + hub['name'] + '</td>';
|
||||
hub_table += '<td>' + hub['branch'] + '</td>';
|
||||
hub_table += '<td>' + hub['cnum'] + '</td>';
|
||||
hub_table += '<td>' + hub['distance'] + '</td>';
|
||||
hub_table += '</tr>';
|
||||
}
|
||||
|
||||
$('#nearest_hubs').html(hub_table);
|
||||
|
||||
});
|
||||
|
||||
// clear rider table
|
||||
rider_table += '<tr>';
|
||||
rider_table += '<td>' + '</td>';
|
||||
rider_table += '<td>' + '</td>';
|
||||
rider_table += '<td>' + '</td>';
|
||||
rider_table += '<td>' + '</td>';
|
||||
rider_table += '</tr>';
|
||||
|
||||
$('#riders').html(rider_table);
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if mode in ['assign-advanceorder'] %}
|
||||
// get nearest hubs ajax
|
||||
var hub_table = '';
|
||||
var rider_table = '';
|
||||
$.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
|
||||
var hubs = data['hubs'];
|
||||
for (i in hubs) {
|
||||
var hub = hubs[i];
|
||||
var hub_marker = L.marker([hub['lat'], hub['long']], { icon: icon_hub });
|
||||
hubLayerGroup.addLayer(hub_marker);
|
||||
|
||||
if (selected_hub == hub['id']) {
|
||||
hub_table += '<tr data-id=' + hub['id'] + ' class="m-table__row--primary"' + '>';
|
||||
}
|
||||
else {
|
||||
hub_table += '<tr data-id=' + hub['id'] + '>';
|
||||
}
|
||||
hub_table += '<td>' + hub['name'] + '</td>';
|
||||
hub_table += '<td>' + hub['branch'] + '</td>';
|
||||
hub_table += '<td>' + hub['cnum'] + '</td>';
|
||||
hub_table += '<td>' + hub['distance'] + '</td>';
|
||||
hub_table += '</tr>';
|
||||
|
||||
}
|
||||
|
||||
$('#nearest_hubs').html(hub_table);
|
||||
|
||||
});
|
||||
|
||||
// get riders of hub
|
||||
// get hub riders ajax
|
||||
// TODO: add latitude and longitude of delivery location to ajax request
|
||||
var rider_table = '';
|
||||
$.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) {
|
||||
var riders = data['riders'];
|
||||
for (i in riders) {
|
||||
var rider = riders[i];
|
||||
var rider_lat = rider['location'][0];
|
||||
var rider_lng = rider['location'][1];
|
||||
var rider_marker = L.marker([rider_lat, rider_lng], { icon: icon_rider_available });
|
||||
riderLayerGroup.addLayer(rider_marker);
|
||||
|
||||
rider_table += '<tr data-id=' + rider['id'] + '>';
|
||||
rider_table += '<td>' + rider['first_name'] + '</td>';
|
||||
rider_table += '<td>' + rider['last_name'] + '</td>';
|
||||
rider_table += '<td>' + rider['contact_num'] + '</td>';
|
||||
rider_table += '<td>' + rider['plate_num'] + '</td>';
|
||||
rider_table += '</tr>';
|
||||
}
|
||||
$('#riders').html(rider_table);
|
||||
});
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if mode in ['view-all', 'update-fulfillment'] %}
|
||||
var hub_table = '';
|
||||
$.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
|
||||
var hubs = data['hubs'];
|
||||
|
|
@ -1036,7 +1106,7 @@ $(function() {
|
|||
{% endif %}
|
||||
});
|
||||
|
||||
{% if mode in ['view-all', 'assign-advance-job-order', 'assign-advance-job-order-edit'] %}
|
||||
{% if mode in ['onestep-edit', 'view-all', 'assign-advanceorder'] %}
|
||||
var lat = {{ obj.getCoordinates.getLatitude }};
|
||||
var lng = {{ obj.getCoordinates.getLongitude }};
|
||||
|
||||
|
|
@ -1065,6 +1135,40 @@ $(function() {
|
|||
});
|
||||
{% endif %}
|
||||
|
||||
{% if mode in ['update-processing', 'update-reassign-hub'] %}
|
||||
// display hub map
|
||||
// OSM code
|
||||
|
||||
var hub_lat = {{ obj.getCoordinates.getLatitude }};
|
||||
var hub_lng = {{ obj.getCoordinates.getLongitude }};
|
||||
|
||||
var osm_hmap = mapCreate('hub_map', hub_lat, hub_lng, 'road', 13);
|
||||
|
||||
var destLayerGroup = L.layerGroup().addTo(osm_hmap);
|
||||
var hubLayerGroup = L.layerGroup().addTo(osm_hmap);
|
||||
|
||||
var dest_icon = L.icon({
|
||||
iconUrl: '/assets/images/icon-destination.png',
|
||||
shadowSize: [0,0]
|
||||
});
|
||||
|
||||
var hub_icon = L.icon({
|
||||
iconUrl: '/assets/images/icon-outlet.png',
|
||||
shadowSize: [0,0]
|
||||
});
|
||||
|
||||
var dest_marker = new L.Marker([hub_lat, hub_lng], {icon: dest_icon}).bindPopup("Destination");
|
||||
|
||||
destLayerGroup.addLayer(dest_marker);
|
||||
|
||||
{% for hub in hubs %}
|
||||
var hub_marker = new L.Marker([{{ hub.hub.getCoordinates.getLatitude }},
|
||||
{{ hub.hub.getCoordinates.getLongitude }}], {icon: hub_icon}).bindPopup("{{ hub.hub.getName }}");
|
||||
|
||||
hubLayerGroup.addLayer(hub_marker);
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
$("#row-form").submit(function(e) {
|
||||
e.preventDefault();
|
||||
if (form_in_process) {
|
||||
|
|
@ -1087,6 +1191,16 @@ $(function() {
|
|||
// add service charges to data
|
||||
fields['service_charges'] = sc_array;
|
||||
|
||||
{% if mode in ['update-processing', 'update-reassign-hub'] %}
|
||||
// add selected hub to data
|
||||
fields['hub'] = selectedHub;
|
||||
{% endif %}
|
||||
|
||||
{% if mode in ['update-assigning', 'update-reassign-rider'] %}
|
||||
// add selected rider to data
|
||||
fields['rider'] = selectedRider;
|
||||
{% endif %}
|
||||
|
||||
e.preventDefault();
|
||||
|
||||
$.ajax({
|
||||
|
|
@ -1291,6 +1405,7 @@ $(function() {
|
|||
|
||||
// toggle new customer
|
||||
$("#flag-new-customer").change(function() {
|
||||
|
||||
checked = $(this).prop('checked');
|
||||
if (checked) {
|
||||
$('.cust_field').prop('disabled', false);
|
||||
|
|
@ -1387,7 +1502,7 @@ $(function() {
|
|||
var sc_array = [];
|
||||
|
||||
// populate invoiceItems if editing so that we don't lose the battery
|
||||
{% if mode in ['view-all', 'assign-advance-joborder', 'assign-advance-job-order-edit'] %}
|
||||
{% if mode in ['view-all', 'open-edit', 'onestep-edit', 'walk-in-edit', 'assign-advanceorder'] %}
|
||||
{% if (obj.getInvoice and obj.getInvoice.getItems|length > 0) %}
|
||||
{% for item in obj.getInvoice.getItems %}
|
||||
{% if item.getBattery() %}
|
||||
|
|
@ -1494,7 +1609,7 @@ $(function() {
|
|||
// mark as invoice changed
|
||||
$("#invoice-change").val(1);
|
||||
var invoice = response.invoice;
|
||||
i
|
||||
|
||||
// populate totals
|
||||
$("#invoice-discount").val(invoice.discount);
|
||||
$("#invoice-price").val(invoice.price);
|
||||
|
|
@ -1512,6 +1627,9 @@ i
|
|||
'<td class="text-right">' + item.quantity + '</td>' +
|
||||
'<td class="text-right">' + item.unit_price + '</td>' +
|
||||
'<td class="text-right">' + item.amount + '</td>' +
|
||||
/*
|
||||
'<td><button type="button" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-invoice-delete" title="Delete"><i class="la la-trash"></i></button></td>' +
|
||||
*/
|
||||
'</tr>';
|
||||
});
|
||||
} else {
|
||||
|
|
@ -1555,6 +1673,146 @@ i
|
|||
});
|
||||
*/
|
||||
|
||||
{% if mode in ['update-processing', 'update-reassign-hub'] %}
|
||||
var selectedHub = '{{ obj.getHub ? obj.getHub.getID : "" }}';
|
||||
|
||||
$("#hubs-table tbody tr").click(function() {
|
||||
var id = $(this).data('id');
|
||||
var lat = $(this).data('lat');
|
||||
var lng = $(this).data('lng');
|
||||
|
||||
if (id != selectedHub) {
|
||||
// highlight this row, set hub value
|
||||
$("#hubs-table").find('.m-table__row--primary').removeClass('m-table__row--primary');
|
||||
|
||||
$(this).addClass('m-table__row--primary');
|
||||
|
||||
// set value
|
||||
selectedHub = id;
|
||||
|
||||
// center the map
|
||||
osm_hmap.flyTo(L.latLng(lat, lng));
|
||||
} else {
|
||||
// unhighlight this row
|
||||
$(this).removeClass('m-table__row--primary');
|
||||
|
||||
// remove id value
|
||||
selectedHub = '';
|
||||
}
|
||||
});
|
||||
{% endif %}
|
||||
|
||||
{% if mode in ['update-assigning', 'update-reassign-rider'] %}
|
||||
var selectedRider = '{{ obj.getRider ? obj.getRider.getID : "" }}';
|
||||
|
||||
$("#riders-table tbody tr").click(function() {
|
||||
var id = $(this).data('id');
|
||||
|
||||
if (id != selectedRider) {
|
||||
// highlight this row, set hub value
|
||||
$("#riders-table").find('.m-table__row--primary').removeClass('m-table__row--primary');
|
||||
|
||||
$(this).addClass('m-table__row--primary');
|
||||
|
||||
// set value
|
||||
selectedRider = id;
|
||||
} else {
|
||||
// unhighlight this row
|
||||
$(this).removeClass('m-table__row--primary');
|
||||
|
||||
// remove id value
|
||||
selectedRider = '';
|
||||
}
|
||||
});
|
||||
{% endif %}
|
||||
|
||||
{% if mode in ['update-processing', 'update-reassign-hub'] %}
|
||||
// reject hub
|
||||
$(".btn-reject").click(function(e) {
|
||||
var hubID = $(this).data('hub-id');
|
||||
var hubName = $(this).data('hub-name');
|
||||
var hubBranch = $(this).data('hub-branch');
|
||||
|
||||
$("#hub-reject-id").val(hubID);
|
||||
$("#hub-reject-name").val(hubName);
|
||||
$("#hub-reject-branch").val(hubBranch);
|
||||
$("#modal-rejection").modal('show');
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
// focus on reason field
|
||||
$("#modal-rejection").on('shown.bs.modal', function() {
|
||||
$("#hub-reject-reason").focus();
|
||||
});
|
||||
|
||||
// reset reject form on close modal
|
||||
$("#modal-rejection").on('hidden.bs.modal', function() {
|
||||
$("#hub-reject-contact-person, #hub-reject-remarks").val("");
|
||||
$("#hub-reject-reason").prop('selectedIndex', 0);
|
||||
});
|
||||
|
||||
// submit hub rejection
|
||||
$("#hub-reject-form").submit(function(e) {
|
||||
var form = $(this);
|
||||
var btnSubmit = form.find('[type="submit"]');
|
||||
|
||||
// disable the button
|
||||
btnSubmit.prop('disabled', true).html('<i class="fas fa-spinner fa-spin fa-fw"></i> Please wait');
|
||||
|
||||
e.preventDefault();
|
||||
|
||||
$.ajax({
|
||||
method: "POST",
|
||||
url: form.prop('action'),
|
||||
data: form.serialize()
|
||||
}).done(function(response) {
|
||||
// set button state
|
||||
var btnReject = $("#hubs-table").find("tr[data-id='" + $("#hub-reject-id").val() + "']").find('.btn-reject');
|
||||
btnReject.removeClass('btn-reject btn-info').addClass('btn-danger btn-disabled').prop('disabled', true).html('Rejected');
|
||||
|
||||
// remove all error classes
|
||||
removeErrors("#hub-reject-form");
|
||||
btnSubmit.prop('disabled', false).html('Reject');
|
||||
|
||||
// hide modal
|
||||
$("#modal-rejection").modal('hide');
|
||||
}).fail(function(response) {
|
||||
if (response.status == 422) {
|
||||
form_in_process = false;
|
||||
var errors = response.responseJSON.errors;
|
||||
var firstfield = false;
|
||||
|
||||
// remove all error classes first
|
||||
removeErrors("#hub-reject-form");
|
||||
btnSubmit.prop('disabled', false).html('Reject');
|
||||
|
||||
// display errors contextually
|
||||
$.each(errors, function(field, msg) {
|
||||
var formfield = form.find("[name='" + field + "'], [data-name='" + field + "']");
|
||||
var label = form.find("label[data-field='" + field + "']");
|
||||
var msgbox = form.find(".form-control-feedback[data-field='" + field + "']");
|
||||
|
||||
// add error classes to bad fields
|
||||
formfield.addClass('form-control-danger');
|
||||
label.addClass('has-danger');
|
||||
msgbox.html(msg).addClass('has-danger').removeClass('hide');
|
||||
|
||||
// check if this field comes first in DOM
|
||||
var domfield = formfield.get(0);
|
||||
|
||||
if (!firstfield || (firstfield && firstfield.compareDocumentPosition(domfield) === 2)) {
|
||||
firstfield = domfield;
|
||||
}
|
||||
});
|
||||
|
||||
// focus on first bad field
|
||||
firstfield.focus();
|
||||
}
|
||||
});
|
||||
});
|
||||
{% endif %}
|
||||
|
||||
// cancel job order
|
||||
$(".btn-cancel-job-order").click(function(e) {
|
||||
var url = $(this).prop('href');
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
sortable: false,
|
||||
overflow: 'visible',
|
||||
template: function (row, index, datatable) {
|
||||
{% if is_granted('jo_onestep.edit') or is_granted('jo_advance_order.edit') or is_granted('jo_assign_advance_order.edit') %}
|
||||
{% if is_granted('jo_assign_advance_order.form') %}
|
||||
var actions = '<a href="' + row.meta.edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-reassign-hub" title="Edit"><i class="la la-edit"></i></a>';
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue