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

Actualiser assets/js/app.js
CI / PHP Syntax Check (push) Has been cancelled
Details
CI / JavaScript Lint (push) Has been cancelled
Details
CI / Docker Build Test (push) Has been cancelled
Details
CI / Validate Translation Files (push) Has been cancelled
Details
CI / Auto-merge develop → main (push) Has been cancelled
Details
CI / Create GitHub Release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
morgane
2026-06-18 16:59:24 +00:00
parent 409ea5d2e5
commit a84824327d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/app.js
+3 -3
View File
@@ -7043,7 +7043,7 @@ function renderDashItem(item) {
const days = daysUntilExpiry(item.expiry_date); const days = daysUntilExpiry(item.expiry_date);
const isExpired = days < 0; const isExpired = days < 0;
const isExpiring = !isExpired && days <= 7; const isExpiring = !isExpired && days <= 7;
const parts = formatQuantityParts(item.quantity, item.unit, item.default_quantity, item.package_unit); const parts = formatQuantityParts(item.quantity, item.unit, item.default_quantity, item.package_unit, item.display_unit_key);
let expiryLabel = ''; let expiryLabel = '';
if (item.expiry_date) { if (item.expiry_date) {
@@ -7299,7 +7299,7 @@ function renderInventoryItem(item) {
const days = daysUntilExpiry(item.expiry_date); const days = daysUntilExpiry(item.expiry_date);
const isExpired = days < 0; const isExpired = days < 0;
const isExpiring = !isExpired && days <= 7; const isExpiring = !isExpired && days <= 7;
const parts = formatQuantityParts(item.quantity, item.unit, item.default_quantity, item.package_unit); const parts = formatQuantityParts(item.quantity, item.unit, item.default_quantity, item.package_unit, item.display_unit_key);
let expiryBadge = ''; let expiryBadge = '';
if (item.expiry_date) { if (item.expiry_date) {
@@ -19831,7 +19831,7 @@ function _formatFamilySiblingStockLine(s) {
} }
const unit = s.unit || 'pz'; const unit = s.unit || 'pz';
const qty = parseFloat(s.stock_qty) || 0; const qty = parseFloat(s.stock_qty) || 0;
const parts = formatQuantityParts(qty, unit, defQty, pkgUnit); const parts = formatQuantityParts(qty, unit, defQty, pkgUnit, s.display_unit_key);
if (parts.unitLabel) { if (parts.unitLabel) {
let line = `${parts.mainQty} ${parts.unitLabel}`; let line = `${parts.mainQty} ${parts.unitLabel}`;
if (parts.packageDetail) line += ` (${parts.packageDetail})`; if (parts.packageDetail) line += ` (${parts.packageDetail})`;