From 7b1a8644864e831d5ce7275ad3cd11b2be60e674 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Fri, 9 Feb 2024 16:38:55 +0100 Subject: [PATCH] Revert / disable 27f9d70b566f894f60ef654a8af88fed23bb4801 (not ready yet) --- README.md | 4 +--- changelog/74_UNRELEASED_xxxx-xx-xx.md | 4 ---- public/viewjs/components/productpicker.js | 6 +++--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ad3f2f59..b47bc29e 100644 --- a/README.md +++ b/README.md @@ -123,9 +123,7 @@ Example: Button "**P** Add as new product" can be "pressed" by using the `P` key ### Barcode lookup via external services 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`. ### Database migrations diff --git a/changelog/74_UNRELEASED_xxxx-xx-xx.md b/changelog/74_UNRELEASED_xxxx-xx-xx.md index 805ac659..ebf81f18 100644 --- a/changelog/74_UNRELEASED_xxxx-xx-xx.md +++ b/changelog/74_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 - Fixed that the location dropdown on the consume page contained the same location multiple times if there are currently stock entries at multiple locations of the corresponding product - Fixed that the status filter "n products are overdue" on the stock overview page also counted/included stock entries due today or tomorrow - Fixed that the stock report "Spendings" did not take products without an assigned product group into account (thanks @Torqu3Wr3nch for the initial work on this) diff --git a/public/viewjs/components/productpicker.js b/public/viewjs/components/productpicker.js index f6371792..42ff0c53 100644 --- a/public/viewjs/components/productpicker.js +++ b/public/viewjs/components/productpicker.js @@ -249,8 +249,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() @@ -275,7 +275,7 @@ $('#product_id_text_input').on('blur', function(e) } ); } - } + }*/ }; if (!Grocy.FeatureFlags.GROCY_FEATURE_FLAG_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING)