✅ ${t('scanner.expiry_found')}: ${formatDate(result.expiry_date)}
`; @@ -14766,29 +14927,38 @@ async function confirmRecipeMove(productId, fromLoc, toLoc, openedId, forcedVacu const newVacuum = forcedVacuum !== undefined ? (forcedVacuum ? 1 : 0) : (document.getElementById('move-vacuum-check')?.checked ? 1 : 0); closeModal(); try { + const invData = await api('inventory_list'); + const invRows = invData.inventory || []; if (openedId) { - let days = estimateExpiryDays({ name: '', category: '' }, toLoc); - if (newVacuum) days = getVacuumExpiryDays(days); - await api('inventory_update', {}, 'POST', { + const item = invRows.find(i => i.id == openedId); + const product = { name: item?.name || '', category: item?.category || '' }; + const payload = { id: openedId, location: toLoc, - expiry_date: addDays(days), product_id: productId, vacuum_sealed: newVacuum, - }); - } else { - const data = await api('inventory_list'); - const item = (data.inventory || []).find(i => i.product_id == productId && i.location === fromLoc && parseFloat(i.quantity) > 0); - if (item) { - let days = estimateExpiryDays({ name: item.name || '', category: item.category || '' }, toLoc); + }; + if (!item?.expiry_user_set) { + let days = estimateExpiryDays(product, toLoc); if (newVacuum) days = getVacuumExpiryDays(days); - await api('inventory_update', {}, 'POST', { + payload.expiry_date = addDays(days); + } + await api('inventory_update', {}, 'POST', payload); + } else { + const item = invRows.find(i => i.product_id == productId && i.location === fromLoc && parseFloat(i.quantity) > 0); + if (item) { + const payload = { id: item.id, location: toLoc, - expiry_date: addDays(days), product_id: productId, vacuum_sealed: newVacuum, - }); + }; + if (!item.expiry_user_set) { + let days = estimateExpiryDays({ name: item.name || '', category: item.category || '' }, toLoc); + if (newVacuum) days = getVacuumExpiryDays(days); + payload.expiry_date = addDays(days); + } + await api('inventory_update', {}, 'POST', payload); } } showToast(t('move.moved_simple', { location: LOCATIONS[toLoc]?.label || toLoc }), 'success'); @@ -17169,8 +17339,10 @@ function _handleOfflineApi(action, params, body) { if (cached) return { ...cached, _offline: true }; return { success: false, _offline: true }; } - if (action === 'search_barcode') { - return _offlineSearchBarcode(params && params.barcode); + if (action === 'search_barcode' || action === 'resolve_barcode') { + const found = _offlineSearchBarcode(params && params.barcode); + if (found.found) return { ...found, source: 'local' }; + return { found: false, source: 'offline' }; } if (action === 'products_search') { const q = String((params && params.q) || '').trim().toLowerCase(); @@ -18138,6 +18310,7 @@ async function spesaModeAfterAdd() { product_id: currentProduct.id, }); updateSpesaBanner(); + _shoppingInventoryCache = null; await _spesaRemovePurchasedFromList(currentProduct); const addLoc = document.getElementById('add-location')?.value || 'dispensa'; _showFamilySiblingSuggest(currentProduct.id, addLoc); @@ -18170,6 +18343,41 @@ async function _spesaRemovePurchasedFromList(product) { _markBringPurchased(namesToMark); } +const _FAMILY_SIBLING_CONFIRM_TTL = 24 * 60 * 60 * 1000; + +function _familySiblingConfirmKey(family, location) { + return `${String(family || '').trim().toLowerCase()}|${location || 'dispensa'}`; +} + +function _getFamilySiblingConfirmed() { + const map = Object.assign({}, _familySiblingConfirmedCache || {}); + const now = Date.now(); + let changed = false; + for (const key of Object.keys(map)) { + if (now - map[key] > _FAMILY_SIBLING_CONFIRM_TTL) { delete map[key]; changed = true; } + } + if (changed) { + _familySiblingConfirmedCache = map; + _saveToServer('family_sibling_confirmed', map); + } + return map; +} + +function _isFamilySiblingRecentlyConfirmed(family, location) { + if (!family) return false; + const map = _getFamilySiblingConfirmed(); + const ts = map[_familySiblingConfirmKey(family, location)]; + return !!ts && (Date.now() - ts) < _FAMILY_SIBLING_CONFIRM_TTL; +} + +function _recordFamilySiblingConfirmed(family, location) { + if (!family) return; + const map = _getFamilySiblingConfirmed(); + map[_familySiblingConfirmKey(family, location)] = Date.now(); + _familySiblingConfirmedCache = map; + _saveToServer('family_sibling_confirmed', map); +} + let _familySiblingDismissTimer = null; function _dismissFamilySiblingPrompt() { @@ -18187,23 +18395,58 @@ function _formatFamilySiblingDate(dtStr) { return d.toLocaleDateString(loc, { day: '2-digit', month: 'long', year: 'numeric' }); } +/** Parse "20g" / "500 ml" from product name when package size missing in catalog. */ +function _inferPackageSizeFromName(name) { + const m = (name || '').match(/\b(\d+(?:[.,]\d+)?)\s*(g|ml|kg|l|lt)\b/i); + if (!m) return null; + let val = parseFloat(String(m[1]).replace(',', '.')); + const u = m[2].toLowerCase(); + if (u === 'kg') { val *= 1000; return { qty: val, unit: 'g' }; } + if (u === 'l' || u === 'lt') { val *= 1000; return { qty: val, unit: 'ml' }; } + return { qty: val, unit: u }; +} + +/** Human-readable stock for spesa family-sibling check (e.g. "4 conf (da 20g)"). */ +function _formatFamilySiblingStockLine(s) { + let defQty = parseFloat(s.default_quantity) || 0; + let pkgUnit = s.package_unit || ''; + const inferred = _inferPackageSizeFromName(s.name); + if (inferred && (!defQty || (s.unit === 'conf' && defQty < inferred.qty))) { + defQty = inferred.qty; + pkgUnit = inferred.unit; + } + const unit = s.unit || 'pz'; + const qty = parseFloat(s.stock_qty) || 0; + const parts = formatQuantityParts(qty, unit, defQty, pkgUnit); + if (parts.unitLabel) { + let line = `${parts.mainQty} ${parts.unitLabel}`; + if (parts.packageDetail) line += ` (${parts.packageDetail})`; + if (parts.fraction) line += ` ${parts.fraction}`; + return line; + } + return formatQuantity(qty, unit, defQty, pkgUnit).replace(/<[^>]*>/g, ''); +} + /** Optional hint: same-family product in the same location (non-blocking). */ function _showFamilySiblingSuggest(productId, location) { _dismissFamilySiblingPrompt(); const loc = location || 'dispensa'; - api('family_sibling_suggest', {}, 'POST', { product_id: productId, location: loc }).then(data => { + const earlyFamily = (currentProduct?.shopping_name || '').trim(); + if (earlyFamily && _isFamilySiblingRecentlyConfirmed(earlyFamily, loc)) return; + api('family_sibling_suggest', {}, 'POST', { product_id: productId, location: loc }).then(async data => { if (!data?.success || !data.sibling) return; const s = data.sibling; + if (_isFamilySiblingRecentlyConfirmed(s.family, loc)) return; + if (!(await _productHasLiveStock(s.product_id))) return; const locKey = s.location || loc; const locInfo = LOCATIONS[locKey] || LOCATIONS.altro; - const qtyStr = `${s.stock_qty} ${s.unit}`; + const stockLine = _formatFamilySiblingStockLine(s); const purchaseRaw = s.last_purchase_at || s.added_at; const purchaseDate = _formatFamilySiblingDate(purchaseRaw); const productLine = s.brand ? `${s.name} (${s.brand})` : s.name; const catIcon = CATEGORY_ICONS[mapToLocalCategory(s.category, s.name)] || '📦'; const metaParts = [ `${locInfo.icon} ${locInfo.label}`, - qtyStr, purchaseDate ? purchaseDate : '', ].filter(Boolean); const thumbHtml = s.image_url @@ -18217,8 +18460,8 @@ function _showFamilySiblingSuggest(productId, location) {