' + esc(d.split) + "
"; + if (d.split) h += '' + esc(d.split) + "
"; if (d.method !== "shipping" && d.locations.length > 1) { - h += '' + esc(only.name) + (only.fee ? " · " + (only.fee.waived ? T.free : money(only.fee.fee) + " " + T.fee) : "") + "
"; + if (only && d.method !== "shipping") h += '' + esc(only.name) + (only.fee ? " · " + (only.fee.waived ? T.free : money(only.fee.fee) + " " + T.fee) : "") + "
"; } if (!d.locationId) { if (d.needsAddress) { root.innerHTML = h; return; } var why = d.locations[0] && d.locations[0].reason; - root.innerHTML = h + (why ? '' + esc(why) + "
" : ""); + root.innerHTML = h + (why ? '' + esc(why) + "
" : ""); return; } - if (d.prepNote && d.prepNote.minutes >= 60) h += '' + esc(T.prep + " " + d.prepNote.item) + " (" + Math.round(d.prepNote.minutes / 6) / 10 + " h)
"; + if (d.prepNote && d.prepNote.minutes >= 60) h += '' + esc(T.prep + " " + d.prepNote.item) + " (" + Math.round(d.prepNote.minutes / 6) / 10 + " h)
"; var peak = d.dates.filter(function (x) { return x.peak && x.peak.message; })[0]; - if (peak) h += '' + esc(peak.peak.message) + "
"; + if (peak) h += '' + esc(peak.peak.message) + "
"; h += calendar(d); h += slots(d, root); @@ -243,7 +250,7 @@ } var ridSeq = 0; - function rid(root) { if (!root.__ssid) root.__ssid = ++ridSeq; return root.__ssid; } + function rid(root) { if (!root.__dwid) root.__dwid = ++ridSeq; return root.__dwid; } function calendar(d) { var map = {}; @@ -254,84 +261,102 @@ var start = d.text.weekStartsOn || 0; var first = ym + "-01"; var lead = (weekday(first) - start + 7) % 7; - var h = '' + esc(T.choose) + "
"; + if (!S.date) return '' + esc(T.choose) + "
"; var x = d.dates.filter(function (y) { return y.date === S.date; })[0]; if (!x) return ""; - var h = '' + esc(T.dispatch) + "
"; + var h = '' + esc(T.dispatch) + "
"; if (!x.available) { - h += '' + esc(x.reasons.join(". ")) + "
"; + h += '' + esc(x.reasons.join(". ")) + "
"; if (x.waitlist && !S.waitlistDone) - h += '"; - if (S.waitlistDone) h += '' + esc(T.joined) + "
"; + h += '"; + if (S.waitlistDone) h += '' + esc(T.joined) + "
"; return h + "' + (live ? esc(T.held) + ' ' : S.expiresAt ? esc(T.expired) : "✓") + "
"; - var loc = d.locations.filter(function (l) { return l.id === d.locationId; })[0]; - if (loc && loc.pickupInstructions) h += '' + esc(loc.pickupInstructions) + "
"; - } + if (S.sel && S.sel.date === x.date) h += stub(d, x); return h + "' + esc(loc.pickupInstructions) + "
"; + return h; + } + function tickTimer() { var left = S.expiresAt ? S.expiresAt - Date.now() : 0; - var els = document.querySelectorAll("[data-ss-timer]"); + var els = document.querySelectorAll("[data-dw-timer]"); if (left <= 0 && els.length) return renderAll(); var s = Math.max(0, Math.round(left / 1000)); for (var i = 0; i < els.length; i++) els[i].textContent = Math.floor(s / 60) + ":" + String(s % 60).padStart(2, "0"); + var total = S.expiresAt && S.heldAt ? S.expiresAt - S.heldAt : 0; + var rings = document.querySelectorAll("[data-dw-ring]"); + for (var j = 0; j < rings.length; j++) rings[j].style.strokeDashoffset = total > 0 ? String(100 - Math.max(0, Math.min(100, (left / total) * 100))) : "0"; } setInterval(tickTimer, 1000); // ---------- events ---------- document.addEventListener("click", function (e) { - var t = e.target.closest && e.target.closest("[data-datewise-root] [data-ss]"); + var t = e.target.closest && e.target.closest("[data-datewise-root] [data-dw]"); if (!t || t.tagName === "FORM") return; - if (t.getAttribute("aria-disabled") === "true" && t.getAttribute("data-ss") !== "date") return; - var a = t.getAttribute("data-ss"), v = t.getAttribute("data-v"); + if (t.getAttribute("aria-disabled") === "true" && t.getAttribute("data-dw") !== "date") return; + var a = t.getAttribute("data-dw"), v = t.getAttribute("data-v"); if (a === "method" && v !== S.method) { S.method = v; lsSet("method", v); S.date = null; S.monthOffset = 0; refresh(true); } else if (a === "loc" && v !== S.locationId) { S.locationId = v; lsSet("location", v); S.date = null; refresh(true); } else if (a === "month") { S.monthOffset += +v; renderAll(); } - else if (a === "date") { S.date = v; S.waitlistDone = false; setMessage(null); renderAll(); focusFirst(".ss-slot:not([aria-disabled])"); } + else if (a === "date") { S.date = v; S.waitlistDone = false; setMessage(null); renderAll(); focusFirst(".dw-slot:not([aria-disabled])"); } else if (a === "slot") hold(S.date, v); }); document.addEventListener("submit", function (e) { var f = e.target; if (!f.closest || !f.closest("[data-datewise-root]")) return; - var a = f.getAttribute("data-ss"); + var a = f.getAttribute("data-dw"); if (!a) return; e.preventDefault(); if (a === "postal") { S.postal = f.postal.value.trim(); lsSet("postal", S.postal); S.date = null; refresh(true); } @@ -346,10 +371,10 @@ // Arrow-key navigation in the calendar grid. document.addEventListener("keydown", function (e) { var t = e.target; - if (!t.classList || !t.classList.contains("ss-day")) return; + if (!t.classList || !t.classList.contains("dw-day")) return; var step = { ArrowLeft: -1, ArrowRight: 1, ArrowUp: -7, ArrowDown: 7 }[e.key]; if (!step) return; - var days = Array.prototype.slice.call(t.parentNode.querySelectorAll(".ss-day")); + var days = Array.prototype.slice.call(t.parentNode.querySelectorAll(".dw-day")); var next = days[days.indexOf(t) + step]; if (next) { e.preventDefault(); t.tabIndex = -1; next.tabIndex = 0; next.focus(); } }); diff --git a/extensions/datewise-widget/blocks/scheduler.liquid b/extensions/datewise-widget/blocks/scheduler.liquid index 3dc4d53..f366c6b 100644 --- a/extensions/datewise-widget/blocks/scheduler.liquid +++ b/extensions/datewise-widget/blocks/scheduler.liquid @@ -8,7 +8,7 @@ data-heading="{{ block.settings.heading | escape }}" {{ block.shopify_attributes }} > - +