From 449e0c0af26a4e210ff03ca2a212091eeb734b9c Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 23 Aug 2021 00:17:45 +1000 Subject: [PATCH] Refactor button in first step of "order parts" wizard - "new supplier part" button was broken - Was linked to the old "launchModalForm" code - Now calls createSupplierPart --- InvenTree/templates/js/translated/order.js | 46 ++++++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js index 8a8f45103c..2381e3bd25 100644 --- a/InvenTree/templates/js/translated/order.js +++ b/InvenTree/templates/js/translated/order.js @@ -109,27 +109,47 @@ function newSupplierPartFromOrderWizard(e) { var part = $(src).attr('part'); - console.log('part: ' + part); - if (!part) { part = $(src).closest('button').attr('part'); console.log('parent: ' + part); } - launchModalForm("/supplier-part/new/", { - modal: '#modal-form-secondary', - data: { - part: part, - }, - success: function(response) { - /* A new supplier part has been created! */ + createSupplierPart({ + part: part, + onSuccess: function(response) { + + // 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 + // For now, this hack will have to do... - var dropdown = '#id_supplier_part_' + part; + var dropdown = `#id_supplier_part_${part}`; - var option = new Option(response.text, response.pk, true, true); + var pk = response.pk; - $('#modal-form').find(dropdown).append(option).trigger('change'); - }, + inventreeGet( + `/api/company/part/${pk}/`, + { + supplier_detail: true, + }, + { + success: function(response) { + var text = ''; + + if (response.supplier_detail) { + text += response.supplier_detail.name; + text += " | "; + } + + text += response.SKU; + + var option = new Option(text, pk, true, true); + + $('#modal-form').find(dropdown).append(option).trigger('change'); + } + } + ) + + } }); }