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

Fix JO link in dashboard for resq. #377

Browse source
This commit is contained in:
Korina Cordero 2020-04-15 03:21:47 +00:00
parent db46e5134f
commit 4fd8292d2e
5 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Controller/JobOrderController.php
View file

@ -939,12 +939,18 @@ class JobOrderController extends Controller
/**
* @ParamConverter("jo", class="App\Entity\JobOrder")
*/
public function popupInfo(JobOrder $jo)
public function popupInfo(JobOrder $jo, JobOrderHandlerInterface $jo_handler)
{
if ($jo == null)
return new Response('No job order data');
return $this->render('job-order/popup.html.twig', [ 'jo' => $jo ]);
// get the right template
$template = $jo_handler->getTwigTemplate('jo_popup');
$params['jo'] = $jo;
// response
return $this->render($template, $params);
}
/**

1
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -2842,6 +2842,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$this->template_hash['jo_onestep_edit_form'] = 'job-order/cmb.form.onestep.html.twig';
$this->template_hash['jo_walkin_form'] = 'job-order/cmb.form.walkin.html.twig';
$this->template_hash['jo_walkin_edit_form'] = 'job-order/cmb.form.walkin.html.twig';
$this->template_hash['jo_popup'] = 'job-order/cmb.popup.html.twig';
}
protected function checkTier($tier)

3
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -2503,8 +2503,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$this->template_hash['jo_list_fulfillment'] = 'job-order/list.fulfillment.html.twig';
$this->template_hash['jo_list_open'] = 'job-order/list.open.html.twig';
$this->template_hash['jo_list_all'] = 'job-order/list.all.html.twig';
$this->template_hash['jo_onestep'] = 'job-order/form.onestep.html.twig';
$this->template_hash['jo_onestep_edit_form'] = 'job-order/form.onestep.html.twig';
$this->template_hash['jo_popup'] = 'job-order/popup.html.twig';
}
protected function checkTier($tier)

13
templates/job-order/cmb.popup.html.twig Normal file
View file

@ -0,0 +1,13 @@
{% set cust = jo.getCustomer %}
{% set cv = jo.getCustomerVehicle %}
<strong>{{ cust.getNameDisplay }}</strong><br>
{{ cv.getPlateNumber }}<br>
<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
{{ jo.getServiceTypeName }}<br>
{{ jo.getStatusText }}
{% if jo.getRider != null %}
<br><br>
{% set rider = jo.getRider %}
{{ rider.getFullName }}<br>
{{ rider.getPlateNumber }}
{% endif %}

2
templates/job-order/popup.html.twig
View file

@ -2,7 +2,7 @@
{% set cv = jo.getCustomerVehicle %}
<strong>{{ cust.getNameDisplay }}</strong><br>
{{ cv.getPlateNumber }}<br>
<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
<a href="{{ url('jo_open_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
{{ jo.getServiceTypeName }}<br>
{{ jo.getStatusText }}
{% if jo.getRider != null %}