diff --git a/api/index.php b/api/index.php
index be1561f..e0a1024 100644
--- a/api/index.php
+++ b/api/index.php
@@ -667,13 +667,45 @@ function addToInventory(PDO $db): void {
$bringKey = italianToBring($prodName);
$listData = bringRequest('GET', "https://api.getbring.com/rest/v2/bringlists/{$listUUID}");
if ($listData && isset($listData['purchase'])) {
+ // Token-based matching — same logic as _productOnBring() in smart_shopping
+ $stop = ['di','del','della','dei','degli','dalle','delle','da','in','con','per',
+ 'a','e','il','lo','la','i','gli','le','un','uno','una','al','alle','agli','allo'];
+ $tokenize = function(string $s) use ($stop): array {
+ $clean = mb_strtolower(preg_replace('/[^\p{L}\s]/u', ' ', $s));
+ return array_values(array_filter(
+ preg_split('/\s+/', trim($clean)),
+ fn($t) => mb_strlen($t) > 2 && !in_array($t, $stop)
+ ));
+ };
+ $prodTokens = $tokenize($prodName);
+ $keyTokens = $tokenize($bringKey);
+ $prodFirst = $prodTokens[0] ?? '';
+ $keyFirst = $keyTokens[0] ?? '';
foreach ($listData['purchase'] as $item) {
- if (strcasecmp($item['name'] ?? '', $bringKey) === 0) {
- $body = http_build_query(['uuid' => $listUUID, 'remove' => $bringKey]);
- bringRequest('PUT', "https://api.getbring.com/rest/v2/bringlists/{$listUUID}", $body);
+ $rawName = $item['name'] ?? '';
+ // 1. Exact match on translated catalog key or original Italian name
+ if (strcasecmp($rawName, $bringKey) === 0 || strcasecmp($rawName, $prodName) === 0) {
+ bringRequest('PUT', "https://api.getbring.com/rest/v2/bringlists/{$listUUID}",
+ http_build_query(['uuid' => $listUUID, 'remove' => $rawName]));
$removedFromBring = true;
break;
}
+ // 2. Token-based fuzzy: first significant word must match
+ if ($prodFirst || $keyFirst) {
+ $rawTokens = $tokenize($rawName);
+ $rawFirst = $rawTokens[0] ?? '';
+ if ($rawFirst && (
+ $rawFirst === $prodFirst ||
+ $rawFirst === $keyFirst ||
+ in_array($prodFirst, $rawTokens) ||
+ in_array($keyFirst, $rawTokens)
+ )) {
+ bringRequest('PUT', "https://api.getbring.com/rest/v2/bringlists/{$listUUID}",
+ http_build_query(['uuid' => $listUUID, 'remove' => $rawName]));
+ $removedFromBring = true;
+ break;
+ }
+ }
}
}
}
diff --git a/assets/css/style.css b/assets/css/style.css
index b1e32e3..e769989 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -2671,6 +2671,47 @@ body {
font-weight: 600;
}
+/* ===== MULTI-BATCH EXPIRY (conf products with different expiry dates) ===== */
+.multi-batch-row {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-top: 8px;
+ padding: 8px 10px;
+ background: rgba(0,0,0,0.04);
+ border: 1px dashed var(--border);
+ border-radius: var(--radius-sm);
+}
+
+.multi-batch-qty {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+ flex-shrink: 0;
+}
+
+.multi-batch-unit {
+ font-size: 0.8rem;
+ color: var(--text-muted);
+}
+
+.multi-batch-date {
+ flex: 1;
+ min-width: 0;
+ font-size: 0.85rem !important;
+}
+
+.btn-icon-sm {
+ background: none;
+ border: 1px solid var(--border);
+ border-radius: 6px;
+ padding: 4px 8px;
+ font-size: 0.75rem;
+ cursor: pointer;
+ color: var(--text-muted);
+ flex-shrink: 0;
+}
+
/* ===== PRODUCT DETAILS CARD (Action Page) ===== */
.product-details-card {
background: var(--bg-card);
@@ -3489,6 +3530,32 @@ body {
min-width: 0;
}
+.cooking-ing-meta {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 5px;
+ margin-top: 5px;
+}
+
+.cooking-ing-chip {
+ font-size: 0.72rem;
+ background: rgba(255,255,255,0.12);
+ border-radius: 5px;
+ padding: 2px 7px;
+ color: rgba(255,255,255,0.75);
+ white-space: nowrap;
+}
+
+.cooking-ing-chip.exp-soon {
+ background: rgba(239,68,68,0.3);
+ color: #fca5a5;
+}
+
+.cooking-ing-chip.exp-close {
+ background: rgba(234,179,8,0.3);
+ color: #fde047;
+}
+
.cooking-use-btn {
flex-shrink: 0;
background: #16a34a;
diff --git a/assets/js/app.js b/assets/js/app.js
index 22b81b3..e0ce1c9 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -3269,6 +3269,8 @@ function showAddForm() {
// Reset historical expiry for this product; will be fetched async
window._historyExpiryDays = null;
window._historyExpiryCount = 0;
+ // Reset extra batches from previous add
+ window._addExtraBatches = [];
// Store base expiry for vacuum recalculation
window._addBaseExpiryDays = estimatedDays;
@@ -3293,6 +3295,12 @@ function showAddForm() {
📝 Puoi modificare la data o scansionarla con la fotocamera
+
+
+
+ 📦 + Lotto con scadenza diversa
+
+
@@ -3511,6 +3531,9 @@ function selectPurchaseType(btn, type) {
`;
// DON'T auto-set remaining percentage - keep the quantity the user already entered
+ // Hide multi-batch section in "existing" mode
+ const mbSection = document.getElementById('multi-batch-section');
+ if (mbSection) mbSection.style.display = 'none';
}
}
@@ -3528,6 +3551,50 @@ function setRemainingPct(pct) {
document.getElementById('add-quantity').value = adjustedQty;
}
+// ===== MULTI-EXPIRY BATCHES (for conf products with different expiry dates) =====
+window._addExtraBatches = [];
+
+function addExpiryBatch() {
+ const loc = document.getElementById('add-location')?.value || '';
+ const baseDays = window._historyExpiryDays ?? estimateExpiryDays(currentProduct, loc);
+ const estimatedDate = addDays(baseDays);
+ window._addExtraBatches.push({ qty: 1, expiry: estimatedDate });
+ _rebuildMultiBatchUI();
+}
+
+function removeExpiryBatch(i) {
+ window._addExtraBatches.splice(i, 1);
+ _rebuildMultiBatchUI();
+}
+
+function adjustBatchQty(i, delta) {
+ window._addExtraBatches[i].qty = Math.max(1, (window._addExtraBatches[i].qty || 1) + delta);
+ _rebuildMultiBatchUI();
+}
+
+function _rebuildMultiBatchUI() {
+ const container = document.getElementById('multi-batch-container');
+ if (!container) return;
+ if (window._addExtraBatches.length === 0) {
+ container.innerHTML = '';
+ return;
+ }
+ container.innerHTML = window._addExtraBatches.map((b, i) => `
+
+ `).join('');
+}
+
function selectLocation(btn, loc) {
btn.parentElement.querySelectorAll('.loc-btn').forEach(b => b.classList.remove('active'));
btn.classList.add('active');
@@ -3583,8 +3650,46 @@ async function submitAdd(e) {
showToast(`✅ ${currentProduct.name} aggiunto!${qtyInfo}`, 'success');
if (result.removed_from_bring) {
setTimeout(() => showToast('🛒 Rimosso dalla lista della spesa', 'info'), 1500);
+ } else if (shoppingItems.length > 0 && shoppingListUUID) {
+ // PHP matching may have missed the item (custom name / no catalog match) —
+ // try a client-side fuzzy remove using the already-loaded shoppingItems
+ const match = _findSimilarItem(currentProduct.name, shoppingItems);
+ if (match) {
+ api('bring_remove', {}, 'POST', {
+ name: match.name,
+ rawName: match.rawName || '',
+ listUUID: shoppingListUUID
+ }).then(r => {
+ if (r && r.success) {
+ shoppingItems = shoppingItems.filter(i => i !== match);
+ setTimeout(() => showToast('🛒 Rimosso dalla lista della spesa', 'info'), 1500);
+ }
+ }).catch(() => {});
+ }
}
if (!spesaModeAfterAdd()) showPage('dashboard');
+
+ // Submit extra batches (different expiry dates) in the background, silently
+ if ((window._addExtraBatches || []).length > 0) {
+ const loc = document.getElementById('add-location')?.value || result.location || 'dispensa';
+ const selectedUnit = document.getElementById('add-unit').value;
+ const productUnit = currentProduct.unit || 'pz';
+ const confUnit = document.getElementById('add-conf-unit')?.value || null;
+ const confSize = parseFloat(document.getElementById('add-conf-size')?.value) || null;
+ for (const batch of window._addExtraBatches) {
+ if (!batch.qty || batch.qty <= 0) continue;
+ api('inventory_add', {}, 'POST', {
+ product_id: currentProduct.id,
+ quantity: batch.qty,
+ location: loc,
+ expiry_date: batch.expiry || null,
+ unit: selectedUnit !== productUnit ? selectedUnit : null,
+ package_unit: selectedUnit === 'conf' ? confUnit : null,
+ package_size: selectedUnit === 'conf' ? confSize : null,
+ }).catch(() => {});
+ }
+ window._addExtraBatches = [];
+ }
} else {
showToast(result.error || 'Errore', 'error');
}
@@ -6911,11 +7016,25 @@ function renderCookingStep() {
const ingsEl = document.getElementById('cooking-step-ings');
if (ings.length > 0) {
+ const LOC_LABELS = { dispensa: '🏠 Dispensa', frigo: '❄️ Frigo', freezer: '🧊 Freezer' };
ingsEl.innerHTML = ings.map(ing => {
const loc = (ing.location || 'dispensa').replace(/'/g, "\\'");
const qtyNum = ing.qty_number || 0;
+ // Build info chips: brand, location, expiry
+ const chips = [];
+ if (ing.brand) chips.push(`${escapeHtml(ing.brand)} `);
+ const locLabel = LOC_LABELS[ing.location] || (ing.location ? `📍 ${ing.location}` : '🏠 Dispensa');
+ chips.push(`${locLabel} `);
+ if (ing.expiry_date) {
+ const daysLeft = Math.round((new Date(ing.expiry_date) - new Date()) / 86400000);
+ const expClass = daysLeft <= 3 ? 'exp-soon' : daysLeft <= 7 ? 'exp-close' : '';
+ chips.push(`📅 scade ${formatDate(ing.expiry_date)} `);
+ }
return `
-
📦 ${escapeHtml(ing.name)} : ${escapeHtml(ing.qty)}
+
+
📦 ${escapeHtml(ing.name)} : ${escapeHtml(ing.qty)}
+
${chips.join('')}
+
📤 Usa