Compare commits
2 commits
9a9139711f
...
48597ae8c7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
48597ae8c7 | ||
|
|
965c5c2495 |
2 changed files with 71 additions and 8 deletions
|
|
@ -19,6 +19,7 @@
|
||||||
"stock_picking_batch",
|
"stock_picking_batch",
|
||||||
"account",
|
"account",
|
||||||
"product_get_price_helper",
|
"product_get_price_helper",
|
||||||
|
"l10n_es_partner",
|
||||||
],
|
],
|
||||||
"data": [
|
"data": [
|
||||||
# Datos: Grupos propios
|
# Datos: Grupos propios
|
||||||
|
|
|
||||||
|
|
@ -436,18 +436,74 @@
|
||||||
|
|
||||||
_loadCart: function () {
|
_loadCart: function () {
|
||||||
var cartKey = "eskaera_" + this.orderId + "_cart";
|
var cartKey = "eskaera_" + this.orderId + "_cart";
|
||||||
var savedCart = localStorage.getItem(cartKey);
|
var raw = localStorage.getItem(cartKey);
|
||||||
this.cart = savedCart ? JSON.parse(savedCart) : {};
|
this.cart = {};
|
||||||
console.log("Cart loaded from localStorage[" + cartKey + "]:", this.cart);
|
if (!raw) {
|
||||||
console.log("Raw localStorage value:", savedCart);
|
console.log("Cart loaded: localStorage[" + cartKey + "] is empty");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var parsed;
|
||||||
|
try {
|
||||||
|
parsed = JSON.parse(raw);
|
||||||
|
} catch (e) {
|
||||||
|
console.warn("Cart load: invalid JSON in localStorage, dropping", e);
|
||||||
|
localStorage.removeItem(cartKey);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Legacy / corrupt shape (raw items object without cycle stamp) → drop.
|
||||||
|
if (
|
||||||
|
!parsed ||
|
||||||
|
typeof parsed !== "object" ||
|
||||||
|
!parsed.items ||
|
||||||
|
!("cutoff_date" in parsed)
|
||||||
|
) {
|
||||||
|
console.log(
|
||||||
|
"Cart load: legacy/unstamped value, dropping localStorage[" + cartKey + "]"
|
||||||
|
);
|
||||||
|
localStorage.removeItem(cartKey);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Cycle mismatch (or no current cycle known) → drop. This is the
|
||||||
|
// primary defence against stale carts surviving cycle rollover.
|
||||||
|
if (!this._currentCutoffDate || parsed.cutoff_date !== this._currentCutoffDate) {
|
||||||
|
console.log(
|
||||||
|
"Cart load: cycle mismatch (stored=" +
|
||||||
|
parsed.cutoff_date +
|
||||||
|
", current=" +
|
||||||
|
this._currentCutoffDate +
|
||||||
|
"), dropping localStorage[" +
|
||||||
|
cartKey +
|
||||||
|
"]"
|
||||||
|
);
|
||||||
|
localStorage.removeItem(cartKey);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.cart = parsed.items;
|
||||||
|
console.log(
|
||||||
|
"Cart loaded from localStorage[" +
|
||||||
|
cartKey +
|
||||||
|
"] (cycle " +
|
||||||
|
parsed.cutoff_date +
|
||||||
|
"):",
|
||||||
|
this.cart
|
||||||
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
_saveCart: function () {
|
_saveCart: function () {
|
||||||
var cartKey = "eskaera_" + this.orderId + "_cart";
|
var cartKey = "eskaera_" + this.orderId + "_cart";
|
||||||
var cartJson = JSON.stringify(this.cart);
|
var payload = JSON.stringify({
|
||||||
localStorage.setItem(cartKey, cartJson);
|
cutoff_date: this._currentCutoffDate || null,
|
||||||
console.log("Cart saved to localStorage[" + cartKey + "]:", this.cart);
|
items: this.cart,
|
||||||
console.log("Verification - immediately read back:", localStorage.getItem(cartKey));
|
});
|
||||||
|
localStorage.setItem(cartKey, payload);
|
||||||
|
console.log(
|
||||||
|
"Cart saved to localStorage[" +
|
||||||
|
cartKey +
|
||||||
|
"] (cycle " +
|
||||||
|
(this._currentCutoffDate || "unknown") +
|
||||||
|
"):",
|
||||||
|
this.cart
|
||||||
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
_clearCurrentOrderCartSilently: function () {
|
_clearCurrentOrderCartSilently: function () {
|
||||||
|
|
@ -493,11 +549,15 @@
|
||||||
|
|
||||||
xhr.onload = function () {
|
xhr.onload = function () {
|
||||||
if (xhr.status !== 200) {
|
if (xhr.status !== 200) {
|
||||||
|
self._currentCutoffDate = null;
|
||||||
done();
|
done();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
var data = JSON.parse(xhr.responseText || "{}");
|
var data = JSON.parse(xhr.responseText || "{}");
|
||||||
|
// Capture current cycle marker so _loadCart can evict a
|
||||||
|
// localStorage cart that belongs to a previous cycle.
|
||||||
|
self._currentCutoffDate = data && data.cutoff_date ? data.cutoff_date : null;
|
||||||
// Clear cart if order is closed, action requests clearance, or cutoff already passed
|
// Clear cart if order is closed, action requests clearance, or cutoff already passed
|
||||||
var shouldClear = false;
|
var shouldClear = false;
|
||||||
if (data) {
|
if (data) {
|
||||||
|
|
@ -527,12 +587,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
self._currentCutoffDate = null;
|
||||||
console.warn("[groupOrderShop] check-status parse error", e);
|
console.warn("[groupOrderShop] check-status parse error", e);
|
||||||
}
|
}
|
||||||
done();
|
done();
|
||||||
};
|
};
|
||||||
|
|
||||||
xhr.onerror = function () {
|
xhr.onerror = function () {
|
||||||
|
self._currentCutoffDate = null;
|
||||||
done();
|
done();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue