diff --git a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php index 60d4d8dc..72e196fe 100644 --- a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php +++ b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php @@ -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; diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 8914bec5..bba63f31 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -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'; diff --git a/templates/job-order/cmb.form.html.twig b/templates/job-order/cmb.form.html.twig new file mode 100644 index 00000000..b32594a0 --- /dev/null +++ b/templates/job-order/cmb.form.html.twig @@ -0,0 +1,1704 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

Job Order

+
+
+
+ +
+ +
+
+
+
+
+
+ + + +

+ {% if mode == 'update-processing' %} + Dispatch + {{ obj.getID() }} + {% elseif mode == 'update-assigning' %} + Rider Assignment + {{ obj.getID() }} + {% elseif mode == 'update-reassign-hub' %} + Re-assign Hub + {{ obj.getID() }} + {% elseif mode == 'update-reassign-rider' %} + Re-assign Rider + {{ obj.getID() }} + {% elseif mode == 'update-all' %} + Viewing + {{ obj.getID() }} + {% else %} + Incoming + {% endif %} +

+
+
+
+
+ +
+ + {% if ftags.vehicle_dropdown %} +
+
+
+ + + +
+
+ + +
+
+
+
+
+
+ + + +
+
+
+ {% else %} + + {% endif %} + {% if obj.getReferenceJO %} +
+
+
+ + + +
+
+
+ {% endif %} + +
+
+

+ Customer Details +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+ +
+ {% trans %}country_code_prefix{% endtrans %} + + +
+
+
+
+
+ + + +
+
+
+
+
+

+ Vehicle Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+
+
+

+ Battery Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+
+
+

+ Transaction Details +

+ + + +
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ +
+ + + + +
+ +
+
+ +
+ + + + +
+ +
+
+
+
+ + + +
+
+ + + +
+
+
+
+
+ + + +
+
+
+ + +
+
+
+
+ + + +
+
+
+ + + +
+
+
+ + + +
+
+
+ +
+
+
+
+

+ Location +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ + + + +
+ + + + +
+
+
+
+
+
+
+
+

+ Invoice +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ + {% if ftags.invoice_edit %} + + + {% else %} + + {% endif %} +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + + {% if not obj.getInvoice or (obj.getInvoice and obj.getInvoice.getItems|length == 0) %} + + + + {% else %} + {% for item in obj.getInvoice.getItems %} + + + + + + + {% endfor %} + {% endif %} + +
ItemQuantityUnit PriceAmount
+ No items to display. +
{{ item.getTitle }}{{ item.getQuantity|number_format }}{{ item.getPrice|number_format(2) }}{{ (item.getPrice * item.getQuantity)|number_format(2) }}
+
+
+ {% if ftags.invoice_edit %} +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ {% endif %} +
+ + {% if mode in ['update-processing', 'update-reassign-hub'] %} +
+
+
+

+ Nearest Hubs +

+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + {% for hub in hubs %} + + + + + + + + + + {% endfor %} + +
HubBranchAvailable RidersJobs For AssignmentContact NumbersAction
+ No items to display. +
{{ hub.hub.getName }}{{ hub.hub.getBranch }}{{ hub.rider_count }}{{ hub.jo_count }}{{ hub.hub.getContactNumbers|replace({"\n": ', '}) }} + {% if hub.flag_rejected %} + + {% else %} + + {% endif %} +
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ {% endif %} + + {% if mode in ['update-assigning', 'update-fulfillment', 'update-reassign-rider', 'update-all'] %} +
+ {% if obj.getHub %} +
+
+

+ Hub Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+ {% endif %} + +
+ + {% if mode in ['update-assigning', 'update-reassign-rider'] %} +
+
+

+ Rider Assignment +

+
+
+
+ + +
+ + + + + + + + + + + + + {% set avail_riders = obj.getHub.getAvailableRiders|default([]) %} + + + + + {% if obj.getHub %} + {% for rider in avail_riders %} + + + + + + + + + {% endfor %} + {% endif %} + +
First NameLast NameContact No.Plate NumberStatus
+ No riders available. +
+
+ 		{{ rider.getFirstName }}{{ rider.getLastName }}{{ rider.getContactNumber }}{{ rider.getPlateNumber }}
+
+
+
+
+ {% endif %} + + {% if mode in ['update-fulfillment', 'update-all'] %} + {% if obj.getRider %} +
+
+

+ Rider Details +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+
+
+ {% endif %} + {% endif %} + {% endif %} + + {% if mode == 'update-all' %} +
+ +
+
+

+ Timeline +

+
+
+
+
+
+ {% for event in obj.getEvents %} +
+ + {{ event.getDateHappen|date("M j, Y") }} +
{{ event.getDateHappen|date("h:i:s a") }}
+ +
+ +
+
+ {{ event.getTypeName }} by {{ event.getUser.getFullName|default('Application') }} {% if event.getRider %} - Rider - {{ event.getRider.getFullName }}{% endif %} +
+
+ {% endfor %} +
+
+
+
+
+ {% endif %} + + {% if ftags.ticket_table %} +
+ +
+
+

+ Tickets +

+
+
+
+
+
+
+
+
+ Create Ticket +
+
+
+ {% endif %} + +
+
+
+
+
+ {% if mode != 'update-all' %} + + {% endif %} + {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %} + Cancel Job Order + {% endif %} + {% if mode != 'create' %} + Back + {% endif %} +
+
+
+
+
+
+
+
+
+ + {% if mode in ['update-processing', 'update-reassign-hub'] %} + + + {% endif %} +{% endblock %} + +{% block scripts %} + + + + + +{% endblock %} diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index b32594a0..9f986a4b 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -1,1704 +1,1675 @@ -{% extends 'base.html.twig' %} - -{% block body %} - -
-
-
-

Job Order

-
-
-
- -
- -
-
-
-
-
-
- - - -

- {% if mode == 'update-processing' %} - Dispatch - {{ obj.getID() }} - {% elseif mode == 'update-assigning' %} - Rider Assignment - {{ obj.getID() }} - {% elseif mode == 'update-reassign-hub' %} - Re-assign Hub - {{ obj.getID() }} - {% elseif mode == 'update-reassign-rider' %} - Re-assign Rider - {{ obj.getID() }} - {% elseif mode == 'update-all' %} - Viewing - {{ obj.getID() }} - {% else %} - Incoming - {% endif %} -

-
-
-
-
- -
- - {% if ftags.vehicle_dropdown %} -
-
-
- - - -
-
- - -
-
-
-
-
-
- - - -
-
-
- {% else %} - - {% endif %} - {% if obj.getReferenceJO %} -
-
-
- - - -
-
-
- {% endif %} - -
-
-

- Customer Details -

-
-
-
- - - -
-
- - - -
-
-
-
- -
- {% trans %}country_code_prefix{% endtrans %} - - -
-
-
- -
- {% trans %}country_code_prefix{% endtrans %} - - -
-
-
-
-
- -
- {% trans %}country_code_prefix{% endtrans %} - - -
-
-
- -
- {% trans %}country_code_prefix{% endtrans %} - - -
-
-
-
-
- - - -
-
-
-
-
-

- Vehicle Details -

-
-
-
- - - -
-
- - - -
-
- - - -
-
-
-
- - - -
-
- - - -
-
-
-
-
-

- Battery Details -

-
-
-
- - - -
-
- - - -
-
- - - -
-
-
-
-
-
-

- Transaction Details -

- - - -
-
-
- - - -
-
- - - -
-
- - - -
-
-
-
- - - -
-
- -
- - - - -
- -
-
- -
- - - - -
- -
-
-
-
- - - -
-
- - - -
-
-
-
-
- - - -
-
-
- - -
-
-
-
- - - -
-
-
- - - -
-
-
- - - -
-
-
- -
-
-
-
-

- Location -

-
-
-
- - - -
-
- - - -
-
-
-
- - - - -
- - - - -
-
-
-
-
-
-
-
-

- Invoice -

-
-
-
- - - -
-
- - - -
-
-
-
- - {% if ftags.invoice_edit %} - - - {% else %} - - {% endif %} -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
-
-
- - - - - - - - - - - - {% if not obj.getInvoice or (obj.getInvoice and obj.getInvoice.getItems|length == 0) %} - - - - {% else %} - {% for item in obj.getInvoice.getItems %} - - - - - - - {% endfor %} - {% endif %} - -
ItemQuantityUnit PriceAmount
- No items to display. -
{{ item.getTitle }}{{ item.getQuantity|number_format }}{{ item.getPrice|number_format(2) }}{{ (item.getPrice * item.getQuantity)|number_format(2) }}
-
-
- {% if ftags.invoice_edit %} -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- - - -
-
- {% endif %} -
- - {% if mode in ['update-processing', 'update-reassign-hub'] %} -
-
-
-

- Nearest Hubs -

-
-
-
- - -
- - - - - - - - - - - - - - - - - - {% for hub in hubs %} - - - - - - - - - - {% endfor %} - -
HubBranchAvailable RidersJobs For AssignmentContact NumbersAction
- No items to display. -
{{ hub.hub.getName }}{{ hub.hub.getBranch }}{{ hub.rider_count }}{{ hub.jo_count }}{{ hub.hub.getContactNumbers|replace({"\n": ', '}) }} - {% if hub.flag_rejected %} - - {% else %} - - {% endif %} -
-
-
-
-
-
-
-
- - -
-
- - -
-
-
-
-
-
-
-
-
-
- {% endif %} - - {% if mode in ['update-assigning', 'update-fulfillment', 'update-reassign-rider', 'update-all'] %} -
- {% if obj.getHub %} -
-
-

- Hub Details -

-
-
-
- - - -
-
- - - -
-
- - - -
-
-
-
- - - -
-
- - - -
-
-
- {% endif %} - -
- - {% if mode in ['update-assigning', 'update-reassign-rider'] %} -
-
-

- Rider Assignment -

-
-
-
- - -
- - - - - - - - - - - - - {% set avail_riders = obj.getHub.getAvailableRiders|default([]) %} - - - - - {% if obj.getHub %} - {% for rider in avail_riders %} - - - - - - - - - {% endfor %} - {% endif %} - -
First NameLast NameContact No.Plate NumberStatus
- No riders available. -
-
- 		{{ rider.getFirstName }}{{ rider.getLastName }}{{ rider.getContactNumber }}{{ rider.getPlateNumber }}
-
-
-
-
- {% endif %} - - {% if mode in ['update-fulfillment', 'update-all'] %} - {% if obj.getRider %} -
-
-

- Rider Details -

-
-
-
- - - -
-
- - - -
-
-
-
- - - -
-
- - - -
-
-
-
- -
-
-
-
- {% endif %} - {% endif %} - {% endif %} - - {% if mode == 'update-all' %} -
- -
-
-

- Timeline -

-
-
-
-
-
- {% for event in obj.getEvents %} -
- - {{ event.getDateHappen|date("M j, Y") }} -
{{ event.getDateHappen|date("h:i:s a") }}
- -
- -
-
- {{ event.getTypeName }} by {{ event.getUser.getFullName|default('Application') }} {% if event.getRider %} - Rider - {{ event.getRider.getFullName }}{% endif %} -
-
- {% endfor %} -
-
-
-
-
- {% endif %} - - {% if ftags.ticket_table %} -
- -
-
-

- Tickets -

-
-
-
-
-
-
-
-
- Create Ticket -
-
-
- {% endif %} - -
-
-
-
-
- {% if mode != 'update-all' %} - - {% endif %} - {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %} - Cancel Job Order - {% endif %} - {% if mode != 'create' %} - Back - {% endif %} -
-
-
-
-
-
-
-
-
- - {% if mode in ['update-processing', 'update-reassign-hub'] %} - - - {% endif %} -{% endblock %} - -{% block scripts %} - - - - - -{% endblock %} +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

Job Order

+
+
+
+ +
+ +
+
+
+
+
+
+ + + +

+ {% if mode == 'update-processing' %} + Dispatch + {{ obj.getID() }} + {% elseif mode == 'update-assigning' %} + Rider Assignment + {{ obj.getID() }} + {% elseif mode == 'update-reassign-hub' %} + Re-assign Hub + {{ obj.getID() }} + {% elseif mode == 'update-reassign-rider' %} + Re-assign Rider + {{ obj.getID() }} + {% elseif mode == 'update-all' %} + Viewing + {{ obj.getID() }} + {% else %} + Incoming + {% endif %} +

+
+
+
+
+ +
+ + {% if ftags.vehicle_dropdown %} +
+
+
+ + + +
+
+ + +
+
+
+
+
+
+ + + +
+
+
+ {% else %} + + {% endif %} + {% if obj.getReferenceJO %} +
+
+
+ + + +
+
+
+ {% endif %} + +
+
+

+ Customer Details +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ +
+ +63 + + +
+
+
+ +
+ +63 + + +
+
+
+
+
+ +
+ +63 + + +
+
+
+ +
+ +63 + + +
+
+
+
+
+ + + +
+
+
+
+
+

+ Vehicle Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+
+
+

+ Battery Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+
+
+

+ Transaction Details +

+ + + +
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ +
+ + + + +
+ +
+
+ +
+ + + + +
+ +
+
+
+
+ + + +
+
+ + + +
+
+
+
+
+ + + +
+
+
+ + +
+
+
+
+ + + +
+
+
+ + + +
+
+
+ + + +
+
+
+ +
+
+
+
+

+ Location +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ + + + +
+ + + + +
+
+
+
+
+
+
+
+

+ Invoice +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ + {% if ftags.invoice_edit %} + + + {% else %} + + {% endif %} +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + + {% if not obj.getInvoice or (obj.getInvoice and obj.getInvoice.getItems|length == 0) %} + + + + {% else %} + {% for item in obj.getInvoice.getItems %} + + + + + + + {% endfor %} + {% endif %} + +
ItemQuantityUnit PriceAmount
+ No items to display. +
{{ item.getTitle }}{{ item.getQuantity|number_format }}{{ item.getPrice|number_format(2) }}{{ (item.getPrice * item.getQuantity)|number_format(2) }}
+
+
+ {% if ftags.invoice_edit %} +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ {% endif %} +
+ + {% if mode in ['update-processing', 'update-reassign-hub'] %} +
+
+
+

+ Nearest Hubs +

+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + {% for hub in hubs %} + + + + + + + + + + {% endfor %} + +
HubBranchAvailable RidersJobs For AssignmentContact NumbersAction
+ No items to display. +
{{ hub.hub.getName }}{{ hub.hub.getBranch }}{{ hub.rider_count }}{{ hub.jo_count }}{{ hub.hub.getContactNumbers|replace({"\n": ', '}) }} + {% if hub.flag_rejected %} + + {% else %} + + {% endif %} +
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ {% endif %} + + {% if mode in ['update-assigning', 'update-fulfillment', 'update-reassign-rider', 'update-all'] %} +
+ {% if obj.getHub %} +
+
+

+ Hub Details +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+ {% endif %} + +
+ + {% if mode in ['update-assigning', 'update-reassign-rider'] %} +
+
+

+ Rider Assignment +

+
+
+
+ + +
+ + + + + + + + + + + + + {% set avail_riders = obj.getHub.getAvailableRiders|default([]) %} + + + + + {% if obj.getHub %} + {% for rider in avail_riders %} + + + + + + + + + {% endfor %} + {% endif %} + +
First NameLast NameContact No.Plate NumberStatus
+ No riders available. +
+
+ 		{{ rider.getFirstName }}{{ rider.getLastName }}{{ rider.getContactNumber }}{{ rider.getPlateNumber }}
+
+
+
+
+ {% endif %} + + {% if mode in ['update-fulfillment', 'update-all'] %} + {% if obj.getRider %} +
+
+

+ Rider Details +

+
+
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+
+
+ {% endif %} + {% endif %} + {% endif %} + + {% if mode == 'update-all' %} +
+ +
+
+

+ Timeline +

+
+
+
+
+
+ {% for event in obj.getEvents %} +
+ + {{ event.getDateHappen|date("M j, Y") }} +
{{ event.getDateHappen|date("h:i:s a") }}
+ +
+ +
+
+ {{ event.getTypeName }} by {{ event.getUser.getFullName|default('Application') }} {% if event.getRider %} - Rider - {{ event.getRider.getFullName }}{% endif %} +
+
+ {% endfor %} +
+
+
+
+
+ {% endif %} + + {% if ftags.ticket_table %} +
+ +
+
+

+ Tickets +

+
+
+
+
+
+
+
+
+ Create Ticket +
+
+
+ {% endif %} + +
+
+
+
+
+ {% if mode != 'update-all' %} + + {% endif %} + {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %} + Cancel Job Order + {% endif %} + {% if mode != 'create' %} + Back + {% endif %} +
+
+
+
+
+
+
+
+
+ + {% if mode in ['update-processing', 'update-reassign-hub'] %} + + + {% endif %} +{% endblock %} + +{% block scripts %} + + + + + +{% endblock %} +