Comment out call for completed job orders. Modify getJOHistory to only retrieve cancelled and fulfilled job orders. #632
This commit is contained in:
parent
918c06725e
commit
4a1ae91b78
2 changed files with 11 additions and 4 deletions
|
|
@ -211,7 +211,7 @@ api_cust_vehicle_remove:
|
||||||
controller: App\Controller\APIController::removeVehicle
|
controller: App\Controller\APIController::removeVehicle
|
||||||
methods: [POST]
|
methods: [POST]
|
||||||
|
|
||||||
api_completed_job_orders:
|
#api_completed_job_orders:
|
||||||
path: /api/job_orders/completed
|
# path: /api/job_orders/completed
|
||||||
controller: App\Controller\APIController::getCompletedJobOrders
|
# controller: App\Controller\APIController::getCompletedJobOrders
|
||||||
methods: [GET]
|
# methods: [GET]
|
||||||
|
|
|
||||||
|
|
@ -2027,8 +2027,10 @@ class APIController extends Controller implements LoggedController
|
||||||
// get job orders
|
// get job orders
|
||||||
$all_jo_data = [];
|
$all_jo_data = [];
|
||||||
// $jos = $cust->getJobOrders();
|
// $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([
|
$jos = $em->getRepository(JobOrder::class)->findBy([
|
||||||
'customer' => $cust,
|
'customer' => $cust,
|
||||||
|
'status' => [JOStatus::CANCELLED, JOStatus::FULFILLED]
|
||||||
], ['date_schedule' => 'DESC']);
|
], ['date_schedule' => 'DESC']);
|
||||||
foreach ($jos as $jo)
|
foreach ($jos as $jo)
|
||||||
{
|
{
|
||||||
|
|
@ -3776,6 +3778,9 @@ class APIController extends Controller implements LoggedController
|
||||||
return $res->getReturnResponse();
|
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)
|
public function getCompletedJobOrders(Request $req, EntityManagerInterface $em, RiderTracker $rt)
|
||||||
{
|
{
|
||||||
$required_params = [];
|
$required_params = [];
|
||||||
|
|
@ -3819,6 +3824,8 @@ class APIController extends Controller implements LoggedController
|
||||||
|
|
||||||
return $completed_jos;
|
return $completed_jos;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
protected function updateWarranty($res, $em, $rt, $trans, $req, $serial, $inv_filename = null, $wcard_filename = null,
|
protected function updateWarranty($res, $em, $rt, $trans, $req, $serial, $inv_filename = null, $wcard_filename = null,
|
||||||
$logger, $log_data, $user_id, $action, $source)
|
$logger, $log_data, $user_id, $action, $source)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue