@pisell/private-materials 6.3.111 → 6.3.112

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

@@ -52,6 +52,8 @@ var import_materials = require("@pisell/materials");
 var import_utils5 = require("../../../info/utils");
 var import_utils6 = require("../../../info/service2/utils");
 var import_utils7 = require("../../../../ticketBooking/utils");
+var import_decimal = require("decimal.js");
+var import_utils8 = require("./utils");
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I;
@@ -165,7 +167,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2, _e2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -193,6 +195,23 @@ var Info = (_, ref) => {
     const { startDate, endDate } = (0, import_utils3.getServiceTimes)({ _extend });
     _extend.startDate = startDate;
     _extend.endDate = endDate;
+    if (isChangeTotal.current) {
+      const discountRatio = new import_decimal.Decimal(values.total).div(_item._extend.origin_total);
+      const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
+      let childProductsTotal = new import_decimal.Decimal(0);
+      if (bundles2.length > 0) {
+        bundles2.forEach((bundle) => {
+          const discountedPrice = new import_decimal.Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_HALF_UP);
+          bundle.bundle_selling_price = discountedPrice.toNumber();
+          childProductsTotal = childProductsTotal.add(
+            discountedPrice.mul(bundle.quantity)
+          );
+        });
+      }
+      const mainProductTotal = new import_decimal.Decimal(values.total).sub(childProductsTotal);
+      const mainProductQuantity = ((_d2 = _extend.other) == null ? void 0 : _d2.quantity) || _extend.quantity || 1;
+      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+    }
     if (_extend.bundle_edit !== void 0) {
       _extend.bundle_edit = 1;
     }
@@ -200,6 +219,10 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils7.genServiceKey)(_item);
     let _id = _item == null ? void 0 : _item._id;
+    _item = (0, import_utils8.setProductPrice)(_item, {
+      newTotal: values.total,
+      origin_total: (_e2 = _item._extend) == null ? void 0 : _e2.origin_total
+    });
     if (!_list.some((d) => d._id === _id)) {
       const detail = (0, import_utils7.addService)(_list, _item, state);
       _list = detail.list;

package/lib/components/booking/info2/service/editService/utils.d.ts

@@ -11,3 +11,18 @@ export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;
 }) => void;
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
+    newTotal: number;
+    origin_total: number;
+}) => any;

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

@@ -20,10 +20,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 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("../addService/utils");
+var import_decimal = require("decimal.js");
+var import_utils3 = require("@pisell/utils");
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
@@ -41,8 +45,40 @@ 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, _i;
+  if (((_a = cacheItem == null ? void 0 : cacheItem.discount_list) == null ? void 0 : _a.length) && ((cacheItem == null ? void 0 : cacheItem.discount_list) || []).some((item) => ["good_pass", "discount_card", "product_discount_card"].includes(
+    item.type
+  ))) {
+    return cacheItem;
+  }
+  if (cacheItem.discount_amount) {
+    return cacheItem;
+  }
+  const discountRatio = new import_decimal.Decimal(newTotal).div(new import_decimal.Decimal(origin_total));
+  let subTotal = new import_decimal.Decimal(0);
+  if (((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle) && (0, import_utils3.isArr)((_c = cacheItem._extend.other) == null ? void 0 : _c.bundle)) {
+    (_e = (_d = cacheItem._extend.other) == null ? void 0 : _d.bundle) == null ? void 0 : _e.forEach((bundle) => {
+      const newPrice = new import_decimal.Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_DOWN).toNumber();
+      const quantity = bundle.num ?? bundle.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.Decimal(newPrice).mul(quantity));
+      bundle.price = newPrice;
+    });
+  }
+  if (((_f = cacheItem._extend.other) == null ? void 0 : _f.option) && (0, import_utils3.isArr)((_g = cacheItem._extend.other) == null ? void 0 : _g.option)) {
+    (_i = (_h = cacheItem._extend.other) == null ? void 0 : _h.option) == null ? void 0 : _i.forEach((option) => {
+      const newPrice = new import_decimal.Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_DOWN).toNumber();
+      const quantity = option.num ?? option.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.Decimal(newPrice).mul(quantity));
+      option.price = newPrice;
+    });
+  }
+  cacheItem._extend.price = new import_decimal.Decimal(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/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

@@ -166,10 +166,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     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/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: "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

@@ -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: "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

@@ -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<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -197,7 +197,7 @@ export declare const updateComponent: (component: string, render?: boolean) => {
     } | {
         readonly type: "step";
         readonly render: boolean;
-        readonly component?: undefined;
+        component?: undefined;
     };
 };
 /**
@@ -297,10 +297,10 @@ 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" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type CallToBookProps = {
     show: boolean;
     type: string;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

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

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

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

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/plus/pisellSalesManagement/config/booking.d.ts

@@ -20,7 +20,7 @@ export declare const getFilterButtonList: () => ({
         }[];
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -46,7 +46,7 @@ export declare const getFilterButtonList: () => ({
         mode?: undefined;
         maxTagCount?: undefined;
         options?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -91,7 +91,7 @@ export declare const getFilterButtonList: () => ({
         options: () => Promise<any>;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -111,7 +111,7 @@ export declare const getFilterButtonList: () => ({
         options?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -133,7 +133,7 @@ export declare const getFilterButtonList: () => ({
         maxTagCount?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         showTime?: undefined;
     };
     sort?: undefined;
@@ -152,7 +152,7 @@ export declare const getFilterButtonList: () => ({
         options?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        readonly component?: undefined;
+        component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
     };

package/lib/plus/walletEditor/components/ImageUpload/index.d.ts

@@ -3,6 +3,6 @@ export interface ImageUploadProps {
     value?: string;
     onChange?: (val: string) => void;
 }
-export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
 declare const ImageUpload: React.FC<ImageUploadProps>;
 export default ImageUpload;

package/lib/pro/Selector/Selector.d.ts

@@ -3,7 +3,7 @@ import { ItemLayout, ItemProps, PresetConfig, SelectorProps, SelectorVariant } f
 import './selector.less';
 export declare const SelectorContext: React.Context<{
     disabled?: boolean | undefined;
-    mode?: "single" | "multiple" | undefined;
+    mode?: "multiple" | "single" | undefined;
     itemLayout?: ItemLayout | undefined;
     valueType?: "object" | "primitive" | undefined;
     variant?: SelectorVariant | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.111",
+  "version": "6.3.112",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,10 +76,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
+    "@pisell/utils": "3.0.5",
     "@pisell/date-picker": "3.0.8",
-    "@pisell/materials": "6.3.27",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.5"
+    "@pisell/materials": "6.3.27"
   },
   "peerDependencies": {
     "react": "^18.0.0",