From 694b78f72a1f8d79c3358be28264c623d83a4823 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Mon, 21 Dec 2020 20:13:49 +0100 Subject: [PATCH] Optimized GROCY_FEATURE_FLAG_STOCK handling (closes #966) --- changelog/60_3.0.0_2020-12-22.md | 3 + public/viewjs/mealplan.js | 12 +++ public/viewjs/shoppinglist.js | 2 +- public/viewjs/shoppinglistitemform.js | 2 - routes.php | 139 +++++++++++--------------- views/layout/default.blade.php | 4 +- views/productform.blade.php | 4 +- views/recipeposform.blade.php | 4 +- views/recipes.blade.php | 10 +- views/shoppinglist.blade.php | 2 +- views/shoppinglistitemform.blade.php | 7 +- 11 files changed, 90 insertions(+), 99 deletions(-) diff --git a/changelog/60_3.0.0_2020-12-22.md b/changelog/60_3.0.0_2020-12-22.md index 5611bc4e..89032d59 100644 --- a/changelog/60_3.0.0_2020-12-22.md +++ b/changelog/60_3.0.0_2020-12-22.md @@ -161,6 +161,9 @@ - Users can now have a picture (will then be shown next to the current user name instead of the generic user icon) - Prefilled number inputs now use sensible decimal places (max. the configured decimals while hiding trailing zeros where appropriate, means if you never use partial amounts for a product, you'll never see decimals for it) - Improved / more precise validation messages for number inputs +- Optimized what's hidden when `GROCY_FEATURE_FLAG_STOCK` is disabled + - Products, quantity units and product groups are possible to use now + - Means you can use for example the shopping list, recipes and the meal plan with products while the "stock handling part" is hidden - Ordering now happens case-insensitive - The data path (previously fixed to the `data` folder) is now configurable, making it possible to run multiple grocy instances from the same directory (with different `config.php` files / different database, etc.) (thanks @fgrsnau) - Via an environment variable `GROCY_DATAPATH` (higher priority) diff --git a/public/viewjs/mealplan.js b/public/viewjs/mealplan.js index 2eaf57a8..8b7d9023 100644 --- a/public/viewjs/mealplan.js +++ b/public/viewjs/mealplan.js @@ -126,6 +126,12 @@ var calendar = $("#calendar").fullCalendar({ costsAndCaloriesPerServing = '
' + resolvedRecipe.calories + ' kcal ' + __t('per serving') + '
'; } + if (!Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK) + { + fulfillmentIconHtml = ""; + fulfillmentInfoHtml = ""; + } + element.html('\
\
' + recipe.name + '
\ @@ -274,6 +280,12 @@ var calendar = $("#calendar").fullCalendar({ { $("#calendar").fullCalendar("gotoDate", GetUriParam("week")); } + + if (!Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK) + { + $(".recipe-order-missing-button").addClass("d-none"); + $(".recipe-consume-button").addClass("d-none"); + } }, }); diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js index 6b0c0583..dc6e19b4 100644 --- a/public/viewjs/shoppinglist.js +++ b/public/viewjs/shoppinglist.js @@ -546,7 +546,7 @@ $("img.barcode").each(function() img.attr("src", dummyCanvas.toDataURL("image/png")); }); -if ($(window).width() < 768) +if ($(window).width() < 768 || !Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK) { $("#filter-container").removeClass("border-bottom"); } diff --git a/public/viewjs/shoppinglistitemform.js b/public/viewjs/shoppinglistitemform.js index 1c817a29..d21b6817 100644 --- a/public/viewjs/shoppinglistitemform.js +++ b/public/viewjs/shoppinglistitemform.js @@ -145,8 +145,6 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e) if (productId) { - Grocy.Components.ProductCard.Refresh(productId); - Grocy.Api.Get('stock/products/' + productId, function(productDetails) { diff --git a/routes.php b/routes.php index b7cb014c..333057f1 100644 --- a/routes.php +++ b/routes.php @@ -33,7 +33,16 @@ $app->group('', function (RouteCollectorProxy $group) { $group->get('/files/{group}/{fileName}', '\Grocy\Controllers\FilesApiController:ShowFile'); - // Stock routes + // Stock master data routes + $group->get('/products', '\Grocy\Controllers\StockController:ProductsList'); + $group->get('/product/{productId}', '\Grocy\Controllers\StockController:ProductEditForm'); + $group->get('/quantityunits', '\Grocy\Controllers\StockController:QuantityUnitsList'); + $group->get('/quantityunit/{quantityunitId}', '\Grocy\Controllers\StockController:QuantityUnitEditForm'); + $group->get('/quantityunitconversion/{quConversionId}', '\Grocy\Controllers\StockController:QuantityUnitConversionEditForm'); + $group->get('/productgroups', '\Grocy\Controllers\StockController:ProductGroupsList'); + $group->get('/productgroup/{productGroupId}', '\Grocy\Controllers\StockController:ProductGroupEditForm'); + + // Stock handling routes if (GROCY_FEATURE_FLAG_STOCK) { $group->get('/stockoverview', '\Grocy\Controllers\StockController:Overview'); @@ -43,21 +52,14 @@ $app->group('', function (RouteCollectorProxy $group) { $group->get('/transfer', '\Grocy\Controllers\StockController:Transfer'); $group->get('/inventory', '\Grocy\Controllers\StockController:Inventory'); $group->get('/stockentry/{entryId}', '\Grocy\Controllers\StockController:StockEntryEditForm'); - $group->get('/products', '\Grocy\Controllers\StockController:ProductsList'); - $group->get('/product/{productId}', '\Grocy\Controllers\StockController:ProductEditForm'); - $group->get('/productbarcodes/{productBarcodeId}', '\Grocy\Controllers\StockController:ProductBarcodesEditForm'); $group->get('/stocksettings', '\Grocy\Controllers\StockController:StockSettings'); $group->get('/locations', '\Grocy\Controllers\StockController:LocationsList'); $group->get('/location/{locationId}', '\Grocy\Controllers\StockController:LocationEditForm'); - $group->get('/quantityunits', '\Grocy\Controllers\StockController:QuantityUnitsList'); - $group->get('/quantityunit/{quantityunitId}', '\Grocy\Controllers\StockController:QuantityUnitEditForm'); - $group->get('/quantityunitconversion/{quConversionId}', '\Grocy\Controllers\StockController:QuantityUnitConversionEditForm'); - $group->get('/productgroups', '\Grocy\Controllers\StockController:ProductGroupsList'); - $group->get('/productgroup/{productGroupId}', '\Grocy\Controllers\StockController:ProductGroupEditForm'); $group->get('/stockjournal', '\Grocy\Controllers\StockController:Journal'); $group->get('/locationcontentsheet', '\Grocy\Controllers\StockController:LocationContentSheet'); $group->get('/quantityunitpluraltesting', '\Grocy\Controllers\StockController:QuantityUnitPluralFormTesting'); $group->get('/stockjournal/summary', '\Grocy\Controllers\StockController:JournalSummary'); + $group->get('/productbarcodes/{productBarcodeId}', '\Grocy\Controllers\StockController:ProductBarcodesEditForm'); } // Stock price tracking @@ -178,88 +180,67 @@ $app->group('/api', function (RouteCollectorProxy $group) { $group->delete('/user/settings/{settingKey}', '\Grocy\Controllers\UsersApiController:DeleteUserSetting'); // Stock - if (GROCY_FEATURE_FLAG_STOCK) - { - $group->get('/stock', '\Grocy\Controllers\StockApiController:CurrentStock'); - $group->get('/stock/entry/{entryId}', '\Grocy\Controllers\StockApiController:StockEntry'); - $group->put('/stock/entry/{entryId}', '\Grocy\Controllers\StockApiController:EditStockEntry'); - $group->get('/stock/volatile', '\Grocy\Controllers\StockApiController:CurrentVolatileStock'); - $group->get('/stock/products/{productId}', '\Grocy\Controllers\StockApiController:ProductDetails'); - $group->get('/stock/products/{productId}/entries', '\Grocy\Controllers\StockApiController:ProductStockEntries'); - $group->get('/stock/products/{productId}/locations', '\Grocy\Controllers\StockApiController:ProductStockLocations'); - $group->get('/stock/products/{productId}/price-history', '\Grocy\Controllers\StockApiController:ProductPriceHistory'); - $group->post('/stock/products/{productId}/add', '\Grocy\Controllers\StockApiController:AddProduct'); - $group->post('/stock/products/{productId}/consume', '\Grocy\Controllers\StockApiController:ConsumeProduct'); - $group->post('/stock/products/{productId}/transfer', '\Grocy\Controllers\StockApiController:TransferProduct'); - $group->post('/stock/products/{productId}/inventory', '\Grocy\Controllers\StockApiController:InventoryProduct'); - $group->post('/stock/products/{productId}/open', '\Grocy\Controllers\StockApiController:OpenProduct'); - $group->post('/stock/products/{productIdToKeep}/merge/{productIdToRemove}', '\Grocy\Controllers\StockApiController:MergeProducts'); - $group->get('/stock/products/by-barcode/{barcode}', '\Grocy\Controllers\StockApiController:ProductDetailsByBarcode'); - $group->post('/stock/products/by-barcode/{barcode}/add', '\Grocy\Controllers\StockApiController:AddProductByBarcode'); - $group->post('/stock/products/by-barcode/{barcode}/consume', '\Grocy\Controllers\StockApiController:ConsumeProductByBarcode'); - $group->post('/stock/products/by-barcode/{barcode}/transfer', '\Grocy\Controllers\StockApiController:TransferProductByBarcode'); - $group->post('/stock/products/by-barcode/{barcode}/inventory', '\Grocy\Controllers\StockApiController:InventoryProductByBarcode'); - $group->post('/stock/products/by-barcode/{barcode}/open', '\Grocy\Controllers\StockApiController:OpenProductByBarcode'); - $group->get('/stock/bookings/{bookingId}', '\Grocy\Controllers\StockApiController:StockBooking'); - $group->post('/stock/bookings/{bookingId}/undo', '\Grocy\Controllers\StockApiController:UndoBooking'); - $group->get('/stock/transactions/{transactionId}', '\Grocy\Controllers\StockApiController:StockTransactions'); - $group->post('/stock/transactions/{transactionId}/undo', '\Grocy\Controllers\StockApiController:UndoTransaction'); - $group->get('/stock/barcodes/external-lookup/{barcode}', '\Grocy\Controllers\StockApiController:ExternalBarcodeLookup'); - } + $group->get('/stock', '\Grocy\Controllers\StockApiController:CurrentStock'); + $group->get('/stock/entry/{entryId}', '\Grocy\Controllers\StockApiController:StockEntry'); + $group->put('/stock/entry/{entryId}', '\Grocy\Controllers\StockApiController:EditStockEntry'); + $group->get('/stock/volatile', '\Grocy\Controllers\StockApiController:CurrentVolatileStock'); + $group->get('/stock/products/{productId}', '\Grocy\Controllers\StockApiController:ProductDetails'); + $group->get('/stock/products/{productId}/entries', '\Grocy\Controllers\StockApiController:ProductStockEntries'); + $group->get('/stock/products/{productId}/locations', '\Grocy\Controllers\StockApiController:ProductStockLocations'); + $group->get('/stock/products/{productId}/price-history', '\Grocy\Controllers\StockApiController:ProductPriceHistory'); + $group->post('/stock/products/{productId}/add', '\Grocy\Controllers\StockApiController:AddProduct'); + $group->post('/stock/products/{productId}/consume', '\Grocy\Controllers\StockApiController:ConsumeProduct'); + $group->post('/stock/products/{productId}/transfer', '\Grocy\Controllers\StockApiController:TransferProduct'); + $group->post('/stock/products/{productId}/inventory', '\Grocy\Controllers\StockApiController:InventoryProduct'); + $group->post('/stock/products/{productId}/open', '\Grocy\Controllers\StockApiController:OpenProduct'); + $group->post('/stock/products/{productIdToKeep}/merge/{productIdToRemove}', '\Grocy\Controllers\StockApiController:MergeProducts'); + $group->get('/stock/products/by-barcode/{barcode}', '\Grocy\Controllers\StockApiController:ProductDetailsByBarcode'); + $group->post('/stock/products/by-barcode/{barcode}/add', '\Grocy\Controllers\StockApiController:AddProductByBarcode'); + $group->post('/stock/products/by-barcode/{barcode}/consume', '\Grocy\Controllers\StockApiController:ConsumeProductByBarcode'); + $group->post('/stock/products/by-barcode/{barcode}/transfer', '\Grocy\Controllers\StockApiController:TransferProductByBarcode'); + $group->post('/stock/products/by-barcode/{barcode}/inventory', '\Grocy\Controllers\StockApiController:InventoryProductByBarcode'); + $group->post('/stock/products/by-barcode/{barcode}/open', '\Grocy\Controllers\StockApiController:OpenProductByBarcode'); + $group->get('/stock/bookings/{bookingId}', '\Grocy\Controllers\StockApiController:StockBooking'); + $group->post('/stock/bookings/{bookingId}/undo', '\Grocy\Controllers\StockApiController:UndoBooking'); + $group->get('/stock/transactions/{transactionId}', '\Grocy\Controllers\StockApiController:StockTransactions'); + $group->post('/stock/transactions/{transactionId}/undo', '\Grocy\Controllers\StockApiController:UndoTransaction'); + $group->get('/stock/barcodes/external-lookup/{barcode}', '\Grocy\Controllers\StockApiController:ExternalBarcodeLookup'); // Shopping list - if (GROCY_FEATURE_FLAG_SHOPPINGLIST) - { - $group->post('/stock/shoppinglist/add-missing-products', '\Grocy\Controllers\StockApiController:AddMissingProductsToShoppingList'); - $group->post('/stock/shoppinglist/add-overdue-products', '\Grocy\Controllers\StockApiController:AddOverdueProductsToShoppingList'); - $group->post('/stock/shoppinglist/add-expired-products', '\Grocy\Controllers\StockApiController:AddExpiredProductsToShoppingList'); - $group->post('/stock/shoppinglist/clear', '\Grocy\Controllers\StockApiController:ClearShoppingList'); - $group->post('/stock/shoppinglist/add-product', '\Grocy\Controllers\StockApiController:AddProductToShoppingList'); - $group->post('/stock/shoppinglist/remove-product', '\Grocy\Controllers\StockApiController:RemoveProductFromShoppingList'); - } + $group->post('/stock/shoppinglist/add-missing-products', '\Grocy\Controllers\StockApiController:AddMissingProductsToShoppingList'); + $group->post('/stock/shoppinglist/add-overdue-products', '\Grocy\Controllers\StockApiController:AddOverdueProductsToShoppingList'); + $group->post('/stock/shoppinglist/add-expired-products', '\Grocy\Controllers\StockApiController:AddExpiredProductsToShoppingList'); + $group->post('/stock/shoppinglist/clear', '\Grocy\Controllers\StockApiController:ClearShoppingList'); + $group->post('/stock/shoppinglist/add-product', '\Grocy\Controllers\StockApiController:AddProductToShoppingList'); + $group->post('/stock/shoppinglist/remove-product', '\Grocy\Controllers\StockApiController:RemoveProductFromShoppingList'); // Recipes - if (GROCY_FEATURE_FLAG_RECIPES) - { - $group->post('/recipes/{recipeId}/add-not-fulfilled-products-to-shoppinglist', '\Grocy\Controllers\RecipesApiController:AddNotFulfilledProductsToShoppingList'); - $group->get('/recipes/{recipeId}/fulfillment', '\Grocy\Controllers\RecipesApiController:GetRecipeFulfillment'); - $group->post('/recipes/{recipeId}/consume', '\Grocy\Controllers\RecipesApiController:ConsumeRecipe'); - $group->get('/recipes/fulfillment', '\Grocy\Controllers\RecipesApiController:GetRecipeFulfillment'); - } + $group->post('/recipes/{recipeId}/add-not-fulfilled-products-to-shoppinglist', '\Grocy\Controllers\RecipesApiController:AddNotFulfilledProductsToShoppingList'); + $group->get('/recipes/{recipeId}/fulfillment', '\Grocy\Controllers\RecipesApiController:GetRecipeFulfillment'); + $group->post('/recipes/{recipeId}/consume', '\Grocy\Controllers\RecipesApiController:ConsumeRecipe'); + $group->get('/recipes/fulfillment', '\Grocy\Controllers\RecipesApiController:GetRecipeFulfillment'); // Chores - if (GROCY_FEATURE_FLAG_CHORES) - { - $group->get('/chores', '\Grocy\Controllers\ChoresApiController:Current'); - $group->get('/chores/{choreId}', '\Grocy\Controllers\ChoresApiController:ChoreDetails'); - $group->post('/chores/{choreId}/execute', '\Grocy\Controllers\ChoresApiController:TrackChoreExecution'); - $group->post('/chores/executions/{executionId}/undo', '\Grocy\Controllers\ChoresApiController:UndoChoreExecution'); - $group->post('/chores/executions/calculate-next-assignments', '\Grocy\Controllers\ChoresApiController:CalculateNextExecutionAssignments'); - } + $group->get('/chores', '\Grocy\Controllers\ChoresApiController:Current'); + $group->get('/chores/{choreId}', '\Grocy\Controllers\ChoresApiController:ChoreDetails'); + $group->post('/chores/{choreId}/execute', '\Grocy\Controllers\ChoresApiController:TrackChoreExecution'); + $group->post('/chores/executions/{executionId}/undo', '\Grocy\Controllers\ChoresApiController:UndoChoreExecution'); + $group->post('/chores/executions/calculate-next-assignments', '\Grocy\Controllers\ChoresApiController:CalculateNextExecutionAssignments'); // Batteries - if (GROCY_FEATURE_FLAG_BATTERIES) - { - $group->get('/batteries', '\Grocy\Controllers\BatteriesApiController:Current'); - $group->get('/batteries/{batteryId}', '\Grocy\Controllers\BatteriesApiController:BatteryDetails'); - $group->post('/batteries/{batteryId}/charge', '\Grocy\Controllers\BatteriesApiController:TrackChargeCycle'); - $group->post('/batteries/charge-cycles/{chargeCycleId}/undo', '\Grocy\Controllers\BatteriesApiController:UndoChargeCycle'); - } + $group->get('/batteries', '\Grocy\Controllers\BatteriesApiController:Current'); + $group->get('/batteries/{batteryId}', '\Grocy\Controllers\BatteriesApiController:BatteryDetails'); + $group->post('/batteries/{batteryId}/charge', '\Grocy\Controllers\BatteriesApiController:TrackChargeCycle'); + $group->post('/batteries/charge-cycles/{chargeCycleId}/undo', '\Grocy\Controllers\BatteriesApiController:UndoChargeCycle'); // Tasks - if (GROCY_FEATURE_FLAG_TASKS) - { - $group->get('/tasks', '\Grocy\Controllers\TasksApiController:Current'); - $group->post('/tasks/{taskId}/complete', '\Grocy\Controllers\TasksApiController:MarkTaskAsCompleted'); - $group->post('/tasks/{taskId}/undo', '\Grocy\Controllers\TasksApiController:UndoTask'); - } + $group->get('/tasks', '\Grocy\Controllers\TasksApiController:Current'); + $group->post('/tasks/{taskId}/complete', '\Grocy\Controllers\TasksApiController:MarkTaskAsCompleted'); + $group->post('/tasks/{taskId}/undo', '\Grocy\Controllers\TasksApiController:UndoTask'); // Calendar - if (GROCY_FEATURE_FLAG_CALENDAR) - { - $group->get('/calendar/ical', '\Grocy\Controllers\CalendarApiController:Ical')->setName('calendar-ical'); - $group->get('/calendar/ical/sharing-link', '\Grocy\Controllers\CalendarApiController:IcalSharingLink'); - } + $group->get('/calendar/ical', '\Grocy\Controllers\CalendarApiController:Ical')->setName('calendar-ical'); + $group->get('/calendar/ical/sharing-link', '\Grocy\Controllers\CalendarApiController:IcalSharingLink'); })->add(JsonMiddleware::class); // Handle CORS preflight OPTIONS requests diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php index c43593ee..fceaaa00 100644 --- a/views/layout/default.blade.php +++ b/views/layout/default.blade.php @@ -362,7 +362,6 @@
    - @if(GROCY_FEATURE_FLAG_STOCK)
  • {{ $__t('Products') }}
    • + @if(GROCY_FEATURE_FLAG_STOCK) @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
  • @@ -388,6 +388,7 @@
    • @endif + @endif
  • {{ $__t('Product groups') }}
    • - @endif @if(GROCY_FEATURE_FLAG_CHORES)
  • diff --git a/views/productform.blade.php b/views/productform.blade.php index 9f21b8f2..4f0b6b9d 100644 --- a/views/productform.blade.php +++ b/views/productform.blade.php @@ -426,7 +426,7 @@
-
+

@@ -533,7 +533,7 @@

-
+

diff --git a/views/recipeposform.blade.php b/views/recipeposform.blade.php index a094592a..9077e467 100644 --- a/views/recipeposform.blade.php +++ b/views/recipeposform.blade.php @@ -46,7 +46,7 @@ 'nextInputSelector' => '#amount' )) -
+
-
+
{{ $__t('Name') }} {{ $__t('Desired servings') }} - {{ $__t('Requirements fulfilled') }} + {{ $__t('Requirements fulfilled') }} Hidden status for sorting of "Requirements fulfilled" column Hidden status for filtering by status Hidden recipe ingredient product names @@ -145,7 +145,7 @@ {{ $recipe->desired_servings }} - + @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1)@elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1)@else@endif @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1){{ $__t('Enough in stock') }}@elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1){{ $__n(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count, 'Not enough in stock, %s ingredient missing but already on the shopping list', 'Not enough in stock, %s ingredients missing but already on the shopping list') }}@else{{ $__n(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count, 'Not enough in stock, %s ingredient missing', 'Not enough in stock, %s ingredients missing') }}@endif @@ -236,7 +236,7 @@

{{ $recipe->name }}

- - @if($selectedRecipePosition->recipe_amount == round($selectedRecipePosition->recipe_amount, 2)){{ round($selectedRecipePosition->recipe_amount, 2) }}@else{{ $selectedRecipePosition->recipe_amount }}@endif @endif {{ $__n($selectedRecipePosition->recipe_amount, FindObjectInArrayByPropertyValue($quantityUnits, 'id', $selectedRecipePosition->qu_id)->name, FindObjectInArrayByPropertyValue($quantityUnits, 'id', $selectedRecipePosition->qu_id)->name_plural) }} {{ FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->name }} + @if(GROCY_FEATURE_FLAG_STOCK) @if($selectedRecipePosition->need_fulfilled == 1)@elseif($selectedRecipePosition->need_fulfilled_with_shopping_list == 1)@else@endif @if(FindObjectInArrayByPropertyValue($recipePositionsResolved, 'recipe_pos_id', $selectedRecipePosition->id)->need_fulfilled == 1) {{ $__t('Enough in stock') }} @else {{ $__t('Not enough in stock (not included in costs), %1$s missing, %2$s already on shopping list', round(FindObjectInArrayByPropertyValue($recipePositionsResolved, 'recipe_pos_id', $selectedRecipePosition->id)->missing_amount, 2), round(FindObjectInArrayByPropertyValue($recipePositionsResolved, 'recipe_pos_id', $selectedRecipePosition->id)->amount_on_shopping_list, 2)) }} @endif + @endif @if($selectedRecipePosition->need_fulfilled == 1 && GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) {{ $selectedRecipePosition->costs }} @endif {{ $selectedRecipePosition->calories }} {{ $__t('Calories') }} @if(!empty($selectedRecipePosition->recipe_variable_amount)) diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php index 20c2106e..9f881c15 100644 --- a/views/shoppinglist.blade.php +++ b/views/shoppinglist.blade.php @@ -76,7 +76,7 @@ class="border-top border-bottom my-2 py-1">
{{count($missingProducts)}} {{ $__n(count($missingProducts), '%s product is below defined min. stock amount', '%s products are below defined min. stock amount') }}
+ class="collapse normal-message status-filter-message responsive-button @if(!GROCY_FEATURE_FLAG_STOCK) d-none @else d-md-inline-block @endif">{{count($missingProducts)}} {{ $__n(count($missingProducts), '%s product is below defined min. stock amount', '%s products are below defined min. stock amount') }}