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

Merge branch '32-fix-ticket-bug' into 'master'

Browse source 
Resolve "Fix ticket bug"

Closes #32

See merge request jankstudio/resq!32
This commit is contained in:
Kendrick Chan 2018-02-28 18:40:26 +00:00
commit de722414df
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Controller/TicketController.php
View file

@ -85,9 +85,6 @@ class TicketController extends BaseController
->getQuery()
->getResult();
$ticket_statuses = TicketStatus::getCollection();
$ticket_types = TicketType::getCollection();
// process rows
$rows = [];
foreach ($obj_rows as $orow) {
@ -98,8 +95,8 @@ class TicketController extends BaseController
$row['first_name'] = $orow->getFirstName();
$row['last_name'] = $orow->getLastName();
$row['contact_num'] = $orow->getContactNumber();
$row['status'] = $ticket_statuses[$orow->getStatus()];
$row['ticket_type'] = $ticket_types[$orow->getTicketType()];
$row['status'] = TicketStatus::getName($orow->getStatus());
$row['ticket_type'] = TicketType::getName($orow->getTicketType());
$row['plate_number'] = $orow->getPlateNumber();
// add row metadata
@ -148,7 +145,8 @@ class TicketController extends BaseController
$params['customer'] = $customer;
// get job order data
if ($job_order_id) {
if ($job_order_id)
{
$job_order = $em->getRepository(JobOrder::class)->find($job_order_id);
// make sure this row exists
@ -158,6 +156,11 @@ class TicketController extends BaseController
// add to view
$params['job_order'] = $job_order;
}
else
{
$job_order = null;
}
}
// get parent associations