From ed53e494b40a82ffcc12b10c1131357be2cd7790 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 24 Jul 2020 08:57:33 +0000 Subject: [PATCH] Fix bug where JO goes back to assigned when updated. #424 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 85ed87d7..1aa00065 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -595,7 +595,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface ->setServiceType($stype) ->setWarrantyClass($req->request->get('warranty_class')) ->setSource($req->request->get('source')) - ->setStatus(JOStatus::ASSIGNED) ->setDeliveryInstructions($req->request->get('delivery_instructions')) ->setTier1Notes($req->request->get('tier1_notes')) ->setTier2Notes($req->request->get('tier2_notes')) @@ -611,6 +610,12 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface $jo->addMeta('discount', $discount); $jo->addMeta('service_charges', $service_charges); + // retain old jo status if it's an update JO + if ($old_jo_status != null) + $jo->setStatus($old_jo_status); + else + $jo->setStatus(JOStatus::ASSIGNED); + // check if user is null, meaning call to create came from API if ($user != null) {