@salla.sa/twilight-components 2.14.487 → 2.14.489

package/dist/collection/components/salla-order-cancel/salla-order-cancel.js

@@ -0,0 +1,366 @@
+/*!
+ * Crafted with ❤ by Salla
+ */
+import { h, Host } from "@stencil/core";
+const MAX_NOTE = 250;
+const ORDER_WAIT_MS = 2500;
+const DATE_HEADER = 'td.single-order-header-item:not(.flex)';
+const CANCELLED_MARKER = '[data-salla-order-cancelled-reason]';
+const CANCELLED_BY_LABELS = {
+    customer: 'أُلغي الطلب من قِبل العميل',
+    merchant: 'أُلغي الطلب من قِبل المتجر',
+};
+const LANG_PAIRS = [
+    ['pages.orders.cancel_modal_title', 'إلغاء الطلب', 'Cancel order'],
+    ['pages.orders.cancel_reason_title', 'لماذا ترغب في إلغاء الطلب؟', 'Why do you want to cancel this order?'],
+    ['pages.orders.cancel_reason_subtitle', 'ساعدنا نعرف السبب لتحسين تجربتك.', 'Help us understand why to improve your experience.'],
+    ['pages.orders.cancel_reason_confirm', 'تأكيد إلغاء الطلب', 'Confirm order cancellation'],
+    ['pages.orders.cancel_reason_back', 'تراجع', 'Go back'],
+    ['pages.orders.cancel_reason_note_placeholder', 'اذكر السبب', 'Mention the reason'],
+    ['pages.orders.cancelled_by_customer', CANCELLED_BY_LABELS.customer, 'Order cancelled by the customer'],
+    ['pages.orders.cancelled_by_merchant', CANCELLED_BY_LABELS.merchant, 'Order cancelled by the merchant'],
+    ['pages.orders.cancel_reason_char_limit', 'يتجاوز النص حد الأحرف المسموح', 'Text exceeds the allowed character limit'],
+];
+const parseJson = (value) => {
+    if (!value)
+        return null;
+    try {
+        const data = typeof value === 'string' ? JSON.parse(value) : value;
+        return data && typeof data === 'object' ? data : null;
+    }
+    catch {
+        return null;
+    }
+};
+const parseCancelledReason = (raw) => {
+    const data = parseJson(raw);
+    const reasons = Array.isArray(data?.reasons)
+        ? data.reasons.filter((r) => typeof r === 'string' && r.length > 0)
+        : [];
+    if (!reasons.length)
+        return null;
+    return { cancelled_by: data?.cancelled_by === 'merchant' ? 'merchant' : 'customer', reasons };
+};
+const normalizeReasons = (reasons) => reasons.filter(r => r.is_active !== false).sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0));
+const parseReasonsProp = (value) => {
+    if (value == null || value === '')
+        return null;
+    const parsed = typeof value === 'string' ? parseJson(value) : value;
+    return Array.isArray(parsed) && parsed.length ? parsed : null;
+};
+/** Modal cancellation + cancelled-order header; reads order from salla-order-totals-card. */
+export class SallaOrderCancel {
+    constructor() {
+        this.reasons = [];
+        this.selectedReasonId = null;
+        this.reasonNote = '';
+        this.confirmLoading = false;
+        this.loading = true;
+        this.modalTitleLabel = '';
+        this.questionLabel = '';
+        this.subtitleLabel = '';
+        this.confirmLabel = '';
+        this.backLabel = '';
+        this.notePlaceholder = '';
+        this.charLimitLabel = '';
+        salla.lang.onLoaded(() => {
+            const ar = salla.lang.messages?.['ar.trans'];
+            const en = salla.lang.messages?.['en.trans'];
+            if (ar && en && salla.helpers?.setNested) {
+                for (const [key, arText, enText] of LANG_PAIRS) {
+                    salla.helpers.setNested(ar, key, arText);
+                    salla.helpers.setNested(en, key, enText);
+                }
+            }
+            this.refreshLabels();
+        });
+    }
+    onCancellationReasonsChange() {
+        void this.load();
+    }
+    async componentWillLoad() {
+        await salla.onReady();
+        this.refreshLabels();
+        await this.load();
+    }
+    refreshLabels() {
+        const t = (key, fb) => salla.lang.getWithDefault(key, fb);
+        this.modalTitleLabel = t('pages.orders.cancel_modal_title', 'إلغاء الطلب');
+        this.questionLabel = t('pages.orders.cancel_reason_title', 'لماذا ترغب في إلغاء الطلب؟');
+        this.subtitleLabel = t('pages.orders.cancel_reason_subtitle', 'ساعدنا نعرف السبب لتحسين تجربتك.');
+        this.confirmLabel = t('pages.orders.cancel_reason_confirm', 'تأكيد إلغاء الطلب');
+        this.backLabel = t('pages.orders.cancel_reason_back', 'تراجع');
+        this.notePlaceholder = t('pages.orders.cancel_reason_note_placeholder', 'اذكر السبب');
+        this.charLimitLabel = t('pages.orders.cancel_reason_char_limit', 'يتجاوز النص حد الأحرف المسموح');
+    }
+    get resolvedOrderId() {
+        const id = this.orderId ?? this.pageOrder?.id ?? salla.config.get('page.id');
+        const n = Number(id);
+        return Number.isFinite(n) ? n : id;
+    }
+    readPageOrder() {
+        const el = document.querySelector('salla-order-totals-card');
+        return el ? parseJson(el.order ?? el.getAttribute('order')) : null;
+    }
+    waitForPageOrder() {
+        const order = this.readPageOrder();
+        if (order)
+            return Promise.resolve(order);
+        if (typeof MutationObserver === 'undefined') {
+            // ponytail: jsdom has no MutationObserver; one microtask retry for spec DOM
+            return Promise.resolve().then(() => this.readPageOrder());
+        }
+        return new Promise(resolve => {
+            let settled = false;
+            const finish = () => {
+                if (settled)
+                    return;
+                settled = true;
+                observer.disconnect();
+                clearTimeout(timer);
+                resolve(this.readPageOrder());
+            };
+            const card = document.querySelector('salla-order-totals-card');
+            const observer = new MutationObserver(finish);
+            observer.observe(card ?? document.documentElement, card
+                ? { attributes: true, attributeFilter: ['order'] }
+                : { childList: true, subtree: true, attributes: true, attributeFilter: ['order'] });
+            const timer = setTimeout(finish, ORDER_WAIT_MS);
+        });
+    }
+    cancelledByLabel(by) {
+        return salla.lang.getWithDefault(`pages.orders.cancelled_by_${by}`, CANCELLED_BY_LABELS[by]);
+    }
+    mountCancelledHeader(attempt = 0) {
+        const cancelled = this.orderCancelledReason;
+        const reason = cancelled?.reasons[0];
+        if (!reason || document.querySelector(CANCELLED_MARKER))
+            return;
+        const anchor = document.querySelector(DATE_HEADER);
+        if (!anchor) {
+            // ponytail: hook mounts before header table in single.twig; retry until anchor exists
+            if (attempt < 20)
+                requestAnimationFrame(() => this.mountCancelledHeader(attempt + 1));
+            return;
+        }
+        const cell = document.createElement('td');
+        cell.className = 's-order-cancel-cancelled-header-item';
+        cell.setAttribute('data-salla-order-cancelled-reason', '');
+        const label = document.createElement('div');
+        label.className = 's-order-cancel-cancelled-header-label';
+        label.textContent = this.cancelledByLabel(cancelled.cancelled_by);
+        const value = document.createElement('b');
+        value.className = 's-order-cancel-cancelled-header-reason';
+        value.textContent = reason;
+        value.title = reason;
+        cell.append(label, value);
+        anchor.insertAdjacentElement('afterend', cell);
+    }
+    purgeLegacyModal() {
+        if (!this.reasons.length)
+            return;
+        for (const el of document.querySelectorAll('salla-modal#modal-order-cancel:not([data-salla-order-cancel])')) {
+            el.remove();
+        }
+    }
+    applyPageOrder(order) {
+        this.pageOrder = order;
+        this.orderCancelledReason = parseCancelledReason(order.order_cancelled_reason) ?? undefined;
+    }
+    async load() {
+        this.loading = true;
+        try {
+            const fromProp = parseReasonsProp(this.cancellationReasons);
+            if (!this.pageOrder) {
+                const order = this.readPageOrder();
+                if (order)
+                    this.applyPageOrder(order);
+            }
+            if (!this.pageOrder && !fromProp) {
+                const order = await this.waitForPageOrder();
+                if (order)
+                    this.applyPageOrder(order);
+            }
+            else if (!this.pageOrder) {
+                void this.waitForPageOrder().then(order => {
+                    if (order) {
+                        this.applyPageOrder(order);
+                        this.mountCancelledHeader();
+                    }
+                });
+            }
+            const order = this.pageOrder;
+            this.reasons = fromProp
+                ? normalizeReasons(fromProp)
+                : order
+                    ? normalizeReasons(Array.isArray(order.cancellation_reasons) ? order.cancellation_reasons : [])
+                    : [];
+        }
+        finally {
+            this.loading = false;
+            this.purgeLegacyModal();
+            this.mountCancelledHeader();
+        }
+    }
+    reasonLabel(reason) {
+        const locale = salla.lang.getLocale?.() || 'ar';
+        return reason.translations?.[locale]?.name || reason.name;
+    }
+    get hasOtherSelected() {
+        return this.selectedReasonId !== null && this.reasons.some(r => r.id === this.selectedReasonId && r.slug === 'other');
+    }
+    get canConfirm() {
+        if (this.selectedReasonId === null)
+            return false;
+        if (!this.hasOtherSelected)
+            return true;
+        const len = this.reasonNote.trim().length;
+        return len > 0 && len <= MAX_NOTE;
+    }
+    selectReason(id) {
+        if (this.selectedReasonId === id) {
+            if (this.reasons.find(r => r.id === id)?.slug === 'other')
+                this.reasonNote = '';
+            this.selectedReasonId = null;
+            return;
+        }
+        if (this.reasons.find(r => r.id === this.selectedReasonId)?.slug === 'other') {
+            this.reasonNote = '';
+        }
+        this.selectedReasonId = id;
+        if (this.reasons.length && this.reasons[this.reasons.length - 1].id === id) {
+            const timer = setTimeout(() => {
+                requestAnimationFrame(() => {
+                    document.getElementById(`s-order-cancel-reason-${id}`)?.scrollIntoView({ block: 'start', behavior: 'smooth' });
+                    const textarea = document.querySelector('.s-order-cancel-textarea');
+                    textarea?.focus();
+                    clearTimeout(timer);
+                });
+            }, 200);
+        }
+    }
+    resetForm() {
+        this.selectedReasonId = null;
+        this.reasonNote = '';
+        this.confirmLoading = false;
+    }
+    setReasonNote(event) {
+        this.reasonNote = event.target.value;
+    }
+    onKeyActivate(event, action) {
+        if (event.key === 'Enter' || event.key === ' ')
+            action();
+    }
+    async confirmCancel() {
+        if (!this.canConfirm || this.confirmLoading)
+            return;
+        this.confirmLoading = true;
+        try {
+            const note = this.hasOtherSelected ? this.reasonNote.trim() : '';
+            const payload = {
+                reasons: [String(this.selectedReasonId)],
+                ...(note && { reason_note: note }),
+            };
+            await salla.order.api.cancel(this.resolvedOrderId, payload);
+            window.location.reload();
+        }
+        catch {
+            this.confirmLoading = false;
+        }
+    }
+    render() {
+        if (this.loading || !this.reasons.length)
+            return h(Host, { class: "s-order-cancel-wrapper" });
+        return (h(Host, { class: "s-order-cancel-wrapper" }, h("salla-modal", { id: "modal-order-cancel", class: "s-order-cancel-modal", "data-salla-order-cancel": "", ref: el => {
+                this.modal = el;
+                void el?.setTitle?.(this.modalTitleLabel);
+            }, width: "sm", onModalVisibilityChanged: e => !e.detail && this.resetForm() }, h("div", { class: "s-order-cancel-content" }, h("div", { class: "s-order-cancel-intro" }, h("p", { class: "s-order-cancel-heading" }, this.questionLabel), h("p", { class: "s-order-cancel-subtitle" }, this.subtitleLabel)), h("div", { class: "s-order-cancel-reasons s-scrollbar" }, this.reasons.map(reason => {
+            const id = `s-order-cancel-reason-${reason.id}`;
+            return (h("label", { key: reason.id, class: "s-order-cancel-reason", htmlFor: id }, h("input", { type: "radio", name: "cancellation_reason", id: id, class: "s-order-cancel-radio s-radio", checked: this.selectedReasonId === reason.id, onChange: () => this.selectReason(reason.id) }), h("span", { class: "s-order-cancel-reason-label" }, this.reasonLabel(reason))));
+        })), this.hasOtherSelected && (h("div", { class: "s-order-cancel-other-field" }, h("textarea", { class: "s-order-cancel-textarea", placeholder: this.notePlaceholder, value: this.reasonNote, onInput: e => this.setReasonNote(e) }), h("p", { class: {
+                's-order-cancel-counter': true,
+                's-order-cancel-counter--limit': this.reasonNote.length >= MAX_NOTE,
+            } }, this.reasonNote.length >= MAX_NOTE && `${this.charLimitLabel} `, MAX_NOTE, "/", this.reasonNote.length))), h("div", { class: "s-order-cancel-actions" }, h("salla-button", { color: "primary", class: "w-full", width: "wide", disabled: !this.canConfirm, loading: this.confirmLoading, onClick: () => this.confirmCancel(), onKeyDown: e => this.onKeyActivate(e, () => this.confirmCancel()) }, this.confirmLabel), h("salla-button", { class: "w-full", width: "wide", fill: "outline", color: "gray", onClick: () => this.modal?.close(), onKeyDown: e => this.onKeyActivate(e, () => this.modal?.close()) }, this.backLabel))))));
+    }
+    static get is() { return "salla-order-cancel"; }
+    static get originalStyleUrls() {
+        return {
+            "$": ["salla-order-cancel.scss"]
+        };
+    }
+    static get styleUrls() {
+        return {
+            "$": ["salla-order-cancel.css"]
+        };
+    }
+    static get properties() {
+        return {
+            "orderId": {
+                "type": "any",
+                "attribute": "order-id",
+                "mutable": false,
+                "complexType": {
+                    "original": "string | number",
+                    "resolved": "number | string",
+                    "references": {}
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [],
+                    "text": ""
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false
+            },
+            "cancellationReasons": {
+                "type": "string",
+                "attribute": "cancellation-reasons",
+                "mutable": false,
+                "complexType": {
+                    "original": "string | CancellationReason[]",
+                    "resolved": "CancellationReason[] | string",
+                    "references": {
+                        "CancellationReason": {
+                            "location": "import",
+                            "path": "./interfaces",
+                            "id": "src/components/salla-order-cancel/interfaces.ts::CancellationReason"
+                        }
+                    }
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [],
+                    "text": ""
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false
+            }
+        };
+    }
+    static get states() {
+        return {
+            "reasons": {},
+            "selectedReasonId": {},
+            "reasonNote": {},
+            "confirmLoading": {},
+            "loading": {},
+            "modalTitleLabel": {},
+            "questionLabel": {},
+            "subtitleLabel": {},
+            "confirmLabel": {},
+            "backLabel": {},
+            "notePlaceholder": {},
+            "charLimitLabel": {}
+        };
+    }
+    static get watchers() {
+        return [{
+                "propName": "cancellationReasons",
+                "methodName": "onCancellationReasonsChange"
+            }];
+    }
+}

package/dist/collection/components/salla-user-menu/salla-user-menu.js

@@ -69,6 +69,8 @@ export class SallaUserMenu {
             this.opened = false;
         };
         this.OrderUpdate = 0;
+        // STD-13103: these pages moved under /account; link directly to avoid 301 redirects.
+        this.accountPrefixedKeys = ['orders', 'pending_orders', 'wallet', 'notifications', 'rating', 'profile', 'wishlist', 'settings'];
         this.items = {
             notifications: BellRing,
             orders: OrderIcon,
@@ -211,7 +213,8 @@ export class SallaUserMenu {
             return { href: this.profileUrl, target: '_blank', rel: 'noopener noreferrer' };
         }
         const urlKey = itemKey === 'loyalty_points' ? 'loyalty' : itemKey;
-        return { href: Salla.url.get(urlKey) };
+        const path = this.accountPrefixedKeys.includes(urlKey) ? `account/${urlKey}` : urlKey;
+        return { href: Salla.url.get(path) };
     }
     getMenuItem([itemKey, itemValue], i) {
         //todo:: enhancement support slot here