diff --git a/src/Controller/ReportController.php b/src/Controller/ReportController.php index c9876bd0..627bd7ec 100644 --- a/src/Controller/ReportController.php +++ b/src/Controller/ReportController.php @@ -813,6 +813,7 @@ class ReportController extends Controller 'Plate Number', 'SKU', 'Serial Number', + 'Inventory', 'Invoice/DR No.', 'Existing Battery', 'Rider Name', @@ -1932,6 +1933,9 @@ class ReportController extends Controller $fac_hub_coord_lat = $fac_hub->getCoordinates()->getLatitude(); } + // get inventory count + $inventory = $jo->getInventoryCount(); + // find date and time when JO was assigned a hub $datetime_hub_assign_jo = ''; $date_hub_assign_jo = ''; @@ -2254,6 +2258,7 @@ class ReportController extends Controller $plate_number, $sku, $serial, + $inventory, $jo->getORName(), $existing_batt, $rider_name, diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php index b3b5a62e..c71f1846 100644 --- a/src/Entity/JobOrder.php +++ b/src/Entity/JobOrder.php @@ -429,6 +429,12 @@ class JobOrder */ protected $cust_location; + // inventory count of hub at time of hub assignment + /** + * @ORM\Column(type="smallint") + */ + protected $inventory_count; + public function __construct() { $this->date_create = new DateTime(); @@ -453,6 +459,8 @@ class JobOrder $this->phone_mobile = ''; $this->will_wait = WillingToWaitContent::WILLING_TO_WAIT; + + $this->inventory_count = 0; } public function getID() @@ -1217,4 +1225,16 @@ class JobOrder { return $this->cust_location; } + + public function setInventoryCount($inventory_count) + { + $this->inventory_count = $inventory_count; + return $this; + } + + public function getInventoryCount() + { + return $this->inventory_count; + } + } diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index cc9e2612..3e86f434 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -1009,7 +1009,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface ->setCallerClassification($caller_class) ->setEmergencyType($etype) ->setOwnershipType($owner_type) - ->setCustomerLocation($cust_location); + ->setCustomerLocation($cust_location) + ->setInventoryCount($req->request->get('hub_inv_count', 0)); // validate $errors = $this->validator->validate($obj); @@ -1641,6 +1642,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface ->setEmergencyType($etype) ->setOwnershipType($owner_type) ->setCustomerLocation($cust_location) + ->setInventoryCount($req->request->get('hub_inv_count', 0)) ->clearRider(); if ($user != null) diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index b2e17e34..246ad673 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -794,7 +794,7 @@ {% for hub in hubs %} - + {{ hub.hub.getName }} {{ hub.hub.getBranch }}