From 4a1ae91b78ae18210522af222e1702fbbdf51b0c Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Fri, 29 Oct 2021 06:07:34 +0000
Subject: [PATCH] Comment out call for completed job orders. Modify
 getJOHistory to only retrieve cancelled and fulfilled job orders. #632

---
 config/routes/api.yaml           | 8 ++++----
 src/Controller/APIController.php | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/config/routes/api.yaml b/config/routes/api.yaml
index 32082547..5151a2e6 100644
--- a/config/routes/api.yaml
+++ b/config/routes/api.yaml
@@ -211,7 +211,7 @@ api_cust_vehicle_remove:
     controller: App\Controller\APIController::removeVehicle
     methods: [POST]
 
-api_completed_job_orders:
-    path: /api/job_orders/completed
-    controller: App\Controller\APIController::getCompletedJobOrders
-    methods: [GET]
+#api_completed_job_orders:
+#    path: /api/job_orders/completed
+#    controller: App\Controller\APIController::getCompletedJobOrders
+#    methods: [GET]
diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index aab904ab..c5afc35a 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -2027,8 +2027,10 @@ class APIController extends Controller implements LoggedController
         // get job orders
         $all_jo_data = [];
         // $jos = $cust->getJobOrders();
+        // get the fulfilled and cancelled job orders, since ongoing jos are not yet part of history
         $jos = $em->getRepository(JobOrder::class)->findBy([
             'customer' => $cust,
+            'status' => [JOStatus::CANCELLED, JOStatus::FULFILLED]
         ], ['date_schedule' => 'DESC']);
         foreach ($jos as $jo)
         {
@@ -3776,6 +3778,9 @@ class APIController extends Controller implements LoggedController
         return $res->getReturnResponse();
     }
 
+    // commenting it out. Modify the getJOHistory instead to just get the fulfilled
+    // and cancelled job orders, since ongoing is not yet part of history
+    /*
     public function getCompletedJobOrders(Request $req, EntityManagerInterface $em, RiderTracker $rt)
     {
         $required_params = [];
@@ -3819,6 +3824,8 @@ class APIController extends Controller implements LoggedController
 
         return $completed_jos;
     }
+    */
+
     protected function updateWarranty($res, $em, $rt, $trans, $req, $serial, $inv_filename = null, $wcard_filename = null,
                                       $logger, $log_data, $user_id, $action, $source)
     {