diff --git a/public/userarea/get_mescola_supplier_lots.php b/public/userarea/get_mescola_supplier_lots.php index 1db7df8..559c423 100644 --- a/public/userarea/get_mescola_supplier_lots.php +++ b/public/userarea/get_mescola_supplier_lots.php @@ -13,6 +13,7 @@ $pdo = $db->getConnection(); $sql = "SELECT msl.id, + msl.idsupplier AS idsupplier, s.supplier_name, msl.supplier_mix_name, msl.lot_code, diff --git a/public/userarea/mescole.php b/public/userarea/mescole.php index f84b753..d926924 100644 --- a/public/userarea/mescole.php +++ b/public/userarea/mescole.php @@ -650,6 +650,22 @@ $("#afCancelEdit").hide(); } + function afSetSupplierValue(supplierId) { + const sel = $("#afIdSupplier"); + const normalizedId = String(supplierId || "").trim(); + + if (normalizedId === "") { + sel.val("").trigger("change"); + return; + } + + if (sel.find('option[value="' + normalizedId + '"]').length > 0) { + sel.val(normalizedId).trigger("change"); + } else { + sel.val("").trigger("change"); + } + } + function afLoadSuppliers(selectedId = "") { return fetch("get_suppliers.php") .then(r => r.json()) @@ -688,6 +704,8 @@ fetch("get_mescola_supplier_lots.php?id=" + encodeURIComponent(idMescola)) .then(r => r.json()) .then(data => { + console.log("ROWS LOTTI:", data); + const tbody = $("#afTable tbody"); tbody.empty(); @@ -706,7 +724,7 @@ data.rows.forEach(row => { const exp = row.expiry_date ? row.expiry_date : ""; - const supplierId = String(row.idsupplier ?? ""); + const supplierId = String(row.idsupplier ?? row.id_supplier ?? row.supplier_id ?? row.supplierId ?? ""); tbody.append(` ${row.id} @@ -760,7 +778,7 @@ const qty = $(this).attr("data-qty"); $("#afEditId").val(editId); - $("#afIdSupplier").val(String(supplierId)).trigger("change"); + afSetSupplierValue(supplierId); $("#afSupplierMixName").val(mix); $("#afLotCode").val(lot); $("#afExpiryDate").val(exp);