@pisell/private-materials 6.6.86 → 6.6.88

package/lib/components/booking/forms/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/info/model.d.ts

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -562,7 +562,7 @@ var Info = (_, ref) => {
         }
       },
       callback: (e2, extension_type, detail) => {
-        var _a3, _b3, _c3, _d3, _e3, _f2, _g2, _h2, _i2;
+        var _a3, _b3, _c3, _d3, _e3, _f2, _g2, _h2, _i2, _j2;
         isEditedRef.current = true;
         shouldReallocateBundlePriceRef.current = false;
         const _detail = detail || item;
@@ -579,12 +579,24 @@ var Info = (_, ref) => {
           other = (0, import_utils8.mergeBundleWithOriginalPrice)(other, ((_d3 = item._extend) == null ? void 0 : _d3.other) || {});
         }
         other.session = e2.session;
+        const originalVariantId = Number((item == null ? void 0 : item.product_variant_id) || 0);
+        const currentVariantId = Number((other == null ? void 0 : other.product_variant_id) || 0);
+        const isProductVariantChanged = originalVariantId !== currentVariantId;
+        const sourceProductPrice = ((_e3 = item == null ? void 0 : item.metadata) == null ? void 0 : _e3.source_product_price) ?? (item == null ? void 0 : item.source_product_price) ?? (item == null ? void 0 : item.price);
         let cacheItem = {
           ...item,
           ..._detail,
           product_id: item.id,
           _id: item == null ? void 0 : item._id,
           _key: e2.key,
+          metadata: {
+            ...item == null ? void 0 : item.metadata,
+            ..._detail == null ? void 0 : _detail.metadata,
+            ...(item == null ? void 0 : item.booking_id) ? {
+              // 仅编辑套餐时保留历史主商品价格；切换组合规格时由新规格重新生成。
+              source_product_price: isProductVariantChanged ? void 0 : sourceProductPrice
+            } : {}
+          },
           _extend: {
             ...item._extend,
             // 将当前表单的值覆盖进去
@@ -595,8 +607,8 @@ var Info = (_, ref) => {
           },
           new: 0
         };
-        if (hasManualPriceAdjustment && ((_e3 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _e3.main_product_selling_price)) {
-          cacheItem._extend.price = (_f2 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _f2.main_product_selling_price;
+        if (hasManualPriceAdjustment && ((_f2 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _f2.main_product_selling_price)) {
+          cacheItem._extend.price = (_g2 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _g2.main_product_selling_price;
         }
         let _total = (0, import_utils6.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
@@ -616,7 +628,7 @@ var Info = (_, ref) => {
             });
           }, 200);
         }
-        const hasSourcePriceSnapshot = ((_g2 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _g2.source_product_price) != null;
+        const hasSourcePriceSnapshot = ((_h2 = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _h2.source_product_price) != null;
         const origin_total = hasSourcePriceSnapshot || hasManualPriceAdjustment ? (0, import_utils6.getProductOriginTotalPrice)(cacheItem) : _total;
         if (hasManualPriceAdjustment && previousOriginTotal > 0 && Number.isFinite(previousTotal)) {
           const sellingRatio = new import_decimal.default(previousTotal).div(previousOriginTotal);
@@ -625,7 +637,7 @@ var Info = (_, ref) => {
           shouldReallocateBundlePriceRef.current = true;
         }
         cacheItem._extend.origin_total = origin_total;
-        (((_h2 = cacheItem._extend) == null ? void 0 : _h2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
+        (((_i2 = cacheItem._extend) == null ? void 0 : _i2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
         dispatch({
           type: "setService",
           payload: {
@@ -634,7 +646,7 @@ var Info = (_, ref) => {
         });
         form.setFieldsValue({
           total: _total,
-          capacity: (_i2 = cacheItem._extend) == null ? void 0 : _i2.capacity,
+          capacity: (_j2 = cacheItem._extend) == null ? void 0 : _j2.capacity,
           quantity: (e2 == null ? void 0 : e2.quantity) || (values == null ? void 0 : values.quantity) || 1
         });
       }

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -109,4 +110,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/notes/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/payments/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -175,10 +175,10 @@ export declare const getProductOriginTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (this: unknown, value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: (this: unknown) => void;

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "mx51" | "payo" | "windcave" | "stripe" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -299,15 +299,15 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
+        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        eftpos?: "tyro" | "mx51" | "payo" | "windcave" | "stripe" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "unset" | "step" | undefined;
+        type?: "step" | "unset" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;

package/lib/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,4 +30,11 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Capacity/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Capacity: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Capacity;

package/lib/plus/productSelect/ProductCard/SkuCard/components/CardMask/index.d.ts

@@ -3,5 +3,5 @@ import { SkuStatusOverlayConfig } from '../../type';
 import './index.less';
 declare const CardMask: ({ props }: {
     props: SkuStatusOverlayConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default CardMask;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Countdown/index.d.ts

@@ -3,5 +3,5 @@ import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const Countdown: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Countdown;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Duration/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Duration: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Duration;

package/lib/plus/productSelect/ProductCard/SkuCard/components/MemberPrice/index.d.ts

@@ -3,5 +3,5 @@ import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const MemberPrice: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default MemberPrice;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Resource/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Resource: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Resource;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Stock/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Stock: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Stock;

package/lib/plus/productSelect/ProductCard/SkuCard/components/Time/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Time: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Time;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.86",
+  "version": "6.6.88",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",