From 3f850c540b305ed12955503170a80e4f07591f67 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Wed, 15 Sep 2021 14:24:50 +0200
Subject: [PATCH] Fixed stock overview context menu item disabled handling
 (fixes #1609)

---
 changelog/64_UNRELEASED_xxxx.xx.xx.md |  1 +
 localization/strings.pot              |  3 ---
 views/stockentries.blade.php          |  2 +-
 views/stockoverview.blade.php         | 14 ++------------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/changelog/64_UNRELEASED_xxxx.xx.xx.md b/changelog/64_UNRELEASED_xxxx.xx.xx.md
index cbf38034..9fce6cea 100644
--- a/changelog/64_UNRELEASED_xxxx.xx.xx.md
+++ b/changelog/64_UNRELEASED_xxxx.xx.xx.md
@@ -1,5 +1,6 @@
 - Fixed that the "Add all list items to stock" shopping list workflow did not work for more than ~6 items (thanks @tjhowse)
 - Fixed that plural form handling (e.g. for quantity units) was wrong for negative numbers
+- Fixed that the context menu entries Consume and Transfer on the stock overview page were disabled when the amount in stock was < 1
 
 ### API
 - Fixed that international characters were not allowed in API query filters
diff --git a/localization/strings.pot b/localization/strings.pot
index aaf2574e..999d8d6f 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1172,9 +1172,6 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr ""
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
 
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 2376f27f..211296a9 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -159,7 +159,7 @@
 									<i class="fas fa-list"></i> {{ $__t('Inventory') }}
 								</a>
 								<div class="dropdown-divider"></div>
-								<a class="dropdown-item stock-consume-button stock-consume-button-spoiled @if($stockEntry->amount < 1) disabled @endif"
+								<a class="dropdown-item stock-consume-button stock-consume-button-spoiled"
 									type="button"
 									href="#"
 									data-product-id="{{ $stockEntry->product_id }}"
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index db25747b..ded6518e 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -243,13 +243,13 @@
 									href="{{ $U('/purchase?embedded&product=' . $currentStockEntry->product_id ) }}">
 									<span class="dropdown-item-icon"><i class="fas fa-cart-plus"></i></span> <span class="dropdown-item-text">{{ $__t('Purchase') }}</span>
 								</a>
-								<a class="dropdown-item show-as-dialog-link permission-STOCK_CONSUME @if($currentStockEntry->amount_aggregated < 1) disabled @endif"
+								<a class="dropdown-item show-as-dialog-link permission-STOCK_CONSUME @if($currentStockEntry->amount_aggregated <= 0) disabled @endif"
 									type="button"
 									href="{{ $U('/consume?embedded&product=' . $currentStockEntry->product_id ) }}">
 									<span class="dropdown-item-icon"><i class="fas fa-utensils"></i></span> <span class="dropdown-item-text">{{ $__t('Consume') }}</span>
 								</a>
 								@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
-								<a class="dropdown-item show-as-dialog-link permission-STOCK_TRANSFER @if($currentStockEntry->amount < 1) disabled @endif"
+								<a class="dropdown-item show-as-dialog-link permission-STOCK_TRANSFER @if($currentStockEntry->amount <= 0) disabled @endif"
 									type="button"
 									href="{{ $U('/transfer?embedded&product=' . $currentStockEntry->product_id) }}">
 									<span class="dropdown-item-icon"><i class="fas fa-exchange-alt"></i></span> <span class="dropdown-item-text">{{ $__t('Transfer') }}</span>
@@ -260,16 +260,6 @@
 									href="{{ $U('/inventory?embedded&product=' . $currentStockEntry->product_id ) }}">
 									<span class="dropdown-item-icon"><i class="fas fa-list"></i></span> <span class="dropdown-item-text">{{ $__t('Inventory') }}</span>
 								</a>
-								<div class="dropdown-divider"></div>
-								<a class="dropdown-item product-consume-button product-consume-button-spoiled permission-STOCK_CONSUME @if($currentStockEntry->amount_aggregated < 1) disabled @endif"
-									type="button"
-									href="#"
-									data-product-id="{{ $currentStockEntry->product_id }}"
-									data-product-name="{{ $currentStockEntry->product_name }}"
-									data-product-qu-name="{{ $currentStockEntry->qu_unit_name }}"
-									data-consume-amount="1">
-									<span class="dropdown-item-text">{{ $__t('Consume %1$s of %2$s as spoiled', '1 ' . $currentStockEntry->qu_unit_name, $currentStockEntry->product_name) }}</span>
-								</a>
 								@if(GROCY_FEATURE_FLAG_RECIPES)
 								<a class="dropdown-item"
 									type="button"