inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 05:25:42 +00:00
Code Activity

Adds API endpoint to "ship" a sales order shipment

Browse Source
This commit is contained in:
Oliver
2021-11-30 00:02:03 +11:00
parent c6b11b5e38
commit f3f3030b37
5 changed files with 119 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
InvenTree/templates/js/translated/order.js
View File

@ -20,6 +20,7 @@
/* exported
allocateStockToSalesOrder,
completeShipment,
createSalesOrder,
editPurchaseOrderLineItem,
exportOrder,
@ -52,6 +53,26 @@ function salesOrderShipmentFields(options={}) {
}
/*
* Complete a shipment
*/
function completeShipment(shipment_id) {
constructForm(`/api/order/so/shipment/${shipment_id}/ship/`, {
method: 'POST',
title: '{% trans "Complete Shipment" %}',
fields: {
tracking_number: {},
},
confirm: true,
confirmMessage: '{% trans "Confirm Shipment" %}',
onSuccess: function(data) {
// TODO
}
});
}
// Open a dialog to create a new sales order shipment
function createSalesOrderShipment(options={}) {
constructForm('{% url "api-so-shipment-list" %}', {
@ -1183,6 +1204,8 @@ function loadSalesOrderShipmentTable(table, options={}) {
html += makeIconButton('fa-edit icon-blue', 'button-shipment-edit', pk, '{% trans "Edit shipment" %}');
html += makeIconButton('fa-truck icon-green', 'button-shipment-ship', pk, '{% trans "Complete shipment" %}');
html += `</div>`;
return html;
@ -1205,6 +1228,12 @@ function loadSalesOrderShipmentTable(table, options={}) {
}
});
});
$(table).find('.button-shipment-ship').click(function() {
var pk = $(this).attr('pk');
completeShipment(pk);
});
}
$(table).inventreeTable({
@ -1505,7 +1534,7 @@ function allocateStockToSalesOrder(order_id, line_items, options={}) {
// Exclude expired stock?
if (global_settings.STOCK_ENABLE_EXPIRY && !global_settings.STOCK_ALLOW_EXPIRED_SALE) {
fields.item.filters.expired = false;
filters.expired = false;
}
return filters;
@ -1781,14 +1810,16 @@ function showAllocationSubTable(index, row, element, options) {
title: '{% trans "Location" %}',
formatter: function(value, row, index, field) {
// Location specified
if (row.location) {
if (shipped) {
return `<em>{% trans "Shipped to customer" %}</em>`;
} else if (row.location) {
// Location specified
return renderLink(
row.location_detail.pathstring || '{% trans "Location" %}',
`/stock/location/${row.location}/`
);
} else {
return `<i>{% trans "Stock location not specified" %}`;
return `<em>{% trans "Stock location not specified" %}</em>`;
}
},
},

3
InvenTree/templates/js/translated/stock.js
View File

@ -94,6 +94,9 @@ function serializeStockItem(pk, options={}) {
});
}
options.confirm = true;
options.confirmMessage = '{% trans "Confirm Stock Serialization" %}';
constructForm(url, options);
}