@pisell/private-materials 6.3.139 → 6.3.140

package/lib/components/scanOrder/components/Menu/index.js

@@ -37,12 +37,11 @@ var import_productSelect = __toESM(require("../../../../plus/productSelect"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_context = require("../../context");
 var import_utils = require("@pisell/utils");
-var import_antd = require("antd");
 var import_materials = require("@pisell/materials");
 var import_transformProductDetail = require("../../utils/transformProductDetail");
 function Menu(props) {
   var _a;
-  const { onCheckout } = props;
+  const { onCheckout, productList, onEnsureProductList } = props;
   const context = (0, import_useEngineContext.default)();
   const { utils } = context.appHelper || {};
   const {
@@ -51,34 +50,18 @@ function Menu(props) {
     viewModel
   } = (0, import_context.useScanOrderContext)();
   const [dineInConfig, setDineInConfig] = (0, import_react.useState)(null);
-  const getConfig = async () => {
+  const getConfig = (0, import_react.useCallback)(async () => {
     const otherParams = await runModuleAction("getOtherParams");
     console.log("otherParams >>>>> ", otherParams);
     const dineInConfig2 = (otherParams == null ? void 0 : otherParams.dineInConfig) ?? {};
     setDineInConfig(dineInConfig2);
-  };
-  getConfig();
-  const [productList, setProductList] = (0, import_react.useState)([]);
+  }, [runModuleAction]);
   (0, import_react.useEffect)(() => {
-    const fetchProductList = async () => {
-      const res = await runModuleAction("getProductList");
-      console.log("getProductList >>>>> ", res);
-      if (Array.isArray(res)) {
-        setProductList(res);
-      } else {
-        import_antd.Modal.confirm({
-          title: res.message,
-          okText: String(import_utils.locales.getText("pisell2.event.confirm") || "OK"),
-          cancelButtonProps: { style: { display: "none" } },
-          maskClosable: false,
-          onOk: () => {
-            location.replace("/");
-          }
-        });
-      }
-    };
-    fetchProductList();
+    getConfig();
   }, []);
+  (0, import_react.useEffect)(() => {
+    void onEnsureProductList();
+  }, [onEnsureProductList]);
   const scrollRef = (0, import_react.useRef)(null);
   const isMobileView = (0, import_utils.isMobile)();
   const height = window.innerHeight - 100;
@@ -96,11 +79,12 @@ function Menu(props) {
     }
   };
   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) {
@@ -108,16 +92,18 @@ function Menu(props) {
         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();
@@ -127,6 +113,7 @@ function Menu(props) {
         sourceData,
         product_id,
         product_variant_id,
+        identity_key,
         updates
       });
     }
@@ -162,18 +149,20 @@ function Menu(props) {
         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: {
@@ -187,6 +176,7 @@ function Menu(props) {
       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
@@ -198,7 +188,7 @@ function Menu(props) {
         type: "pisell1.productDetail",
         data: {
           detail: { ...sourceItem, open_deposit: 1 },
-          setting: { can_input: true, item_max_length: 1, is_detail_open: true }
+          setting: { can_input: true, item_max_length: 1, is_detail_open: false }
         },
         callback: async (data) => {
           if (data == null ? void 0 : data.isCancel) return;
@@ -248,8 +238,5 @@ function Menu(props) {
       cartElementId: "#scan-order-v2-cart-btn"
     }
   );
-  if (isMobileView) {
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-menu pisell-scan-menu-mobile" }, productSelectNode);
-  }
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-menu" }, /* @__PURE__ */ import_react.default.createElement(import_materials.PisellScrollView, { height, overflow: "y", ref: scrollRef }, productSelectNode));
 }

package/lib/components/scanOrder/components/Voucher/index.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import '../../../booking/components/voucher/index.less';
+import '../../../appointmentBooking/components/Voucher/index.less';
+/**
+ * VoucherCard -- 优惠券/Promotion 区块
+ * 嵌入购物车底部，提供券列表展示、勾选、扫码兑码、未登录引导等能力
+ */
+export default function VoucherCard(): JSX.Element;

package/lib/components/scanOrder/components/Voucher/index.js

@@ -0,0 +1,162 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/scanOrder/components/Voucher/index.tsx
+var Voucher_exports = {};
+__export(Voucher_exports, {
+  default: () => VoucherCard
+});
+module.exports = __toCommonJS(Voucher_exports);
+var import_react = __toESM(require("react"));
+var import_ChevronDown = __toESM(require("@pisell/icon/es/ChevronDown"));
+var import_UserCircle = __toESM(require("@pisell/icon/es/UserCircle"));
+var import_classnames = __toESM(require("classnames"));
+var import_antd = require("antd");
+var import_utils = require("@pisell/utils");
+var import_materials = require("@pisell/materials");
+var import_context = require("../../context");
+var import_hooks = require("../../hooks");
+var import_voucher = require("../../../booking/components/voucher/index.less");
+var import_Voucher = require("../../../appointmentBooking/components/Voucher/index.less");
+function VoucherCard() {
+  const {
+    discountList,
+    runModuleAction,
+    refreshViewModel,
+    scanOrderModule
+  } = (0, import_context.useScanOrderContext)();
+  const { isLogin, openLoginModal } = (0, import_hooks.useScanOrderLogin)();
+  const [showDetail, setShowDetail] = (0, import_react.useState)(true);
+  const [code, setCode] = (0, import_react.useState)("");
+  const availableData = (0, import_react.useMemo)(() => {
+    return (discountList || []).filter((item) => !!item.isAvailable).map((discount) => ({
+      ...discount,
+      isDisabled: discount.isDisabled || discount.isDisabledForProductUsed
+    }));
+  }, [discountList]);
+  const syncAfterDiscountChange = (0, import_react.useCallback)(async () => {
+    await refreshViewModel();
+  }, [refreshViewModel]);
+  const onScanCode = (0, import_react.useCallback)(async () => {
+    var _a;
+    if (!code.trim()) return;
+    try {
+      const tempOrder = (_a = scanOrderModule == null ? void 0 : scanOrderModule.getTempOrder) == null ? void 0 : _a.call(scanOrderModule);
+      const customerId = (tempOrder == null ? void 0 : tempOrder.customer_id) || void 0;
+      const result = await runModuleAction("scanCode", code, customerId);
+      if (result == null ? void 0 : result.isAvailable) {
+        setCode("");
+        await syncAfterDiscountChange();
+      } else {
+        const content = {
+          time_limit: import_utils.locales.getText("pisell2.text.goodpass.code-invalid-expired")
+        };
+        import_antd.message.error({
+          content: String(
+            (result == null ? void 0 : result.type) === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : content[result == null ? void 0 : result.unavailableReason] || import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
+          )
+        });
+      }
+    } catch (error) {
+      console.warn("[scanOrder] scanCode failed", error);
+      import_antd.message.error({
+        content: String(
+          import_utils.locales.getText("pisell2.text.goodpass.code-invalid") || "兑换码无效"
+        )
+      });
+    }
+  }, [code, scanOrderModule, runModuleAction, syncAfterDiscountChange]);
+  const onDiscountChange = (0, import_react.useCallback)(
+    async (val) => {
+      try {
+        await runModuleAction("setDiscountSelected", {
+          discountId: val.id,
+          isSelected: val.isSelected
+        });
+        await syncAfterDiscountChange();
+      } catch (error) {
+        console.warn("[scanOrder] setDiscountSelected failed", error);
+      }
+    },
+    [runModuleAction, syncAfterDiscountChange]
+  );
+  const mixedSort = (0, import_react.useCallback)((val) => {
+    return [...val].sort((a, b) => Number(b == null ? void 0 : b.isSelected) - Number(a == null ? void 0 : a.isSelected));
+  }, []);
+  const renderLoginCard = () => {
+    if (isLogin) return null;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "login-card" }, /* @__PURE__ */ import_react.default.createElement(import_UserCircle.default, { style: { fontSize: 28 } }), /* @__PURE__ */ import_react.default.createElement("div", { className: "text-wrapper", style: { maxWidth: "none" } }, /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellText,
+      {
+        className: "login-btn",
+        onClick: () => {
+          openLoginModal({
+            callback: () => {
+            }
+          });
+        }
+      },
+      import_utils.locales.getText("pisell2.text.goodpass.login")
+    ), " ", /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.text.goodpass.login-tip"))));
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__appointment-booking-voucher-container", style: { marginTop: "10px" } }, /* @__PURE__ */ import_react.default.createElement("div", { className: "voucher-title" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "voucher-title-left" }, import_utils.locales.getText("pisell2.text.goodpass")), /* @__PURE__ */ import_react.default.createElement(
+    "span",
+    {
+      className: "voucher-title-right",
+      onClick: () => setShowDetail(!showDetail)
+    },
+    import_utils.locales.getText("pisell2.text.details"),
+    " ",
+    /* @__PURE__ */ import_react.default.createElement(
+      import_ChevronDown.default,
+      {
+        className: (0, import_classnames.default)("voucher-right-icon", { show: showDetail })
+      }
+    )
+  )), /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("voucher-detail", { show: showDetail }) }, availableData.length > 0 ? /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellGoodPassCard,
+    {
+      style: { width: "100%" },
+      dataSource: availableData,
+      mixedSort,
+      onChange: onDiscountChange
+    }
+  ) : null, renderLoginCard(), /* @__PURE__ */ import_react.default.createElement("div", { className: "voucher-code-input-wrapper" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "voucher-code-input" }, /* @__PURE__ */ import_react.default.createElement("div", { style: { whiteSpace: "nowrap" } }, import_utils.locales.getText("pisell2.text.goodpass.code"), ":"), /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellInput,
+    {
+      value: code,
+      allowClear: true,
+      onChange: (e) => {
+        var _a;
+        return setCode(((_a = e.target) == null ? void 0 : _a.value) || "");
+      },
+      size: "small",
+      placeholder: import_utils.locales.getText("pisell2.text.goodpass.enter-code")
+    }
+  )), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { size: "small", onClick: onScanCode, disabled: !code.trim() }, import_utils.locales.getText("pisell2.text.apply")))));
+}

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;