@pisell/private-materials 6.9.2 → 6.9.4

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

@@ -301,6 +301,7 @@ declare const _default: {
         '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.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;
@@ -617,6 +618,7 @@ declare const _default: {
         '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.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;
@@ -933,6 +935,7 @@ declare const _default: {
         '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.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;

package/lib/components/booking/locales.js

@@ -362,6 +362,7 @@ var locales_default = {
     "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.status.valid": "Valid",
     "pisell2.text.status.expired": "Expired",
     "pisell2.text.validity.expired": (str) => {
@@ -380,7 +381,7 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "View More",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "Contact info",
-    "pisell2.booking.text.search-placeholder": "Search Customers / Contacts",
+    "pisell2.booking.text.search-placeholder": "Customers / Contacts / Holder",
     "pisell-select-holder-please-select": "Please Select",
     "pisell-select-holder-selected": "Selected: "
   },
@@ -717,6 +718,7 @@ var locales_default = {
     "pisell2.text.goodpass.enter-code": "请输入券码",
     "pisell2.text.goodpass.code-invalid": "当前券码不可用",
     "pisell2.text.goodpass.code-invalid-cart": "当前购物车中无可用商品",
+    "pisell2.text.goodpass.code-invalid-expired": "当前优惠券不在使用期限内",
     "pisell2.text.status.valid": "有效",
     "pisell2.text.status.expired": "已过期",
     "pisell2.text.validity.expired": (str) => {
@@ -735,7 +737,7 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "查看更多",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "联系信息",
-    "pisell2.booking.text.search-placeholder": "搜索客户/联系信息",
+    "pisell2.booking.text.search-placeholder": "搜索客户/联系信息/持有人",
     "pisell-select-holder-please-select": "请选择",
     "pisell-select-holder-selected": "已选择："
   },
@@ -1072,6 +1074,7 @@ var locales_default = {
     "pisell2.text.goodpass.enter-code": "請輸入券碼",
     "pisell2.text.goodpass.code-invalid": "當前券碼不可用",
     "pisell2.text.goodpass.code-invalid-cart": "當前購物車中無可用商品",
+    "pisell2.text.goodpass.code-invalid-expired": "當前優惠券不在使用期限內",
     "pisell2.text.status.valid": "有效",
     "pisell2.text.status.expired": "已過期",
     "pisell2.text.validity.expired": (str) => {
@@ -1090,7 +1093,7 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "查看更多",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "聯繫信息",
-    "pisell2.booking.text.search-placeholder": "搜索客戶/聯系信息",
+    "pisell2.booking.text.search-placeholder": "搜索客戶/聯系信息/持有人",
     "pisell-select-holder-please-select": "請選擇",
     "pisell-select-holder-selected": "已選擇："
   }

package/lib/components/booking/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -110,4 +111,11 @@ export declare const walkInData: {
     id: number;
     nickname: 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/booking/notes/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/payments/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/utils.d.ts

@@ -173,10 +173,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/booking/utils.js

@@ -652,11 +652,11 @@ var getMainPrice = (item, price) => {
   return newPrice.toNumber();
 };
 var getProductTotalPrice = (item) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   let price = new import_decimal.default(item._extend.price || 0);
   let other = (_a = item._extend) == null ? void 0 : _a.other;
-  if ((_b = item._extend) == null ? void 0 : _b.priceOverride) {
-    price = new import_decimal.default(((_c = item._extend) == null ? void 0 : _c.priceOverride) || 0);
+  if (((_b = item._extend) == null ? void 0 : _b.priceOverride) || ((_c = item._extend) == null ? void 0 : _c.priceOverride) === 0) {
+    price = new import_decimal.default(((_d = item._extend) == null ? void 0 : _d.priceOverride) || 0);
     return price.toNumber();
   }
   if (other == null ? void 0 : other.product_variant_id) {

package/lib/components/checkout/PaymentModal.d.ts

@@ -26,6 +26,7 @@ interface PaymentModalProps {
 }
 interface PaymentModalMainProps extends PaymentModalProps {
     onClose?: (reset?: boolean) => void;
+    onSetLocalOrderId?: (order_id: number) => void;
     setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
     editOrderId?: number;
     config?: {

package/lib/components/checkout/PaymentModal.js

@@ -50,6 +50,7 @@ var import_WalletPassModule = __toESM(require("./components/WalletPassModule"));
 var import_PaymentOptionsModule = __toESM(require("./components/PaymentOptionsModule"));
 var import_CashPaymentModule = __toESM(require("./components/CashPaymentModule"));
 var import_AdditionalModule = __toESM(require("./components/AdditionalModule"));
+var import_OsKeyContext = require("../ticketBooking/context/OsKeyContext");
 var import_PaymentResultToast = require("./components/PaymentResultToast");
 var import_PaymentResultToastUtils = require("./utils/PaymentResultToastUtils");
 var import_icon = require("@pisell/icon");
@@ -73,6 +74,24 @@ var CheckoutHooks = {
   OnOrderSyncFailed: "checkout:onOrderSyncFailed",
   OnOrderPaymentAdded: "checkout:onPaymentItemAdded"
 };
+function convertCurrencyAmountToWalletPassValue(params) {
+  var _a, _b;
+  const currencyDecimal = toDecimalOrNull(params.currencyAmount) ?? new import_decimal.default(0);
+  const pointsDecimal = toDecimalOrNull((_a = params.walletPassUsageUnit) == null ? void 0 : _a.points);
+  const priceDecimal = toDecimalOrNull((_b = params.walletPassUsageUnit) == null ? void 0 : _b.price);
+  if (!pointsDecimal || !priceDecimal) return (0, import_utils.formatAmount)(currencyDecimal.toNumber());
+  if (pointsDecimal.eq(0) || priceDecimal.eq(0)) return (0, import_utils.formatAmount)(currencyDecimal.toNumber());
+  const baseRatio = currencyDecimal.div(priceDecimal).toDecimalPlaces(6, import_decimal.default.ROUND_DOWN);
+  return baseRatio.mul(pointsDecimal).toFixed(2, import_decimal.default.ROUND_DOWN);
+}
+function toDecimalOrNull(value) {
+  if (value === null || value === void 0) return null;
+  try {
+    return new import_decimal.default(value);
+  } catch {
+    return null;
+  }
+}
 var PaymentContent = (0, import_react.forwardRef)(
   ({
     cartData,
@@ -125,6 +144,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const [paymentOptionsTitle, setPaymentOptionsTitle] = (0, import_react.useState)(
       import_utils.locales.getText("cards.and.digitals") || "Cards & Digitals"
     );
+    const osKey = (0, import_OsKeyContext.useOsKey)();
     const paymentOptionList = (0, import_react.useMemo)(() => {
       return paymentMethods.filter(
         (item) => !(item.type === "app" && item.code === "EFTPOS_LINKLY") && (["custom"].includes(item.type) || import_PaymentOptionsModule.SHOW_METHODS_CODE.includes(item.code))
@@ -164,7 +184,11 @@ var PaymentContent = (0, import_react.forwardRef)(
       const cashPaymentMethod = paymentMethods.find(
         (method) => {
           var _a2;
-          return method.code === "CASHMANUAL" || method.type === "CASHMANUAL" || ((_a2 = method.name) == null ? void 0 : _a2.toLowerCase().includes("cash"));
+          return (
+            // method.code === 'CASHMANUAL' ||
+            // method.type === 'CASHMANUAL' ||
+            (_a2 = method.name) == null ? void 0 : _a2.toLowerCase().includes("cash")
+          );
         }
       );
       logger == null ? void 0 : logger.addLog({
@@ -182,18 +206,14 @@ var PaymentContent = (0, import_react.forwardRef)(
       });
       await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
         amount: result.amount,
-        // /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-        // code: cashPaymentMethod?.code,
-        // /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-        // custom_payment_id: cashPaymentMethod?.id,
-        // /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
-        // name: cashPaymentMethod?.name,
-        // /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
-        // type: cashPaymentMethod?.type,
-        code: "CUSTOM_10361",
-        "type": "custom",
-        "name": "Cash - Cafe",
-        "custom_payment_id": 10361,
+        /** 支付类型，跟支付列表上对应的支付方式保持一致 */
+        code: cashPaymentMethod == null ? void 0 : cashPaymentMethod.code,
+        /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
+        custom_payment_id: cashPaymentMethod == null ? void 0 : cashPaymentMethod.id,
+        /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
+        name: cashPaymentMethod == null ? void 0 : cashPaymentMethod.name,
+        /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
+        type: cashPaymentMethod == null ? void 0 : cashPaymentMethod.type,
         /** 代金券、充值卡、积分卡等wallet pass id */
         voucher_id: 0,
         rounding_amount: result.roundingAmount
@@ -218,13 +238,16 @@ var PaymentContent = (0, import_react.forwardRef)(
         "EFTPOS_LINKLY",
         "EFTPOS_PAYO",
         "EFTPOS_WINDCAVE",
-        "EFTPOS_TYRO"
+        "EFTPOS_TYRO",
+        "EFTPOS_HUIFU"
       ];
       const mx51Code = "EFTPOS";
       let payType = "";
       if (eftposCodes.includes((method == null ? void 0 : method.code) || "")) {
         payType = "eftpos";
       }
+      const currentOrderInfo = checkoutModule.getCurrentOrderInfo();
+      const originUUid = currentOrderInfo == null ? void 0 : currentOrderInfo.uuid;
       if ((method == null ? void 0 : method.code) === mx51Code) {
         payType = "mx51";
         const orderId = await checkoutModule.getCurrentOrderId();
@@ -242,6 +265,10 @@ var PaymentContent = (0, import_react.forwardRef)(
           },
           callback: ({ status, data, msg }) => {
             console.log("eftpos_pay_result>>>>>>", status, data, msg);
+            if ((data == null ? void 0 : data.action) === "cancel_order") {
+              onPaymentCancel(true);
+              return;
+            }
             if (status === "success") {
               const payResultParams = {
                 amount: Number(data == null ? void 0 : data.amount),
@@ -273,7 +300,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                   };
                 }
               }
-              checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync(payResultParams);
+              checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync(payResultParams, originUUid);
             }
           }
         });
@@ -299,7 +326,9 @@ var PaymentContent = (0, import_react.forwardRef)(
               orderId: data.orderId,
               symbol: getData("shop_symbol"),
               amount: finalAmount,
-              surcharge: processSurcharge(method.surcharge)
+              surcharge: processSurcharge(method.surcharge),
+              operator_type: "shop",
+              platform: "pos"
             },
             mode: "pay"
           },
@@ -341,7 +370,7 @@ var PaymentContent = (0, import_react.forwardRef)(
                   };
                 }
               }
-              checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync(payResultParams);
+              checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync(payResultParams, originUUid);
             }
           }
         });
@@ -414,7 +443,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           );
           setPaymentMethods(reorderedPaymentMethods);
           const isShowCashPayment = paymentMethods2.some(
-            (item) => item.code === "CASHMANUAL"
+            (item) => item.code === "CASHMANUAL" || /现金|現金/i.test(item.name) || /cash/i.test(item.name)
           );
           setShowCashPayment(isShowCashPayment);
           onShowCashPaymentChange == null ? void 0 : onShowCashPaymentChange(isShowCashPayment);
@@ -733,14 +762,22 @@ var PaymentContent = (0, import_react.forwardRef)(
                 /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
                 type: (_d = walletPassDetail.map[mapCode]) == null ? void 0 : _d.type,
                 /** 代金券、充值卡、积分卡等wallet pass id */
-                voucher_id: item.voucher_id
+                voucher_id: item.voucher_id,
+                wallet_pass_usage_unit: item.wallet_pass_usage_unit,
+                wallet_pass_use_value: convertCurrencyAmountToWalletPassValue({
+                  currencyAmount: item.amount,
+                  walletPassUsageUnit: item.wallet_pass_usage_unit
+                })
               });
             }
           });
           logger == null ? void 0 : logger.addLog({
             type: "info",
             title: "handleSelectWalletChange checkoutModule updateVoucherPaymentItemsAsync",
-            metadata: {}
+            metadata: {
+              voucherItems,
+              select
+            }
           });
           await checkoutModule.updateVoucherPaymentItemsAsync(voucherItems);
           if (walletPassRef.current) {
@@ -831,9 +868,14 @@ var PaymentContent = (0, import_react.forwardRef)(
           break;
       }
     };
-    (0, import_react.useImperativeHandle)(ref, () => ({
-      handleButtonClick
-    }));
+    (0, import_react.useImperativeHandle)(
+      ref,
+      () => ({
+        handleButtonClick,
+        getSyncingLock: () => syncingLock
+      }),
+      [handleButtonClick, syncingLock]
+    );
     const getCustomerInfo = () => {
       var _a;
       const getValidName = (value) => {
@@ -1114,6 +1156,7 @@ var PaymentModal = ({
   data,
   callback,
   onClose,
+  onSetLocalOrderId,
   setEditCartMode,
   editOrderId,
   paymentResultDisplayMode,
@@ -1145,13 +1188,18 @@ var PaymentModal = ({
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
   const { nativePrint } = (0, import_printer.default)();
+  const businessCode = (0, import_OsKeyContext.useBusinessCode)();
   const handleRetry = async () => {
+    var _a2, _b2;
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
     const res = await (checkoutModule == null ? void 0 : checkoutModule.manualSyncOrderAsync());
     console.log(res);
     if (res.success) {
       setShowRetryModal(false);
       await (showSuccessToast == null ? void 0 : showSuccessToast(res));
+      if (((_b2 = (_a2 = res == null ? void 0 : res.response) == null ? void 0 : _a2.data) == null ? void 0 : _b2.payment_status) === "paid") {
+        onClose == null ? void 0 : onClose(true);
+      }
     }
   };
   (0, import_react.useEffect)(() => {
@@ -1407,18 +1455,37 @@ var PaymentModal = ({
       "PaymentModal - Toast closed, executing payment completion callback"
     );
     if (currentPaymentResultRef.current) {
-      callback == null ? void 0 : callback(currentPaymentResultRef.current);
+      callback == null ? void 0 : callback({ ...currentPaymentResultRef.current, isCallbackFromToast: true });
     }
   };
   const handleModalClose = () => {
     console.log("PaymentModal - Modal closing independently");
     onClose == null ? void 0 : onClose(true);
   };
-  const handlePaymentCancel = (reset) => {
+  const handlePaymentCancel = (reset, notCancelOrder) => {
+    var _a2, _b2;
+    const isSyncingLocked = ((_b2 = (_a2 = paymentContentRef.current) == null ? void 0 : _a2.getSyncingLock) == null ? void 0 : _b2.call(_a2)) || false;
+    console.log("Payment cancelled, syncingLock:", isSyncingLocked);
+    if (isSyncingLocked) {
+      logger == null ? void 0 : logger.addLog({
+        type: "warning",
+        title: "订单正在同步中，用户点击取消",
+        metadata: {
+          isSyncingLocked
+        }
+      });
+      return;
+    }
     console.log("Payment cancelled");
     callback == null ? void 0 : callback({ status: "cancelled" });
     const checkout = pisellos.getModule("checkout");
-    checkout.cancelCurrentOrderAsync();
+    if (!notCancelOrder) {
+      checkout.cancelCurrentOrderAsync();
+    } else {
+      onClose == null ? void 0 : onClose(false);
+      onSetLocalOrderId == null ? void 0 : onSetLocalOrderId(checkout.getCurrentOrderId());
+      return;
+    }
     onClose == null ? void 0 : onClose(reset || false);
   };
   const handleSetEditCartMode = async (closeModal = false) => {
@@ -1448,7 +1515,7 @@ var PaymentModal = ({
         if (checkout.isCurrentOrderSynced() && ((_a2 = checkout.getCurrentOrderInfo()) == null ? void 0 : _a2.paymentStatus) !== "unpaid") {
           handleSetEditCartMode(true);
         } else {
-          handlePaymentCancel(false);
+          handlePaymentCancel(false, true);
         }
       }
     }
@@ -1488,7 +1555,8 @@ var PaymentModal = ({
             currency_code: getData("shop_currency_code"),
             currency_symbol: getData("shop_symbol"),
             order_rounding_setting: getData("order_rounding_setting"),
-            shop_wallet_pass_id
+            shop_wallet_pass_id,
+            business_code: businessCode
           });
           const newData = (0, import_lodash.cloneDeep)(data);
           const existPayment = newData.existPayment;
@@ -1728,10 +1796,15 @@ var PaymentModal = ({
       setTimeout(() => {
         (0, import_PaymentResultToast.closePaymentResultToast)();
       }, 0);
-      const { isTerminal, isWebPos: isWebPos2 } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
+      const { isTerminal, isWebPos: isWebPos2, NativePage } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
+      const checkout = pisellos.getModule("checkout");
+      const orderId = await checkout.getCurrentOrderId();
+      if (isWebPos2) {
+        const nativePage = NativePage == null ? void 0 : NativePage();
+        nativePage.open({ page: "/native/order/detail", params: { order_id: orderId } });
+        return;
+      }
       if (isTerminal == null ? void 0 : isTerminal()) {
-        const checkout = pisellos.getModule("checkout");
-        const orderId = await checkout.getCurrentOrderId();
         return interaction.utils.postMessageToApp({
           module: "booking",
           key: "view_order",
@@ -2043,6 +2116,7 @@ var PaymentModal = ({
         },
         title: /* @__PURE__ */ import_react.default.createElement(CustomHeader, null),
         width: 880,
+        className: "payment-modal-modal",
         destroyOnClose: false,
         maskClosable: false,
         footer: null,