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

Merge branch '388-resq-jo-details-report-fixes' into 'master'

Browse source 
Resolve "Resq - JO details report fixes"

Closes #388

See merge request jankstudio/resq!431
This commit is contained in:
Kendrick Chan 2020-04-23 09:50:09 +00:00
commit 1287fff597
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Controller/ReportController.php
View file

@ -1425,10 +1425,9 @@ class ReportController extends Controller
$time_diff_create_arrive = $interval->format('%h:%i');
}
// get invoice date create and item sku and serial if any
// get invoice date create and item sku if any
$datetime_create_invoice = '';
$sku = '';
$serial = '';
$invoice = $jo->getInvoice();
if ($invoice != null)
{
@ -1441,10 +1440,7 @@ class ReportController extends Controller
{
$battery = $item->getBattery();
if ($battery != null)
{
$sku = $battery->getModel()->getName() . ' ' . $battery->getSize()->getName();
$serial = $battery->getSAPCode();
}
}
}
@ -1492,6 +1488,7 @@ class ReportController extends Controller
$plate_number = '';
$dpa = 'No';
$existing_batt = '';
$serial = '';
$customer = $jo->getCustomer();
if ($customer != null)
@ -1519,7 +1516,10 @@ class ReportController extends Controller
$plate_number = $cust_vehicle->getPlateNumber();
$curr_batt = $cust_vehicle->getCurrentBattery();
if ($curr_batt != null)
{
$existing_batt = $curr_batt->getModel()->getName() . ' ' . $curr_batt->getSize()->getName();
$serial = $cust_vehicle->getWarrantyCode();
}
}
$result[] = [