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

Fix formatting issue for csv output. #197

Browse source
This commit is contained in:
Korina Cordero 2019-04-03 07:29:14 +00:00
parent 3af6d6b7e8
commit c80013bc02
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/Controller/ReportController.php
View file

@ -324,6 +324,7 @@ class ReportController extends BaseController
$invoice_items = $jo->getInvoice()->getItems(); $invoice_items = $jo->getInvoice()->getItems();
foreach ($invoice_items as $item) foreach ($invoice_items as $item)
{ {
// check if the item is a battery
if ($item->getBattery() != null) if ($item->getBattery() != null)
{ {
$batt_id = $item->getBattery()->getID(); $batt_id = $item->getBattery()->getID();
@ -338,42 +339,44 @@ class ReportController extends BaseController
$batteries = []; $batteries = [];
foreach($jo->getCustomerVehicle()->getVehicle()->getBatteries() as $comp_batt) foreach($jo->getCustomerVehicle()->getVehicle()->getBatteries() as $comp_batt)
{ {
$batteries[] = [ //$batteries[] = [
'id' => $comp_batt->getID(), // 'mfg_name' => $comp_batt->getManufacturer()->getName(),
'mfg_name' => $comp_batt->getManufacturer()->getName(), // 'model_name' => $comp_batt->getModel()->getName(),
'model_name' => $comp_batt->getModel()->getName(), // 'size_name' => $comp_batt->getSize()->getName(),
'size_name' => $comp_batt->getSize()->getName(), //];
]; $batteries[] = $comp_batt->getManufacturer()->getName() . ' ' .
$comp_batt->getModel()->getName() . ' ' .
$comp_batt->getSize()->getName();
} }
$results[] = [ $results[] = [
'jo_id' => $jo->getID(), 'jo_id' => $jo->getID(),
'jo_date_create' => $jo->getDateCreate(), 'jo_date_create' => $jo->getDateCreate()->format('m/d/Y H:i'),
'cus_vehicle_manufacturer' => $jo->getCustomerVehicle()->getVehicle()->getManufacturer()->getName(), 'cus_vehicle_manufacturer' => $jo->getCustomerVehicle()->getVehicle()->getManufacturer()->getName(),
'cus_vehicle_make' => $jo->getCustomerVehicle()->getVehicle()->getMake(), 'cus_vehicle_make' => $jo->getCustomerVehicle()->getVehicle()->getMake(),
'cus_vehicle_model' => $jo->getCustomerVehicle()->getModelYear(), 'cus_vehicle_model' => $jo->getCustomerVehicle()->getModelYear(),
'battery_model_ordered' => $item->getBattery()->getModel()->getName(), 'battery_model_ordered' => $item->getBattery()->getModel()->getName(),
'battery_size_ordered' => $item->getBattery()->getSize()->getName(), 'battery_size_ordered' => $item->getBattery()->getSize()->getName(),
'compatible_batt' => $batteries, 'compatible_batt' => implode(', ', $batteries),
]; ];
} }
} }
} }
} }
/*
$resp = new StreamedResponse(); $resp = new StreamedResponse();
$resp->setCallback(function() use ($results) { $resp->setCallback(function() use ($results) {
// csv output // csv output
$csv_handle = fopen('php://output', 'w+'); $csv_handle = fopen('php://output', 'w+');
fputcsv($csv_handle, [ fputcsv($csv_handle, [
'Order #', 'Order #',
'Order Date and Time' 'Order Date and Time',
//'Manufacturer', 'Manufacturer',
//'Make', 'Make',
//'Year', 'Year',
//'Battery Model', 'Battery Model',
//'Battery Size', 'Battery Size',
//'Compatible Batteries' 'Compatible Batteries'
]); ]);
foreach ($results as $row) foreach ($results as $row)
{ {
@ -390,10 +393,9 @@ class ReportController extends BaseController
$resp->headers->set('Content-Disposition', 'attachment; filename="' . $filename . '"'); $resp->headers->set('Content-Disposition', 'attachment; filename="' . $filename . '"');
return $resp; return $resp;
*/
//return $this->json([
return $this->json([ // 'result' => $results,
'result' => $results, //]);
]);
} }
} }