rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '327-rapicontroller-fix-for-payment' into 'master'

Browse source 
Resolve "RAPIController fix for payment"

Closes #327

See merge request jankstudio/resq!369
This commit is contained in:
Kendrick Chan 2020-02-06 03:15:29 +00:00
commit 506505bff5
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Controller/RAPIController.php
View file

@ -45,7 +45,7 @@ use App\Entity\User;
use App\Entity\JOEvent;
use DateTime;
use DateInterval;
// Rider API controller
class RAPIController extends Controller
@ -621,27 +621,27 @@ class RAPIController extends Controller
// save to customer vehicle battery record
// TODO: this has to move to JOHandler
$this->updateVehicleBattery($obj);
$this->updateVehicleBattery($jo);
// create warranty
if ($obj->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
{
$serial = null;
$warranty_class = $obj->getWarrantyClass();
$first_name = $obj->getCustomer()->getFirstName();
$last_name = $obj->getCustomer()->getLastName();
$mobile_number = $obj->getCustomer()->getPhoneMobile();
$warranty_class = $jo->getWarrantyClass();
$first_name = $jo->getCustomer()->getFirstName();
$last_name = $jo->getCustomer()->getLastName();
$mobile_number = $jo->getCustomer()->getPhoneMobile();
// check if date fulfilled is null
if ($obj->getDateFulfill() == null)
$date_purchase = $obj->getDateCreate();
if ($jo->getDateFulfill() == null)
$date_purchase = $jo->getDateCreate();
else
$date_purchase = $obj->getDateFulfill();
$date_purchase = $jo->getDateFulfill();
$plate_number = $wh->cleanPlateNumber($obj->getCustomerVehicle()->getPlateNumber());
$plate_number = $wh->cleanPlateNumber($jo->getCustomerVehicle()->getPlateNumber());
$batt_list = array();
$invoice = $obj->getInvoice();
$invoice = $jo->getInvoice();
if (!empty($invoice))
{
// get battery
@ -945,6 +945,7 @@ class RAPIController extends Controller
return;
// warranty expiration
$warr_months = 0;
$warr = $jo->getWarrantyClass();
if ($warr == WarrantyClass::WTY_PRIVATE)
$warr_months = $battery->getWarrantyPrivate();