-
Submit
- {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
-
Cancel Job Order
+ {% if mode != 'view-all' %}
+
{{ mode == 'update-fulfillment' ? 'Fulfill' : 'Submit' }}
+ {% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
+
Cancel Job Order
+ {% endif %}
{% endif %}
Back
@@ -756,6 +803,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 += '
';
+ hub_marker = L.marker([hub['lat'], hub['long']], { icon: icon_hub });
+ hubLayerGroup.addLayer(hub_marker);
+
+ hub_table += '' + hub['name'] + ' ';
+ hub_table += '' + hub['branch'] + ' ';
+ hub_table += '' + hub['cnum'] + ' ';
+ hub_table += '' + hub['distance'] + ' ';
+ hub_table += ' ';
+ }
+ }
+
+ $('#nearest_hubs').html(hub_table);
+ });
+ {% endif %}
+
// add marker to layer group
markerLayerGroup.addLayer(marker);
@@ -819,76 +892,80 @@ $(function() {
});
$(function() {
- $('#hubs-table').on('click', 'tr', function() {
- var id = $(this).data('id');
+ {% if mode != 'view-all' %}
+ $('#hubs-table').on('click', 'tr', function() {
+ var id = $(this).data('id');
- riderLayerGroup.clearLayers();
+ riderLayerGroup.clearLayers();
- if (id != selected_hub) {
+ if (id != selected_hub) {
- // highlight this row
- $('#hubs-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
+ // highlight this row
+ $('#hubs-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
- $(this).addClass('m-table__row--primary');
+ $(this).addClass('m-table__row--primary');
- // set hub
- selected_hub = id;
- $('#hub-field').val(selected_hub);
+ // set hub
+ selected_hub = id;
+ $('#hub-field').val(selected_hub);
- // clear rider field
- $('#rider-field').val('');
- selected_rider = '';
+ // clear rider field
+ $('#rider-field').val('');
+ selected_rider = '';
- // get riders of hub
- // get hub riders ajax
- // TODO: add latitude and longitude of delivery location to ajax request
- var rider_table = '';
- $.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) {
- var riders = data['riders'];
- for (i in riders) {
- var rider = riders[i];
- var rider_lat = rider['location'][0];
- var rider_lng = rider['location'][1];
- var rider_marker = L.marker([rider_lat, rider_lng], { icon: icon_rider_available });
- riderLayerGroup.addLayer(rider_marker);
+ // get riders of hub
+ // get hub riders ajax
+ // TODO: add latitude and longitude of delivery location to ajax request
+ var rider_table = '';
+ $.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) {
+ var riders = data['riders'];
+ for (i in riders) {
+ var rider = riders[i];
+ var rider_lat = rider['location'][0];
+ var rider_lng = rider['location'][1];
+ var rider_marker = L.marker([rider_lat, rider_lng], { icon: icon_rider_available });
+ riderLayerGroup.addLayer(rider_marker);
- rider_table += '
';
- rider_table += '' + rider['first_name'] + ' ';
- rider_table += '' + rider['last_name'] + ' ';
- rider_table += '' + rider['contact_num'] + ' ';
- rider_table += '' + rider['plate_num'] + ' ';
- rider_table += ' ';
- }
+ rider_table += '
';
+ rider_table += '' + rider['first_name'] + ' ';
+ rider_table += '' + rider['last_name'] + ' ';
+ rider_table += '' + rider['contact_num'] + ' ';
+ rider_table += '' + rider['plate_num'] + ' ';
+ rider_table += ' ';
+ }
- $('#riders').html(rider_table);
- });
- } else {
- // unhighlight this row
- $(this).removeClass('m-table__row--primary');
-
- // remove id value
- selected_hub = '';
- }
- });
+ $('#riders').html(rider_table);
+ });
+ } else {
+ // unhighlight this row
+ $(this).removeClass('m-table__row--primary');
+
+ // remove id value
+ selected_hub = '';
+ }
+ });
+ {% endif %}
});
$(function() {
- $('#rider-table').on('click', 'tr', function() {
- var id = $(this).data('id');
+ {% if mode != 'view-all' %}
+ $('#rider-table').on('click', 'tr', function() {
+ var id = $(this).data('id');
- // highlight this row
- $('#rider-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
+ // highlight this row
+ $('#rider-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
- $(this).addClass('m-table__row--primary');
+ $(this).addClass('m-table__row--primary');
- // set rider
- selected_rider = id;
- $('#rider-field').val(selected_rider);
- });
+ // set rider
+ selected_rider = id;
+ $('#rider-field').val(selected_rider);
+ });
+ {% endif %}
});
- {% if mode in ['onestep-edit'] %}
+ {% if mode in ['onestep-edit', 'view-all', 'update-fulfillment'] %}
var lat = {{ obj.getCoordinates.getLatitude }};
var lng = {{ obj.getCoordinates.getLongitude }};
@@ -969,6 +1046,9 @@ $(function() {
// add invoice items to data
fields['invoice_items'] = invoiceItems;
+ // add service charges to data
+ fields['service_charges'] = sc_array;
+
{% if mode in ['update-processing', 'update-reassign-hub'] %}
// add selected hub to data
fields['hub'] = selectedHub;
@@ -1192,6 +1272,7 @@ $(function() {
$('.cust_field').val('');
$('.cv_field').val('');
$('#cv-make').val('');
+ $('.battery_field').val('');
} else {
$('.cust_field').prop('disabled', true);
$('.cv_field').prop('disabled', true);
@@ -1276,6 +1357,22 @@ $(function() {
});
var invoiceItems = [];
+ var sc_array = [];
+
+ // populate invoiceItems if editing so that we don't lose the battery
+ {% if mode in ['view-all', 'open-edit', 'onestep-edit', 'walk-in-edit', 'update-fulfillment'] %}
+ {% if (obj.getInvoice and obj.getInvoice.getItems|length > 0) %}
+ {% for item in obj.getInvoice.getItems %}
+ {% if item.getBattery() %}
+ invoiceItems.push({
+ battery: {{ item.getBattery().getID() }},
+ quantity: {{ item.getQuantity() }},
+ trade_in: {{ obj.getInvoice().getTradeIn }},
+ });
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ {% endif %}
// add to invoice
$("#btn-add-to-invoice").click(function() {
@@ -1316,7 +1413,7 @@ $(function() {
});
// update invoice when promo is changed
- $("#invoice-promo").change(function() {
+ $("#invoice-discount").change(function() {
generateInvoice();
});
@@ -1325,72 +1422,84 @@ $(function() {
generateInvoice();
});
- // reset the invoice table
- $("#btn-reset-invoice").click(function() {
- $("#invoice-promo").prop('selectedIndex', 0);
- invoiceItems = [];
- generateInvoice();
- });
+ // reset the invoice table
+ $("#btn-reset-invoice").click(function() {
+ $("#invoice-discount").val(0);
+ $('.sc-select').closest('.row').remove();
+ invoiceItems = [];
+ generateInvoice();
+ });
// recompute
$("#btn-recompute-invoice").click(function() {
generateInvoice();
});
- function generateInvoice() {
- var promo = $("#invoice-promo").val();
- var table = $("#invoice-table tbody");
+ function generateInvoice() {
+ var discount = $("#invoice-discount").val();
+ var table = $("#invoice-table tbody");
var stype = $("#service_type").val();
var cvid = $("#customer-vehicle").val();
- // generate invoice values
- $.ajax({
- method: "POST",
- url: "{{ url('jo_gen_invoice') }}",
- data: {
+ sc_array = [];
+
+ // get the service charges
+ $('.sc-select').each(function() {
+ var id = $(this).children('option:selected').val();
+ sc_array.push({
+ id: id,
+ });
+ });
+
+ // generate invoice values
+ $.ajax({
+ method: "POST",
+ url: "{{ url('jo_gen_invoice') }}",
+ data: {
'stype': stype,
- 'items': invoiceItems,
- 'promo': promo,
- 'cvid': cvid
- }
- }).done(function(response) {
+ 'items': invoiceItems,
+ 'promo': discount,
+ 'cvid': cvid,
+ 'service_charges': sc_array,
+ }
+ }).done(function(response) {
// mark as invoice changed
$("#invoice-change").val(1);
- var invoice = response.invoice;
+ var invoice = response.invoice;
- // populate totals
- $("#invoice-promo-discount").val(invoice.discount);
- $("#invoice-price").val(invoice.price);
- $("#invoice-trade-in").val(invoice.trade_in);
- $("#invoice-vat").val(invoice.vat);
- $("#invoice-total-amount").val(invoice.total_price);
+ // populate totals
+ $("#invoice-discount").val(invoice.discount);
+ $("#invoice-price").val(invoice.price);
+ $("#invoice-trade-in").val(invoice.trade_in);
+ $("#invoice-vat").val(invoice.vat);
+ $("#invoice-total-amount").val(invoice.total_price);
- // populate rows
- var html = '';
+ // populate rows
+ var html = '';
- if (invoice.items.length > 0) {
- $.each(invoice.items, function(key, item) {
- html += '
' +
- '' + item.title + ' ' +
- '' + item.quantity + ' ' +
- '' + item.unit_price + ' ' +
- '' + item.amount + ' ' +
- /*
- ' ';
- });
- } else {
- html = '
' +
- '' +
- 'No items to display.' +
- ' ' +
- ' ';
- }
-
- table.html(html);
- });
- }
+ if (invoice.items.length > 0) {
+ $.each(invoice.items, function(key, item) {
+ html += '
' +
+ '' + item.title + ' ' +
+ '' + item.quantity + ' ' +
+ '' + item.unit_price + ' ' +
+ '' + item.amount + ' ' +
+ /*
+ ' ';
+ });
+ } else {
+ html = '
' +
+ '' +
+ 'No items to display.' +
+ ' ' +
+ ' ';
+ }
+
+ 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?
@@ -1601,6 +1710,54 @@ $(function() {
});
});
});
+
+ // service charge add
+ $('#btn-sc-add').click(function(e) {
+ console.log('adding service charge');
+ // add dropdown before the button
+ var html = '
';
+
+ $('#sc-section').append(html);
+
+ // trigger change in select
+ $('#sc-section').find('.sc-select').last().change();
+ return false;
+ });
+
+ // service charge remove
+ $('body').on('click', '.btn-sc-remove', function(e) {
+ console.log('removing service charge');
+
+ $(this).closest('.row').remove();
+
+ generateInvoice();
+
+ return false;
+ });
+
+ $('body').on('change', '.sc-select', function(e) {
+ var amount = $(this).children('option:selected').data('amount');
+ $(this).closest('.row').find('.sc-amount').val(amount);
+
+ generateInvoice();
+ });
+
});
{% endblock %}
diff --git a/templates/job-order/cmb.form.walkin.html.twig b/templates/job-order/cmb.form.walkin.html.twig
new file mode 100644
index 00000000..e628d93b
--- /dev/null
+++ b/templates/job-order/cmb.form.walkin.html.twig
@@ -0,0 +1,1099 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Walk-in Job Order
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+
+{% endblock %}
+
diff --git a/templates/job-order/cmb.list.all.html.twig b/templates/job-order/cmb.list.all.html.twig
new file mode 100644
index 00000000..1e8b6511
--- /dev/null
+++ b/templates/job-order/cmb.list.all.html.twig
@@ -0,0 +1,202 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+
+{% endblock %}
diff --git a/templates/job-order/cmb.list.fulfillment.html.twig b/templates/job-order/cmb.list.fulfillment.html.twig
new file mode 100644
index 00000000..7cd98ad3
--- /dev/null
+++ b/templates/job-order/cmb.list.fulfillment.html.twig
@@ -0,0 +1,183 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+
+{% endblock %}
diff --git a/templates/job-order/cmb.list.open.html.twig b/templates/job-order/cmb.list.open.html.twig
new file mode 100644
index 00000000..a575e645
--- /dev/null
+++ b/templates/job-order/cmb.list.open.html.twig
@@ -0,0 +1,206 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+
+
+
+{% endblock %}
+
+{% block scripts %}
+
+{% endblock %}
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index a0e5985c..bba70b39 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -47,6 +47,9 @@