@pisell/private-materials 3.3.65 → 3.3.67

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

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

package/es/components/appointmentBooking/components/Content/index.d.ts

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

package/es/components/appointmentBooking/components/Voucher/index.d.ts

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

package/es/components/appointmentBooking/components/Voucher/index.less

@@ -9,7 +9,6 @@
     align-items: center;
     gap: 10px;
     color: var(--Gray-500, #667085);
-    font-family: Inter;
     font-size: 14px;
     font-style: normal;
     font-weight: 600;
@@ -103,7 +102,6 @@
     > div {
       color: var(--Gray-500, #667085);
       text-align: center;
-      font-family: Inter;
       font-size: 16px;
       font-style: normal;
       font-weight: 600;

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

package/es/components/appointmentBooking/index.d.ts

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

package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

package/es/components/booking/components/footer/index.js

@@ -36,7 +36,8 @@ import { checkHolderIsError, formatValues } from "./utils";
 import VoucherCard from "../voucher";
 import { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
-
+import { sendWarningLog } from '@pisell/utils';
+import dayjs from 'dayjs';
 /**
  * @title: 底部
  * @description:
@@ -324,7 +325,8 @@ var Footer = function Footer(props) {
           case 5:
             _context2.next = 7;
             return handleSave({
-              type: 'checkout'
+              type: 'checkout',
+              messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
             });
           case 7:
             res = _context2.sent;
@@ -469,7 +471,19 @@ var Footer = function Footer(props) {
             _context4.prev = 20;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
-            api = state.bookingId ? editApi : createApi; // 活动预约新建时校验重复 -- 暂不处理
+            api = state.bookingId ? editApi : createApi; // 增加日志记录
+            sendWarningLog({
+              title: 'saveBooking',
+              content: [{
+                key: '下单前数据',
+                value: JSON.stringify(values)
+              }, {
+                key: '日期',
+                value: dayjs().format('YYYY-MM-DD HH:mm')
+              }]
+            });
+
+            // 活动预约新建时校验重复 -- 暂不处理
             // if (!state.bookingId && state.renderType === 'eventBooking') {
             //   const { data } = await eventBookingCheck(values);
             //   if (data.list.length) {
@@ -496,45 +510,46 @@ var Footer = function Footer(props) {
             //     }
             //   }
             // }
+
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context4.next = 27;
+              _context4.next = 28;
               break;
             }
-            _context4.next = 27;
+            _context4.next = 28;
             return handleSaveAddons();
-          case 27:
+          case 28:
             if (!infoEdit) {
-              _context4.next = 32;
+              _context4.next = 33;
               break;
             }
-            _context4.next = 30;
+            _context4.next = 31;
             return api(values, state.bookingId);
-          case 30:
+          case 31:
             callbackData = _context4.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 32:
+          case 33:
             // 回调关闭弹窗
-            state === null || state === void 0 || state.callback(callbackData);
+            state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context4.abrupt("return", callbackData || values);
-          case 37:
-            _context4.prev = 37;
+          case 38:
+            _context4.prev = 38;
             _context4.t1 = _context4["catch"](20);
             console.log(_context4.t1);
             if ((_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.code) === 70101) {
               message.error(_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message);
             }
             _setLoading(false);
-          case 42:
+          case 43:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[20, 37]]);
+      }, _callee4, null, [[20, 38]]);
     }));
     return function handleSave(_x2) {
       return _ref5.apply(this, arguments);

package/es/components/booking/components/voucher/index.d.ts

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

package/es/components/booking/components/voucher/index.less

@@ -77,7 +77,6 @@
     > div {
       color: var(--Gray-500, #667085);
       text-align: center;
-      font-family: Inter;
       font-size: 16px;
       font-style: normal;
       font-weight: 600;

package/es/components/booking/forms/footer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

package/es/components/booking/info/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

package/es/components/booking/info/service/addTimeModal/index.d.ts

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

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) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

package/es/components/booking/info2/service/editService/index.js

@@ -208,7 +208,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current;
+    var _resourcesRef$current, _item$_extend;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -227,7 +227,11 @@ var Info = function Info(_, ref) {
     var _item = _objectSpread(_objectSpread({}, state.service.cacheItem), {}, {
       autoClose: false
     });
-    var _extend = _objectSpread(_objectSpread({}, _item._extend), values);
+    var _extend = _objectSpread(_objectSpread({}, _item._extend), {}, {
+      other: _objectSpread(_objectSpread({}, ((_item$_extend = _item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other) || {}), {}, {
+        quantity: values.quantity
+      })
+    }, values);
     var _getServiceTimes = getServiceTimes({
         _extend: _extend
       }),
@@ -405,11 +409,11 @@ var Info = function Info(_, ref) {
     var isSession = isSessionProduct(item);
     var sessionValue = {};
     if (isSession) {
-      var _item$_extend, _item$_extend2, _item$_extend3;
+      var _item$_extend2, _item$_extend3, _item$_extend4;
       sessionValue.startEndTime = {
-        startDate: item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.start_date,
-        endDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.end_date,
-        duration: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration
+        startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
+        duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
       };
     }
 
@@ -428,9 +432,9 @@ var Info = function Info(_, ref) {
         },
         isOS: isSession,
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
-        value: _objectSpread(_objectSpread({
-          quantity: item._extend.quantity
-        }, item._extend.other), sessionValue)
+        value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), sessionValue), {}, {
+          quantity: values.quantity || item._extend.quantity
+        })
       },
       callback: function callback(e, extension_type, detail) {
         var _cacheItem$_extend;

package/es/components/booking/info2/utilsByBooking.js

@@ -81,12 +81,13 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
    */
   if (isFlexible) {
     // 如果有event, 那么灵活时长时间只能在 最后一个event的结束时间 ~ time的结束时间内
-    if (eventList.length) {
-      timeStartDate = eventList.reduce(function (max, event) {
-        var endAt = dayjs(event.end_at);
-        return endAt.isAfter(max) ? endAt : max;
-      }, dayjs(eventList[0].end_at));
-    }
+    // if (eventList.length) {
+    //   timeStartDate = (eventList).reduce((max: any, event: any) => {
+    //     const endAt = dayjs(event.end_at);
+    //     return endAt.isAfter(max) ? endAt : max;
+    //   }, dayjs(eventList[0].end_at));
+    // }
+
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
 
     // 如果灵活时长不在范围内, 则认为是已约满
@@ -317,11 +318,17 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
   if (lastServer) {
     var lastServerStartDate = lastServer._extend.startDate;
     var lastServerEndDate = lastServer._extend.endDate;
-    // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
-    if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-      _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+
+    // 同时预约模式
+    if (appointmentTimingPreference === 'parallel') {
+      _extend.start_time = lastServerStartDate.format('HH:mm');
     } else {
-      _extend.start_time = appointmentTimingPreference === 'sequential' ? lastServerEndDate.format("HH:mm") : lastServerStartDate.format('HH:mm');
+      // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
+      if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     // 没有上一个商品  资源为 0

package/es/components/booking/utils.js

@@ -683,11 +683,17 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
     _extend.resource = lastServer._extend.resource;
     var lastServerStartDate = lastServer._extend.startDate;
     var lastServerEndDate = lastServer._extend.endDate;
-    // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
-    if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
-      _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+
+    // 同时预约模式
+    if (appointmentTimingPreference === 'parallel') {
+      _extend.start_time = lastServerStartDate.format('HH:mm');
     } else {
-      _extend.start_time = appointmentTimingPreference === 'sequential' ? lastServerEndDate.format("HH:mm") : lastServerStartDate.format('HH:mm');
+      // 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段,  不跨天则取上一个的结束时间
+      if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     // 没有上一个商品  资源为 0

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

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

package/es/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

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

@@ -11,7 +11,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: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "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,7 +15,7 @@ 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<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 import './index.less';
 declare const _default: (props: PosProps) => JSX.Element | null;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts

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

package/es/components/eventBooking/components/Provider/Information/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.less

@@ -16,7 +16,6 @@
 
   .sales-close-tip {
     color: #1b1b1b;
-    font-family: Inter;
     font-size: 14px;
     font-style: normal;
     font-weight: 400;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.less

@@ -21,7 +21,6 @@
   //   position: absolute;
   //   bottom: 54px;
   //   left: 0;
-  //   font-family: Inter;
   //   font-size: 12px;
   //   font-style: normal;
   //   font-weight: 600;

package/es/components/eventBooking/components/timeResourceSelector/index.less

@@ -12,7 +12,6 @@
 
   .time-resource-title {
     color: var(--Gray-900, #101828);
-    font-family: Inter;
     font-size: 14px;
     font-style: normal;
     font-weight: 600;

package/es/components/ruleSetting/index.d.ts

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