@pisell/private-materials 6.3.139 → 6.3.141

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

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

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/lib/components/booking/notes/NoteBlock/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/lib/components/ecocup/components/AddCustomerModal/index.d.ts

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

package/lib/components/ecocup/components/CupActionList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ECupActionType, ICup, ICustomer } from '../../types';
 import './index.less';
 interface IProps {

package/lib/components/ecocup/components/CupActionModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ICustomer, ICup, ECupActionType } from '../../types';
 interface IProps {

package/lib/components/ecocup/components/CupStatusModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ECupScanStatus, ICup } from '../../types';
 import './index.less';
 interface IProps {

package/lib/components/ecocup/components/CustomerAndCupModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ICup, ICustomer } from '../../types';
 interface IProps {

package/lib/components/ecocup/components/MoreDropdown/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface MoreDropdownProps {
     locales: any;
     onClick?: (key: string) => void;

package/lib/components/ecocup/components/SearchBar/index.d.ts

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

package/lib/components/ecocup/components/SettingModal/index.d.ts

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

package/lib/components/ecocup/cupList/hooks/useColumns.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../index.less';
 interface IProps {
     onClickAction: (type: string, record: any) => void;

package/lib/components/ecocup/cupList/hooks/useSummary.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import '../index.less';
 export declare const useSummary: (locales: any, staticsData: any, isPartner?: boolean) => () => JSX.Element;

package/lib/components/ecocup/cupList/index.d.ts

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

package/lib/components/eventBooking/components/ErrorTip/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ErrorTip: ({ text }: any) => JSX.Element;
 export default ErrorTip;

package/lib/components/eventBooking/components/Provider/Cart/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel }: any) => JSX.Element;
 export default Cart;

package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const EmptyHolderModal: (props: any) => JSX.Element;
 export default EmptyHolderModal;

package/lib/components/eventBooking/components/Provider/Event/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Event: () => JSX.Element;
 export default Event;

package/lib/components/eventBooking/components/Provider/Footer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Footer: () => JSX.Element;
 export default Footer;

package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const InformationOptionsModal: (props: any) => JSX.Element;
 export default InformationOptionsModal;

package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const OrderProductModal: (props: any) => JSX.Element;
 export default OrderProductModal;

package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts

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

package/lib/components/eventBooking/components/Provider/Resource/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Resource: () => JSX.Element;
 export default Resource;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const WeekItem: (props: any) => JSX.Element;
 export default WeekItem;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const BookingOptions: (props: {
     onChangeBookingOption?: ((bookingOption: any) => void) | undefined;
 }) => JSX.Element;

package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ScheduleTimeItem: ({ timeList }: any) => JSX.Element;
 export default ScheduleTimeItem;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
 export default SetupForm;

package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

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

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

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

@@ -37,9 +37,12 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_shoppingCart = __toESM(require("../../../shoppingCart"));
 var import_context = require("../../context");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_subTotal = __toESM(require("../../../subTotal"));
+var import_Voucher = __toESM(require("../Voucher"));
 var import_index = require("./index.less");
 function Cart(props) {
+  var _a, _b, _c, _d, _e, _f;
   const {
     open,
     onCancel,
@@ -52,16 +55,24 @@ function Cart(props) {
     disabled = false
   } = props;
   const { runModuleAction, refreshViewModel, scanOrderModule } = (0, import_context.useScanOrderContext)();
+  const engineContext = (0, import_useEngineContext.default)();
+  const businessUtils = (_b = (_a = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.businessUtils;
+  const locale = ((_d = (_c = engineContext == null ? void 0 : engineContext.engine) == null ? void 0 : _c.props) == null ? void 0 : _d.locale) || "en";
+  const hasGoodPassApp = !!((_e = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _e.call(businessUtils, "goodpass"));
+  const hasDiscountCardApp = !!((_f = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _f.call(businessUtils, "discountcard"));
+  const showVoucher = hasGoodPassApp || hasDiscountCardApp;
   const isVisible = embedded || open;
   if (!isVisible) return null;
   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();
+  }, [runModuleAction]);
+  (0, import_react.useEffect)(() => {
+    getConfig();
+  }, []);
   const isShowNote = (0, import_react.useMemo)(() => {
     return dineInConfig == null ? void 0 : dineInConfig["sale.allow_item_notes"];
   }, [dineInConfig]);
@@ -75,11 +86,11 @@ function Cart(props) {
     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;
+    var _a2;
     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 tempOrder = (_a2 = scanOrderModule == null ? void 0 : scanOrderModule.getTempOrder) == null ? void 0 : _a2.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"
@@ -89,11 +100,21 @@ function Cart(props) {
     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)
     );
+    const surchargeItems = ((summary == null ? void 0 : summary.surcharges) || []).filter((s) => Number(s == null ? void 0 : s.amount) > 0).map((s) => {
+      const labelObj = (s == null ? void 0 : s.label) || (s == null ? void 0 : s.name) || {};
+      const label = labelObj[locale] || labelObj.en || labelObj.original || (s == null ? void 0 : s.key) || "";
+      return {
+        key: (s == null ? void 0 : s.key) || `surcharge_${s == null ? void 0 : s.surcharge_id}`,
+        label,
+        value: Number(s == null ? void 0 : s.amount)
+      };
+    });
     return [
       {
         key: "sub_total",
         value: Number.isNaN(subTotal) ? 0 : subTotal
       },
+      ...surchargeItems,
       {
         key: "tax",
         value: Number.isNaN(totalTaxFee) ? 0 : totalTaxFee,
@@ -111,25 +132,58 @@ function Cart(props) {
         bold: true
       }
     ];
-  }, [summary, scanOrderModule]);
+  }, [summary, scanOrderModule, locale]);
   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;
-    const productVariantId = Number((item == null ? void 0 : item.product_variant_id) ?? 0);
-    const identityKey = (item == null ? void 0 : item.identity_key) || (item == null ? void 0 : item.rowKey) || void 0;
-    if (productId === null && Number.isNaN(productVariantId)) return;
-    try {
-      await runModuleAction("removeProductFromOrder", {
+    if (type === "note") {
+      const productId = (item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id) ?? null;
+      const productVariantId = Number((item == null ? void 0 : item.product_variant_id) ?? 0);
+      const identityKey = item == null ? void 0 : item.identity_key;
+      if (productId === null && Number.isNaN(productVariantId)) return;
+      const identity = {
         product_id: productId,
-        product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
-        identity_key: identityKey
-      });
-      await refreshViewModel();
-    } catch (error) {
-      console.error("[scanOrder] removeProductFromOrder failed", {
-        error,
-        item
-      });
+        product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId
+      };
+      if (typeof identityKey === "string" && identityKey.length > 0) {
+        identity.identity_key = identityKey;
+      }
+      try {
+        await runModuleAction(
+          "setOrderProductLineNote",
+          identity,
+          String((item == null ? void 0 : item.note) ?? "")
+        );
+        await refreshViewModel();
+      } catch (error) {
+        console.error("[scanOrder] setOrderProductLineNote failed", {
+          error,
+          item
+        });
+      }
+      return;
+    } else if (type === "delete") {
+      const productId = (item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id) ?? null;
+      const productVariantId = Number((item == null ? void 0 : item.product_variant_id) ?? 0);
+      const identityKey = item == null ? void 0 : item.identity_key;
+      if (productId === null && Number.isNaN(productVariantId)) return;
+      if (typeof identityKey !== "string" || identityKey.length === 0) {
+        console.error("[scanOrder] removeProductFromOrder skipped: missing identity_key", {
+          item
+        });
+        return;
+      }
+      try {
+        await runModuleAction("removeProductFromOrder", {
+          product_id: productId,
+          product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
+          identity_key: identityKey
+        });
+        await refreshViewModel();
+      } catch (error) {
+        console.error("[scanOrder] removeProductFromOrder failed", {
+          error,
+          item
+        });
+      }
     }
   };
   (0, import_react.useEffect)(() => {
@@ -157,8 +211,9 @@ function Cart(props) {
       onChange: handleCartChange
     }
   );
-  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);
+  const cartSubtotalSection = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showVoucher ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, null) : 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 cartBodyClassName = embedded ? "pisell-scan-order-cart-body pisell-scan-order-cart-body-embedded" : "pisell-scan-order-cart-body";
+  const cartBodyContent = /* @__PURE__ */ import_react.default.createElement("div", { className: cartBodyClassName }, 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,

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

@@ -118,16 +118,22 @@
   cursor: not-allowed;
 }
 
+/* 移动端：结算内嵌卡 — 与 pisell-scan-order-content-mobile-wrap 的底部留白配合；
+ * 不再在 cart-body 上重复 96px，否则与外层叠加会出现大块空白，sticky 在整页滚动时也会与内容同步位移 */
 .pisell-scan-order-content-mobile-wrap {
-  .pisell-scan-order-cart-body {
-    padding-bottom: 96px;
+  .pisell-scan-order-cart-body-embedded {
+    padding-bottom: 16px;
   }
 
   .pisell-scan-order-cart-embedded-footer {
-    position: sticky;
+    position: fixed;
+    left: 0;
+    right: 0;
     bottom: 0;
-    z-index: 5;
-    padding-bottom: calc(20px + env(safe-area-inset-bottom, 0px));
+    z-index: 28;
+    padding: 12px 16px calc(20px + env(safe-area-inset-bottom, 0px));
+    border-top: 1px solid #eaecf0;
+    background: #fff;
     box-shadow: 0 -4px 10px rgba(16, 24, 40, 0.06);
   }
 }

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

@@ -35,7 +35,6 @@ 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"));
@@ -50,13 +49,15 @@ function Check() {
   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 () => {
+  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();
+  }, [runModuleAction]);
+  (0, import_react.useEffect)(() => {
+    getConfig();
+  }, []);
   const isShowOrderNote = (0, import_react.useMemo)(() => {
     return dineInConfig == null ? void 0 : dineInConfig["sale.allow_order_notes"];
   }, [dineInConfig]);
@@ -80,41 +81,50 @@ function Check() {
     () => String(import_utils.locales.getText("pisell2.scan.order.products.title") || "Products"),
     []
   );
+  const showCheckStepEmptyCartTip = () => {
+    import_antd.message.error(import_utils.locales.getText("pisell2.scan.order.check.cart.empty.tip") || "Please go back to add products");
+  };
   const doSubmit = async () => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const items = (viewModel == null ? void 0 : viewModel.cartItems) || [];
+    if (items.length === 0) {
+      showCheckStepEmptyCartTip();
+      setSubmitting(false);
+      return;
+    }
     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"]) {
+      if ((dineInConfig == null ? void 0 : dineInConfig["sale.require_payment_on_submit"]) && !isAdditionalOrder) {
+        try {
+          await runModuleAction("restoreOrder");
+        } catch (error) {
+          console.warn("[scanOrder] restoreOrder after payment failed", error);
+        }
         utils.action({
           type: "pisell1.payment",
           data: {
             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
+            total_amount: ((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.order_wait_pay_amount) || ((_c = viewModel == null ? void 0 : viewModel.summary) == null ? void 0 : _c.total_amount)
           },
           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) {
+        if ((_d = res == null ? void 0 : res.data) == null ? void 0 : _d.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}`;
-          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) {
+          const link = `/order/details?id=${(_e = res == null ? void 0 : res.data) == null ? void 0 : _e.order_id}`;
+          const app = (_f = utils == null ? void 0 : utils.getApp) == null ? void 0 : _f.call(utils);
+          if ((_g = app == null ? void 0 : app.history) == null ? void 0 : _g.replace) {
             app.history.replace(link);
-          } else if ((_g = app == null ? void 0 : app.history) == null ? void 0 : _g.push) {
+          } else if ((_h = app == null ? void 0 : app.history) == null ? void 0 : _h.push) {
             app.history.push(link);
           } else {
             location.replace(link);
@@ -133,12 +143,7 @@ function Check() {
     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
-      });
+      showCheckStepEmptyCartTip();
       return;
     }
     if (isAdditionalOrder) {