@pisell/private-materials 6.6.5 → 6.6.6

package/lib/components/booking/info2/service/editService/utils.js

@@ -1,6 +1,8 @@
+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)
@@ -14,21 +16,32 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/booking/info2/service/editService/utils.tsx
 var utils_exports = {};
 __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
-  setAutoAllocationStorage: () => setAutoAllocationStorage
+  setAutoAllocationStorage: () => setAutoAllocationStorage,
+  setProductPrice: () => setProductPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
+var import_utils2 = require("@pisell/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
     const valueObj = JSON.parse(value);
-    return (0, import_utils.isBoolean)(valueObj[id]) ? valueObj[id] : true;
+    return (0, import_utils2.isBoolean)(valueObj[id]) ? valueObj[id] : true;
   }
   return true;
 };
@@ -41,8 +54,32 @@ var setAutoAllocationStorage = (data) => {
     localStorage.setItem("resource-auto-allocation", JSON.stringify({ ...data }));
   }
 };
+var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const discountRatio = new import_decimal.default(newTotal).div(new import_decimal.default(origin_total));
+  let subTotal = new import_decimal.default(0);
+  if (((_a = cacheItem._extend.other) == null ? void 0 : _a.bundle) && (0, import_utils.isArr)((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle)) {
+    (_d = (_c = cacheItem._extend.other) == null ? void 0 : _c.bundle) == null ? void 0 : _d.forEach((bundle) => {
+      const newPrice = new import_decimal.default(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+      const quantity = bundle.num ?? bundle.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
+      bundle.price = newPrice;
+    });
+  }
+  if (((_e = cacheItem._extend.other) == null ? void 0 : _e.option) && (0, import_utils.isArr)((_f = cacheItem._extend.other) == null ? void 0 : _f.option)) {
+    (_h = (_g = cacheItem._extend.other) == null ? void 0 : _g.option) == null ? void 0 : _h.forEach((option) => {
+      const newPrice = new import_decimal.default(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+      const quantity = option.num ?? option.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
+      option.price = newPrice;
+    });
+  }
+  cacheItem._extend.price = new import_decimal.default(newTotal).sub(subTotal).toNumber();
+  return cacheItem;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getAutoAllocationStorage,
-  setAutoAllocationStorage
+  setAutoAllocationStorage,
+  setProductPrice
 });

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

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

@@ -161,6 +161,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getMainPrice: (item: any, price?: number) => number;
 export declare const getProductTotalPrice: (item: any) => number;
 /**
  * @title: 判断 duration

package/lib/components/booking/utils.js

@@ -47,6 +47,7 @@ __export(utils_exports, {
   getIsEject: () => getIsEject,
   getIsOnlySession: () => getIsOnlySession,
   getLastServer: () => getLastServer,
+  getMainPrice: () => getMainPrice,
   getNowTime: () => getNowTime,
   getProductTotalPrice: () => getProductTotalPrice,
   getResourceTimeIsUsable: () => getResourceTimeIsUsable,
@@ -624,6 +625,15 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
   }
   return _extend;
 };
+var getMainPrice = (item, price) => {
+  var _a;
+  let newPrice = new import_decimal.default(price || item._extend.price || 0);
+  let other = (_a = item._extend) == null ? void 0 : _a.other;
+  if (other == null ? void 0 : other.product_variant_id) {
+    newPrice = new import_decimal.default((other == null ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
 var getProductTotalPrice = (item) => {
   var _a;
   let price = new import_decimal.default(item._extend.price || 0);
@@ -718,6 +728,7 @@ var getIsEdit = (state) => {
   getIsEject,
   getIsOnlySession,
   getLastServer,
+  getMainPrice,
   getNowTime,
   getProductTotalPrice,
   getResourceTimeIsUsable,

package/lib/components/checkout/components/AmountSummary/index.less

@@ -248,7 +248,6 @@
 
   .balance-due-label {
     font-size: 16px;
-    color: #7f56da;
     font-weight: 400;
     line-height: 1.5;
     margin-bottom: 4px;
@@ -256,7 +255,7 @@
 
   .balance-due-amount {
     font-size: 14px;
-    font-weight: 400;
+    font-weight: 600;
     color: #7f56da;
     line-height: 0.75;
     text-decoration: underline;
@@ -272,13 +271,13 @@
   .pay-text {
     font-size: 16px;
     font-weight: 500;
-    color: #7f56da;
     letter-spacing: 0.09375em;
+    margin-top: 12px;
   }
 
   .pay-amount {
-    font-size: 32px;
-    font-weight: 400;
+    font-size: 36px;
+    font-weight: 600;
     color: #1e1830;
     line-height: 0.75;
   }

package/lib/components/eftpos/deviceList/index.d.ts

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

package/lib/components/eftpos/form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/lib/components/eftpos/group/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/lib/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/receipt/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/lib/components/eftposPay/component/alert/warn.d.ts

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

package/lib/components/eftposPay/component/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

package/lib/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -41,6 +41,7 @@ var import_const = require("../../const");
 var import_const2 = require("../const");
 var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
+var QUERY_INTERVAL = 1e3 * 2;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
   const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
@@ -56,6 +57,7 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const startTimeRef = (0, import_react.useRef)(null);
   const isQueryFinishedRef = (0, import_react.useRef)(true);
   const queryIdRef = (0, import_react.useRef)(null);
+  const queryIntervalTimerRef = (0, import_react.useRef)(null);
   const _resultQuery = async () => {
     var _a, _b;
     if (controllerRef.current) {
@@ -107,9 +109,9 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         console.log("交易状态为0需要继续查询");
         _log("Querying" /* Querying */, result);
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       if (data.status < 0) {
@@ -145,18 +147,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
         _log("NetworkError" /* NetworkError */);
         console.log("Error: 网关类报错，将继续查询");
         isQueryFinishedRef.current = false;
-        setTimeout(() => {
+        queryIntervalTimerRef.current = setTimeout(() => {
           _resultQuery();
-        }, 1500);
+        }, QUERY_INTERVAL);
         return;
       }
       _log("Error" /* Error */, error);
@@ -203,6 +205,10 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       clearTimeout(requestTimeoutIdRef.current);
       requestTimeoutIdRef.current = null;
     }
+    if (queryIntervalTimerRef.current) {
+      clearTimeout(queryIntervalTimerRef.current);
+      queryIntervalTimerRef.current = null;
+    }
     if (controllerRef.current) {
       controllerRef.current.abort();
       controllerRef.current = null;

package/lib/components/eftposPay/payo/config.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

package/lib/components/eftposPay/payo/config.js

@@ -42,6 +42,7 @@ var import_helper = require("../helper");
 var import_hooks = require("../hooks");
 var import_store = require("../store");
 var import_hooks2 = require("./hooks");
+var import_payment = require("./payment");
 var POS = ({
   api,
   onChange
@@ -68,6 +69,13 @@ var POS = ({
   const initRef = (0, import_react.useRef)(false);
   const unloadRef = (0, import_react.useRef)(false);
   const [check] = (0, import_hooks2.useValidate)(1e3 * 60);
+  const { run: paymentRun, clean: paymentClean } = (0, import_payment.usePayment)({
+    payApi: api.pay,
+    checkApi: api.check,
+    shouldContinue: () => {
+      return !(unloadRef.current || !netRef.current);
+    }
+  });
   (0, import_react.useEffect)(() => {
     failRef.current = fail;
   }, [fail]);
@@ -126,7 +134,7 @@ var POS = ({
     );
   };
   (0, import_react.useEffect)(() => {
-    var _a, _b;
+    var _a, _b, _c;
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }
@@ -145,82 +153,98 @@ var POS = ({
       })
     );
     controllerRef.current = new AbortController();
-    const resultPromise = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay ? api.pay(
-      {
-        ...(custom == null ? void 0 : custom.platform) ? {
-          operator_id: custom.operator_id,
-          operator_type: custom.operator_type,
-          platform: custom.platform,
-          custom_payment_id: custom.custom_payment_id,
-          service_charge: {
-            amount: payRef.current.surMoney,
-            percentage: payRef.current.surPercentRate
-          },
-          original_amount: payRef.current.amount
-        } : {},
-        order_id: orderIdRef.current,
-        amount: payRef.current.total,
-        card_reader_type: eftposRef.current,
-        card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
-        number: numRef.current,
-        pay_param_base64: encodeURIComponent(
-          btoa(
-            encodeURIComponent(
-              JSON.stringify({
-                ...dataRef.current,
-                number: numRef.current
-              })
-            )
+    const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
+    const apiParams = isPay ? {
+      ...(custom == null ? void 0 : custom.platform) ? {
+        operator_id: custom.operator_id,
+        operator_type: custom.operator_type,
+        platform: custom.platform,
+        custom_payment_id: custom.custom_payment_id
+      } : {},
+      original_amount: payRef.current.amount,
+      service_charge: {
+        amount: payRef.current.surMoney,
+        percentage: payRef.current.surPercentRate
+      },
+      order_id: orderIdRef.current,
+      amount: payRef.current.total,
+      card_reader_type: eftposRef.current,
+      card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
+      number: numRef.current,
+      pay_param_base64: encodeURIComponent(
+        btoa(
+          encodeURIComponent(
+            JSON.stringify({
+              ...dataRef.current,
+              number: numRef.current
+            })
           )
         )
-      },
-      { signal: controllerRef.current.signal }
-    ) : api.refund(
-      {
-        order_id: orderIdRef.current,
-        amount: amountRef.current,
-        card_reader_type: eftposRef.current,
-        card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
-        number: numRef.current,
-        pay_param_base64: encodeURIComponent(
-          btoa(
-            encodeURIComponent(
-              JSON.stringify({
-                ...dataRef.current,
-                number: numRef.current
-              })
-            )
+      )
+    } : {
+      order_id: orderIdRef.current,
+      amount: amountRef.current,
+      card_reader_type: eftposRef.current,
+      card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
+      number: numRef.current,
+      pay_param_base64: encodeURIComponent(
+        btoa(
+          encodeURIComponent(
+            JSON.stringify({
+              ...dataRef.current,
+              number: numRef.current
+            })
           )
         )
-      },
-      { signal: controllerRef.current.signal }
-    );
-    resultPromise.then((res) => {
-      console.log("netRef.current111 = ", netRef.current);
-      if (unloadRef.current || !netRef.current) {
-        return;
-      }
-      if (res && `${res.code}` === "200") {
-        success(res);
-        return;
-      }
-      return Promise.reject(res);
-    }).catch((err) => {
-      console.log(
-        "netRef.current222 = ",
-        netRef.current,
-        unloadRef.current,
-        err
-      );
-      if (unloadRef.current || !netRef.current) {
-        return;
-      }
-      if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
-        checkApi();
-        return;
-      }
-      failRef.current(err, true);
-    });
+      )
+    };
+    if (isPay) {
+      paymentRun({
+        paymentType: import_payment.ActionType.Pay,
+        paymentNum: numRef.current,
+        orderId: orderIdRef.current,
+        deviceId: (_c = deviceRef.current) == null ? void 0 : _c.id,
+        params: apiParams,
+        callbacks: {
+          onSuccess: (res) => {
+            success(res);
+          },
+          onError: (err) => {
+            console.log("err = >>>>>", err);
+            failRef.current(err, true);
+          }
+        }
+      });
+      return;
+    } else {
+      const resultPromise = api.refund(apiParams, { signal: controllerRef.current.signal });
+      resultPromise.then((res) => {
+        console.log("netRef.current111 = ", netRef.current);
+        if (unloadRef.current || !netRef.current) {
+          return;
+        }
+        if (res && `${res.code}` === "200") {
+          success(res);
+          return;
+        }
+        return Promise.reject(res);
+      }).catch((err) => {
+        console.log(
+          "netRef.current222 = ",
+          netRef.current,
+          unloadRef.current,
+          err
+        );
+        if (unloadRef.current || !netRef.current) {
+          return;
+        }
+        if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
+          checkApi();
+          return;
+        }
+        failRef.current(err, true);
+      });
+    }
   }, [api, check, dispatch, onChange]);
   (0, import_react.useEffect)(
     () => () => {
@@ -230,6 +254,7 @@ var POS = ({
       if (clearRef.current) {
         clearTimeout(clearRef.current);
       }
+      paymentClean();
     },
     []
   );

package/lib/components/eftposPay/payo/payment.d.ts

@@ -0,0 +1,66 @@
+interface RunApiParams {
+    [key: string]: any;
+}
+export declare enum ActionType {
+    Pay = "pay",
+    Refund = "refund",
+    Query = "query"
+}
+interface UsePaymentOptions {
+    /**
+     * 支付接口
+     */
+    payApi: (params: RunApiParams, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 退款接口
+     */
+    refundApi?: (params: RunApiParams, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 查询接口
+     */
+    checkApi: (params: {
+        number: string;
+    }, options?: {
+        signal?: AbortSignal;
+    }) => Promise<any>;
+    /**
+     * 检查是否应该继续处理结果（用于处理网络断开、组件卸载等情况）
+     */
+    shouldContinue?: () => boolean;
+}
+interface RunParams {
+    /** 支付类型 */
+    paymentType: ActionType;
+    /** 支付交易号 */
+    paymentNum: string;
+    /** 订单ID */
+    orderId?: string | number;
+    /** 设备ID */
+    deviceId?: string | number;
+    /** 支付参数 */
+    params: RunApiParams;
+    /** 回调方法 */
+    callbacks: RunCallbacks;
+}
+interface RunCallbacks {
+    /**
+     * 成功回调
+     */
+    onSuccess: (res: any) => void;
+    /**
+     * 失败回调
+     */
+    onError: (error: any) => void;
+}
+export declare const usePayment: (options: UsePaymentOptions) => {
+    run: (options: RunParams) => Promise<void>;
+    stop: () => void;
+    clean: (params?: {
+        clearCallbacks?: boolean;
+    }) => void;
+};
+export {};