@@ -452,7 +464,7 @@
- {% if mode in ['onestep-edit'] %}
+ {% if mode in ['onestep-edit', 'view-all', 'update-fulfillment'] %}
{% set avail_riders = obj.getHub.getAvailableRiders|default([]) %}
@@ -462,7 +474,11 @@
{% if obj.getHub %}
{% for rider in avail_riders %}
-
+ {% if mode in ['view-all', 'update-fulfillment'] %}
+
+ {% else %}
+
+ {% endif %}
{{ rider.getFirstName }}
{{ rider.getLastName }}
{{ rider.getContactNumber }}
@@ -485,24 +501,26 @@
-
-
-
+ {% if mode != 'view-all' %}
+
+
+
+ {% endif %}
-
- {% for jo_sc_key, jo_sc in obj.getMeta('service_charges')|default([]) %}
+
+ {% for jo_sc in jo_service_charges %}
-
-
+
@@ -634,9 +652,11 @@
-
- {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
- Cancel Job Order
+ {% if mode != 'view-all' %}
+
+ {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
+ Cancel Job Order
+ {% endif %}
{% endif %}
Back
@@ -781,6 +801,32 @@ $(function() {
});
{% endif %}
+ {% if mode in ['view-all', 'update-fulfillment'] %}
+ var hub_table = '';
+ $.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
+ var hubs = data['hubs'];
+ var hub_marker;
+ for (i in hubs) {
+ var hub = hubs[i];
+
+ if(selected_hub == hub['id']) {
+ hub_table += '
';
+ }
+
+ table.html(html);
+ });
+ }
// remove from invoice table
// TODO: figure out a way to delete rows, and should deleting trade ins be allowed since they count as items on the table?
@@ -1677,9 +1732,6 @@ $(function() {
$('#sc-section').append(html);
- // clear the sc_array
- sc_array.length = 0;
-
// trigger change in select
$('#sc-section').find('.sc-select').last().change();
return false;
@@ -1691,16 +1743,6 @@ $(function() {
$(this).closest('.row').remove();
- sc_array.length = 0;
-
- // get the service charges
- $('.sc-select').each(function() {
- var id = $(this).children('option:selected').val();
- sc_array.push({
- id: id,
- });
- });
-
generateInvoice();
return false;
@@ -1710,17 +1752,6 @@ $(function() {
var amount = $(this).children('option:selected').data('amount');
$(this).closest('.row').find('.sc-amount').val(amount);
- // clear the sc_array
- sc_array.length = 0;
-
- // get the service charges
- $('.sc-select').each(function() {
- var id = $(this).children('option:selected').val();
- sc_array.push({
- id: id,
- });
- });
-
generateInvoice();
});
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
index 1a833e63..f2e02e44 100644
--- a/templates/job-order/cmb.form.walkin.html.twig
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -341,9 +341,11 @@
-
+ {% if mode != 'view-all' %}
+
+ {% endif %}
@@ -358,14 +360,23 @@
- {% for hub in hubs %}
-
-
{{ hub.getName }}
-
{{ hub.getBranch }}
-
{{ hub.getContactNumbers }}
+ {% if mode == 'view-all' %}
+
+
{{ obj.getHub.getName }}
+
{{ obj.getHub.getBranch }}
+
{{ obj.getHub.getContactNumbers }}
- {% endfor %}
+ {% else %}
+ {% for hub in hubs %}
+
+
{{ hub.getName }}
+
{{ hub.getBranch }}
+
{{ hub.getContactNumbers }}
+
+
+ {% endfor %}
+ {% endif %}
@@ -495,9 +506,11 @@
-
- {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
- Cancel Job Order
+ {% if mode != 'view-all' %}
+
+ {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
+ Cancel Job Order
+ {% endif %}
{% endif %}
Back