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

Merge branch '718-warranty-raffle-report-changes' into 'master'

Browse source 
Resolve "Warranty Raffle Report Changes"

Closes #718

See merge request jankstudio/resq!833
This commit is contained in:
Kendrick Chan 2022-11-16 10:42:42 +00:00
commit 8776d69a92
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Controller/ReportController.php
View file

@ -1261,7 +1261,7 @@ class ReportController extends Controller
'Raffle Number', 'Raffle Number',
'Serial Number', 'Serial Number',
'Product Name', 'Product Name',
'Transaction Number', // Warranty ID 'Transaction Number', // Warranty Raffle Log ID
'Date', 'Date',
'Outlet', 'Outlet',
'Plate Number', 'Plate Number',
@ -1271,6 +1271,7 @@ class ReportController extends Controller
'Contact Number', 'Contact Number',
'Address', 'Address',
'Email', 'Email',
'Action Taken',
]); ]);
foreach ($data as $row) foreach ($data as $row)
@ -2725,11 +2726,12 @@ class ReportController extends Controller
$db = $em->getConnection(); $db = $em->getConnection();
// get the data from warranty_raffle_log // get the data from warranty_raffle_log
$wrl_sql = 'SELECT wrl.serial AS serial, wrl.warranty_id AS warranty_id, $wrl_sql = 'SELECT wrl.id AS wrl_id, wrl.serial AS serial, wrl.warranty_id AS warranty_id,
wrl.batt_model_name AS model_name, wrl.batt_size_name AS size_name, wrl.batt_model_name AS model_name, wrl.batt_size_name AS size_name,
wrl.date_create AS date_create, wrl.plate_number AS plate_number, wrl.date_create AS date_create, wrl.plate_number AS plate_number,
wrl.first_name AS first_name, wrl.last_name AS last_name, wrl.first_name AS first_name, wrl.last_name AS last_name,
wrl.contact_num AS contact_num, wrl.address AS address, wrl.email AS email wrl.contact_num AS contact_num, wrl.address AS address, wrl.email AS email,
wrl.action AS action
FROM warranty_raffle_log wrl FROM warranty_raffle_log wrl
WHERE wrl.date_create >= :date_start WHERE wrl.date_create >= :date_start
AND wrl.date_create <= :date_end'; AND wrl.date_create <= :date_end';
@ -2780,7 +2782,7 @@ class ReportController extends Controller
'raffle_num' => $raffle_number, 'raffle_num' => $raffle_number,
'serial' => $row['serial'], 'serial' => $row['serial'],
'product_name' => $battery_name, 'product_name' => $battery_name,
'warranty_id' => $warranty_id, 'warranty_id' => $row['wrl_id'],
'date' => $date_create, 'date' => $date_create,
'hub' => $hub, 'hub' => $hub,
'plate_number' => $row['plate_number'], 'plate_number' => $row['plate_number'],
@ -2789,7 +2791,8 @@ class ReportController extends Controller
'last_name' => $row['last_name'], 'last_name' => $row['last_name'],
'contact_number' => $row['contact_num'], 'contact_number' => $row['contact_num'],
'address' => $row['address'], 'address' => $row['address'],
'email' => $row['email'] 'email' => $row['email'],
'action' => $row['action'],
]; ];
} }