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 +3389 -1713
4 changed files with 3389 additions and 1713 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 341db63735 - Show all commits

1
src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
View file

@ -17,6 +17,7 @@ use App\Ramcar\FuelType;
use App\Entity\Invoice;
use App\Entity\InvoiceItem;
use App\Entity\User;
use App\Entity\Battery;
use App\Service\InvoiceGeneratorInterface;

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

@ -2030,15 +2030,15 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$this->template_hash = [];
// add all twig templates for job order to hash
$this->template_hash['jo_incoming_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_open_edit_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_incoming_vehicle_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_processing_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_assigning_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_fulfillment_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_open_hub_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_open_rider_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_all_form'] = 'job-order/form.html.twig';
$this->template_hash['jo_incoming_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_open_edit_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_incoming_vehicle_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_processing_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_assigning_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_fulfillment_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_open_hub_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_open_rider_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_all_form'] = 'job-order/cmb.form.html.twig';
$this->template_hash['jo_list_processing'] = 'job-order/list.processing.html.twig';
$this->template_hash['jo_list_assigning'] = 'job-order/list.assigning.html.twig';
$this->template_hash['jo_list_fulfillment'] = 'job-order/list.fulfillment.html.twig';

1704
templates/job-order/cmb.form.html.twig Normal file
View file

File diff suppressed because it is too large Load diff

3379
templates/job-order/form.html.twig
View file

File diff suppressed because it is too large Load diff