Add action to report. Modify transaction id in report. #718
This commit is contained in:
parent
f0d14b7d77
commit
c70dbd3b52
1 changed files with 8 additions and 5 deletions
|
|
@ -1261,7 +1261,7 @@ class ReportController extends Controller
|
|||
'Raffle Number',
|
||||
'Serial Number',
|
||||
'Product Name',
|
||||
'Transaction Number', // Warranty ID
|
||||
'Transaction Number', // Warranty Raffle Log ID
|
||||
'Date',
|
||||
'Outlet',
|
||||
'Plate Number',
|
||||
|
|
@ -1271,6 +1271,7 @@ class ReportController extends Controller
|
|||
'Contact Number',
|
||||
'Address',
|
||||
'Email',
|
||||
'Action Taken',
|
||||
]);
|
||||
|
||||
foreach ($data as $row)
|
||||
|
|
@ -2725,11 +2726,12 @@ class ReportController extends Controller
|
|||
$db = $em->getConnection();
|
||||
|
||||
// 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.date_create AS date_create, wrl.plate_number AS plate_number,
|
||||
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
|
||||
WHERE wrl.date_create >= :date_start
|
||||
AND wrl.date_create <= :date_end';
|
||||
|
|
@ -2780,7 +2782,7 @@ class ReportController extends Controller
|
|||
'raffle_num' => $raffle_number,
|
||||
'serial' => $row['serial'],
|
||||
'product_name' => $battery_name,
|
||||
'warranty_id' => $warranty_id,
|
||||
'warranty_id' => $row['wrl_id'],
|
||||
'date' => $date_create,
|
||||
'hub' => $hub,
|
||||
'plate_number' => $row['plate_number'],
|
||||
|
|
@ -2789,7 +2791,8 @@ class ReportController extends Controller
|
|||
'last_name' => $row['last_name'],
|
||||
'contact_number' => $row['contact_num'],
|
||||
'address' => $row['address'],
|
||||
'email' => $row['email']
|
||||
'email' => $row['email'],
|
||||
'action' => $row['action'],
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue