Merge branch '401-resq-modify-warrantyhandler-to-use-date_schedule-for-expiry-date-computation' into 'master'

Resolve "Resq - modify WarrantyHandler to use date_schedule for expiry date computation"

Closes #401

See merge request jankstudio/resq!465
This commit is contained in:
Kendrick Chan 2020-05-12 01:29:36 +00:00
commit 19527e38da
2 changed files with 14 additions and 8 deletions

View file

@ -834,10 +834,13 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$mobile_number = $obj->getCustomer()->getPhoneMobile(); $mobile_number = $obj->getCustomer()->getPhoneMobile();
// check if date fulfilled is null // check if date fulfilled is null
if ($obj->getDateFulfill() == null) //if ($obj->getDateFulfill() == null)
$date_purchase = $obj->getDateCreate(); // $date_purchase = $obj->getDateCreate();
else //else
$date_purchase = $obj->getDateFulfill(); // $date_purchase = $obj->getDateFulfill();
// use date_schedule for warranty expiration computation
$date_purchase = $obj->getDateSchedule();
// validate plate number // validate plate number
// $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber()); // $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());

View file

@ -535,10 +535,13 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
$mobile_number = $jo->getCustomer()->getPhoneMobile(); $mobile_number = $jo->getCustomer()->getPhoneMobile();
// check if date fulfilled is null // check if date fulfilled is null
if ($jo->getDateFulfill() == null) //if ($jo->getDateFulfill() == null)
$date_purchase = $jo->getDateCreate(); // $date_purchase = $jo->getDateCreate();
else //else
$date_purchase = $jo->getDateFulfill(); // $date_purchase = $jo->getDateFulfill();
// use date_schedule for warranty expiration computation
$date_purchase = $jo->getDateSchedule();
$plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber()); $plate_number = $this->wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());