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

Resolve "Transition branch for CMB and Resq merging" #1181

Merged
korina.cordero merged 258 commits from 329-transition-branch-for-cmb-and-resq-merging into master 2020-04-03 02:49:26 +00:00
Conversation 18 Commits 258 Files changed 143 +8 -3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e8e97bcd6b - Show all commits

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

@ -2,7 +2,12 @@
{% set cv = jo.getCustomerVehicle %}
<strong>{{ cust.getNameDisplay }}</strong><br>
{{ cv.getPlateNumber }}<br>
<a href="">Job Order #{{ jo.getID }}</a><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/rider/popup.html.twig
View file

@ -4,7 +4,7 @@
{% set cust = jo.getCustomer %}
{% set cv = jo.getCustomerVehicle %}
<br>
<a href="">Job Order #{{ jo.getID }}</a><br>
<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
{{ jo.getServiceTypeName }}<br>
{{ jo.getStatusText }}<br><br>
{{ cust.getNameDisplay }}<br>