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

Merge branch '683-use-gettickettypetext-when-returning-ticket-type-for-ticket-list' into 'master'

Browse source 
Resolve "Use getTicketTypeText when returning ticket type for ticket list"

Closes #683

See merge request jankstudio/resq!797
This commit is contained in:
Kendrick Chan 2022-06-12 05:40:00 +00:00
commit b68d722013
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Controller/TicketController.php
View file

@ -96,20 +96,6 @@ class TicketController extends Controller
// process rows // process rows
$rows = []; $rows = [];
foreach ($obj_rows as $orow) { foreach ($obj_rows as $orow) {
// check for the ticket types (legacy vs new)
$ttype = '';
$new_ticket_type = $orow->getNewTicketType();
if ($new_ticket_type == null)
{
// get legacy ticket type
$ttype = TicketType::getName($orow->getTicketType());
}
else
{
// use new ticket type
$ttype = $orow->getNewTicketType()->getName();
}
// add row data // add row data
$row['id'] = $orow->getID(); $row['id'] = $orow->getID();
$row['date_create'] = $orow->getDateCreate()->format("d M Y g:i A"); $row['date_create'] = $orow->getDateCreate()->format("d M Y g:i A");
@ -117,7 +103,7 @@ class TicketController extends Controller
$row['last_name'] = $orow->getLastName(); $row['last_name'] = $orow->getLastName();
$row['contact_num'] = $orow->getContactNumber(); $row['contact_num'] = $orow->getContactNumber();
$row['status'] = TicketStatus::getName($orow->getStatus()); $row['status'] = TicketStatus::getName($orow->getStatus());
$row['ticket_type'] = $ttype; $row['ticket_type'] = $orow->getTicketTypeText();
$row['plate_number'] = $orow->getPlateNumber(); $row['plate_number'] = $orow->getPlateNumber();
// add row metadata // add row metadata