@@ -9168,7 +9223,7 @@ async function submitAdd(e) {
const confSize = parseFloat(document.getElementById('add-conf-size')?.value);
if (!confSize || confSize <= 0) {
showLoading(false);
- showToast('Specifica il contenuto di ogni confezione', 'error');
+ showToast(t('product.conf_size_required'), 'error');
document.getElementById('add-conf-size')?.focus();
return;
}
@@ -9326,7 +9381,7 @@ function _updateUseHeroMeta(items) {
const unit = items[0]?.unit;
const qtyStr = stripHtml(formatQuantity(totalQty, unit, items[0]?.default_quantity, items[0]?.package_unit));
const locCount = new Set(items.map(i => i.location)).size;
- const locSuffix = locCount > 1 ? ` · ${locCount} ${t('use.locations_short') || 'posti'}` : '';
+ const locSuffix = locCount > 1 ? ` · ${locCount} ${t('use.locations_short')}` : '';
pills.push(`
📦 ${escapeHtml(qtyStr)}${locSuffix}`);
}
@@ -9408,6 +9463,7 @@ function _renderUseExpiryHint(items) {
}
function _isOpenedInventoryItem(item) {
+ if (item.opened_at) return true;
const q = parseFloat(item.quantity);
const dq = parseFloat(item.default_quantity) || 0;
if (item.unit === 'conf' && dq > 0) return q !== Math.floor(q);
@@ -9415,6 +9471,10 @@ function _isOpenedInventoryItem(item) {
return false;
}
+function _useAllTotalQty(items) {
+ return items.reduce((s, i) => s + parseFloat(i.quantity || 0), 0);
+}
+
function _locationHasOpenedPackage(items, location) {
return items.some(i => i.location === location && _isOpenedInventoryItem(i));
}
@@ -9513,10 +9573,10 @@ async function loadUseInventoryInfo() {
unitSwitch.style.display = 'flex';
document.getElementById('use-unit-sub').textContent = subLabel;
- // If scale is active, start in sub-unit (g/ml) mode — scale always reads weight.
- // Otherwise default to conf so the user thinks in packages.
+ // If scale is active, prefer grams for weighing — unless user explicitly chose conf.
const _scaleActiveNow = getSettings().scale_enabled && getSettings().scale_gateway_url && _scaleConnected;
- switchUseUnit(_scaleActiveNow ? 'sub' : 'conf');
+ const _pref = _useConfMode._userPref;
+ switchUseUnit(_pref === 'conf' ? 'conf' : (_scaleActiveNow ? 'sub' : 'conf'));
// Fraction shortcut buttons for conf mode (½, 1, 2 packages)
const existingConfFrac = document.getElementById('conf-fraction-btns');
@@ -9586,6 +9646,8 @@ function switchUseUnit(mode) {
const qtyInput = document.getElementById('use-quantity');
const hint = document.getElementById('use-partial-hint');
+ if (_useConfMode) _useConfMode._userPref = mode;
+
// Show/hide fraction buttons depending on mode
const confFracBtns = document.getElementById('conf-fraction-btns');
const pzFracBtns = document.getElementById('pz-fraction-btns');
@@ -9921,7 +9983,7 @@ function showLowStockBringPrompt(result, afterCallback) {
if (shoppingListUUID) payload.listUUID = shoppingListUUID;
const data = await api('shopping_add', {}, 'POST', payload);
if (data.success && data.added > 0) {
- showToast('🛒 Prodotto finito → aggiunto a Bring!', 'info');
+ showToast(t('toast.finished_to_bring'), 'info');
}
} catch(_e) { /* silent */ }
})();
@@ -10174,7 +10236,7 @@ async function confirmMoveAfterUse(productId, fromLoc, toLoc, openedId, forcedVa
product_id: productId,
vacuum_sealed: newVacuum,
});
- showToast(`📦 Spostato in ${LOCATIONS[toLoc]?.label || toLoc}`, 'success');
+ showToast(t('move.moved_simple', { location: LOCATIONS[toLoc]?.label || toLoc }), 'success');
}
}
} catch (e) {
@@ -10187,11 +10249,16 @@ async function confirmMoveAfterUse(productId, fromLoc, toLoc, openedId, forcedVa
async function submitUseAll() {
const name = currentProduct ? currentProduct.name : '';
const items0 = _useCurrentItems ? _useCurrentItems.filter(i => parseFloat(i.quantity) > 0) : [];
+ if (items0.length === 0) return;
- // If there are opened packages, show the disambiguation FIRST (before the destructive confirm)
+ const unit = items0[0]?.unit || 'pz';
+ const totalQty = _useAllTotalQty(items0);
+ const isConfMulti = unit === 'conf' && totalQty > 1.001;
+
+ // Opened packages and/or conf disambiguation (one conf vs all)
const allOpened = items0.filter(_isOpenedInventoryItem);
- if (allOpened.length >= 1) {
- _showUseAllDisambiguation(allOpened, items0);
+ if (allOpened.length >= 1 || isConfMulti) {
+ _showUseAllDisambiguation(allOpened, items0, { showOneConf: isConfMulti });
return;
}
@@ -10202,8 +10269,6 @@ async function submitUseAll() {
}
// Multiple rows, no opened packages → standard destructive confirm
- const totalQty = items0.reduce((s, i) => s + parseFloat(i.quantity || 0), 0);
- const unit = items0[0]?.unit || 'pz';
const qtyStr = stripHtml(formatQuantity(totalQty, unit, items0[0]?.default_quantity, items0[0]?.package_unit));
_showDestructiveConfirm(
t('use.use_all_confirm_title') || '✅ Finisci tutto',
@@ -10224,7 +10289,7 @@ async function _doSubmitUseAll() {
});
showLoading(false);
if (result.success) {
- showToast(`📤 ${currentProduct.name} terminato!`, 'success');
+ showToast(t('toast.finished_all', { name: currentProduct.name }), 'success');
if (result.added_to_bring) {
setTimeout(() => showToast(t('use.toast_bring'), 'info'), 1500);
}
@@ -10239,12 +10304,16 @@ async function _doSubmitUseAll() {
}
/**
- * Show a modal asking which opened package to mark as finished.
- * Called when multiple opened packages exist across different locations.
+ * Ask whether the user finished one package or everything.
+ * Shown for opened packages and/or conf products with qty > 1.
*/
-function _showUseAllDisambiguation(openedItems, allItems) {
+function _showUseAllDisambiguation(openedItems, allItems, options = {}) {
+ const { showOneConf = false } = options;
const contentEl = document.getElementById('modal-content');
- const name = currentProduct ? currentProduct.name : '';
+ const preferLoc = document.getElementById('use-location')?.value
+ || openedItems[0]?.location
+ || allItems[0]?.location
+ || 'dispensa';
const locButtons = openedItems.map(item => {
const locInfo = LOCATIONS[item.location] || { icon: '📦', label: item.location };
@@ -10257,10 +10326,17 @@ function _showUseAllDisambiguation(openedItems, allItems) {
`;
}).join('');
- // Option to finish everything
- const totalQty = allItems.reduce((s, i) => s + parseFloat(i.quantity), 0);
+ const totalQty = _useAllTotalQty(allItems);
const unit = allItems[0]?.unit || 'pz';
const totalStr = stripHtml(formatQuantity(totalQty, unit, allItems[0]?.default_quantity, allItems[0]?.package_unit));
+ const oneStr = stripHtml(formatQuantity(1, unit, allItems[0]?.default_quantity, allItems[0]?.package_unit));
+
+ const oneConfBtn = showOneConf ? `
+
` : '';
contentEl.innerHTML = `
${t('use.disambiguation_hint')}
${locButtons}
+ ${oneConfBtn}
@@ -85,7 +85,7 @@
-
+
