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: 85090ec fix: generic 'latte' opened shelf life 4→7 days (UHT default)
This commit is contained in:
github-actions[bot]
2026-05-11 17:09:26 +00:00
parent 27238a39cb 85090ecc9f
commit 184042a0ae
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/database.php
+1 -1
View File
@@ -365,7 +365,7 @@ function estimateOpenedExpiryDaysPHP(string $name, string $category, string $loc
if (preg_match('/latte\s+(uht|a\s+lunga)/', $n)) return 7; if (preg_match('/latte\s+(uht|a\s+lunga)/', $n)) return 7;
// Long-life mountain/brand milks stored in pantry before use (UHT) // Long-life mountain/brand milks stored in pantry before use (UHT)
if (preg_match('/latte.*(montagna|alta\s+qual|parmalat|granarolo|esselunga|conservaz|microfiltrat)/i', $n)) return 7; if (preg_match('/latte.*(montagna|alta\s+qual|parmalat|granarolo|esselunga|conservaz|microfiltrat)/i', $n)) return 7;
if (preg_match('/\blatte\b/', $n)) return 4; if (preg_match('/\blatte\b/', $n)) return 7; // generic: default to UHT (most common in IT households)
if (preg_match('/\b(yogurt|yaourt|yoghurt)\b/', $n)) return 5; if (preg_match('/\b(yogurt|yaourt|yoghurt)\b/', $n)) return 5;
if (preg_match('/mozzarella|burrata|stracciatella/', $n)) return 3; if (preg_match('/mozzarella|burrata|stracciatella/', $n)) return 3;
if (preg_match('/philadelphia|spalmabile/', $n)) return 7; if (preg_match('/philadelphia|spalmabile/', $n)) return 7;
assets/js/app.js
+1 -1
View File
@@ -1669,7 +1669,7 @@ function estimateOpenedExpiryDays(product, location) {
if (/latte\s+(uht|a\s+lunga)/.test(name)) return 7; if (/latte\s+(uht|a\s+lunga)/.test(name)) return 7;
// Long-life mountain/brand milks stored in pantry before use (UHT) // Long-life mountain/brand milks stored in pantry before use (UHT)
if (/latte.*(montagna|alta\s+qual|parmalat|granarolo|esselunga|conservaz|microfiltrat)/i.test(name)) return 7; if (/latte.*(montagna|alta\s+qual|parmalat|granarolo|esselunga|conservaz|microfiltrat)/i.test(name)) return 7;
if (/\blatte\b/.test(name)) return 4; if (/\blatte\b/.test(name)) return 7; // generic: default to UHT (most common in IT households)
if (/\b(yogurt|yaourt|yoghurt)\b/.test(name)) return 5; if (/\b(yogurt|yaourt|yoghurt)\b/.test(name)) return 5;
if (/mozzarella|burrata|stracciatella/.test(name)) return 3; if (/mozzarella|burrata|stracciatella/.test(name)) return 3;
if (/philadelphia|spalmabile/.test(name)) return 7; if (/philadelphia|spalmabile/.test(name)) return 7;
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=20260511d"> <link rel="stylesheet" href="assets/css/style.css?v=20260511e">
<!-- 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=20260511d"></script> <script src="assets/js/app.js?v=20260511e"></script>
</body> </body>
</html> </html>