@pisell/private-materials 6.5.27 → 6.6.2

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

@@ -154,6 +154,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -322,6 +323,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -490,6 +492,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;

package/lib/components/checkout/locales.js

@@ -210,6 +210,7 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "The amount cannot be 0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "Order sync failed, please check your network",
+    "pisell2.checkout.order-create-failed": "Order create failed, please refresh app",
     "pisell2.checkout.sync-retry-hint": "Network error, please click the retry button to resync the order",
     "pisell2.checkout.tips": "Tips",
     "retry": "Retry",
@@ -415,6 +416,7 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "金额不能为0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "订单同步失败，请检查网络",
+    "pisell2.checkout.order-create-failed": "订单创建失败，请重启APP",
     "pisell2.checkout.sync-retry-hint": "网络异常，请点击重试按钮重新同步订单",
     "pisell2.checkout.tips": "提示",
     "retry": "重试",
@@ -620,6 +622,7 @@ var locales_default = {
     "pisell2.amount-summary.amount-cannot-be-zero": "金額不能為0",
     // Order sync errors
     "pisell2.checkout.order-sync-failed": "訂單同步失敗，請檢查網絡",
+    "pisell2.checkout.order-create-failed": "订单创建失败，请重启APP",
     "pisell2.checkout.sync-retry-hint": "網絡異常，請點擊重試按鈕重新同步訂單",
     "pisell2.checkout.tips": "提示",
     "retry": "重試",

package/lib/components/eftposPay/linkly/index.js

@@ -125,6 +125,7 @@ var Linkly = ({ api, onChange }) => {
     failRef.current = fail;
   }, [fail]);
   (0, import_react.useEffect)(() => {
+    var _a, _b, _c;
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }
@@ -136,7 +137,36 @@ var Linkly = ({ api, onChange }) => {
       resultQuery();
       return;
     }
-    payOrRefund(resultQuery, handleLinklySuccess);
+    if (((_a = utils == null ? void 0 : utils.isTerminal) == null ? void 0 : _a.call(utils)) && ((_c = (_b = utils == null ? void 0 : utils.interaction) == null ? void 0 : _b.utils) == null ? void 0 : _c.asyncDataManager)) {
+      const _payOrRefund = async () => {
+        var _a2, _b2, _c2;
+        try {
+          const activeStatus = await ((_c2 = (_b2 = (_a2 = utils == null ? void 0 : utils.interaction) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.asyncDataManager) == null ? void 0 : _c2.call(_b2, {
+            module: "get",
+            key: "pay_webview_active"
+          }));
+          if (activeStatus !== "unActive") {
+            payOrRefund(resultQuery, handleLinklySuccess);
+          } else {
+            (0, import_utils.sendWarningLog)({
+              title: "Linkly-支付-当前页面非活跃状态，无法进行支付",
+              content: [
+                { key: "response", value: JSON.stringify({ activeStatus }) }
+              ]
+            });
+          }
+        } catch (error) {
+          (0, import_utils.sendWarningLog)({
+            title: "Linkly-支付-获取当前页面活跃状态失败",
+            content: [{ key: "error", value: JSON.stringify(error) }]
+          });
+          payOrRefund(resultQuery, handleLinklySuccess);
+        }
+      };
+      _payOrRefund();
+    } else {
+      payOrRefund(resultQuery, handleLinklySuccess);
+    }
   }, []);
   (0, import_react.useEffect)(() => {
     return () => {

package/lib/components/eftposPay/tyro/index.js

@@ -158,6 +158,12 @@ var tyro_default = ({
       response: {},
       metadata: {
         receipt: []
+      },
+      _config: {
+        retry: {
+          count: 10,
+          delay: 500
+        }
       }
     }).then((res) => {
       requestIdRef.current = res.data.id;
@@ -229,6 +235,12 @@ var tyro_default = ({
       response: {},
       metadata: {
         receipt: []
+      },
+      _config: {
+        retry: {
+          count: 10,
+          delay: 500
+        }
       }
     }).then((res) => {
       requestIdRef.current = res.data.id;

package/lib/components/list/List.js

@@ -145,6 +145,9 @@ var List = (props) => {
   };
   const processedData = (0, import_react.useMemo)(() => {
     const sourceData = loading ? MOCK_LIST_DATA : data || [];
+    console.log(`processedData recalculating: tabStyle=${tabStyle}, activeTab=${activeTab}, tabItems=${tabItems.length}, dataLength=${sourceData.length}`);
+    console.log(`sourceData sample: ${JSON.stringify(sourceData.slice(0, 2), null, 2)}`);
+    console.log(`tabGroup: ${tabGroup}`);
     if (tabStyle === "anchor" && tabItems.length > 0) {
       const groupedData = [];
       const categoryTabs = tabItems.filter((tab) => tab.key !== "all");

package/lib/components/pay/toB/components/MX51/index.js

@@ -33,8 +33,8 @@ __export(MX51_exports, {
 });
 module.exports = __toCommonJS(MX51_exports);
 var import_react = require("react");
+var import_utils = require("@pisell/utils");
 var import_useLogger = __toESM(require("../../../../../hooks/useLogger"));
-var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var getUuid = () => {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx".replace(/[xy]/g, (c) => {
     const r = Math.random() * 16 | 0;
@@ -43,10 +43,7 @@ var getUuid = () => {
   });
 };
 var MX51 = (props, ref) => {
-  var _a, _b;
   const logger = (0, import_useLogger.default)();
-  const context = (0, import_useEngineContext.default)();
-  const action = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.action;
   const onOpen = ({ data, payCallback }) => {
     const { params, mode } = data;
     const uniquePaymentNumber = getUuid();
@@ -65,40 +62,18 @@ var MX51 = (props, ref) => {
       title: "ToB_MX51_onOpen 开始调用",
       metadata: { params: newData }
     });
-    action({
-      type: "webpos.handleMX51Pay",
-      data: newData,
-      callback: (res) => {
-        var _a2, _b2;
-        let isSame = false;
-        if (res == null ? void 0 : res.uniquePaymentNumber) {
-          const _res = res;
-          isSame = (_res == null ? void 0 : _res.uniquePaymentNumber) === uniquePaymentNumber;
-          if (isSame) {
-            payCallback == null ? void 0 : payCallback(_res);
-          }
-        } else {
-          const _res = res;
-          const newRes = {
-            result: (_res == null ? void 0 : _res.code) == "200" ? true : false,
-            msg: _res == null ? void 0 : _res.msg,
-            amount: (_a2 = _res == null ? void 0 : _res.data) == null ? void 0 : _a2.amount,
-            surcharge: (_b2 = _res == null ? void 0 : _res.data) == null ? void 0 : _b2.surcharge,
-            uniquePaymentNumber: _res == null ? void 0 : _res.uuid
-          };
-          isSame = (_res == null ? void 0 : _res.uuid) === uniquePaymentNumber;
-          if (isSame) {
-            payCallback == null ? void 0 : payCallback(newRes);
-          }
+    (0, import_utils.webPayment)(newData, (res) => {
+      const isSame = (res == null ? void 0 : res.uniquePaymentNumber) === uniquePaymentNumber;
+      logger == null ? void 0 : logger.addLog({
+        type: "info",
+        title: "ToB_MX51_onOpen_callback",
+        metadata: {
+          msg: isSame ? "uniquePaymentNumber一致" : "uniquePaymentNumber不一致",
+          res
         }
-        logger == null ? void 0 : logger.addLog({
-          type: "info",
-          title: "ToB_MX51_onOpen_callback",
-          metadata: {
-            msg: isSame ? "交易流水号一致" : "交易流水号不一致",
-            res
-          }
-        });
+      });
+      if (isSame) {
+        payCallback == null ? void 0 : payCallback(res);
       }
     });
   };

package/lib/components/pay/toB/types/index.d.ts

@@ -58,15 +58,3 @@ export interface MX51PayResult {
     surcharge: number;
     uniquePaymentNumber: string;
 }
-/**
- * @title 原生MX51支付结果
- */
-export interface NativeMX51PayResult {
-    code: string;
-    msg?: string;
-    data: {
-        amount: number;
-        surcharge: number;
-    };
-    uuid: string;
-}

package/lib/components/pisellSelectCustomerModal/RightPanel/serve.js

@@ -25,14 +25,7 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getCustomerList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/customer/select-list`, params, {
-    abort: true,
-    fullResult: true,
-    cache: {
-      mode: "remote_local",
-      type: "indexDB"
-    }
-  });
+  let { data } = await import_utils.request.getRequest().get(`/shop/customer/select-list`, params, { abort: true, fullResult: true });
   return data;
 };
 var addCustomer = async (params) => {

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -54,6 +54,7 @@ var Product = (props) => {
     platform,
     isShowChangeResource,
     isShowDelete,
+    isShowAmountFooter,
     isShowChangeHolder,
     isShowHolder,
     isShowAddHolderButton,
@@ -82,7 +83,8 @@ var Product = (props) => {
       isShowDelete,
       isShowHolder,
       isShowAddHolderButton,
-      isShowEditProduct
+      isShowEditProduct,
+      isShowAmountFooter
     };
   }, [
     isShowNote,
@@ -93,7 +95,8 @@ var Product = (props) => {
     isShowHolder,
     isShowAddHolderButton,
     isShowChangeHolder,
-    isShowEditProduct
+    isShowEditProduct,
+    isShowAmountFooter
   ]);
   const getProductCardStyleProps = (0, import_ahooks.useMemoizedFn)(
     (type) => {
@@ -101,7 +104,8 @@ var Product = (props) => {
       if (state.scenario !== "booking2") return {};
       return {
         isShowImage: conf == null ? void 0 : conf.show_product_image,
-        isShowDelete: conf == null ? void 0 : conf.show_remove_button,
+        isShowDelete: (conf == null ? void 0 : conf.show_remove_button) && isShowDelete,
+        isShowAmountFooter,
         disabledEdit: true
       };
     }

package/lib/components/shoppingCart/type.d.ts

@@ -29,6 +29,7 @@ export interface shoppingCartProps {
     isShowImage?: boolean;
     isShowHolder?: boolean;
     isShowDelete?: boolean;
+    isShowAmountFooter?: boolean;
     collapseParams?: CollapseProps;
     productParams?: productProps;
     isHideClearCart?: boolean;

package/lib/components/ticketBooking/components/ProductDisplayAdapter/index.less

@@ -1,18 +1,6 @@
 .sku-list-container {
   height: 100%;
   background-color: #4e4e4e;
-  .empty-content {
-    .empty-icon-wrapper {
-      .empty-default-icon {
-        color: rgba(255, 255, 255, 0.8) !important;
-      }
-    }
-    .empty-inner {
-      .empty-text {
-        color: rgba(255, 255, 255, 0.8) !important;
-      }
-    }
-  }
   .sku-list {
     background-color: #4e4e4e;
     overflow: auto;

package/lib/components/ticketBooking/components/addServiceVariant/MultiDayTimeSelectModal.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { Dayjs } from 'dayjs';
+import './MultiDayTimeSelectModal.less';
+interface MultiDayTimeSelectModalProps {
+    open: boolean;
+    productName?: string;
+    locale?: string;
+    defaultStartDate?: Dayjs;
+    loading?: boolean;
+    /** 最大天数，默认30天 */
+    maxDays?: number;
+    /** 开始时间和结束时间是否分离 */
+    separateStartEnd?: boolean;
+    onConfirm: (startDate: Dayjs, endDate: Dayjs, duration: number) => void;
+    onCancel: () => void;
+}
+declare const MultiDayTimeSelectModal: React.FC<MultiDayTimeSelectModalProps>;
+export default MultiDayTimeSelectModal;

package/lib/components/ticketBooking/components/addServiceVariant/MultiDayTimeSelectModal.js

@@ -0,0 +1,118 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/ticketBooking/components/addServiceVariant/MultiDayTimeSelectModal.tsx
+var MultiDayTimeSelectModal_exports = {};
+__export(MultiDayTimeSelectModal_exports, {
+  default: () => MultiDayTimeSelectModal_default
+});
+module.exports = __toCommonJS(MultiDayTimeSelectModal_exports);
+var import_react = __toESM(require("react"));
+var import_dayjs = __toESM(require("dayjs"));
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_multiDayTimeSelect = __toESM(require("../../../../pro/multiDayTimeSelect"));
+var import_MultiDayTimeSelectModal = require("./MultiDayTimeSelectModal.less");
+var MultiDayTimeSelectModal = ({
+  open,
+  productName,
+  locale = "en",
+  defaultStartDate,
+  loading = false,
+  maxDays = 30,
+  separateStartEnd = false,
+  onConfirm,
+  onCancel
+}) => {
+  const [value, setValue] = (0, import_react.useState)(null);
+  const formRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    if (open) {
+      const startDate = defaultStartDate || (0, import_dayjs.default)();
+      const endDate = startDate.add(1, "day");
+      const initialValue = {
+        startDate,
+        endDate,
+        duration: 1
+      };
+      setValue(initialValue);
+    }
+  }, [open, defaultStartDate]);
+  const handleChange = (newValue) => {
+    setValue(newValue);
+  };
+  const handleConfirm = async () => {
+    var _a;
+    try {
+      await ((_a = formRef.current) == null ? void 0 : _a.validate());
+      if (value) {
+        onConfirm(value.startDate, value.endDate, value.duration);
+      }
+    } catch (error) {
+    }
+  };
+  const handleCancel = () => {
+    if (loading) return;
+    onCancel();
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellModal,
+    {
+      open,
+      title: productName || import_utils.locales.getText("pisell2.text.product_name"),
+      onCancel: handleCancel,
+      onOk: handleConfirm,
+      okText: import_utils.locales.getText("pisell2.text.confirm"),
+      cancelText: import_utils.locales.getText("pisell2.text.cancel"),
+      width: 600,
+      destroyOnClose: true,
+      confirmLoading: loading,
+      closable: !loading,
+      maskClosable: !loading,
+      headerDivider: false,
+      footerDivider: false,
+      cancelButtonProps: {
+        disabled: loading
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(
+      import_multiDayTimeSelect.default,
+      {
+        ref: formRef,
+        maxDays,
+        defaultStartDate,
+        separateStartEnd,
+        value: value || void 0,
+        onChange: handleChange,
+        locale,
+        disabled: loading
+      }
+    )
+  );
+};
+var MultiDayTimeSelectModal_default = MultiDayTimeSelectModal;

package/lib/components/ticketBooking/components/addServiceVariant/addService.d.ts

@@ -5,8 +5,6 @@ interface AddServiceProps {
     dispatch?: any;
     state?: any;
     renderMode?: 'current' | 'drawer';
-    onPrerenderComplete?: () => void;
-    onGetProductsReady?: (getProducts: any) => void;
     /**
      * 产品展示配置
      *