@pisell/private-materials 3.3.71 → 3.3.73

package/es/components/appointmentBooking/components/Date/index.js

@@ -13,7 +13,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useEffect, useMemo, forwardRef, useImperativeHandle } from 'react';
+import React, { useState, useEffect, useMemo, forwardRef, useImperativeHandle, useRef } from 'react';
 import { Skeleton } from 'antd';
 import Dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -29,6 +29,7 @@ import { localeTypes } from "./state";
 import "./index.less";
 var Date = /*#__PURE__*/forwardRef(function (props, ref) {
   var _context$engine2, _Dayjs$locale;
+  var isFetchingDates = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -223,7 +224,7 @@ var Date = /*#__PURE__*/forwardRef(function (props, ref) {
   }();
   var getDates = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(date) {
-      var startDate, endDate, params, data, selected, _selected$, firstAvailableDate, baseMonthData, updatedDates;
+      var startDate, endDate, params, data, firstAvailableDate, nextMonthDate, selected, _selected$, baseMonthData, updatedDates;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -238,19 +239,29 @@ var Date = /*#__PURE__*/forwardRef(function (props, ref) {
             return getDateData(params);
           case 6:
             data = _context4.sent;
-            _context4.next = 9;
+            firstAvailableDate = (data || []).find(function (d) {
+              return d.status === 'available';
+            }); // 如果当前月没有可用日期，并且这是第一次尝试，则自动查询下一个月
+            if (!(!firstAvailableDate && !isFetchingDates.current)) {
+              _context4.next = 14;
+              break;
+            }
+            isFetchingDates.current = true;
+            nextMonthDate = Dayjs(date).add(1, 'month');
+            setCurrentMonth(nextMonthDate);
+            setLoading(true);
+            return _context4.abrupt("return");
+          case 14:
+            _context4.next = 16;
             return appointmentBooking.getDateRange();
-          case 9:
+          case 16:
             selected = _context4.sent;
             console.log(data, selected, customPageId, 'getDates');
             if ((selected === null || selected === void 0 ? void 0 : selected.length) > 0) {
               setCurrentDate(selected === null || selected === void 0 || (_selected$ = selected[0]) === null || _selected$ === void 0 ? void 0 : _selected$.date);
             } else if (!isDateSelectedFirst) {
               // 当前月则默认选中当前第一个可用的
-              if (date.format('YYYY-MM') === Dayjs().format('YYYY-MM')) {
-                firstAvailableDate = (data || []).find(function (d) {
-                  return d.status === 'available';
-                });
+              if (date.format('YYYY-MM') === Dayjs().format('YYYY-MM') || isFetchingDates.current) {
                 if (firstAvailableDate) {
                   setCurrentDate(firstAvailableDate === null || firstAvailableDate === void 0 ? void 0 : firstAvailableDate.date);
                   appointmentBooking.setDateRange([firstAvailableDate]);
@@ -273,19 +284,18 @@ var Date = /*#__PURE__*/forwardRef(function (props, ref) {
             });
             setLoading(false);
             setDateMonthList(updatedDates);
-            _context4.next = 23;
+            _context4.next = 29;
             break;
-          case 18:
-            _context4.prev = 18;
+          case 25:
+            _context4.prev = 25;
             _context4.t0 = _context4["catch"](0);
             setLoading(false);
             setDateMonthList([]);
-            console.log(_context4.t0, 'wh978968234234');
-          case 23:
+          case 29:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[0, 18]]);
+      }, _callee4, null, [[0, 25]]);
     }));
     return function getDates(_x2) {
       return _ref4.apply(this, arguments);

package/es/components/booking/info/client/index.js

@@ -33,6 +33,7 @@ import { isWalkIn as getIsWalkIn } from "../../utils";
 import { getFranchiseeCustomerInfo, getFranchiseeCustomerList } from "./serve";
 import { useMemoizedFn } from 'ahooks';
 import { getWaiverTitle } from "../clientVariant/utils";
+import useGetHolderList from "../hooks/useGetHolderList";
 var isLoadClient = false;
 var Client = function Client() {
   var _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
@@ -52,6 +53,7 @@ var Client = function Client() {
     _useState6 = _slicedToArray(_useState5, 2),
     franchiseeLoading = _useState6[0],
     setFranchiseeLoading = _useState6[1];
+  var getHolders = useGetHolderList(state, dispatch);
   var _useState7 = useState({
       skip: 1,
       num: 10,
@@ -281,6 +283,7 @@ var Client = function Client() {
         if (data) {
           handleSelectClient([data]);
         }
+        getHolders();
         getClients(_objectSpread(_objectSpread({}, state.client.clientsParams), {}, {
           search: '',
           customer_id: data === null || data === void 0 ? void 0 : data.id,
@@ -298,14 +301,20 @@ var Client = function Client() {
         showAcceptsMarketing: false
       },
       callback: function callback(customer_id, params) {
-        var _params$, _params$2, _state$client2;
+        var _state$client2, _state$client2$map, _params$, _params$2, _state$client3;
+        var waiverForm = ((_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.clients) === null || _state$client2 === void 0 || (_state$client2 = _state$client2[0].waiver_form) === null || _state$client2 === void 0 || (_state$client2$map = _state$client2.map) === null || _state$client2$map === void 0 ? void 0 : _state$client2$map.call(_state$client2, function (item) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            is_filled: 0
+          });
+        })) || [];
         // 创建后本地数据处理到数组
         dispatch({
           type: 'setClient',
           payload: {
             clients: [].concat(_toConsumableArray(params !== null && params !== void 0 && (_params$ = params[0]) !== null && _params$ !== void 0 && _params$.customer ? [_objectSpread(_objectSpread({}, params === null || params === void 0 || (_params$2 = params[0]) === null || _params$2 === void 0 ? void 0 : _params$2.customer), {}, {
-              id: customer_id
-            })] : []), _toConsumableArray(((_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.clients) || []))
+              id: customer_id,
+              waiver_form: waiverForm
+            })] : []), _toConsumableArray(((_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.clients) || []))
           }
         });
       }

package/es/components/booking/info/service2/utils.d.ts

@@ -244,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/es/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/device.d.ts

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "loading" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | undefined;
+        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/ticketBooking/utils/index.js

@@ -121,12 +121,19 @@ export var addService = function addService(list, addItem, state) {
   } else {
     // 非预约商品判断是否相同，相同合并
     var isNotSame = true;
+    // 是否设置过 只追加到第一个中
+    var isSetCount = false;
     value = list.map(function (item) {
-      if (isSameProduct(item, addItem)) {
+      // 是否商品券折扣的商品
+      var isGoodPassDiscountProduct = (item.discount_list || []).some(function (item) {
+        return item.type === 'good_pass';
+      });
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct) {
         var _item$_extend, _addItem$_extend, _item$_extend2;
         isNotSame = false;
         var quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
         count = quantity;
+        isSetCount = true;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
             quantity: quantity,

package/lib/components/appointmentBooking/components/Date/index.js

@@ -48,6 +48,7 @@ var import_index = require("./index.less");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 var Date = (0, import_react.forwardRef)((props, ref) => {
   var _a, _b, _c;
+  const isFetchingDates = (0, import_react.useRef)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [currentDate, setCurrentDate] = (0, import_react.useState)();
   const [dateMonthList, setDateMonthList] = (0, import_react.useState)([]);
@@ -139,15 +140,22 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
         endDate
       };
       const data = await getDateData(params);
+      const firstAvailableDate = (data || []).find(
+        (d) => d.status === "available"
+      );
+      if (!firstAvailableDate && !isFetchingDates.current) {
+        isFetchingDates.current = true;
+        const nextMonthDate = (0, import_dayjs.default)(date).add(1, "month");
+        setCurrentMonth(nextMonthDate);
+        setLoading(true);
+        return;
+      }
       const selected = await appointmentBooking.getDateRange();
       console.log(data, selected, customPageId, "getDates");
       if ((selected == null ? void 0 : selected.length) > 0) {
         setCurrentDate((_a2 = selected == null ? void 0 : selected[0]) == null ? void 0 : _a2.date);
       } else if (!isDateSelectedFirst) {
-        if (date.format("YYYY-MM") === (0, import_dayjs.default)().format("YYYY-MM")) {
-          const firstAvailableDate = (data || []).find(
-            (d) => d.status === "available"
-          );
+        if (date.format("YYYY-MM") === (0, import_dayjs.default)().format("YYYY-MM") || isFetchingDates.current) {
           if (firstAvailableDate) {
             setCurrentDate(firstAvailableDate == null ? void 0 : firstAvailableDate.date);
             appointmentBooking.setDateRange([firstAvailableDate]);
@@ -171,7 +179,6 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
     } catch (error) {
       setLoading(false);
       setDateMonthList([]);
-      console.log(error, "wh978968234234");
     }
   };
   (0, import_react.useEffect)(() => {

package/lib/components/booking/info/client/index.js

@@ -45,6 +45,7 @@ var import_utils2 = require("../../utils");
 var import_serve = require("./serve");
 var import_ahooks = require("ahooks");
 var import_utils3 = require("../clientVariant/utils");
+var import_useGetHolderList = __toESM(require("../hooks/useGetHolderList"));
 var isLoadClient = false;
 var Client = () => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
@@ -53,6 +54,7 @@ var Client = () => {
   const [loading, setLoading] = (0, import_react.useState)(false);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [franchiseeLoading, setFranchiseeLoading] = (0, import_react.useState)(0);
+  const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
   const [params, setParams] = (0, import_react.useState)({
     skip: 1,
     num: 10,
@@ -202,6 +204,7 @@ var Client = () => {
         if (data) {
           handleSelectClient([data]);
         }
+        getHolders();
         getClients({
           ...state.client.clientsParams,
           search: "",
@@ -220,13 +223,17 @@ var Client = () => {
         showAcceptsMarketing: false
       },
       callback: (customer_id, params2) => {
-        var _a2, _b2, _c2;
+        var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+        const waiverForm = ((_d2 = (_c2 = (_b2 = (_a2 = state.client) == null ? void 0 : _a2.clients) == null ? void 0 : _b2[0].waiver_form) == null ? void 0 : _c2.map) == null ? void 0 : _d2.call(_c2, (item) => ({
+          ...item,
+          is_filled: 0
+        }))) || [];
         dispatch({
           type: "setClient",
           payload: {
             clients: [
-              ...((_a2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _a2.customer) ? [{ ...(_b2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _b2.customer, id: customer_id }] : [],
-              ...((_c2 = state.client) == null ? void 0 : _c2.clients) || []
+              ...((_e2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _e2.customer) ? [{ ...(_f2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _f2.customer, id: customer_id, waiver_form: waiverForm }] : [],
+              ...((_g2 = state.client) == null ? void 0 : _g2.clients) || []
             ]
           }
         });

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

@@ -244,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/lib/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/device.d.ts

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "loading" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | undefined;
+        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/ticketBooking/utils/index.js

@@ -142,12 +142,15 @@ var addService = (list, addItem, state) => {
     count = addItem._extend.quantity;
   } else {
     let isNotSame = true;
+    let isSetCount = false;
     value = list.map((item) => {
       var _a, _b, _c;
-      if (isSameProduct(item, addItem)) {
+      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => item2.type === "good_pass");
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct) {
         isNotSame = false;
         const quantity = (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1);
         count = quantity;
+        isSetCount = true;
         return {
           ...item,
           _extend: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.71",
+  "version": "3.3.73",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,7 +60,7 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.3.27",
+    "@pisell/materials": "3.3.29",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.2"
   },