@pisell/private-materials 6.3.139 → 6.3.141

package/lib/components/scanOrder/context.js

@@ -67,6 +67,7 @@ function ScanOrderProvider({
   const [entryMode, setEntryMode] = (0, import_react.useState)("default");
   const [submitDisabledTips, setSubmitDisabledTips] = (0, import_react.useState)("");
   const [isCacheHydrated, setIsCacheHydrated] = (0, import_react.useState)(false);
+  const [resumeStep, setResumeStep] = (0, import_react.useState)(null);
   const hydratedRef = (0, import_react.useRef)(false);
   const stepList = [...import_hooks.SCAN_ORDER_STEPS];
   const isGatePassed = (0, import_react.useCallback)(
@@ -89,7 +90,11 @@ function ScanOrderProvider({
   const clearStepCache = (0, import_react.useCallback)(() => {
     var _a;
     (_a = scanOrderModule == null ? void 0 : scanOrderModule.clearUIState) == null ? void 0 : _a.call(scanOrderModule);
+    setResumeStep(null);
   }, [scanOrderModule]);
+  const consumeResumeStep = (0, import_react.useCallback)(() => {
+    setResumeStep(null);
+  }, []);
   const refreshViewModel = async () => {
     if (scanOrderModule && typeof scanOrderModule.getSummary === "function") {
       try {
@@ -126,35 +131,37 @@ function ScanOrderProvider({
     var _a, _b, _c, _d, _e, _f;
     if (hydratedRef.current || !scanOrderModule) return;
     hydratedRef.current = true;
-    const currentResourceId = entryContext == null ? void 0 : entryContext.resource_id;
+    const normalizedResourceId = String((entryContext == null ? void 0 : entryContext.resource_id) ?? "");
+    const normalizedBiz = String((entryContext == null ? void 0 : entryContext.biz) ?? "");
     const currentHasOrderId = Boolean(entryContext == null ? void 0 : entryContext.order_id);
-    const currentBiz = entryContext == null ? void 0 : entryContext.biz;
     const cachedEntry = (_a = scanOrderModule.getUIState) == null ? void 0 : _a.call(scanOrderModule, "entryContext");
-    const entrySame = cachedEntry && cachedEntry.resourceId === currentResourceId && cachedEntry.biz === currentBiz;
+    const entrySame = Boolean(cachedEntry) && String((cachedEntry == null ? void 0 : cachedEntry.resourceId) ?? "") === normalizedResourceId && String((cachedEntry == null ? void 0 : cachedEntry.biz) ?? "") === normalizedBiz;
     if (!entrySame) {
       (_b = scanOrderModule.clearUIState) == null ? void 0 : _b.call(scanOrderModule);
       (_c = scanOrderModule.setUIState) == null ? void 0 : _c.call(scanOrderModule, "entryContext", {
-        resourceId: currentResourceId,
+        resourceId: normalizedResourceId,
         hasOrderId: currentHasOrderId,
-        biz: currentBiz
+        biz: normalizedBiz
       });
       setIsCacheHydrated(true);
       return;
     }
+    const isResumable = (s) => s === "product" || s === "check";
     const pending = (_d = scanOrderModule.getUIState) == null ? void 0 : _d.call(scanOrderModule, "pendingStep");
-    if (pending && stepList.includes(pending)) {
+    if (isResumable(pending)) {
       (_e = scanOrderModule.deleteUIState) == null ? void 0 : _e.call(scanOrderModule, "pendingStep");
-      setCurrentStep(pending);
+      setResumeStep(pending);
       setIsCacheHydrated(true);
       return;
     }
     const cached = (_f = scanOrderModule.getUIState) == null ? void 0 : _f.call(scanOrderModule, "step");
-    if (cached && stepList.includes(cached)) setCurrentStep(cached);
+    if (isResumable(cached)) setResumeStep(cached);
     setIsCacheHydrated(true);
   }, [scanOrderModule, entryContext == null ? void 0 : entryContext.resource_id, entryContext == null ? void 0 : entryContext.order_id, entryContext == null ? void 0 : entryContext.biz]);
   (0, import_react.useEffect)(() => {
     var _a;
     if (!hydratedRef.current || !isCacheHydrated || !scanOrderModule) return;
+    if (currentStep === "init") return;
     (_a = scanOrderModule.setUIState) == null ? void 0 : _a.call(scanOrderModule, "step", currentStep);
   }, [currentStep, isCacheHydrated, scanOrderModule]);
   (0, import_react.useEffect)(() => {
@@ -256,7 +263,9 @@ function ScanOrderProvider({
       isCacheHydrated,
       markGate,
       isGatePassed,
-      clearStepCache
+      clearStepCache,
+      resumeStep,
+      consumeResumeStep
     };
   }, [
     entryContext,
@@ -274,7 +283,9 @@ function ScanOrderProvider({
     isCacheHydrated,
     markGate,
     isGatePassed,
-    clearStepCache
+    clearStepCache,
+    resumeStep,
+    consumeResumeStep
   ]);
   return /* @__PURE__ */ import_react.default.createElement(ScanOrderContext.Provider, { value }, children);
 }

package/lib/components/scanOrder/hooks.js

@@ -103,7 +103,10 @@ var useScanOrderLogin = () => {
     const { callback } = params || {};
     utils.action({
       type: "pisell1.login",
-      data: {},
+      data: {
+        notReload: true,
+        type: "plugin"
+      },
       callback
     });
   };

package/lib/components/scanOrder/locales.d.ts

@@ -27,7 +27,20 @@ declare const _default: {
         'pisell2.scan.order.pickup.ref.placeholder': string;
         'pisell2.scan.order.products.title': string;
         'pisell2.scan.order.products.empty.tip': string;
+        'pisell2.scan.order.check.cart.empty.tip': string;
         'pisell2.scan.order.submit.disabled.default': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
+        'pisell2.text.goodpass.login': string;
+        'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.apply': string;
+        'pisell2.text.details': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.appointment.deposit.close': string;
         'pisell2.appointment.policy': string;
@@ -62,7 +75,20 @@ declare const _default: {
         'pisell2.scan.order.pickup.ref.placeholder': string;
         'pisell2.scan.order.products.title': string;
         'pisell2.scan.order.products.empty.tip': string;
+        'pisell2.scan.order.check.cart.empty.tip': string;
         'pisell2.scan.order.submit.disabled.default': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
+        'pisell2.text.goodpass.login': string;
+        'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.apply': string;
+        'pisell2.text.details': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.appointment.deposit.close': string;
         'pisell2.appointment.policy': string;
@@ -97,7 +123,20 @@ declare const _default: {
         'pisell2.scan.order.pickup.ref.placeholder': string;
         'pisell2.scan.order.products.title': string;
         'pisell2.scan.order.products.empty.tip': string;
+        'pisell2.scan.order.check.cart.empty.tip': string;
         'pisell2.scan.order.submit.disabled.default': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
+        'pisell2.text.goodpass.login': string;
+        'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.apply': string;
+        'pisell2.text.details': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.appointment.deposit.close': string;
         'pisell2.appointment.policy': string;
@@ -132,7 +171,20 @@ declare const _default: {
         'pisell2.scan.order.pickup.ref.placeholder': string;
         'pisell2.scan.order.products.title': string;
         'pisell2.scan.order.products.empty.tip': string;
+        'pisell2.scan.order.check.cart.empty.tip': string;
         'pisell2.scan.order.submit.disabled.default': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
+        'pisell2.text.goodpass.login': string;
+        'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.apply': string;
+        'pisell2.text.details': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.appointment.deposit.close': string;
         'pisell2.appointment.policy': string;
@@ -167,7 +219,20 @@ declare const _default: {
         'pisell2.scan.order.pickup.ref.placeholder': string;
         'pisell2.scan.order.products.title': string;
         'pisell2.scan.order.products.empty.tip': string;
+        'pisell2.scan.order.check.cart.empty.tip': string;
         'pisell2.scan.order.submit.disabled.default': string;
+        'pisell2.text.goodpass': string;
+        'pisell2.text.goodpass.product-vouchers': string;
+        'pisell2.text.goodpass.view-more': string;
+        'pisell2.text.goodpass.code': string;
+        'pisell2.text.goodpass.enter-code': string;
+        'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
+        'pisell2.text.goodpass.code-invalid-expired': string;
+        'pisell2.text.goodpass.login': string;
+        'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.apply': string;
+        'pisell2.text.details': string;
         'pisell2.appointment.booking.empty.data': string;
         'pisell2.appointment.deposit.close': string;
         'pisell2.appointment.policy': string;

package/lib/components/scanOrder/locales.js

@@ -51,7 +51,20 @@ var locales_default = {
     "pisell2.scan.order.pickup.ref.placeholder": "e.g. John",
     "pisell2.scan.order.products.title": "Products",
     "pisell2.scan.order.products.empty.tip": "Please select products",
+    "pisell2.scan.order.check.cart.empty.tip": "Please go back to add products",
     "pisell2.scan.order.submit.disabled.default": "Order submission is currently disabled.",
+    "pisell2.text.goodpass": "Promotion",
+    "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
+    "pisell2.text.goodpass.view-more": "View More",
+    "pisell2.text.goodpass.code": "Code",
+    "pisell2.text.goodpass.enter-code": "Enter Code",
+    "pisell2.text.goodpass.code-invalid": "Current code is invalid",
+    "pisell2.text.goodpass.code-invalid-cart": "No eligible items in the cart",
+    "pisell2.text.goodpass.code-invalid-expired": "Current coupon is not valid in use",
+    "pisell2.text.goodpass.login": "Login",
+    "pisell2.text.goodpass.login-tip": "to access your promotions",
+    "pisell2.text.apply": "Apply",
+    "pisell2.text.details": "Details",
     "pisell2.appointment.booking.empty.data": "No data",
     "pisell2.appointment.deposit.close": "Close",
     "pisell2.appointment.policy": "You have read and agreed to this policy",
@@ -86,7 +99,20 @@ var locales_default = {
     "pisell2.scan.order.pickup.ref.placeholder": "例如：小明",
     "pisell2.scan.order.products.title": "商品",
     "pisell2.scan.order.products.empty.tip": "请选择商品",
+    "pisell2.scan.order.check.cart.empty.tip": "请返回添加商品",
     "pisell2.scan.order.submit.disabled.default": "当前暂不可下单",
+    "pisell2.text.goodpass": "促销",
+    "pisell2.text.goodpass.product-vouchers": "商品兑换券",
+    "pisell2.text.goodpass.view-more": "查看更多",
+    "pisell2.text.goodpass.code": "券码",
+    "pisell2.text.goodpass.enter-code": "请输入券码",
+    "pisell2.text.goodpass.code-invalid": "当前券码不可用",
+    "pisell2.text.goodpass.code-invalid-cart": "当前购物车中无可用商品",
+    "pisell2.text.goodpass.code-invalid-expired": "当前优惠券不在使用期限内",
+    "pisell2.text.goodpass.login": "登录",
+    "pisell2.text.goodpass.login-tip": "以获取会员福利或使用账户积分",
+    "pisell2.text.apply": "应用",
+    "pisell2.text.details": "详情",
     "pisell2.appointment.booking.empty.data": "暂无数据",
     "pisell2.appointment.deposit.close": "关闭",
     "pisell2.appointment.policy": "您已仔细阅读并同意此协议",
@@ -121,7 +147,20 @@ var locales_default = {
     "pisell2.scan.order.pickup.ref.placeholder": "例如：小明",
     "pisell2.scan.order.products.title": "商品",
     "pisell2.scan.order.products.empty.tip": "請選擇商品",
+    "pisell2.scan.order.check.cart.empty.tip": "請返回添加商品",
     "pisell2.scan.order.submit.disabled.default": "當前暫不可下單",
+    "pisell2.text.goodpass": "促銷",
+    "pisell2.text.goodpass.product-vouchers": "商品兌換券",
+    "pisell2.text.goodpass.view-more": "查看更多",
+    "pisell2.text.goodpass.code": "券碼",
+    "pisell2.text.goodpass.enter-code": "請輸入券碼",
+    "pisell2.text.goodpass.code-invalid": "當前券碼不可用",
+    "pisell2.text.goodpass.code-invalid-cart": "當前購物車中無可用商品",
+    "pisell2.text.goodpass.code-invalid-expired": "當前優惠券不在使用期限內",
+    "pisell2.text.goodpass.login": "登錄",
+    "pisell2.text.goodpass.login-tip": "以獲取會員福利或使用賬戶積分",
+    "pisell2.text.apply": "應用",
+    "pisell2.text.details": "詳情",
     "pisell2.appointment.booking.empty.data": "暫無數據",
     "pisell2.appointment.deposit.close": "关闭",
     "pisell2.appointment.policy": "您已仔細閱讀並同意此協議",
@@ -156,7 +195,20 @@ var locales_default = {
     "pisell2.scan.order.pickup.ref.placeholder": "例: ジョン",
     "pisell2.scan.order.products.title": "商品",
     "pisell2.scan.order.products.empty.tip": "商品を選択してください",
+    "pisell2.scan.order.check.cart.empty.tip": "商品を追加するには、前の画面に戻ってください",
     "pisell2.scan.order.submit.disabled.default": "現在、注文を送信できません。",
+    "pisell2.text.goodpass": "プロモーション",
+    "pisell2.text.goodpass.product-vouchers": "商品バウチャー",
+    "pisell2.text.goodpass.view-more": "もっと見る",
+    "pisell2.text.goodpass.code": "コード",
+    "pisell2.text.goodpass.enter-code": "コードを入力",
+    "pisell2.text.goodpass.code-invalid": "現在のコードは無効です",
+    "pisell2.text.goodpass.code-invalid-cart": "カートに適格な項目がありません",
+    "pisell2.text.goodpass.code-invalid-expired": "現在のクーポンは使用期限外です",
+    "pisell2.text.goodpass.login": "ログイン",
+    "pisell2.text.goodpass.login-tip": "プロモーションにアクセスするため",
+    "pisell2.text.apply": "適用",
+    "pisell2.text.details": "詳細",
     "pisell2.appointment.booking.empty.data": "データなし",
     "pisell2.appointment.deposit.close": "閉じる",
     "pisell2.appointment.policy": "このポリシーを読み、同意しました",
@@ -191,7 +243,20 @@ var locales_default = {
     "pisell2.scan.order.pickup.ref.placeholder": "Ex.: João",
     "pisell2.scan.order.products.title": "Produtos",
     "pisell2.scan.order.products.empty.tip": "Selecione produtos",
+    "pisell2.scan.order.check.cart.empty.tip": "Volte para adicionar produtos",
     "pisell2.scan.order.submit.disabled.default": "No momento, não é possível enviar pedidos.",
+    "pisell2.text.goodpass": "Promoção",
+    "pisell2.text.goodpass.product-vouchers": "Vales de Produto",
+    "pisell2.text.goodpass.view-more": "Ver Mais",
+    "pisell2.text.goodpass.code": "Código",
+    "pisell2.text.goodpass.enter-code": "Digite o Código",
+    "pisell2.text.goodpass.code-invalid": "Código atual é inválido",
+    "pisell2.text.goodpass.code-invalid-cart": "Nenhum item elegível no carrinho",
+    "pisell2.text.goodpass.code-invalid-expired": "Cupom atual não está no período de uso",
+    "pisell2.text.goodpass.login": "Entrar",
+    "pisell2.text.goodpass.login-tip": "para acessar suas promoções",
+    "pisell2.text.apply": "Aplicar",
+    "pisell2.text.details": "Detalhes",
     "pisell2.appointment.booking.empty.data": "Sem dados",
     "pisell2.appointment.deposit.close": "Fechar",
     "pisell2.appointment.policy": "Você leu e concordou com esta política",

package/lib/components/scanOrder/types.d.ts

@@ -42,6 +42,8 @@ export interface ScanOrderContextValue {
     tableName: string;
     entryMode: ScanOrderEntryMode;
     submitDisabledTips: string;
+    /** 折扣/优惠券列表（来自 scanOrder 模块 getDiscountList） */
+    discountList: any[];
     isReady: boolean;
     setCurrentStep: (step: ScanOrderStepKey) => void;
     setTableName: (name: string) => void;
@@ -62,6 +64,14 @@ export interface ScanOrderContextValue {
     isGatePassed: (flag: ScanOrderGateKey) => boolean;
     /** 整桶清空（提交成功 / restoreOrder 等场景） */
     clearStepCache: () => void;
+    /**
+     * bootstrap 结束后要恢复到的目标 step（仅记录 `'product' | 'check'`）。
+     * hydrate 阶段不直接 `setCurrentStep`，避免在 checkResourceAvailable 之前让
+     * `<Menu>` / `<Check>` mount、提前发出缺 menu_list_ids 的请求。
+     */
+    resumeStep: ScanOrderStepKey | null;
+    /** 消费并清空 resumeStep；建议在完成 goToStep 后立刻调用 */
+    consumeResumeStep: () => void;
 }
 export interface ScanOrderProviderProps {
     entryContext: ScanOrderEntryContext;

package/lib/components/scanOrder/utils/toShoppingCartProducts.d.ts

@@ -9,6 +9,7 @@ interface ScanOrderOrderProduct {
     product_option_item?: any[];
     product_bundle?: any[];
     identity_key?: string;
+    note?: string;
     metadata?: Record<string, any>;
     _origin?: Record<string, any>;
     [key: string]: any;

package/lib/components/scanOrder/utils/toShoppingCartProducts.js

@@ -73,6 +73,76 @@ function normalizeOptions(product) {
     };
   });
 }
+function getProductOriginRich(product) {
+  var _a, _b, _c;
+  return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.origin) || ((_c = (_b = product == null ? void 0 : product._origin) == null ? void 0 : _b.callbackData) == null ? void 0 : _c.origin) || {};
+}
+function findVariantGroupById(groups, groupId) {
+  return groups.find((g) => Number(g == null ? void 0 : g.id) === Number(groupId));
+}
+function findVariantItemDisplayName(variantGroup, variantItemId) {
+  const items = Array.isArray(variantGroup == null ? void 0 : variantGroup.variant_item) ? variantGroup.variant_item : [];
+  const found = items.find(
+    (it) => Number(it == null ? void 0 : it.id) === Number(variantItemId)
+  );
+  const raw = (found == null ? void 0 : found.name) ?? (typeof (found == null ? void 0 : found.title) === "string" ? found.title : found == null ? void 0 : found.title) ?? "";
+  return String(raw ?? "").trim();
+}
+function buildVariantStringFromSkuIds(origin, skuIdsRaw) {
+  const groups = Array.isArray(origin == null ? void 0 : origin.variant_group) ? origin.variant_group : [];
+  const parts = [];
+  const segments = String(skuIdsRaw || "").split("_").map((s) => s.trim()).filter(Boolean);
+  for (const seg of segments) {
+    const colonIdx = seg.indexOf(":");
+    if (colonIdx <= 0) continue;
+    const groupId = Number(seg.slice(0, colonIdx));
+    const itemId = Number(seg.slice(colonIdx + 1));
+    if (Number.isNaN(groupId) || Number.isNaN(itemId)) continue;
+    const vg = findVariantGroupById(groups, groupId);
+    if (!vg) continue;
+    const groupName = String((vg == null ? void 0 : vg.name) ?? "").trim();
+    const itemName = findVariantItemDisplayName(vg, itemId);
+    if (groupName && itemName) parts.push(`${groupName}: ${itemName}`);
+    else if (itemName) parts.push(itemName);
+    else if (groupName) parts.push(groupName);
+  }
+  return parts.join(", ");
+}
+function fallbackVariantLabelFromTitles(origin, variantRow) {
+  const groups = Array.isArray(origin == null ? void 0 : origin.variant_group) ? origin.variant_group : [];
+  const nameObj = (variantRow == null ? void 0 : variantRow.name) || (variantRow == null ? void 0 : variantRow.title);
+  if (!nameObj || typeof nameObj !== "object") return "";
+  const parts = [];
+  for (const g of groups) {
+    const pid = g == null ? void 0 : g.position_id;
+    if (pid == null) continue;
+    const val = nameObj[String(pid)] ?? nameObj[pid];
+    if (val == null || val === "") continue;
+    const groupName = String((g == null ? void 0 : g.name) ?? "").trim();
+    const itemLabel = String(val).trim();
+    if (groupName && itemLabel) parts.push(`${groupName}: ${itemLabel}`);
+    else if (itemLabel) parts.push(itemLabel);
+  }
+  if (parts.length) return parts.join(", ");
+  const vals = Object.values(nameObj).filter(
+    (v) => v != null && String(v).trim() !== ""
+  );
+  return vals.map((v) => String(v).trim()).join(" / ");
+}
+function getVariantProductOptionString(product) {
+  const variantId = product == null ? void 0 : product.product_variant_id;
+  if (variantId == null || variantId === "" || Number(variantId) <= 0) return "";
+  const origin = getProductOriginRich(product);
+  const variants = Array.isArray(origin == null ? void 0 : origin.variant) ? origin.variant : [];
+  const matched = variants.find((v) => Number(v == null ? void 0 : v.id) === Number(variantId));
+  if (!matched) return "";
+  const skuIds = matched == null ? void 0 : matched.sku_ids;
+  if (skuIds != null && String(skuIds).trim() !== "") {
+    const fromSku = buildVariantStringFromSkuIds(origin, String(skuIds));
+    if (fromSku) return fromSku;
+  }
+  return fallbackVariantLabelFromTitles(origin, matched);
+}
 function normalizeBundles(product) {
   var _a;
   const callbackData = ((_a = product == null ? void 0 : product._origin) == null ? void 0 : _a.callbackData) || {};
@@ -112,17 +182,22 @@ function toShoppingCartProducts(params) {
   const { orderProducts, amountSymbol = "$" } = params;
   if (!Array.isArray(orderProducts)) return [];
   return orderProducts.map((productItem, index) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d;
     const productNum = toSafeNum(productItem == null ? void 0 : productItem.num);
     const unitPrice = getUnitPrice(productItem);
-    const rowKey = ((_b = (_a = productItem == null ? void 0 : productItem._origin) == null ? void 0 : _a.callbackData) == null ? void 0 : _b.rowKey) || ((_d = (_c = productItem == null ? void 0 : productItem._origin) == null ? void 0 : _c.callbackData) == null ? void 0 : _d.key) || ((_f = (_e = productItem == null ? void 0 : productItem._origin) == null ? void 0 : _e.callbackData) == null ? void 0 : _f.unique) || (productItem == null ? void 0 : productItem.identity_key) || `${productItem.product_id ?? "p"}_${productItem.product_variant_id}_${index}`;
+    const callbackData = ((_a = productItem == null ? void 0 : productItem._origin) == null ? void 0 : _a.callbackData) || {};
+    const identityKey = typeof (productItem == null ? void 0 : productItem.identity_key) === "string" && productItem.identity_key.length > 0 ? productItem.identity_key : void 0;
+    const rowKey = identityKey ?? `${productItem.product_id ?? "p"}_${productItem.product_variant_id}_${index}`;
+    const fromCallbackOptionString = typeof (callbackData == null ? void 0 : callbackData.product_option_string) === "string" ? callbackData.product_option_string.trim() : "";
+    const productOptionString = fromCallbackOptionString || getVariantProductOptionString(productItem) || void 0;
     const base = {
       _id: rowKey,
       rowKey,
-      identity_key: (productItem == null ? void 0 : productItem.identity_key) || void 0,
+      identity_key: identityKey,
       id: productItem.product_id,
       product_id: productItem.product_id,
       product_variant_id: productItem.product_variant_id,
+      note: (productItem == null ? void 0 : productItem.note) != null ? String(productItem.note) : "",
       name: getDisplayName(productItem),
       image: getDisplayImage(productItem),
       num: productNum,
@@ -133,9 +208,16 @@ function toShoppingCartProducts(params) {
       options: normalizeOptions(productItem),
       bundle: normalizeBundles(productItem),
       _origin: productItem == null ? void 0 : productItem._origin,
-      isNormalProduct: true
+      isNormalProduct: true,
+      ...productOptionString ? { product_option_string: productOptionString } : {}
     };
-    if ((_g = productItem == null ? void 0 : productItem.metadata) == null ? void 0 : _g.venue_booking) {
+    if (Array.isArray(productItem.product_option_item) && productItem.product_option_item.length) {
+      base.product_option_item = productItem.product_option_item;
+    }
+    if (Array.isArray(productItem.product_bundle) && productItem.product_bundle.length) {
+      base.product_bundle = productItem.product_bundle;
+    }
+    if ((_b = productItem == null ? void 0 : productItem.metadata) == null ? void 0 : _b.venue_booking) {
       const origin = productItem._origin || {};
       const meta = productItem.metadata || {};
       const startDate = origin.start_date;
@@ -148,7 +230,7 @@ function toShoppingCartProducts(params) {
       base.end_time = endTime || "";
       base.duration_type = origin.sub_type || "minutes";
       base.resource_id = meta.resource_id;
-      base.relation_form_name = meta.resource_name || ((_i = (_h = origin.resources) == null ? void 0 : _h[0]) == null ? void 0 : _i.main_field) || "";
+      base.relation_form_name = meta.resource_name || ((_d = (_c = origin.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.main_field) || "";
       if (Array.isArray(origin.resources)) base.resources = origin.resources;
     }
     return base;

package/lib/components/scanOrder/utils/transformProductDetail.js

@@ -66,6 +66,12 @@ function normalizeBundleItems(bundleItems) {
     };
   });
 }
+function findVariantById(origin, variantId) {
+  if (!origin || !variantId || variantId <= 0) return null;
+  const variants = Array.isArray(origin == null ? void 0 : origin.variant) ? origin.variant : [];
+  const matched = variants.find((v) => Number(v == null ? void 0 : v.id) === variantId);
+  return matched || null;
+}
 function transformProductDetailToOrderProduct(params) {
   var _a;
   const { payload, fallbackProductId = null, sourceItem = {} } = params;
@@ -79,17 +85,18 @@ function transformProductDetailToOrderProduct(params) {
     0
   );
   const callbackOrigin = (payload == null ? void 0 : payload.origin) || ((_a = payload == null ? void 0 : payload._origin) == null ? void 0 : _a.sourceItem) || (payload == null ? void 0 : payload._origin) || {};
+  const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceItem, productVariantId);
   const sellingPrice = toPriceString(
-    (payload == null ? void 0 : payload.price) ?? (payload == null ? void 0 : payload.selling_price) ?? (callbackOrigin == null ? void 0 : callbackOrigin.price) ?? (sourceItem == null ? void 0 : sourceItem.price) ?? (sourceItem == null ? void 0 : sourceItem.selling_price) ?? (sourceItem == null ? void 0 : sourceItem.base_price),
+    (payload == null ? void 0 : payload.price) ?? (payload == null ? void 0 : payload.selling_price) ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (callbackOrigin == null ? void 0 : callbackOrigin.price) ?? (sourceItem == null ? void 0 : sourceItem.price) ?? (sourceItem == null ? void 0 : sourceItem.selling_price) ?? (sourceItem == null ? void 0 : sourceItem.base_price),
     "0.00"
   );
   const originalPrice = sellingPrice;
   const taxFee = toPriceString(
-    (payload == null ? void 0 : payload.tax_fee) ?? (callbackOrigin == null ? void 0 : callbackOrigin.tax_fee) ?? (sourceItem == null ? void 0 : sourceItem.tax_fee),
+    (payload == null ? void 0 : payload.tax_fee) ?? (matchedVariant == null ? void 0 : matchedVariant.tax_fee) ?? (callbackOrigin == null ? void 0 : callbackOrigin.tax_fee) ?? (sourceItem == null ? void 0 : sourceItem.tax_fee),
     "0.00"
   );
   const isChargeTax = toNumber(
-    (payload == null ? void 0 : payload.is_charge_tax) ?? (callbackOrigin == null ? void 0 : callbackOrigin.is_charge_tax) ?? (sourceItem == null ? void 0 : sourceItem.is_charge_tax),
+    (payload == null ? void 0 : payload.is_charge_tax) ?? (matchedVariant == null ? void 0 : matchedVariant.is_charge_tax) ?? (callbackOrigin == null ? void 0 : callbackOrigin.is_charge_tax) ?? (sourceItem == null ? void 0 : sourceItem.is_charge_tax),
     0
   );
   return {

package/lib/components/shoppingCart/hooks/useAddService.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useAddService: (id?: number, type?: string) => JSX.Element | null;
 export default useAddService;

package/lib/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (key?: number | undefined) => JSX.Element;
 export default useClearCart;

package/lib/components/venueBooking/components/Addons/index.js

@@ -93,11 +93,12 @@ function Addons() {
     }
   };
   const removeOrderProduct = async (params) => {
-    const { product_id, product_variant_id, sourceData } = params;
+    const { product_id, product_variant_id, identity_key, sourceData } = params;
     try {
       await runModuleAction("removeProductFromOrder", {
         product_id,
-        product_variant_id
+        product_variant_id,
+        ...identity_key ? { identity_key } : {}
       });
       await refreshViewModel();
     } catch (error) {
@@ -105,16 +106,18 @@ function Addons() {
         error,
         sourceData,
         product_id,
-        product_variant_id
+        product_variant_id,
+        identity_key
       });
     }
   };
   const updateOrderProduct = async (params) => {
-    const { product_id, product_variant_id, updates, sourceData } = params;
+    const { product_id, product_variant_id, identity_key, updates, sourceData } = params;
     try {
       await runModuleAction("updateProductInOrder", {
         product_id,
         product_variant_id,
+        ...identity_key ? { identity_key } : {},
         updates
       });
       await refreshViewModel();
@@ -124,6 +127,7 @@ function Addons() {
         sourceData,
         product_id,
         product_variant_id,
+        identity_key,
         updates
       });
     }
@@ -158,18 +162,20 @@ function Addons() {
         return;
       }
       const normalizedQuantity = Number.isNaN(nextQuantity) ? 0 : Math.max(0, Math.floor(nextQuantity));
+      const cartItems = Array.isArray(viewModel == null ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
+      const existedCartItem = cartItems.find((cartItem) => {
+        return String((cartItem == null ? void 0 : cartItem.product_id) ?? null) === String((orderProduct == null ? void 0 : orderProduct.product_id) ?? null) && Number((cartItem == null ? void 0 : cartItem.product_variant_id) ?? 0) === productVariantId;
+      });
+      const existedIdentityKey = typeof (existedCartItem == null ? void 0 : existedCartItem.identity_key) === "string" && existedCartItem.identity_key.length > 0 ? existedCartItem.identity_key : void 0;
       if (normalizedQuantity <= 0) {
         await removeOrderProduct({
           product_id: (orderProduct == null ? void 0 : orderProduct.product_id) ?? null,
           product_variant_id: productVariantId,
+          identity_key: existedIdentityKey,
           sourceData: quantityData
         });
         return;
       }
-      const cartItems = Array.isArray(viewModel == null ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
-      const existedCartItem = cartItems.find((cartItem) => {
-        return String((cartItem == null ? void 0 : cartItem.product_id) ?? null) === String((orderProduct == null ? void 0 : orderProduct.product_id) ?? null) && Number((cartItem == null ? void 0 : cartItem.product_variant_id) ?? 0) === productVariantId;
-      });
       if (!existedCartItem) {
         await addOrderProduct({
           orderProduct: { ...orderProduct, num: normalizedQuantity },
@@ -180,6 +186,7 @@ function Addons() {
       await updateOrderProduct({
         product_id: (orderProduct == null ? void 0 : orderProduct.product_id) ?? null,
         product_variant_id: productVariantId,
+        identity_key: existedIdentityKey,
         updates: {
           num: normalizedQuantity,
           _origin: orderProduct == null ? void 0 : orderProduct._origin

package/lib/components/venueBooking/components/Cart/index.js

@@ -139,7 +139,7 @@ function Cart(props) {
   const isVenueBookingCartItem = (target) => {
     if (!target || typeof target !== "object") return false;
     if ((target == null ? void 0 : target.start_date) && (target == null ? void 0 : target.end_date)) return true;
-    const identity = String((target == null ? void 0 : target.identity_key) || (target == null ? void 0 : target.rowKey) || (target == null ? void 0 : target._id) || "");
+    const identity = String((target == null ? void 0 : target.identity_key) || "");
     if (identity.startsWith("venue:")) return true;
     return false;
   };
@@ -157,8 +157,14 @@ function Cart(props) {
     }
     const productId = (targetItem == null ? void 0 : targetItem.product_id) ?? (targetItem == null ? void 0 : targetItem.id) ?? null;
     const productVariantId = Number((targetItem == null ? void 0 : targetItem.product_variant_id) ?? 0);
-    const identityKey = (targetItem == null ? void 0 : targetItem.identity_key) || (targetItem == null ? void 0 : targetItem.rowKey) || void 0;
+    const identityKey = targetItem == null ? void 0 : targetItem.identity_key;
     if (productId === null && Number.isNaN(productVariantId)) return;
+    if (typeof identityKey !== "string" || identityKey.length === 0) {
+      console.error("[venueBooking] removeProductFromOrder skipped: missing identity_key", {
+        item: targetItem
+      });
+      return;
+    }
     try {
       await runModuleAction("removeProductFromOrder", {
         product_id: productId,

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/lib/plus/orderList/components/HandleActions.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const HandleActions: (props: {
     locales: any;
     __id?: string;

package/lib/plus/orderList/components/QuickFilter.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const QuickFilter: (props: {
     locales: any;
 }) => JSX.Element;

package/lib/plus/orderList/components/Reset.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Reset: (props: {
     locales: any;
     setValueType: (value: any) => void;