@pisell/private-materials 6.3.175 → 6.3.177

package/es/components/scanOrder/locales.js

@@ -30,6 +30,21 @@ export default {
     '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.scan.order.multiple.orders.tip': 'There are multiple active orders for this table. Please contact staff for add-on orders.',
+    'pisell2.scan.order.multiple.orders.confirm': 'I Got It',
+    'pisell2.scan.order.settled.cannot.add.tip': 'This order has already been settled and you cannot add more items. Please scan again to create a new order or contact staff.',
+    'pisell2.scan.order.inventory.insufficient.title': 'Insufficient inventory',
+    'pisell2.scan.order.inventory.insufficient.description': 'The following items are out of stock or do not have enough inventory. Please adjust your cart and try again.',
+    'pisell2.scan.order.inventory.insufficient.products.label': 'Unavailable products:',
+    'pisell2.scan.order.add.on.confirm.title': 'This table has already started ordering',
+    'pisell2.scan.order.add.on.confirm.description': 'Someone at your table has placed the order. This will be submitted as an add-on order.',
+    'pisell2.scan.order.add.on.confirm.button': 'Confirm Add-on Order',
+    'pisell2.scan.order.add.on.return.button': 'Return to Cart',
+    'pisell2.scan.order.add.on.unavailable.title': 'Add-on ordering is not available',
+    'pisell2.scan.order.add.on.unavailable.description': 'You can’t add items to this order from your phone right now.\nPlease ask a staff member for help.',
+    'pisell2.scan.order.add.on.unavailable.confirm': 'Got it',
+    'pisell2.scan.order.add.on.login.required.title': 'Notice',
+    'pisell2.scan.order.add.on.login.required': 'Please login before placing an add-on order.',
     'pisell2.text.goodpass': 'Promotion',
     'pisell2.text.goodpass.product-vouchers': 'Product Vouchers',
     'pisell2.text.goodpass.view-more': 'View More',
@@ -79,6 +94,21 @@ export default {
     'pisell2.scan.order.products.empty.tip': '请选择商品',
     'pisell2.scan.order.check.cart.empty.tip': '请返回添加商品',
     'pisell2.scan.order.submit.disabled.default': '当前暂不可下单',
+    'pisell2.scan.order.multiple.orders.tip': '当前桌台存在多个进行中的订单，请联系店员处理加餐。',
+    'pisell2.scan.order.multiple.orders.confirm': '我知道了',
+    'pisell2.scan.order.settled.cannot.add.tip': '当前订单已结账，无法继续加餐。请重新扫码创建新订单或联系店员。',
+    'pisell2.scan.order.inventory.insufficient.title': '库存不足',
+    'pisell2.scan.order.inventory.insufficient.description': '以下商品库存不足或已售罄，请调整购物车后重新提交。',
+    'pisell2.scan.order.inventory.insufficient.products.label': '异常商品：',
+    'pisell2.scan.order.add.on.confirm.title': '本桌已开始点餐',
+    'pisell2.scan.order.add.on.confirm.description': '同行顾客已提交订单。本次将作为加餐提交，请确认后继续。',
+    'pisell2.scan.order.add.on.confirm.button': '确认加餐',
+    'pisell2.scan.order.add.on.return.button': '返回购物车',
+    'pisell2.scan.order.add.on.unavailable.title': '暂不支持加餐',
+    'pisell2.scan.order.add.on.unavailable.description': '当前无法通过手机为此订单加餐。\n如需加餐，请联系工作人员。',
+    'pisell2.scan.order.add.on.unavailable.confirm': '我知道了',
+    'pisell2.scan.order.add.on.login.required.title': '提示',
+    'pisell2.scan.order.add.on.login.required': '需要登录后才能加餐',
     'pisell2.text.goodpass': '促销',
     'pisell2.text.goodpass.product-vouchers': '商品兑换券',
     'pisell2.text.goodpass.view-more': '查看更多',
@@ -128,6 +158,21 @@ export default {
     'pisell2.scan.order.products.empty.tip': '請選擇商品',
     'pisell2.scan.order.check.cart.empty.tip': '請返回添加商品',
     'pisell2.scan.order.submit.disabled.default': '當前暫不可下單',
+    'pisell2.scan.order.multiple.orders.tip': '當前桌台存在多個進行中的訂單，請聯繫店員處理加餐。',
+    'pisell2.scan.order.multiple.orders.confirm': '我知道了',
+    'pisell2.scan.order.settled.cannot.add.tip': '當前訂單已結賬，無法繼續加餐。請重新掃碼創建新訂單或聯繫店員。',
+    'pisell2.scan.order.inventory.insufficient.title': '庫存不足',
+    'pisell2.scan.order.inventory.insufficient.description': '以下商品庫存不足或已售罄，請調整購物車後重新提交。',
+    'pisell2.scan.order.inventory.insufficient.products.label': '異常商品：',
+    'pisell2.scan.order.add.on.confirm.title': '本桌已開始點餐',
+    'pisell2.scan.order.add.on.confirm.description': '同行顧客已提交訂單。本次將作為加餐提交，請確認後繼續。',
+    'pisell2.scan.order.add.on.confirm.button': '確認加餐',
+    'pisell2.scan.order.add.on.return.button': '返回購物車',
+    'pisell2.scan.order.add.on.unavailable.title': '暫不支援加餐',
+    'pisell2.scan.order.add.on.unavailable.description': '目前無法透過手機為此訂單加餐。\n如需加餐，請聯絡工作人員。',
+    'pisell2.scan.order.add.on.unavailable.confirm': '我知道了',
+    'pisell2.scan.order.add.on.login.required.title': '提示',
+    'pisell2.scan.order.add.on.login.required': '需要登錄後才能加餐',
     'pisell2.text.goodpass': '促銷',
     'pisell2.text.goodpass.product-vouchers': '商品兌換券',
     'pisell2.text.goodpass.view-more': '查看更多',
@@ -177,6 +222,21 @@ export default {
     'pisell2.scan.order.products.empty.tip': '商品を選択してください',
     'pisell2.scan.order.check.cart.empty.tip': '商品を追加するには、前の画面に戻ってください',
     'pisell2.scan.order.submit.disabled.default': '現在、注文を送信できません。',
+    'pisell2.scan.order.multiple.orders.tip': '現在のテーブルには進行中の注文が複数あります。追加注文についてはスタッフにお問い合わせください。',
+    'pisell2.scan.order.multiple.orders.confirm': '了解しました',
+    'pisell2.scan.order.settled.cannot.add.tip': '現在の注文はすでに会計済みのため、追加注文できません。再度QRコードをスキャンして新しい注文を作成するか、スタッフにお問い合わせください。',
+    'pisell2.scan.order.inventory.insufficient.title': '在庫が不足しています',
+    'pisell2.scan.order.inventory.insufficient.description': '以下の商品は在庫切れ、または在庫が不足しています。カートを調整してからもう一度送信してください。',
+    'pisell2.scan.order.inventory.insufficient.products.label': '対象商品:',
+    'pisell2.scan.order.add.on.confirm.title': 'このテーブルではすでに注文が開始されています',
+    'pisell2.scan.order.add.on.confirm.description': '同席のお客様がすでに注文を送信しました。今回は追加注文として送信されます。確認して続行してください。',
+    'pisell2.scan.order.add.on.confirm.button': '追加注文を確認',
+    'pisell2.scan.order.add.on.return.button': 'カートに戻る',
+    'pisell2.scan.order.add.on.unavailable.title': '追加注文は現在ご利用いただけません',
+    'pisell2.scan.order.add.on.unavailable.description': '現在、スマートフォンからこの注文に商品を追加することはできません。\n追加注文をご希望の場合は、スタッフにお声がけください。',
+    'pisell2.scan.order.add.on.unavailable.confirm': '了解しました',
+    'pisell2.scan.order.add.on.login.required.title': 'お知らせ',
+    'pisell2.scan.order.add.on.login.required': '追加注文を行うにはログインが必要です。',
     'pisell2.text.goodpass': 'プロモーション',
     'pisell2.text.goodpass.product-vouchers': '商品バウチャー',
     'pisell2.text.goodpass.view-more': 'もっと見る',
@@ -226,6 +286,21 @@ export default {
     '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.scan.order.multiple.orders.tip': 'Há vários pedidos ativos nesta mesa. Entre em contato com a equipe para adicionar itens.',
+    'pisell2.scan.order.multiple.orders.confirm': 'Entendi',
+    'pisell2.scan.order.settled.cannot.add.tip': 'Este pedido já foi finalizado e não é possível adicionar mais itens. Escaneie novamente para criar um novo pedido ou entre em contato com a equipe.',
+    'pisell2.scan.order.inventory.insufficient.title': 'Estoque insuficiente',
+    'pisell2.scan.order.inventory.insufficient.description': 'Os seguintes itens estão sem estoque ou não têm estoque suficiente. Ajuste o carrinho e tente novamente.',
+    'pisell2.scan.order.inventory.insufficient.products.label': 'Produtos indisponíveis:',
+    'pisell2.scan.order.add.on.confirm.title': 'Esta mesa já começou a fazer o pedido',
+    'pisell2.scan.order.add.on.confirm.description': 'Alguém na sua mesa já enviou o pedido. Este será enviado como um pedido adicional.',
+    'pisell2.scan.order.add.on.confirm.button': 'Confirmar pedido adicional',
+    'pisell2.scan.order.add.on.return.button': 'Voltar ao carrinho',
+    'pisell2.scan.order.add.on.unavailable.title': 'Pedidos adicionais não estão disponíveis',
+    'pisell2.scan.order.add.on.unavailable.description': 'No momento, você não pode adicionar itens a este pedido pelo celular.\nPeça ajuda a um membro da equipe.',
+    'pisell2.scan.order.add.on.unavailable.confirm': 'Entendi',
+    'pisell2.scan.order.add.on.login.required.title': 'Aviso',
+    'pisell2.scan.order.add.on.login.required': 'Faça login antes de fazer um pedido adicional.',
     'pisell2.text.goodpass': 'Promoção',
     'pisell2.text.goodpass.product-vouchers': 'Vales de Produto',
     'pisell2.text.goodpass.view-more': 'Ver Mais',

package/es/components/venueBooking/components/Voucher/index.js

@@ -189,7 +189,12 @@ export default function VoucherCard() {
       className: "login-btn",
       onClick: function onClick() {
         openLoginModal({
-          callback: function callback() {}
+          callback: function callback(status) {
+            if (status !== 'success') return;
+            handleLoginSuccess().then(function () {
+              void syncAfterDiscountChange();
+            });
+          }
         });
       }
     }, locales.getText('pisell2.text.goodpass.login')), ' ', /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.text.goodpass.login-tip'))));

package/es/pro/Login2.0/locales.js

@@ -259,7 +259,7 @@ export default {
     'pisell-register2-complete-title': '注册完成!',
     'pisell-register2-redirecting': '正在重定向到您的帐户...',
     'pisell-login2-continue-with-email': '使用邮箱',
-    'pisell-login2-continue-with-phone': '使用手机',
+    'pisell-login2-continue-with-phone': '使用手机号继续',
     'pisell-login2-email-not-registered': '该邮箱未注册，请先注册',
     'pisell-login2-check-email-failed': '检查邮箱失败，请重试',
     'pisell-login2-continue-failed': '继续失败，请重试',

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

@@ -147,7 +147,7 @@ var VoucherCard = (props) => {
     var _a2, _b2, _c;
     const originBundleProductId = (originBundle == null ? void 0 : originBundle.bundle_product_id) || (originBundle == null ? void 0 : originBundle.bundle_id);
     const bundleProductId = (bundleItem == null ? void 0 : bundleItem._bundle_product_id) || (bundleItem == null ? void 0 : bundleItem.product_id) || ((_a2 = bundleItem == null ? void 0 : bundleItem.originBundleItem) == null ? void 0 : _a2._bundle_product_id) || ((_b2 = bundleItem == null ? void 0 : bundleItem.originBundleItem) == null ? void 0 : _b2.product_id);
-    return String(originBundleProductId || "") === String(bundleProductId || "") || String(((_c = originBundle == null ? void 0 : originBundle.metadata) == null ? void 0 : _c.custom_product_bundle_map_id) || "") === String((bundleItem == null ? void 0 : bundleItem._id) || "");
+    return (String(originBundleProductId || "") === String(bundleProductId || "") || String(((_c = originBundle == null ? void 0 : originBundle.metadata) == null ? void 0 : _c.custom_product_bundle_map_id) || "") === String((bundleItem == null ? void 0 : bundleItem._id) || "")) && (originBundle == null ? void 0 : originBundle.bundle_id) === (bundleItem == null ? void 0 : bundleItem.bundle_id);
   };
   const syncOriginProductBundles = (item) => {
     var _a2, _b2;

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

@@ -43,11 +43,12 @@ var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
 function Check() {
-  const { viewModel, runModuleAction, refreshViewModel, tableName, entryMode, clearStepCache } = (0, import_context.useScanOrderContext)();
+  const { viewModel, runModuleAction, refreshViewModel, tableName, entryMode, clearStepCache, entryContext } = (0, import_context.useScanOrderContext)();
   const isAdditionalOrder = entryMode === "additional_order";
   const [submitting, setSubmitting] = (0, import_react.useState)(false);
   const [note, setNote] = (0, import_react.useState)((viewModel == null ? void 0 : viewModel.note) || "");
   const [pickupRefOpen, setPickupRefOpen] = (0, import_react.useState)(false);
+  const [addOnConfirmOpen, setAddOnConfirmOpen] = (0, import_react.useState)(false);
   const utils = (0, import_hooks.contextUtils)();
   const [dineInConfig, setDineInConfig] = (0, import_react.useState)(null);
   const [channel, setChannel] = (0, import_react.useState)("");
@@ -84,6 +85,30 @@ function Check() {
     () => String(import_utils.locales.getText("pisell2.scan.order.products.title") || "Products"),
     []
   );
+  const addOnConfirmTitle = (0, import_react.useMemo)(
+    () => String(
+      import_utils.locales.getText("pisell2.scan.order.add.on.confirm.title") || "This table has already started ordering"
+    ),
+    []
+  );
+  const addOnConfirmDescription = (0, import_react.useMemo)(
+    () => String(
+      import_utils.locales.getText("pisell2.scan.order.add.on.confirm.description") || "Someone at your table has placed the order. This will be submitted as an add-on order."
+    ),
+    []
+  );
+  const addOnConfirmButtonText = (0, import_react.useMemo)(
+    () => String(
+      import_utils.locales.getText("pisell2.scan.order.add.on.confirm.button") || "Confirm Add-on Order"
+    ),
+    []
+  );
+  const addOnReturnButtonText = (0, import_react.useMemo)(
+    () => String(
+      import_utils.locales.getText("pisell2.scan.order.add.on.return.button") || "Return to Cart"
+    ),
+    []
+  );
   const showCheckStepEmptyCartTip = () => {
     import_antd.message.error(import_utils.locales.getText("pisell2.scan.order.check.cart.empty.tip") || "Please go back to add products");
   };
@@ -91,6 +116,28 @@ function Check() {
     const content = String(tip || import_utils.locales.getText("pisell2.scan.order.submit.failed") || "Submit order failed");
     (0, import_materials.PisellToast)({ content });
   }, []);
+  const showInventoryInsufficientModal = (0, import_react.useCallback)((error) => {
+    var _a;
+    setSubmitting(false);
+    const unavailableProducts = Array.isArray((_a = error == null ? void 0 : error.data) == null ? void 0 : _a.unavailable_products) ? error.data.unavailable_products : [];
+    const productNames = unavailableProducts.map((product) => String((product == null ? void 0 : product.title) || (product == null ? void 0 : product.product_id) || "").trim()).filter(Boolean);
+    const title = String(
+      import_utils.locales.getText("pisell2.scan.order.inventory.insufficient.title") || "Insufficient inventory"
+    );
+    const description = String(
+      import_utils.locales.getText("pisell2.scan.order.inventory.insufficient.description") || "The following items are out of stock or do not have enough inventory. Please adjust your cart and try again."
+    );
+    const productsLabel = String(
+      import_utils.locales.getText("pisell2.scan.order.inventory.insufficient.products.label") || "Unavailable products:"
+    );
+    const fallbackMessage = String((error == null ? void 0 : error.message) || description);
+    import_antd.Modal.info({
+      title,
+      content: /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("div", null, description), /* @__PURE__ */ import_react.default.createElement("div", null, productsLabel), productNames.length > 0 ? /* @__PURE__ */ import_react.default.createElement("ul", null, productNames.map((name, index) => /* @__PURE__ */ import_react.default.createElement("li", { key: `${name}-${index}` }, name))) : /* @__PURE__ */ import_react.default.createElement("div", null, fallbackMessage)),
+      okText: String(import_utils.locales.getText("pisell2.event.confirm") || "OK"),
+      maskClosable: false
+    });
+  }, []);
   const doSubmit = async () => {
     var _a, _b, _c, _d, _e;
     const items = (viewModel == null ? void 0 : viewModel.cartItems) || [];
@@ -105,6 +152,10 @@ function Check() {
       const res = await runModuleAction("submitScanOrder");
       console.log("submitScanOrder >>>>> ", res);
       if ((res == null ? void 0 : res.status) === false) {
+        if ((res == null ? void 0 : res.code) === 6008) {
+          showInventoryInsufficientModal(res);
+          return;
+        }
         setSubmitting(false);
         showSubmitFailedTip(res == null ? void 0 : res.message);
         return;
@@ -118,7 +169,8 @@ function Check() {
       clearStepCache();
       const channelMap = {
         "scan_to_order": "table-order",
-        "scan_to_order_2": "mobile_order"
+        "scan_to_order_2": "mobile_order",
+        "scan_to_order_3": "scantoorder3"
       };
       const saleChannel = channelMap[channel] || channel;
       if (shouldPayOnSubmit) {
@@ -161,7 +213,28 @@ function Check() {
       await refreshViewModel();
     } catch (error) {
       console.error("[scanOrder] submitScanOrder failed", error);
-      showSubmitFailedTip(error == null ? void 0 : error.message);
+      if ((error == null ? void 0 : error.code) === 670005) {
+        setSubmitting(false);
+        showSubmitFailedTip(
+          String(import_utils.locales.getText("pisell2.scan.order.settled.cannot.add.tip") || "")
+        );
+      } else if ((error == null ? void 0 : error.code) === 670007 && (entryContext == null ? void 0 : entryContext.resource_id)) {
+        const reservationResourceSelectType = await runModuleAction("getReservationResourceSelectType");
+        const allowAddItems = await runModuleAction("checkAllowAddItems");
+        const res = await runModuleAction("syncAdditionalOrderFromResource", entryContext == null ? void 0 : entryContext.resource_id);
+        if (reservationResourceSelectType.resourceSelectType === "single" && (allowAddItems == null ? void 0 : allowAddItems.enabled) && (res == null ? void 0 : res.matched)) {
+          setSubmitting(false);
+          setAddOnConfirmOpen(true);
+        } else {
+          setSubmitting(false);
+          showSubmitFailedTip(error == null ? void 0 : error.message);
+        }
+      } else if ((error == null ? void 0 : error.code) === 6008) {
+        showInventoryInsufficientModal(error);
+      } else {
+        setSubmitting(false);
+        showSubmitFailedTip(error == null ? void 0 : error.message);
+      }
     } finally {
     }
   };
@@ -209,6 +282,15 @@ function Check() {
     if (submitting) return;
     setPickupRefOpen(false);
   };
+  const handleAddOnConfirm = async () => {
+    if (submitting) return;
+    setAddOnConfirmOpen(false);
+    await doSubmit();
+  };
+  const handleAddOnReturn = () => {
+    if (submitting) return;
+    setAddOnConfirmOpen(false);
+  };
   const noteContent = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check-note" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check-note-title" }, noteTitle), /* @__PURE__ */ import_react.default.createElement(
     import_antd.Input.TextArea,
     {
@@ -243,5 +325,36 @@ function Check() {
       onCancel: handlePickupRefCancel,
       onConfirm: handlePickupRefConfirm
     }
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Modal,
+    {
+      open: addOnConfirmOpen,
+      footer: null,
+      onCancel: handleAddOnReturn,
+      maskClosable: false,
+      destroyOnClose: true,
+      centered: true,
+      className: "pisell-scan-order-add-on-confirm-modal"
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-add-on-confirm-body" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-add-on-confirm-title" }, addOnConfirmTitle), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-add-on-confirm-desc" }, addOnConfirmDescription), /* @__PURE__ */ import_react.default.createElement(
+      import_materials.Button,
+      {
+        type: "primary",
+        block: true,
+        size: "large",
+        loading: submitting,
+        onClick: handleAddOnConfirm
+      },
+      addOnConfirmButtonText
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_materials.Button,
+      {
+        block: true,
+        size: "large",
+        disabled: submitting,
+        onClick: handleAddOnReturn
+      },
+      addOnReturnButtonText
+    ))
   ), submitting ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check-loading-mask" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check-loading-panel" }, /* @__PURE__ */ import_react.default.createElement(import_materials.PisellLoading, { loading: true, mask: { backgroundColor: "transparent", width: 64, height: 64 } }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check-loading-placeholder" })))) : null);
 }

package/lib/components/scanOrder/components/Check/index.less

@@ -80,3 +80,42 @@
   width: 64px;
   height: 64px;
 }
+
+.pisell-scan-order-add-on-confirm-modal {
+  .pisell-lowcode-modal-content {
+    border-radius: 28px;
+  }
+
+  .pisell-lowcode-modal-body {
+    padding: 42px 32px 32px;
+  }
+}
+
+.pisell-scan-order-add-on-confirm-body {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  text-align: center;
+
+  .pisell-lowcode-btn {
+    height: 56px;
+    border-radius: 18px;
+    font-size: 18px;
+    font-weight: 700;
+  }
+}
+
+.pisell-scan-order-add-on-confirm-title {
+  color: #1f2937;
+  font-size: 28px;
+  font-weight: 800;
+  line-height: 1.25;
+}
+
+.pisell-scan-order-add-on-confirm-desc {
+  margin-bottom: 18px;
+  color: #667085;
+  font-size: 20px;
+  font-weight: 400;
+  line-height: 1.35;
+}

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

@@ -95,7 +95,7 @@ function ReadyState() {
     resumeStep,
     consumeResumeStep
   } = (0, import_context.useScanOrderContext)();
-  const { isLogin, openLoginModal } = (0, import_hooks.useScanOrderLogin)();
+  const { openLoginModal } = (0, import_hooks.useScanOrderLogin)();
   const utils = (0, import_hooks.contextUtils)();
   const [FormCard] = (0, import_useComponents.default)({
     components: ["FormCard"]
@@ -154,6 +154,7 @@ function ReadyState() {
   const requestPaxMinRef = (0, import_react.useRef)(1);
   const requestPaxMaxRef = (0, import_react.useRef)(1);
   const tableFormRecordRef = (0, import_react.useRef)(null);
+  const entryLoginPromptedRef = (0, import_react.useRef)(false);
   const entryPaxModalWasPresentedRef = (0, import_react.useRef)(false);
   const getLocalizedName = (nameMap) => {
     if (!nameMap) return "";
@@ -186,6 +187,10 @@ function ReadyState() {
     };
   };
   const app = (_a = utils == null ? void 0 : utils.getApp) == null ? void 0 : _a.call(utils);
+  const getCurrentIsLogin = () => {
+    var _a2, _b2;
+    return Boolean((_b2 = (_a2 = utils == null ? void 0 : utils.token) == null ? void 0 : _a2.get) == null ? void 0 : _b2.call(_a2));
+  };
   const navigateToHome = () => {
     var _a2, _b2;
     if ((_a2 = app == null ? void 0 : app.history) == null ? void 0 : _a2.replace) {
@@ -349,8 +354,7 @@ function ReadyState() {
     return (_b2 = (_a2 = utils == null ? void 0 : utils.request) == null ? void 0 : _a2.get) == null ? void 0 : _b2.call(_a2, `/h5/shop-policy/${id}`, {});
   };
   (0, import_react.useEffect)(() => {
-    const checkResourceAvailable = async () => {
-      var _a2;
+    const runResourceCheck = async () => {
       const hasOrderId = !!(entryContext == null ? void 0 : entryContext.order_id);
       const {
         mode,
@@ -392,39 +396,116 @@ function ReadyState() {
         }
         await runEntryPaxGateThenEnterProduct();
       } else if (isAdditionalOrder) {
-        await enterProductStep();
-      } else if (mode === "submit_disabled") {
-        const tips = resolveLocalizedText(errorTips) || String(import_utils.locales.getText("pisell2.scan.order.submit.disabled.default") || "");
-        setSubmitDisabledTips(tips);
-        await enterProductStep();
-      } else if (mode === "resource_busy") {
-        if (Number(order_id) !== 0) {
-          if (!isLogin) {
+        const allowAddItems = await runModuleAction("checkAllowAddItems");
+        if (!getCurrentIsLogin()) {
+          const openLoginForOrderDetail = () => {
+            var _a2;
             (_a2 = scanOrderModule == null ? void 0 : scanOrderModule.setUIState) == null ? void 0 : _a2.call(scanOrderModule, "pendingStep", currentStep);
             openLoginModal({
-              callback: (status) => {
-                var _a3, _b2;
+              callback: async (status) => {
                 if (status === "success") {
-                  (_a3 = scanOrderModule == null ? void 0 : scanOrderModule.deleteUIState) == null ? void 0 : _a3.call(scanOrderModule, "pendingStep");
-                  handleOrderDetail(order_id);
+                  if (!(entryContext == null ? void 0 : entryContext.order_id) || !allowAddItems.enabled) {
+                    handleOrderDetail(order_id);
+                    return;
+                  }
+                  await runModuleAction("restorePreviousOrderData");
+                  await enterProductStep();
                   return;
                 }
-                (_b2 = scanOrderModule == null ? void 0 : scanOrderModule.deleteUIState) == null ? void 0 : _b2.call(scanOrderModule, "pendingStep");
-                location.replace("/");
+                console.log("status>>>>>>>", status);
+                const loginRequiredModal = import_antd.Modal.info({
+                  title: import_utils.locales.getText(
+                    "pisell2.scan.order.add.on.login.required.title"
+                  ),
+                  content: String(
+                    import_utils.locales.getText(
+                      "pisell2.scan.order.add.on.login.required"
+                    ) || ""
+                  ).trim(),
+                  okText: String(import_utils.locales.getText("pisell2.event.confirm") || "OK"),
+                  maskClosable: false,
+                  onOk: () => {
+                    loginRequiredModal.destroy();
+                    openLoginForOrderDetail();
+                  }
+                });
               }
             });
+          };
+          openLoginForOrderDetail();
+          return;
+        } else {
+          if (!(entryContext == null ? void 0 : entryContext.order_id) || !allowAddItems.enabled) {
+            handleOrderDetail(order_id);
+            return;
+          }
+          await runModuleAction("restorePreviousOrderData");
+          await enterProductStep();
+        }
+      } else if (mode === "submit_disabled") {
+        const tips = resolveLocalizedText(errorTips) || String(import_utils.locales.getText("pisell2.scan.order.submit.disabled.default") || "");
+        setSubmitDisabledTips(tips);
+        await enterProductStep();
+      } else if (mode === "multiple_orders") {
+        import_antd.Modal.info({
+          title: import_utils.locales.getText("pisell2.scan.order.step.error"),
+          content: String(
+            import_utils.locales.getText("pisell2.scan.order.multiple.orders.tip") || ""
+          ).trim(),
+          okText: String(
+            import_utils.locales.getText("pisell2.scan.order.multiple.orders.confirm") || "I Got It"
+          ),
+          maskClosable: false,
+          onOk: () => {
+            navigateToHome();
+          }
+        });
+      } else if (mode === "resource_busy") {
+        if (Number(order_id) !== 0) {
+          if (!getCurrentIsLogin()) {
+            const openLoginForOrderDetail = () => {
+              var _a2;
+              (_a2 = scanOrderModule == null ? void 0 : scanOrderModule.setUIState) == null ? void 0 : _a2.call(scanOrderModule, "pendingStep", currentStep);
+              openLoginModal({
+                callback: (status) => {
+                  var _a3;
+                  if (status === "success") {
+                    (_a3 = scanOrderModule == null ? void 0 : scanOrderModule.deleteUIState) == null ? void 0 : _a3.call(scanOrderModule, "pendingStep");
+                    handleOrderDetail(order_id);
+                    return;
+                  }
+                  import_antd.Modal.info({
+                    title: import_utils.locales.getText(
+                      "pisell2.scan.order.add.on.login.required.title"
+                    ),
+                    content: String(
+                      import_utils.locales.getText(
+                        "pisell2.scan.order.add.on.login.required"
+                      ) || ""
+                    ).trim(),
+                    okText: String(import_utils.locales.getText("pisell2.event.confirm") || "OK"),
+                    maskClosable: false,
+                    onOk: () => {
+                      openLoginForOrderDetail();
+                    }
+                  });
+                }
+              });
+            };
+            openLoginForOrderDetail();
           } else {
             handleOrderDetail(order_id);
           }
         } else {
-          let content = resolveLocalizedText(errorTips);
-          content = String(
-            import_utils.locales.getText("pisell2.scan.order.resource.status.exception") || ""
+          const content = String(
+            import_utils.locales.getText("pisell2.scan.order.add.on.unavailable.description") || ""
           );
           import_antd.Modal.info({
-            title: import_utils.locales.getText("pisell2.scan.order.step.error"),
-            content: content.trim(),
-            okText: String(import_utils.locales.getText("pisell2.event.confirm") || "OK"),
+            title: import_utils.locales.getText("pisell2.scan.order.add.on.unavailable.title"),
+            content: /* @__PURE__ */ import_react.default.createElement("div", { style: { whiteSpace: "pre-line" } }, content.trim()),
+            okText: String(
+              import_utils.locales.getText("pisell2.scan.order.add.on.unavailable.confirm") || "Got it"
+            ),
             maskClosable: false,
             onOk: () => {
               location.replace("/");
@@ -456,7 +537,7 @@ function ReadyState() {
       }
     };
     if (!isCacheHydrated) return;
-    checkResourceAvailable();
+    runResourceCheck();
   }, [isCacheHydrated]);
   (0, import_react.useEffect)(() => {
     window.scrollTo({
@@ -562,7 +643,7 @@ function ReadyState() {
       });
       return;
     }
-    if (!isLogin) {
+    if (!getCurrentIsLogin()) {
       (_a2 = scanOrderModule == null ? void 0 : scanOrderModule.setUIState) == null ? void 0 : _a2.call(scanOrderModule, "pendingStep", "check");
       openLoginModal({
         callback: (status) => {

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

@@ -191,7 +191,9 @@ function Menu(props) {
           setting: { can_input: true, item_max_length: 1, is_detail_open: false }
         },
         callback: async (data) => {
+          var _a2, _b, _c;
           if (data == null ? void 0 : data.isCancel) return;
+          if (((_a2 = data == null ? void 0 : data.origin) == null ? void 0 : _a2.is_track) && !((_b = data == null ? void 0 : data.origin) == null ? void 0 : _b.over_sold) && ((_c = data == null ? void 0 : data.origin) == null ? void 0 : _c.stock_quantity) <= 0) return;
           const orderProduct = (0, import_transformProductDetail.transformProductDetailToOrderProduct)({
             payload: data,
             fallbackProductId: (item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id),

package/lib/components/scanOrder/hooks.js

@@ -101,6 +101,13 @@ var useScanOrderLogin = () => {
   const isLogin = !!((_b = (_a = utils == null ? void 0 : utils.token) == null ? void 0 : _a.get) == null ? void 0 : _b.call(_a));
   const openLoginModal = (params) => {
     const { callback } = params || {};
+    const { pubsub } = utils;
+    pubsub.once("pisell1.login.success", (res) => {
+      if (res === "success") {
+        callback(res);
+      }
+      callback("close");
+    });
     utils.action({
       type: "pisell1.login",
       data: {