@@ -514,6 +520,14 @@ $("#barcode-scan-into-location").click(function() {
});
});
+{% if plugins_enabled %}
+$('#locate-item-button').click(function() {
+ locateItemOrLocation({
+ item: {{ item.pk }},
+ });
+});
+{% endif %}
+
function itemAdjust(action) {
inventreeGet(
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 61320a2676..1066adf6ea 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -1,6 +1,7 @@
{% extends "stock/stock_app_base.html" %}
{% load static %}
{% load inventree_extras %}
+{% load plugin_extras %}
{% load i18n %}
{% block sidebar %}
@@ -27,6 +28,14 @@
{% include "admin_button.html" with url=url %}
{% endif %}
+{% mixin_available "locate" as locate_available %}
+{% if location and plugins_enabled and locate_available %}
+
+
+{% endif %}
+
{% if barcodes %}
{% if location %}
@@ -206,6 +215,14 @@
{% block js_ready %}
{{ block.super }}
+ {% if plugins_enabled and location %}
+ $('#locate-location-button').click(function() {
+ locateItemOrLocation({
+ location: {{ location.pk }},
+ });
+ });
+ {% endif %}
+
onPanelLoad('sublocations', function() {
loadStockLocationTable($('#sublocation-table'), {
params: {
diff --git a/InvenTree/stock/test_api.py b/InvenTree/stock/test_api.py
index 1f040b008d..28a8e0de0b 100644
--- a/InvenTree/stock/test_api.py
+++ b/InvenTree/stock/test_api.py
@@ -2,9 +2,6 @@
Unit testing for the Stock API
"""
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
import os
import io
import tablib
diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py
index 168403d692..15191b5fb7 100644
--- a/InvenTree/stock/views.py
+++ b/InvenTree/stock/views.py
@@ -2,9 +2,6 @@
Django views for interacting with Stock app
"""
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
from datetime import datetime
from django.views.generic import DetailView, ListView
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 0d8272892a..795a5679aa 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -2,6 +2,7 @@
{% load i18n %}
{% load inventree_extras %}
+{% plugins_enabled as plugins_enabled %}
{% settings_value 'BARCODE_ENABLE' as barcodes %}
{% settings_value 'REPORT_ENABLE_TEST_REPORT' as test_report_enabled %}
{% settings_value "REPORT_ENABLE" as report_enabled %}
diff --git a/InvenTree/templates/js/translated/bom.js b/InvenTree/templates/js/translated/bom.js
index 9bd66877da..0119b36664 100644
--- a/InvenTree/templates/js/translated/bom.js
+++ b/InvenTree/templates/js/translated/bom.js
@@ -16,6 +16,7 @@
/* exported
constructBomUploadTable,
+ deleteBomItems,
downloadBomTemplate,
exportBom,
newPartFromBomWizard,
@@ -647,7 +648,88 @@ function bomSubstitutesDialog(bom_item_id, substitutes, options={}) {
reloadParentTable();
}
});
+}
+
+function deleteBomItems(items, options={}) {
+ /* Delete the selected BOM items from the database
+ */
+
+ function renderItem(item, opts={}) {
+
+ var sub_part = item.sub_part_detail;
+ var thumb = thumbnailImage(sub_part.thumbnail || sub_part.image);
+
+ var html = `
+
+ | ${thumb} ${sub_part.full_name} |
+ ${item.reference} |
+ ${item.quantity}
+ |
+ `;
+
+ return html;
+ }
+
+ var rows = '';
+
+ items.forEach(function(item) {
+ rows += renderItem(item);
+ });
+
+ var html = `
+
+ {% trans "All selected BOM items will be deleted" %}
+
+
+
+
+ | {% trans "Part" %} |
+ {% trans "Reference" %} |
+ {% trans "Quantity" %} |
+
+ ${rows}
+
+ `;
+
+ constructFormBody({}, {
+ title: '{% trans "Delete selected BOM items?" %}',
+ fields: {},
+ preFormContent: html,
+ submitText: '{% trans "Delete" %}',
+ submitClass: 'danger',
+ confirm: true,
+ onSubmit: function(fields, opts) {
+ // Individually send DELETE requests for each BOM item
+ // We do *not* send these all at once, to prevent overloading the server
+
+ // Show the progress spinner
+ $(opts.modal).find('#modal-progress-spinner').show();
+
+ function deleteNextBomItem() {
+
+ if (items.length > 0) {
+
+ var item = items.shift();
+
+ inventreeDelete(`/api/bom/${item.pk}/`,
+ {
+ complete: deleteNextBomItem,
+ }
+ );
+ } else {
+ // Destroy this modal once all items are deleted
+ $(opts.modal).modal('hide');
+
+ if (options.success) {
+ options.success();
+ }
+ }
+ }
+
+ deleteNextBomItem();
+ },
+ });
}
@@ -1146,19 +1228,13 @@ function loadBomTable(table, options={}) {
var pk = $(this).attr('pk');
- var html = `
-
- {% trans "Are you sure you want to delete this BOM item?" %}
-
`;
+ var item = table.bootstrapTable('getRowByUniqueId', pk);
- constructForm(`/api/bom/${pk}/`, {
- method: 'DELETE',
- title: '{% trans "Delete BOM Item" %}',
- preFormContent: html,
- onSuccess: function() {
+ deleteBomItems([item], {
+ success: function() {
reloadBomTable(table);
}
- });
+ });
});
// Callback for "edit" button
diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js
index 642523a60b..d45a2de78c 100644
--- a/InvenTree/templates/js/translated/forms.js
+++ b/InvenTree/templates/js/translated/forms.js
@@ -288,6 +288,7 @@ function constructDeleteForm(fields, options) {
* - method: The HTTP method e.g. 'PUT', 'POST', 'DELETE' (default='PATCH')
* - title: The form title
* - submitText: Text for the "submit" button
+ * - submitClass: CSS class for the "submit" button (default = ')
* - closeText: Text for the "close" button
* - fields: list of fields to display, with the following options
* - filters: API query filters
diff --git a/InvenTree/templates/js/translated/label.js b/InvenTree/templates/js/translated/label.js
index d19c403861..388509c8bf 100644
--- a/InvenTree/templates/js/translated/label.js
+++ b/InvenTree/templates/js/translated/label.js
@@ -236,17 +236,13 @@ function selectLabel(labels, items, options={}) {
if (plugins_enabled) {
inventreeGet(
`/api/plugin/`,
- {},
+ {
+ mixin: 'labels',
+ },
{
async: false,
success: function(response) {
- response.forEach(function(plugin) {
- // Look for active plugins which implement the 'labels' mixin class
- if (plugin.active && plugin.mixins && plugin.mixins.labels) {
- // This plugin supports label printing
- plugins.push(plugin);
- }
- });
+ plugins = response;
}
}
);
diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js
index 85f503682e..464006ae12 100644
--- a/InvenTree/templates/js/translated/modals.js
+++ b/InvenTree/templates/js/translated/modals.js
@@ -42,6 +42,8 @@ function createNewModal(options={}) {
}
});
+ var submitClass = options.submitClass || 'primary';
+
var html = `