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

Resolve "Fix ticket bug" #843

Merged
jankstudio merged 2 commits from 32-fix-ticket-bug into master 2018-02-28 18:40:32 +00:00
Conversation 2 Commits 2 Files changed 1 +9 -6
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() ->getQuery()
->getResult(); ->getResult();
$ticket_statuses = TicketStatus::getCollection();
$ticket_types = TicketType::getCollection();
// process rows // process rows
$rows = []; $rows = [];
foreach ($obj_rows as $orow) { foreach ($obj_rows as $orow) {
@ -98,8 +95,8 @@ class TicketController extends BaseController
$row['first_name'] = $orow->getFirstName(); $row['first_name'] = $orow->getFirstName();
$row['last_name'] = $orow->getLastName(); $row['last_name'] = $orow->getLastName();
$row['contact_num'] = $orow->getContactNumber(); $row['contact_num'] = $orow->getContactNumber();
$row['status'] = $ticket_statuses[$orow->getStatus()]; $row['status'] = TicketStatus::getName($orow->getStatus());
$row['ticket_type'] = $ticket_types[$orow->getTicketType()]; $row['ticket_type'] = TicketType::getName($orow->getTicketType());
$row['plate_number'] = $orow->getPlateNumber(); $row['plate_number'] = $orow->getPlateNumber();
// add row metadata // add row metadata
@ -148,7 +145,8 @@ class TicketController extends BaseController
$params['customer'] = $customer; $params['customer'] = $customer;
// get job order data // get job order data
if ($job_order_id) { if ($job_order_id)
{
$job_order = $em->getRepository(JobOrder::class)->find($job_order_id); $job_order = $em->getRepository(JobOrder::class)->find($job_order_id);
// make sure this row exists // make sure this row exists
@ -158,6 +156,11 @@ class TicketController extends BaseController
// add to view // add to view
$params['job_order'] = $job_order; $params['job_order'] = $job_order;
} }
else
{
$job_order = null;
}
} }
// get parent associations // get parent associations