From c0fbc4adaf5db42bbea0df555730af3734575a1a Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sun, 1 Jan 2023 20:33:08 +0100 Subject: [PATCH] Fixed /stockoverview value column sort format (fixes #2088) --- changelog/70_UNRELEASED_xxxx.xx.xx.md | 1 + public/viewjs/stockoverview.js | 2 +- views/stockoverview.blade.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog/70_UNRELEASED_xxxx.xx.xx.md b/changelog/70_UNRELEASED_xxxx.xx.xx.md index cfb83291..a9a39305 100644 --- a/changelog/70_UNRELEASED_xxxx.xx.xx.md +++ b/changelog/70_UNRELEASED_xxxx.xx.xx.md @@ -21,6 +21,7 @@ - Changed that when the ingredient option "Only check if any amount is in stock" is enabled, costs and calories are now based on the original entered amount instead of an "virtual" fixed amount of `1` - When using the "Add as barcode to existing product" workflow on a purchase transaction, the selected quantity unit and the entered amount is now also added to the new barcode - Fixed that hiding the "Purchased date" column (table options) on the stock entries page didn't work +- Fixed that sorting by the "Value" column on the stock overview page didn't work - Fixed that the consumed amount was wrong, when consuming multiple substituted subproducts at once and when multiple/different conversion factors were involved ### Shopping list diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index 82603122..896c668d 100755 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -28,7 +28,7 @@ var stockOverviewTable = $('#stock-overview-table').DataTable({ { "type": "html", "targets": 11 }, { "type": "custom-sort", "targets": 12 }, { "type": "num", "targets": 13 }, - { "type": "html-num-fmt", "targets": 4 }, + { "type": "custom-sort", "targets": 4 }, { "type": "custom-sort", "targets": 18 } ].concat($.fn.dataTable.defaults.columnDefs) }); diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php index 3eb370fd..1aeed723 100755 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -353,6 +353,7 @@ @endif + {{$currentStockEntry->value}} {{ $currentStockEntry->value }}