2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00

Fix for "new purchase order" button

This commit is contained in:
Oliver Walters 2021-08-23 00:28:36 +10:00
parent 449e0c0af2
commit 174b7ba7f2

View File

@ -78,7 +78,13 @@ function createPurchaseOrder(options={}) {
} }
}, },
onSuccess: function(data) { onSuccess: function(data) {
location.href = `/order/purchase-order/${data.pk}/`;
if (options.onSuccess) {
options.onSuccess(data);
} else {
// Default action is to redirect browser to the new PO
location.href = `/order/purchase-order/${data.pk}/`;
}
}, },
title: '{% trans "Create Purchase Order" %}', title: '{% trans "Create Purchase Order" %}',
}); });
@ -116,7 +122,7 @@ function newSupplierPartFromOrderWizard(e) {
createSupplierPart({ createSupplierPart({
part: part, part: part,
onSuccess: function(response) { onSuccess: function(data) {
// TODO: 2021-08-23 - This whole form wizard needs to be refactored. // TODO: 2021-08-23 - This whole form wizard needs to be refactored.
// In the future, use the API forms functionality to add the new item // In the future, use the API forms functionality to add the new item
@ -124,7 +130,7 @@ function newSupplierPartFromOrderWizard(e) {
var dropdown = `#id_supplier_part_${part}`; var dropdown = `#id_supplier_part_${part}`;
var pk = response.pk; var pk = data.pk;
inventreeGet( inventreeGet(
`/api/company/part/${pk}/`, `/api/company/part/${pk}/`,
@ -165,20 +171,40 @@ function newPurchaseOrderFromOrderWizard(e) {
var supplier = $(src).attr('supplierid'); var supplier = $(src).attr('supplierid');
launchModalForm("/order/purchase-order/new/", { createPurchaseOrder({
modal: '#modal-form-secondary', supplier: supplier,
data: { onSuccess: function(data) {
supplier: supplier,
},
success: function(response) {
/* A new purchase order has been created! */
var dropdown = '#id-purchase-order-' + supplier; // TODO: 2021-08-23 - The whole form wizard needs to be refactored
// In the future, the drop-down should be using a dynamic AJAX request
// to fill out the select2 options!
var option = new Option(response.text, response.pk, true, true); var pk = data.pk;
$('#modal-form').find(dropdown).append(option).trigger('change'); inventreeGet(
}, `/api/order/po/${pk}/`,
{
supplier_detail: true,
},
{
success: function(response) {
var text = global_settings.PURCHASEORDER_REFERENCE_PREFIX || '';
text += response.reference;
if (response.supplier_detail) {
text += ` ${response.supplier_detail.name}`;
}
var dropdown = `#id-purchase-order-${supplier}`;
var option = new Option(text, pk, true, true);
$('#modal-form').find(dropdown).append(option).trigger('change');
}
}
)
}
}); });
} }