@pisell/private-materials 6.6.101 → 6.6.102

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

@@ -31,20 +31,100 @@ var utils_exports = {};
 __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
+  hasEntitlementDiscount: () => hasEntitlementDiscount,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
-  setProductPrice: () => setProductPrice
+  setProductPrice: () => setProductPrice,
+  updateEntitlementQuantity: () => updateEntitlementQuantity
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
-var import_utils2 = require("@pisell/utils");
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils3 = require("../../../components/footer/utils");
+var import_lodash = require("lodash");
+var import_utils2 = require("../../../components/footer/utils");
+var import_utils3 = require("../../../utils");
+var isEntitlementDiscount = (discount) => ((discount == null ? void 0 : discount.tag) || (discount == null ? void 0 : discount.type)) === "entitlement_pass";
+var getServiceDiscounts = (item) => {
+  var _a, _b;
+  return [
+    ...(item == null ? void 0 : item.discount_list) || [],
+    ...(((_b = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).flatMap((bundle) => bundle.discount_list || [])
+  ];
+};
+var hasEntitlementDiscount = (item) => getServiceDiscounts(item).some(isEntitlementDiscount);
+var updateEntitlementQuantity = (previous, next) => {
+  var _a, _b, _c, _d;
+  const discounts = getServiceDiscounts(previous);
+  const persisted = [previous == null ? void 0 : previous.booking_id, previous == null ? void 0 : previous.order_detail_id, (_a = previous == null ? void 0 : previous._extend) == null ? void 0 : _a.order_detail_id].some((value) => Number(value) > 0) || discounts.some((discount) => isEntitlementDiscount(discount) && discount.id);
+  const previousQuantity = Number(((_b = previous == null ? void 0 : previous._extend) == null ? void 0 : _b.quantity) || 1);
+  const nextQuantity = Number(next._extend.quantity || 1);
+  if (!persisted || !hasEntitlementDiscount(previous) || nextQuantity === previousQuantity) {
+    return [next];
+  }
+  if (nextQuantity < previousQuantity) {
+    return [{
+      ...previous,
+      _extend: {
+        ...previous._extend,
+        quantity: nextQuantity,
+        ...Array.isArray(next._extend.holder_id) ? { holder_id: next._extend.holder_id.slice(0, nextQuantity) } : {},
+        other: { ...previous._extend.other, quantity: nextQuantity }
+      },
+      discount_list: (previous.discount_list || []).map((discount) => {
+        var _a2, _b2;
+        if (!isEntitlementDiscount(discount) || ((_a2 = discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id)) return discount;
+        const num = Math.min(Number(((_b2 = discount.metadata) == null ? void 0 : _b2.num) ?? previousQuantity), nextQuantity);
+        return { ...discount, _num: num, metadata: { ...discount.metadata, num } };
+      })
+    }];
+  }
+  const appended = (0, import_lodash.cloneDeep)(next);
+  const uid = (0, import_utils.getUniqueId)();
+  appended._id = uid;
+  appended.booking_id = 0;
+  appended.order_detail_id = 0;
+  appended.new = 0;
+  appended.discount_list = [];
+  appended.discount_amount = 0;
+  appended.metadata = { ...appended.metadata, unique_identification_number: uid };
+  delete appended.metadata.entitlement_source_identity;
+  delete appended.metadata.entitlement_source_product_uid;
+  if (appended._origin) delete appended._origin.booking_id;
+  const extend = appended._extend;
+  extend.order_detail_id = 0;
+  extend.unique_identification_number = uid;
+  extend.quantity = nextQuantity - previousQuantity;
+  if (Array.isArray(extend.holder_id)) {
+    const holders = extend.holder_id.slice(previousQuantity, nextQuantity);
+    extend.holder_id = holders.length ? holders : void 0;
+  }
+  extend.other = { ...extend.other, quantity: extend.quantity };
+  extend.other.bundle = (extend.other.bundle || []).map((bundle) => {
+    var _a2, _b2, _c2;
+    const price = bundle.original_price ?? ((_c2 = (_b2 = (_a2 = bundle.discount_list) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.discount) == null ? void 0 : _c2.original_amount) ?? bundle.product_price ?? bundle.price;
+    const bundleUid = (0, import_utils.getUniqueId)();
+    const metadata = { ...bundle.metadata, custom_product_bundle_map_id: bundleUid, unique_identification_number: bundleUid };
+    delete metadata.entitlement_source_identity;
+    return { ...bundle, _id: bundleUid, price, bundle_selling_price: price, discount_list: [], metadata };
+  });
+  const mainDiscount = (next.discount_list || []).find((discount) => {
+    var _a2, _b2;
+    return !((_a2 = discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id) && ((_b2 = discount.discount) == null ? void 0 : _b2.original_amount) != null;
+  });
+  if (mainDiscount && ((_d = (_c = previous == null ? void 0 : previous._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.product_variant_id) === extend.other.product_variant_id) {
+    extend.price = Number(mainDiscount.discount.original_amount);
+    if (extend.other.product_variant_id) extend.other.price = extend.price;
+  }
+  extend.main_product_selling_price = (0, import_utils3.getMainPrice)(appended);
+  extend.total = (0, import_utils3.getProductTotalPrice)(appended);
+  extend.origin_total = extend.total;
+  return [previous, appended];
+};
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
     const valueObj = JSON.parse(value);
-    return (0, import_utils2.isBoolean)(valueObj[id]) ? valueObj[id] : true;
+    return (0, import_utils.isBoolean)(valueObj[id]) ? valueObj[id] : true;
   }
   return true;
 };
@@ -58,8 +138,8 @@ var setAutoAllocationStorage = (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(
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  if (hasEntitlementDiscount(cacheItem) || ((cacheItem == null ? void 0 : cacheItem.discount_list) || []).some((item) => ["good_pass", "discount_card", "product_discount_card"].includes(
     item.type
   ))) {
     return cacheItem;
@@ -69,16 +149,16 @@ var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
   }
   const discountRatio = new import_decimal.default(newTotal).div(new import_decimal.default(origin_total));
   let subTotal = new import_decimal.default(0);
-  if (((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle) && (0, import_utils.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) => {
+  if (((_a = cacheItem._extend.other) == null ? void 0 : _a.bundle) && (0, import_utils.isArr)((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle)) {
+    (_d = (_c = cacheItem._extend.other) == null ? void 0 : _c.bundle) == null ? void 0 : _d.forEach((bundle) => {
       const newPrice = new import_decimal.default(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
       const quantity = bundle.num ?? bundle.quantity ?? 1;
       subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
       bundle.price = newPrice;
     });
   }
-  if (((_f = cacheItem._extend.other) == null ? void 0 : _f.option) && (0, import_utils.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) => {
+  if (((_e = cacheItem._extend.other) == null ? void 0 : _e.option) && (0, import_utils.isArr)((_f = cacheItem._extend.other) == null ? void 0 : _f.option)) {
+    (_h = (_g = cacheItem._extend.other) == null ? void 0 : _g.option) == null ? void 0 : _h.forEach((option) => {
       const newPrice = new import_decimal.default(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
       const quantity = option.num ?? option.quantity ?? 1;
       subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
@@ -91,7 +171,7 @@ var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
 var getProductAllDiscountList = (cacheItem) => {
   var _a, _b;
   const discountList = [...cacheItem.discount_list || []];
-  const bundleDiscountList = (0, import_utils3.getBundleDiscountList)(((_b = (_a = cacheItem._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []) || [];
+  const bundleDiscountList = (0, import_utils2.getBundleDiscountList)(((_b = (_a = cacheItem._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []) || [];
   discountList.push(...bundleDiscountList);
   return discountList;
 };
@@ -113,7 +193,9 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
 0 && (module.exports = {
   getAutoAllocationStorage,
   getProductAllDiscountList,
+  hasEntitlementDiscount,
   mergeBundleWithOriginalPrice,
   setAutoAllocationStorage,
-  setProductPrice
+  setProductPrice,
+  updateEntitlementQuantity
 });

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

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

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

@@ -1,10 +1 @@
-/// <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;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -1,10 +1 @@
-/// <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;
-}>;
+export declare const Provider: any, Context: any;

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/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" | "mx51" | "payo" | "windcave" | "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" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
-        action?: "pay" | "amount" | "deviceList" | 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,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -30,11 +29,4 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

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

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/components/ticketBooking/utils/index.js

@@ -190,13 +190,13 @@ var addService = (list, addItem, state, isMultiDay) => {
     let isSetCount = false;
     value = list.map((item) => {
       var _a, _b, _c, _d, _e;
-      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => item2.type === "good_pass");
+      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => ["good_pass", "entitlement_pass"].includes(item2.tag || item2.type));
       const isEdit = item == null ? void 0 : item.edit;
       const bundleDiscountList = [];
       (((_b = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).forEach((item2) => {
         bundleDiscountList.push(...(item2 == null ? void 0 : item2.discount_list) || []);
       });
-      const isGoodPassBundleProduct = bundleDiscountList.some((item2) => item2.type === "good_pass");
+      const isGoodPassBundleProduct = bundleDiscountList.some((item2) => ["good_pass", "entitlement_pass"].includes(item2.tag || item2.type));
       if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
         isNotSame = false;
         const quantity = (((_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.quantity) || 1) + (((_d = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _d.quantity) || 1);

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 | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | 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 | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | 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 | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | 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 | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | 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 | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | 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 | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | 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 | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | 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 | JSX.Element | React.ReactFragment | null;
+}) => string | number | true | React.ReactFragment | JSX.Element | null;
 export default Time;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.101",
+  "version": "6.6.102",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -64,9 +64,9 @@
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
-    "@pisell/date-picker": "3.0.7",
-    "@pisell/materials": "6.6.23",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "6.6.25",
+    "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {
     "react": "^18.0.0",