@pisell/private-materials 3.3.65 → 3.3.67

package/es/components/walletList/index.less

@@ -31,7 +31,7 @@
       opacity: 1;
     }
 
-    >div {
+    > div {
       height: 100%;
       margin: 0;
       padding: 0;
@@ -215,7 +215,7 @@
     cursor: pointer;
     width: 44px;
     height: 44px;
-    background-color: #FFFFFF;
+    background-color: #ffffff;
     border-radius: 50%;
     display: flex;
     padding: 10px;
@@ -224,9 +224,10 @@
     justify-content: center;
     cursor: pointer;
     border-radius: 22px;
-    background: rgba(255, 255, 255, 0.90);
+    background: rgba(255, 255, 255, 0.9);
     backdrop-filter: blur(4px);
-    box-shadow: 0px 2px 4px rgba(16, 24, 40, 0.1), 0px 1px 3px rgba(16, 24, 40, 0.1);
+    box-shadow: 0px 2px 4px rgba(16, 24, 40, 0.1),
+      0px 1px 3px rgba(16, 24, 40, 0.1);
     z-index: 10;
     position: relative;
     /* 确保相对定位 */
@@ -244,8 +245,9 @@
     }
 
     &:hover {
-      background-color: #FFFFFF;
-      box-shadow: 0px 3px 6px rgba(16, 24, 40, 0.15), 0px 2px 4px rgba(16, 24, 40, 0.1);
+      background-color: #ffffff;
+      box-shadow: 0px 3px 6px rgba(16, 24, 40, 0.15),
+        0px 2px 4px rgba(16, 24, 40, 0.1);
     }
 
     &.disabled {
@@ -253,7 +255,8 @@
       opacity: 0.7;
 
       &:hover {
-        box-shadow: 0px 2px 4px rgba(16, 24, 40, 0.1), 0px 1px 3px rgba(16, 24, 40, 0.1);
+        box-shadow: 0px 2px 4px rgba(16, 24, 40, 0.1),
+          0px 1px 3px rgba(16, 24, 40, 0.1);
       }
     }
 
@@ -269,17 +272,18 @@
     justify-content: center;
     padding: 12px;
     border-radius: 17px;
-    background: rgba(255, 255, 255, 0.90);
+    background: rgba(255, 255, 255, 0.9);
     backdrop-filter: blur(4px);
     height: 34px;
     z-index: 100;
-    box-shadow: 0px 2px 4px rgba(16, 24, 40, 0.1), 0px 1px 3px rgba(16, 24, 40, 0.1);
+    box-shadow: 0px 2px 4px rgba(16, 24, 40, 0.1),
+      0px 1px 3px rgba(16, 24, 40, 0.1);
 
     .wallet-dot {
       width: 10px;
       height: 10px;
       border-radius: 50%;
-      background-color: #F2F4F7;
+      background-color: #f2f4f7;
       margin: 0 8px;
       transition: all 0.3s ease;
 
@@ -287,7 +291,7 @@
         width: 8px;
         height: 8px;
         border-radius: 4px;
-        background-color: #6941C6;
+        background-color: #6941c6;
       }
     }
   }
@@ -297,14 +301,13 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    color: #FFFFFF;
+    color: #ffffff;
     min-width: 70px;
     text-align: center;
 
     color: var(--Gray-500, #667085);
 
     /* Text xl/Semibold */
-    font-family: Inter;
     font-size: 20px;
     font-style: normal;
     font-weight: 600;
@@ -345,7 +348,6 @@
     }
   }
 
-
   .pisell-lowcode__error {
     text-align: center;
     padding: 20px;
@@ -364,4 +366,4 @@
   .pisell-wallet-skeleton {
     padding: 16px;
   }
-}
+}

package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

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

package/es/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/components/appointmentBooking/index.d.ts

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

package/lib/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/lib/components/booking/components/footer/index.js

@@ -51,6 +51,8 @@ var import_utils3 = require("./utils");
 var import_voucher = __toESM(require("../voucher"));
 var import__ = require("../../../../index");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
+var import_utils4 = require("@pisell/utils");
+var import_dayjs = __toESM(require("dayjs"));
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const { state, buttons, dispatch, source } = props;
@@ -222,7 +224,10 @@ var Footer = (props) => {
         const isHasDayProducts = handleDaySubmit();
         if (isHasDayProducts) return;
       }
-      const res = await handleSave({ type: "checkout" });
+      const res = await handleSave({
+        type: "checkout",
+        messageShow: !(isTerminal == null ? void 0 : isTerminal())
+      });
       goCheckout((res == null ? void 0 : res.order_id) || state.bookingId);
       return;
     }
@@ -288,6 +293,13 @@ var Footer = (props) => {
       let callbackData = null;
       let values = (0, import_utils3.formatValues)({ ...state, ...saveOtherValue });
       const api = state.bookingId ? editApi : createApi;
+      (0, import_utils4.sendWarningLog)({
+        title: "saveBooking",
+        content: [
+          { key: "下单前数据", value: JSON.stringify(values) },
+          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") }
+        ]
+      });
       if (addonsEdit) {
         await handleSaveAddons();
       }
@@ -301,7 +313,7 @@ var Footer = (props) => {
           );
         }
       }
-      state == null ? void 0 : state.callback(callbackData);
+      state == null ? void 0 : state.callback(callbackData, type);
       _setLoading(false);
       return callbackData || values;
     } catch (err) {

package/lib/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/lib/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/lib/components/booking/forms/footer.d.ts

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

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

package/lib/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/lib/components/booking/info2/service/editService/index.js

@@ -158,7 +158,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2;
+    var _a2, _b2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -177,6 +177,10 @@ var Info = (_, ref) => {
     };
     let _extend = {
       ..._item._extend,
+      other: {
+        ...((_b2 = _item._extend) == null ? void 0 : _b2.other) || {},
+        quantity: values.quantity
+      },
       ...values
     };
     const { startDate, endDate } = (0, import_utils3.getServiceTimes)({ _extend });
@@ -333,9 +337,9 @@ var Info = (_, ref) => {
         isOS: isSession,
         customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
         value: {
-          quantity: item._extend.quantity,
           ...item._extend.other,
-          ...sessionValue
+          ...sessionValue,
+          quantity: values.quantity || item._extend.quantity
         }
       },
       callback: (e2, extension_type, detail) => {

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

@@ -73,12 +73,6 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
   let endDate = null;
   let isCalcCount = true;
   if (isFlexible) {
-    if (eventList.length) {
-      timeStartDate = eventList.reduce((max, event) => {
-        const endAt = (0, import_dayjs.default)(event.end_at);
-        return endAt.isAfter(max) ? endAt : max;
-      }, (0, import_dayjs.default)(eventList[0].end_at));
-    }
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
     if (!isDateRange && eventList.length) {
       isCalcCount = false;
@@ -218,10 +212,14 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
   if (lastServer) {
     let lastServerStartDate = lastServer._extend.startDate;
     let lastServerEndDate = lastServer._extend.endDate;
-    if ((0, import_dayjs.default)(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 ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     let findNextSliceProps = {

package/lib/components/booking/utils.js

@@ -557,10 +557,14 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
     _extend.resource = lastServer._extend.resource;
     let lastServerStartDate = lastServer._extend.startDate;
     let lastServerEndDate = lastServer._extend.endDate;
-    if ((0, import_dayjs.default)(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 ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     let findNextSliceProps = {

package/lib/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/lib/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/lib/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/lib/components/eftposPay/component/fail/unknow.d.ts

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

package/lib/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/lib/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/lib/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/lib/components/eftposPay/pay.d.ts

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

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: "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/lib/components/eftposPay/windcave/windcave.d.ts

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

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/components/ruleSetting/index.d.ts

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