From d7b5b8958ad6241506ed310b1b91b957f70e406c Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Mon, 23 Dec 2024 17:39:59 +0100 Subject: [PATCH] Stage changes of 27f9d70b566f894f60ef654a8af88fed23bb4801 (not ready yet) --- README.md | 2 +- changelog/76_UNRELEASED_xxxx-xx-xx.md | 4 ---- public/viewjs/components/productpicker.js | 6 +++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f3d98a6f..b139c7c9 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ Example: Button "**P** Add as new product" can be "pressed" by using the `P` key Products can be directly added to the database via looking them up against external services by a barcode. -This can be done in-place using the product picker workflow "External barcode lookup (via plugin)" (the workflow dialog is displayed when entering something unknown in any product input field). +This is currently only possible through the REST API. There is no plugin included for any service, see the reference implementation in `data/plugins/DemoBarcodeLookupPlugin.php`. diff --git a/changelog/76_UNRELEASED_xxxx-xx-xx.md b/changelog/76_UNRELEASED_xxxx-xx-xx.md index 38726ddf..132254c9 100644 --- a/changelog/76_UNRELEASED_xxxx-xx-xx.md +++ b/changelog/76_UNRELEASED_xxxx-xx-xx.md @@ -10,10 +10,6 @@ ### Stock -- Added a new product picker workflow "External barcode lookup (via plugin)" - - This executes the configured barcode lookup plugin with the given barcode - - If the lookup was successful, the product edit page of the created product is displayed, where the product setup can be completed (if required) - - After that, the transaction is continued with that product - Optimized form validation (max amount checks) related to unit conversion with a lot of decimal places on the consume and transfer page - Optimized that the stock report "Spendings" now excludes self produced products (thanks @danielr18 for the initial work on this) - Fixed that when copying a product, the field "Treat opened as out of stock" wasn't copied along (thanks @TheDodger) diff --git a/public/viewjs/components/productpicker.js b/public/viewjs/components/productpicker.js index 94cac3aa..c723cef8 100644 --- a/public/viewjs/components/productpicker.js +++ b/public/viewjs/components/productpicker.js @@ -250,8 +250,8 @@ $('#product_id_text_input').on('blur', function(e) Grocy.Components.ProductPicker.PopupOpen = false; window.location.href = U('/product/new?flow=InplaceNewProductWithBarcode&barcode=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(Grocy.CurrentUrlRelative + "?flow=InplaceAddBarcodeToExistingProduct&barcode=" + input + "&" + embedded) + "&" + embedded); } - }, - barcodepluginlookup: { + } + /*barcodepluginlookup: { label: 'E ' + __t('External barcode lookup (via plugin)'), className: 'btn-dark add-new-product-plugin-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses, callback: function() @@ -276,7 +276,7 @@ $('#product_id_text_input').on('blur', function(e) } ); } - } + }*/ }; if (!Grocy.FeatureFlags.GROCY_FEATURE_FLAG_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING)