@pisell/private-materials 6.3.138 → 6.3.139

package/lib/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,4 +30,11 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/PhoneField/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/lib/components/pisellSelectCustomerModal/RightPanel/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface RightPanelProps {
     value: any;

package/lib/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItemPreview;

package/lib/components/productExtension/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

package/lib/components/ruleSetting/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/lib/components/ruleSetting/ruleBorder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

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

@@ -9,6 +9,8 @@ interface CartProps {
     embedded?: boolean;
     confirmLoading?: boolean;
     extraContent?: React.ReactNode;
+    /** 视觉禁用：按钮仍会触发 onNext，由父级自行拦截（用于弹 toast 等反馈） */
+    disabled?: boolean;
 }
 export default function Cart(props: CartProps): JSX.Element | null;
 export {};

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

@@ -48,9 +48,10 @@ function Cart(props) {
     summary,
     embedded = false,
     confirmLoading = false,
-    extraContent
+    extraContent,
+    disabled = false
   } = props;
-  const { runModuleAction, refreshViewModel } = (0, import_context.useScanOrderContext)();
+  const { runModuleAction, refreshViewModel, scanOrderModule } = (0, import_context.useScanOrderContext)();
   const isVisible = embedded || open;
   if (!isVisible) return null;
   const [dineInConfig, setDineInConfig] = (0, import_react.useState)(null);
@@ -64,14 +65,30 @@ function Cart(props) {
   const isShowNote = (0, import_react.useMemo)(() => {
     return dineInConfig == null ? void 0 : dineInConfig["sale.allow_item_notes"];
   }, [dineInConfig]);
-  const totalAmount = (summary == null ? void 0 : summary.total_amount) ?? (summary == null ? void 0 : summary.expect_amount) ?? (summary == null ? void 0 : summary.amount) ?? (summary == null ? void 0 : summary.total) ?? "0.00";
+  const totalDisplayAmount = (0, import_react.useMemo)(() => {
+    const rawAmount = (summary == null ? void 0 : summary.total_amount) ?? (summary == null ? void 0 : summary.expect_amount) ?? (summary == null ? void 0 : summary.amount) ?? (summary == null ? void 0 : summary.total) ?? (summary == null ? void 0 : summary.totalAmount) ?? (summary == null ? void 0 : summary.payable_amount) ?? 0;
+    const parsed = Number(rawAmount);
+    if (Number.isNaN(parsed)) return "0.00";
+    return parsed.toFixed(2);
+  }, [summary]);
   const confirmOrderText = String(
     import_utils.locales.getText("pisell2.scan.order.action.confirm.order") || import_utils.locales.getText("pisell2.event.confirm") || "Confirm"
   );
   const subTotalList = (0, import_react.useMemo)(() => {
+    var _a;
     const subTotal = Number((summary == null ? void 0 : summary.product_amount) ?? 0);
     const totalTaxFee = Number((summary == null ? void 0 : summary.tax_fee) ?? 0);
     const total = Number((summary == null ? void 0 : summary.total_amount) ?? (summary == null ? void 0 : summary.expect_amount) ?? 0);
+    const tempOrder = (_a = scanOrderModule == null ? void 0 : scanOrderModule.getTempOrder) == null ? void 0 : _a.call(scanOrderModule);
+    const tempSummary = (tempOrder == null ? void 0 : tempOrder.summary) || {};
+    const taxTitle = String(
+      (tempSummary == null ? void 0 : tempSummary.tax_title) || (summary == null ? void 0 : summary.tax_title) || "GST/Tax"
+    );
+    const rawTaxRate = Number((tempSummary == null ? void 0 : tempSummary.tax_rate) ?? (summary == null ? void 0 : summary.tax_rate));
+    const normalizedTaxRate = Number.isNaN(rawTaxRate) ? 0 : rawTaxRate > 1 ? rawTaxRate / 100 : rawTaxRate;
+    const isPriceIncludeTax = Boolean(
+      (tempSummary == null ? void 0 : tempSummary.is_price_include_tax) ?? (tempSummary == null ? void 0 : tempSummary.isPriceIncludeTax) ?? (summary == null ? void 0 : summary.is_price_include_tax)
+    );
     return [
       {
         key: "sub_total",
@@ -80,7 +97,12 @@ function Cart(props) {
       {
         key: "tax",
         value: Number.isNaN(totalTaxFee) ? 0 : totalTaxFee,
-        hidden: Number.isNaN(totalTaxFee) ? true : totalTaxFee <= 0
+        hidden: Number.isNaN(totalTaxFee) ? true : totalTaxFee <= 0,
+        tax: {
+          title: taxTitle,
+          rate: normalizedTaxRate,
+          is_price_include_tax: isPriceIncludeTax
+        }
       },
       {
         key: "custom_total",
@@ -89,7 +111,7 @@ function Cart(props) {
         bold: true
       }
     ];
-  }, [summary]);
+  }, [summary, scanOrderModule]);
   const handleCartChange = async (item, type) => {
     if (type !== "delete") return;
     const productId = (item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id) ?? null;
@@ -114,7 +136,7 @@ function Cart(props) {
     if (!isVisible) return;
     refreshViewModel();
   }, [isVisible]);
-  const cartBodyContent = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-body" }, /* @__PURE__ */ import_react.default.createElement(
+  const cartLineItems = /* @__PURE__ */ import_react.default.createElement(
     import_shoppingCart.default,
     {
       productParams: {
@@ -134,9 +156,21 @@ function Cart(props) {
       isHideClearCart: true,
       onChange: handleCartChange
     }
-  ), /* @__PURE__ */ import_react.default.createElement(import_subTotal.default, { list: subTotalList, style: { padding: 0 } }), extraContent ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-extra-content" }, extraContent) : null);
+  );
+  const cartSubtotalSection = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_subTotal.default, { list: subTotalList, style: { padding: 0 } }), extraContent ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-extra-content" }, extraContent) : null);
+  const cartBodyContent = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-body" }, cartLineItems, cartSubtotalSection);
   if (embedded) {
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, cartBodyContent, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-embedded-footer" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "primary", block: true, onClick: onNext, loading: confirmLoading }, confirmOrderText)));
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, cartBodyContent, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-embedded-footer" }, /* @__PURE__ */ import_react.default.createElement(
+      import_materials.Button,
+      {
+        type: "primary",
+        block: true,
+        onClick: onNext,
+        loading: confirmLoading,
+        className: disabled ? "pisell-scan-order-cart-embedded-confirm-disabled" : void 0
+      },
+      confirmOrderText
+    )));
   }
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-mask", onClick: onCancel }), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-drawer" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-header" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.event.cart")), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "text", onClick: onCancel }, import_utils.locales.getText("pisell2.event.close.continue"))), cartBodyContent, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-footer" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-total" }, import_utils.locales.getText("pisell2.event.total"), ": ", totalAmount), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "primary", onClick: onNext, loading: confirmLoading }, import_utils.locales.getText("pisell2.event.continue")))));
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-mask", onClick: onCancel }), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-drawer" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-sheet-handle-wrap", "aria-hidden": true }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-sheet-handle" }))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-list-scroll" }, cartLineItems), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-bottom-panel" }, cartSubtotalSection, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-footer" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-footer-total-col" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-footer-total-label" }, import_utils.locales.getText("pisell2.event.total")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-footer-total-amount" }, "$", totalDisplayAmount)), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { type: "primary", onClick: onNext, loading: confirmLoading }, import_utils.locales.getText("pisell2.event.continue"))))));
 }

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

@@ -11,19 +11,51 @@
   right: 0;
   bottom: 0;
   z-index: 91;
-  max-height: 70vh;
-  border-radius: 16px 16px 0 0;
+  max-height: 95vh;
+  max-height: 95dvh;
+  min-height: 0;
+  border-radius: 12px 12px 0 0;
   background: #fff;
   display: flex;
   flex-direction: column;
+  overflow: hidden;
+  box-shadow: 0 -8px 40px rgba(16, 24, 40, 0.12);
 }
 
+/* 顶栏仅保留居中拖动手柄横线 */
 .pisell-scan-order-cart-header {
+  flex-shrink: 0;
+  padding: 0;
+}
+
+.pisell-scan-order-cart-sheet-handle-wrap {
+  width: 100%;
   display: flex;
-  justify-content: space-between;
+  justify-content: center;
   align-items: center;
-  padding: 16px;
-  border-bottom: 1px solid #eaecf0;
+  padding: 10px 0 8px;
+}
+
+.pisell-scan-order-cart-sheet-handle {
+  width: 36px;
+  height: 5px;
+  border-radius: 100px;
+  background: #d0d5dd;
+}
+
+.pisell-scan-order-cart-list-scroll {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+  padding: 8px 16px 12px;
+}
+
+.pisell-scan-order-cart-bottom-panel {
+  flex-shrink: 0;
+  border-top: 1px solid #eaecf0;
+  background: #fff;
+  padding: 12px 16px 0;
 }
 
 .pisell-scan-order-cart-body {
@@ -49,14 +81,30 @@
   justify-content: space-between;
   align-items: center;
   gap: 12px;
-  padding: 12px 16px 20px;
+  margin-top: 12px;
+  padding: 12px 0 calc(16px + env(safe-area-inset-bottom, 0px));
   border-top: 1px solid #eaecf0;
 }
 
-.pisell-scan-order-cart-total {
+/* 与 pisell-scan-order-footer 左侧合计样式一致 */
+.pisell-scan-order-cart-footer-total-col {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-width: 0;
+}
+
+.pisell-scan-order-cart-footer-total-label {
   color: #101828;
   font-size: 14px;
-  font-weight: 500;
+  line-height: 20px;
+}
+
+.pisell-scan-order-cart-footer-total-amount {
+  color: #e77d75;
+  font-size: 24px;
+  font-weight: 600;
+  line-height: 1;
 }
 
 .pisell-scan-order-cart-embedded-footer {
@@ -65,6 +113,11 @@
   background: #fff;
 }
 
+.pisell-scan-order-cart-embedded-confirm-disabled {
+  opacity: 0.45;
+  cursor: not-allowed;
+}
+
 .pisell-scan-order-content-mobile-wrap {
   .pisell-scan-order-cart-body {
     padding-bottom: 96px;

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

@@ -35,14 +35,19 @@ module.exports = __toCommonJS(Check_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
+var import_materials = require("@pisell/materials");
 var import_Cart = __toESM(require("../Cart"));
+var import_FulfillmentMode = __toESM(require("../FulfillmentMode"));
+var import_ManualPickupRefModal = __toESM(require("../ManualPickupRefModal"));
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
 function Check() {
-  const { viewModel, runModuleAction, refreshViewModel } = (0, import_context.useScanOrderContext)();
+  const { viewModel, runModuleAction, refreshViewModel, tableName, entryMode, clearStepCache } = (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 utils = (0, import_hooks.contextUtils)();
   const [dineInConfig, setDineInConfig] = (0, import_react.useState)(null);
   const getConfig = async () => {
@@ -65,14 +70,24 @@ function Check() {
       import_utils.locales.getText("pisell2.text.add-order-notes") || import_utils.locales.getText("pisell2.scan.order.note.placeholder") || "请输入备注"
     );
   }, []);
-  const handleSubmit = async () => {
-    var _a, _b, _c, _d;
-    if (submitting) return;
+  const currentTableText = (0, import_react.useMemo)(
+    () => String(
+      import_utils.locales.getText("pisell2.scan.order.current.table") || "Current table"
+    ),
+    []
+  );
+  const productsTitle = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.scan.order.products.title") || "Products"),
+    []
+  );
+  const doSubmit = async () => {
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
       setSubmitting(true);
       await runModuleAction("updateTempOrderNote", note);
       const res = await runModuleAction("submitScanOrder");
       console.log("submitScanOrder >>>>> ", res);
+      clearStepCache();
       if (dineInConfig == null ? void 0 : dineInConfig["workflow.require_payment_on_submit"]) {
         utils.action({
           type: "pisell1.payment",
@@ -80,13 +95,30 @@ function Check() {
             order_id: (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.order_id,
             total_amount: (_b = viewModel == null ? void 0 : viewModel.summary) == null ? void 0 : _b.total_amount
           },
-          callback: (e) => {
+          callback: async (_e2) => {
+            try {
+              await runModuleAction("restoreOrder");
+            } catch (error) {
+              console.warn("[scanOrder] restoreOrder after payment failed", error);
+            }
           }
         });
       } else {
         if ((_c = res == null ? void 0 : res.data) == null ? void 0 : _c.order_id) {
+          try {
+            await runModuleAction("restoreOrder");
+          } catch (error) {
+            console.warn("[scanOrder] restoreOrder before redirect failed", error);
+          }
           const link = `/order/details?id=${(_d = res == null ? void 0 : res.data) == null ? void 0 : _d.order_id}`;
-          location.replace(link);
+          const app = (_e = utils == null ? void 0 : utils.getApp) == null ? void 0 : _e.call(utils);
+          if ((_f = app == null ? void 0 : app.history) == null ? void 0 : _f.replace) {
+            app.history.replace(link);
+          } else if ((_g = app == null ? void 0 : app.history) == null ? void 0 : _g.push) {
+            app.history.push(link);
+          } else {
+            location.replace(link);
+          }
         }
       }
       await refreshViewModel();
@@ -97,6 +129,55 @@ function Check() {
       setSubmitting(false);
     }
   };
+  const handleSubmit = async () => {
+    if (submitting) return;
+    const cartItems = (viewModel == null ? void 0 : viewModel.cartItems) || [];
+    if (cartItems.length === 0) {
+      (0, import_materials.PisellToast)({
+        content: String(
+          import_utils.locales.getText("pisell2.scan.order.products.empty.tip") || "Please select products"
+        ),
+        duration: 2
+      });
+      return;
+    }
+    if (isAdditionalOrder) {
+      await doSubmit();
+      return;
+    }
+    try {
+      setSubmitting(true);
+      const manualPickup = await runModuleAction("checkManualPickupRef");
+      if (manualPickup == null ? void 0 : manualPickup.enabled) {
+        setPickupRefOpen(true);
+        setSubmitting(false);
+        return;
+      }
+    } catch (error) {
+      console.error("[scanOrder] checkManualPickupRef failed", error);
+      import_antd.message.error((error == null ? void 0 : error.message) || "Submit order failed");
+      setSubmitting(false);
+      return;
+    }
+    await doSubmit();
+  };
+  const handlePickupRefConfirm = async (value) => {
+    try {
+      setSubmitting(true);
+      await runModuleAction("setPickupRef", value);
+    } catch (error) {
+      console.error("[scanOrder] setPickupRef failed", error);
+      import_antd.message.error((error == null ? void 0 : error.message) || "Submit order failed");
+      setSubmitting(false);
+      return;
+    }
+    setPickupRefOpen(false);
+    await doSubmit();
+  };
+  const handlePickupRefCancel = () => {
+    if (submitting) return;
+    setPickupRefOpen(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,
     {
@@ -110,7 +191,7 @@ function Check() {
       }
     }
   ));
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check" }, tableName ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check-current-table" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-scan-order-check-current-table-label" }, currentTableText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-scan-order-check-current-table-value" }, tableName)) : null, !isAdditionalOrder ? /* @__PURE__ */ import_react.default.createElement(import_FulfillmentMode.default, null) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-check-products-title" }, productsTitle), /* @__PURE__ */ import_react.default.createElement(
     import_Cart.default,
     {
       embedded: true,
@@ -121,7 +202,15 @@ function Check() {
       items: (viewModel == null ? void 0 : viewModel.cartItems) || [],
       summary: (viewModel == null ? void 0 : viewModel.summary) || {},
       confirmLoading: submitting,
-      extraContent: isShowOrderNote ? noteContent : void 0
+      extraContent: !isAdditionalOrder && isShowOrderNote ? noteContent : void 0
+    }
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_ManualPickupRefModal.default,
+    {
+      open: pickupRefOpen,
+      confirmLoading: submitting,
+      onCancel: handlePickupRefCancel,
+      onConfirm: handlePickupRefConfirm
     }
   ));
 }

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

@@ -3,6 +3,36 @@
   flex-direction: column;
 }
 
+.pisell-scan-order-check-current-table {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 12px 16px;
+  background: #fff;
+  border-radius: 12px;
+
+  .pisell-scan-order-check-current-table-label {
+    color: #101828;
+    font-size: 16px;
+    font-weight: 500;
+  }
+
+  .pisell-scan-order-check-current-table-value {
+    color: #344054;
+    font-size: 14px;
+    font-weight: 500;
+  }
+}
+
+.pisell-scan-order-check-products-title {
+  padding: 0 16px;
+  margin-bottom: 8px;
+  color: #101828;
+  font-size: 16px;
+  font-weight: 500;
+}
+
 .pisell-scan-order-check-note {
   padding: 0;
   margin-top: 30px;