morgane/EverShelf
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

chore: auto-merge develop → main

Browse Source 
Triggered by: d056a6a fix: expired section hides items with quantity=0
This commit is contained in:
github-actions[bot]
2026-05-11 17:37:45 +00:00
parent cdc776d7c7 d056a6a116
commit c47eba3ddb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/index.php
+1 -1
View File
@@ -1892,7 +1892,7 @@ function getStats(PDO $db): void {
SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit, SELECT i.*, p.name, p.brand, p.category, p.unit, p.default_quantity, p.package_unit,
COALESCE(i.vacuum_sealed, 0) as vacuum_sealed COALESCE(i.vacuum_sealed, 0) as vacuum_sealed
FROM inventory i JOIN products p ON i.product_id = p.id FROM inventory i JOIN products p ON i.product_id = p.id
WHERE i.expiry_date IS NOT NULL AND i.expiry_date < date('now') WHERE i.expiry_date IS NOT NULL AND i.expiry_date < date('now') AND i.quantity > 0
ORDER BY i.expiry_date ASC ORDER BY i.expiry_date ASC
")->fetchAll(); ")->fetchAll();
index.html
+2 -2
View File
@@ -11,7 +11,7 @@
<title>EverShelf</title> <title>EverShelf</title>
<link rel="manifest" href="manifest.json"> <link rel="manifest" href="manifest.json">
<link rel="icon" type="image/png" href="assets/img/logo/logo_icon.png"> <link rel="icon" type="image/png" href="assets/img/logo/logo_icon.png">
<link rel="stylesheet" href="assets/css/style.css?v=20260511i"> <link rel="stylesheet" href="assets/css/style.css?v=20260511j">
<!-- QuaggaJS for barcode scanning --> <!-- QuaggaJS for barcode scanning -->
<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2@1.8.4/dist/quagga.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2@1.8.4/dist/quagga.min.js"></script>
<!-- @xenova/transformers: ES-module bootstrap that exposes a lazy category-classifier as window._categoryPipelinePromise --> <!-- @xenova/transformers: ES-module bootstrap that exposes a lazy category-classifier as window._categoryPipelinePromise -->
@@ -1469,6 +1469,6 @@
</div> </div>
</div> </div>
<script src="assets/js/app.js?v=20260511i"></script> <script src="assets/js/app.js?v=20260511j"></script>
</body> </body>
</html> </html>