diff --git a/InvenTree/order/templates/order/order_wizard/match_fields.html b/InvenTree/order/templates/order/order_wizard/match_fields.html index c7a9b02fd2..d4c91efeb3 100644 --- a/InvenTree/order/templates/order/order_wizard/match_fields.html +++ b/InvenTree/order/templates/order/order_wizard/match_fields.html @@ -1,99 +1,2 @@ {% extends "order/order_wizard/po_upload.html" %} -{% load inventree_extras %} -{% load i18n %} -{% load static %} - -{% block form_alert %} -{% if missing_columns and missing_columns|length > 0 %} - -{% endif %} -{% if duplicates and duplicates|length > 0 %} - -{% endif %} -{% endblock form_alert %} - -{% block form_buttons_top %} - {% if wizard.steps.prev %} - - {% endif %} - -{% endblock form_buttons_top %} - -{% block form_content %} - - - {% trans "File Fields" %} - - {% for col in form %} - -
- - {{ col.name }} - -
- - {% endfor %} - - - - - {% trans "Match Fields" %} - - {% for col in form %} - - {{ col }} - {% for duplicate in duplicates %} - {% if duplicate == col.value %} - - {% endif %} - {% endfor %} - - {% endfor %} - - {% for row in rows %} - {% with forloop.counter as row_index %} - - - - - {{ row_index }} - {% for item in row.data %} - - - {{ item }} - - {% endfor %} - - {% endwith %} - {% endfor %} - -{% endblock form_content %} - -{% block form_buttons_bottom %} -{% endblock form_buttons_bottom %} - -{% block js_ready %} -{{ block.super }} - -$('.fieldselect').select2({ - width: '100%', - matcher: partialMatcher, -}); - -{% endblock %} \ No newline at end of file +{% include "patterns/wizard/match_fields.html" %} \ No newline at end of file diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html index 5c680e509c..b101cfc8b5 100644 --- a/InvenTree/order/templates/order/order_wizard/po_upload.html +++ b/InvenTree/order/templates/order/order_wizard/po_upload.html @@ -10,54 +10,11 @@ {% endblock %} {% block page_content %} - -
-
- {% block heading %} -

{% trans "Upload File for Purchase Order" %}

- {{ wizard.form.media }} - {% endblock %} -
-
- {% block details %} - {% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %} - -

{% blocktrans with step=wizard.steps.step1 count=wizard.steps.count %}Step {{step}} of {{count}}{% endblocktrans %} - {% if description %}- {{ description }}{% endif %}

- - {% block form_alert %} - {% endblock form_alert %} - -
- {% csrf_token %} - {% load crispy_forms_tags %} - - {% block form_buttons_top %} - {% endblock form_buttons_top %} - - - {{ wizard.management_form }} - {% block form_content %} - {% crispy wizard.form %} - {% endblock form_content %} -
- - {% block form_buttons_bottom %} - {% if wizard.steps.prev %} - - {% endif %} - -
- {% endblock form_buttons_bottom %} - - {% else %} - - {% endif %} - {% endblock details %} -
- + {% trans "Upload File for Purchase Order" as header_text %} + {% order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change as upload_go_ahead %} + {% trans "Order is already processed. Files cannot be uploaded." as error_text %} + {% "panel-upload-file" as panel_id %} + {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=upload_go_ahead error_text=error_text panel_id=panel_id %} {% endblock %} {% block js_ready %} diff --git a/InvenTree/part/templates/part/import_wizard/match_fields.html b/InvenTree/part/templates/part/import_wizard/match_fields.html index 9c33717772..8bde89a175 100644 --- a/InvenTree/part/templates/part/import_wizard/match_fields.html +++ b/InvenTree/part/templates/part/import_wizard/match_fields.html @@ -1,99 +1,2 @@ {% extends "part/import_wizard/part_upload.html" %} -{% load inventree_extras %} -{% load i18n %} -{% load static %} - -{% block form_alert %} -{% if missing_columns and missing_columns|length > 0 %} - -{% endif %} -{% if duplicates and duplicates|length > 0 %} - -{% endif %} -{% endblock form_alert %} - -{% block form_buttons_top %} - {% if wizard.steps.prev %} - - {% endif %} - -{% endblock form_buttons_top %} - -{% block form_content %} - - - {% trans "File Fields" %} - - {% for col in form %} - -
- - {{ col.name }} - -
- - {% endfor %} - - - - - {% trans "Match Fields" %} - - {% for col in form %} - - {{ col }} - {% for duplicate in duplicates %} - {% if duplicate == col.value %} - - {% endif %} - {% endfor %} - - {% endfor %} - - {% for row in rows %} - {% with forloop.counter as row_index %} - - - - - {{ row_index }} - {% for item in row.data %} - - - {{ item }} - - {% endfor %} - - {% endwith %} - {% endfor %} - -{% endblock form_content %} - -{% block form_buttons_bottom %} -{% endblock form_buttons_bottom %} - -{% block js_ready %} -{{ block.super }} - -$('.fieldselect').select2({ - width: '100%', - matcher: partialMatcher, -}); - -{% endblock %} \ No newline at end of file +{% include "patterns/wizard/match_fields.html" %} \ No newline at end of file diff --git a/InvenTree/part/templates/part/import_wizard/part_upload.html b/InvenTree/part/templates/part/import_wizard/part_upload.html index 666afad1cb..4fef625d1d 100644 --- a/InvenTree/part/templates/part/import_wizard/part_upload.html +++ b/InvenTree/part/templates/part/import_wizard/part_upload.html @@ -10,51 +10,10 @@ {% endblock %} {% block content %} -
-
-

- {% trans "Import Parts from File" %} - {{ wizard.form.media }} -

-
-
- {% if roles.part.change %} - -

{% blocktrans with step=wizard.steps.step1 count=wizard.steps.count %}Step {{step}} of {{count}}{% endblocktrans %} - {% if description %}- {{ description }}{% endif %}

- - {% block form_alert %} - {% endblock form_alert %} - -
- {% csrf_token %} - {% load crispy_forms_tags %} - - {% block form_buttons_top %} - {% endblock form_buttons_top %} - - - {{ wizard.management_form }} - {% block form_content %} - {% crispy wizard.form %} - {% endblock form_content %} -
- - {% block form_buttons_bottom %} - {% if wizard.steps.prev %} - - {% endif %} - -
- {% endblock form_buttons_bottom %} - - {% else %} - - {% endif %} -
-
+ {% trans "Import Parts from File" as header_text %} + {% roles.part.change as upload_go_ahead %} + {% trans "Unsuffitient privileges." as error_text %} + {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=upload_go_ahead error_text=error_text %} {% endblock %} {% block js_ready %} diff --git a/InvenTree/part/templates/part/part_app_base.html b/InvenTree/part/templates/part/part_app_base.html index 0b578aaadd..c7b38f9cc2 100644 --- a/InvenTree/part/templates/part/part_app_base.html +++ b/InvenTree/part/templates/part/part_app_base.html @@ -14,7 +14,7 @@ {% endblock %} {% block breadcrumbs %} - + {% if part %} {% include "part/cat_link.html" with category=part.category part=part %} {% else %} diff --git a/InvenTree/part/templates/part/upload_bom.html b/InvenTree/part/templates/part/upload_bom.html index 57c7014197..151a4b5424 100644 --- a/InvenTree/part/templates/part/upload_bom.html +++ b/InvenTree/part/templates/part/upload_bom.html @@ -89,8 +89,11 @@ $('#bom-upload').click(function() { }, title: '{% trans "Upload BOM File" %}', onSuccess: function(response) { - $('#bom-upload').hide(); + // Clear existing entries from the table + $('.bom-import-row').remove(); + + // Disable the "submit" button $('#bom-submit').show(); constructBomUploadTable(response); diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html index af558ced12..cb4ecc3059 100644 --- a/InvenTree/stock/templates/stock/item_base.html +++ b/InvenTree/stock/templates/stock/item_base.html @@ -10,7 +10,7 @@ {% endblock %} {% block breadcrumbs %} - + {% include 'stock/loc_link.html' with location=item.location %} {% endblock %} diff --git a/InvenTree/stock/templates/stock/stock_app_base.html b/InvenTree/stock/templates/stock/stock_app_base.html index 93994ebd21..cf30a3221a 100644 --- a/InvenTree/stock/templates/stock/stock_app_base.html +++ b/InvenTree/stock/templates/stock/stock_app_base.html @@ -18,7 +18,7 @@ {% endblock %} {% block breadcrumbs %} - + {% if item %} {% include 'stock/loc_link.html' with location=item.location %} {% else %} diff --git a/InvenTree/templates/InvenTree/settings/plugin.html b/InvenTree/templates/InvenTree/settings/plugin.html index 7b428e161f..caee7c92bf 100644 --- a/InvenTree/templates/InvenTree/settings/plugin.html +++ b/InvenTree/templates/InvenTree/settings/plugin.html @@ -77,7 +77,7 @@ {% endif %} {% if plugin.website %} - + {% endif %} {{ plugin.author }} diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 9bd0dba26e..32bc4d43e7 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -65,7 +65,7 @@ {% if emailaddress.primary %} - {{ emailaddress.email }} + {{ emailaddress.email }} {% else %} {{ emailaddress.email }} {% endif %} diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index fd3e496f80..05d0712e6a 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -94,7 +94,7 @@ {% if server_restart_required and not demo_mode %}