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 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 99e8485065 - Show all commits

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

@ -2245,7 +2245,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$params['ftags']['ticket_table'] = false;
$params['ftags']['cancel_button'] = false;
break;
case 'onestep_edit':
case 'onestep-edit':
$params['ftags']['invoice_edit'] = true;
$params['ftags']['preset_vehicle'] = true;
break;

4
templates/job-order/form.onestep.html.twig
View file

@ -420,7 +420,7 @@
</div>
<div class="m-form__seperator m-form__seperator--dashed"></div>
<div class="m-form__section{{ ftags.invoice_edit ? ' m-form__section--last' }}">
<div class="m-form__section m-form__section--last">
<div class="m-form__heading">
<h3 class="m-form__heading-title">
Invoice
@ -691,7 +691,7 @@ $(function() {
});
$(function() {
var selected_hub = '{{ obj.getHub ? obj.getHub.getID : "" }}';
var selected_hub = "";
$('#hubs-table').on('click', 'tr', function() {
var id = $(this).data('id');