@pisell/private-materials 6.7.5 → 6.7.7

package/lib/components/booking/components/footer/utils.js

@@ -129,8 +129,8 @@ var formatProductBundle = (bundle) => {
       "custom_price": (d == null ? void 0 : d.custom_price) || Math.abs(new import_decimal.default((d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
       "option": option,
-      "bundle_selling_price": d == null ? void 0 : d.price,
-      "bundle_sum_price": (d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.original_total),
+      "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
+      // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
@@ -149,6 +149,11 @@ var getBundleDiscountList = (bundle) => {
   let discountList = [];
   bundle.forEach((d) => {
     if (d.discount_list && (0, import_utils5.isArr)(d.discount_list)) {
+      d.discount_list.forEach((item) => {
+        if (item == null ? void 0 : item.id) {
+          item.order_discount_id = item.id;
+        }
+      });
       discountList.push(...d.discount_list.filter((item) => !item.id));
     }
   });
@@ -241,7 +246,7 @@ var formatHolders = (state, item, values) => {
 var formatProductPrice = (item) => {
   var _a, _b, _c, _d;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
-  let price = Number((_b = item._extend) == null ? void 0 : _b.price);
+  let price = Number((item == null ? void 0 : item.price) ?? ((_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.price));
   if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
     const variant = item.variant.find(
       (d) => d.id === (other == null ? void 0 : other.product_variant_id)
@@ -286,7 +291,7 @@ var formatMetaData = (item, isMultiDayPrices) => {
   return metadata;
 };
 var formatProductMetadata = (item) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.surcharge_fee) {
     metadata.main_product_attached_bundle_surcharge_fee = (_b = item._extend) == null ? void 0 : _b.surcharge_fee;
@@ -300,6 +305,9 @@ var formatProductMetadata = (item) => {
   if ((_g = item._extend) == null ? void 0 : _g.relation_surcharge_ids) {
     metadata.relation_surcharge_ids = (_h = item._extend) == null ? void 0 : _h.relation_surcharge_ids;
   }
+  if ((_i = item._extend) == null ? void 0 : _i.unique_identification_number) {
+    metadata.unique_identification_number = (_j = item._extend) == null ? void 0 : _j.unique_identification_number;
+  }
   return metadata;
 };
 var getSourceProductPrice = (item) => {
@@ -317,22 +325,29 @@ var getSourceProductPrice = (item) => {
   return price;
 };
 var getMainProductSellingPrice = (item) => {
-  var _a, _b, _c, _d, _e;
-  if (!(0, import_utils5.isNumber)((_a = item._extend) == null ? void 0 : _a.main_product_selling_price)) {
+  var _a, _b, _c, _d, _e, _f;
+  if (!(0, import_utils5.isNumber)((_a = item._extend) == null ? void 0 : _a.main_product_selling_price) && !(0, import_utils5.isString)((_b = item._extend) == null ? void 0 : _b.main_product_selling_price)) {
     return void 0;
   }
   let optionPrice = new import_decimal.default(0);
-  if (((_b = item._extend.other) == null ? void 0 : _b.option) && Array.isArray((_c = item._extend.other) == null ? void 0 : _c.option)) {
-    optionPrice = (_d = item._extend.other) == null ? void 0 : _d.option.reduce((accumulator, currentValue) => {
+  if (((_c = item._extend.other) == null ? void 0 : _c.option) && Array.isArray((_d = item._extend.other) == null ? void 0 : _d.option)) {
+    optionPrice = (_e = item._extend.other) == null ? void 0 : _e.option.reduce((accumulator, currentValue) => {
       const currentPrice = new import_decimal.default(currentValue.price || 0);
       const currentNum = new import_decimal.default(currentValue.num || 0);
       return accumulator.add(currentPrice.mul(currentNum));
     }, optionPrice);
   }
-  return new import_decimal.default((_e = item._extend) == null ? void 0 : _e.main_product_selling_price).add(optionPrice).toNumber();
+  return new import_decimal.default((_f = item._extend) == null ? void 0 : _f.main_product_selling_price).add(optionPrice).toNumber();
 };
 var formatProducts = (item, quantity) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  if (item == null ? void 0 : item.discount_list) {
+    item == null ? void 0 : item.discount_list.forEach((d) => {
+      if (d == null ? void 0 : d.id) {
+        d.order_discount_id = d.id;
+      }
+    });
+  }
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
   const discount_amount = origin_total - total;
@@ -435,7 +450,7 @@ var formatBookings = (data, values) => {
   let bookings = [];
   let obj = {};
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -475,26 +490,32 @@ var formatBookings = (data, values) => {
       item._extend.unique_identification_number = unique_identification_number;
     }
     const isSetGroupId = obj[(_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.groupId];
+    if (!((_g = item._extend) == null ? void 0 : _g.unique_identification_number)) {
+      const unique_identification_number = (0, import_utils5.getUniqueId)();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
+    debugger;
     const booking = {
-      "product": formatProducts(item),
-      "metadata": formatMetaData(item, !isSetGroupId),
-      "relation_products": formatRelationDetails(item._extend.relation_details),
-      "id": item.booking_id || 0,
-      "relation_id": item._extend.relation_id || 0,
-      "like_status": item._extend.like_status || "common",
-      "relation_type": item._extend.relation_type || "",
-      "is_all": false,
-      "schedule_id": item._extend.schedule_id || 0,
-      "end_time": end_time,
-      "sub_type": isDay ? "days" : getSubType(item),
-      "select_date": start_date,
-      "start_time": start_time,
-      "end_date": end_date,
-      "start_date": start_date,
-      "duration": isDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
-      "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
-      "resources": formatResource(item),
-      "note": item._extend.note,
+      schedule_event_id: item == null ? void 0 : item.booking_id,
+      product: formatProducts(item),
+      relation_products: formatRelationDetails(item._extend.relation_details),
+      id: item.booking_id || 0,
+      relation_id: item._extend.relation_id || 0,
+      like_status: item._extend.like_status || "common",
+      relation_type: item._extend.relation_type || "",
+      is_all: false,
+      schedule_id: item._extend.schedule_id || 0,
+      end_time,
+      sub_type: isDay ? "days" : getSubType(item),
+      select_date: start_date,
+      start_time,
+      end_date,
+      start_date,
+      duration: isDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
+      number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
+      resources: formatResource(item),
+      note: item._extend.note,
+      metadata: formatMetaData(item, !isSetGroupId),
       ...eventOtherParams || {},
       ...dayParams
     };
@@ -510,7 +531,7 @@ var formatBookings = (data, values) => {
       newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
       if (i > 0) {
         newItem._extend.surcharge_rounding_remainder = void 0;
-        if (((_i = (_h = (_g = newItem._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.bundle) == null ? void 0 : _i.length) > 0) {
+        if (((_j = (_i = (_h = newItem._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.bundle) == null ? void 0 : _j.length) > 0) {
           newItem._extend.other.bundle.forEach((bundleItem) => {
             bundleItem.surcharge_rounding_remainder = void 0;
           });

package/lib/components/booking/components/formItemChildrenWrap/index.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const FormItemChildrenWrap: (props: any) => JSX.Element;
+import React from "react";
+declare const FormItemChildrenWrap: (props: any) => React.JSX.Element;
 export default FormItemChildrenWrap;

package/lib/components/booking/components/menuButton/index.d.ts

@@ -6,5 +6,5 @@ interface MenuButtonProps {
     menuWrapStyle?: React.CSSProperties;
     dropdownProps?: DropdownProps;
 }
-declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => JSX.Element;
+declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => React.JSX.Element;
 export default MenuButton;

package/lib/components/booking/components/reloadResourceModal/index.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 interface IProps {
     modal: any;
     onReload: () => Promise<any>;
     onCancel: () => void;
 }
-declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => JSX.Element;
+declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => React.JSX.Element;
 export default ReloadResourceModal;

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

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

package/lib/components/booking/components/voucher/index.js

@@ -60,6 +60,8 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
+  const stateRef = (0, import_react.useRef)(state);
+  stateRef.current = state;
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
     dispatch({
@@ -161,8 +163,8 @@ var VoucherCard = (props) => {
       }
       if (isBooking4Shop) {
         const val = shopDiscount.calcDiscount([
-          ...state.service.value,
-          ...state.addons.value
+          ...stateRef.current.service.value,
+          ...stateRef.current.addons.value
         ]);
         console.log("input: ", state.service.value);
         console.log("output: ", val);

package/lib/components/booking/deposit/ClientItem/index.d.ts

@@ -14,5 +14,5 @@ declare type ClientItemProps = {
     className?: string;
     walkInName?: string;
 };
-declare const ClientItem: (props: ClientItemProps) => JSX.Element;
+declare const ClientItem: (props: ClientItemProps) => React.JSX.Element;
 export default ClientItem;

package/lib/components/booking/deposit/DepositItem/index.d.ts

@@ -21,5 +21,5 @@ declare type DepositItemProps = {
     isBookingCancelled: boolean;
     hideOrderDetail?: boolean;
 };
-declare const DepositItem: (props: DepositItemProps) => JSX.Element;
+declare const DepositItem: (props: DepositItemProps) => React.JSX.Element;
 export default DepositItem;

package/lib/components/booking/deposit/index.d.ts

@@ -1,2 +1,3 @@
-declare const Deposit: (props: any) => JSX.Element;
+import React from 'react';
+declare const Deposit: (props: any) => React.JSX.Element;
 export default Deposit;

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

@@ -1,6 +1,7 @@
+import React from 'react';
 interface FooterProps {
     state: any;
     reload: () => void;
 }
-declare const Footer: ({ state, reload }: FooterProps) => JSX.Element | null;
+declare const Footer: ({ state, reload }: FooterProps) => React.JSX.Element | null;
 export default Footer;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 /**
  * @title: 表单选择器
@@ -7,5 +7,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:06
  */
-declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => JSX.Element;
+declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => React.JSX.Element;
 export default Single;

package/lib/components/booking/forms/table/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
-declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
+declare const Table: ({ value, onChange, field, mode, onAdd }: any) => React.JSX.Element;
 export default Table;

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
-declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
+import React from 'react';
+declare const useClearCart: (state: any, dispatch: any) => false | React.JSX.Element;
 export default useClearCart;

package/lib/components/booking/hooks/useQuotation.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
-    dom: JSX.Element;
+    dom: React.JSX.Element;
 };
 export default useQuotation;

package/lib/components/booking/hooks/useQuotation.js

@@ -95,10 +95,11 @@ var setNewCartValue = (cartValue, newProducts) => {
       }
       const selectBundleInfo = item._extend.other.bundle.find((item2) => item2.id === bundle.id);
       const optionPrice = calculateTotalPrice((selectBundleInfo == null ? void 0 : selectBundleInfo.option) || []);
+      const isEditDiscount = item.booking_id && (bundle.discount_list || []).length;
       return {
         ...bundle,
         base_price: bundleItemMap[bundle.id].base_price,
-        price: new import_decimal.default(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
+        price: isEditDiscount ? bundle.price : new import_decimal.default(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
         // product_price: bundleItemMap[item.id].product_price,
       };
     });

package/lib/components/booking/info/addServiceVariant/index.d.ts

@@ -1,6 +1,7 @@
+import React from 'react';
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
 export default AddServiceVariant;

package/lib/components/booking/info/client/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;
@@ -36,7 +36,7 @@ declare const useClientFn: (_params: useClientFnParams) => {
     };
     searchChange: (search: string) => void;
     loading: boolean;
-    loadMore: JSX.Element | null;
+    loadMore: React.JSX.Element | null;
     handleOpenClientModal: (val?: string) => void;
     getNickname: (item: any) => any;
     franchiseeLoading: number;

package/lib/components/booking/info/clientVariant/vertical/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface VerticalClientProps {
+    globalState: any;
+    setGlobalState: any;
+}
+declare const VerticalClient: React.ForwardRefExoticComponent<VerticalClientProps & React.RefAttributes<unknown>>;
+export default VerticalClient;

package/lib/components/booking/info/date/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
-declare const DateCom: () => JSX.Element;
+declare const DateCom: () => React.JSX.Element;
 export default DateCom;

package/lib/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
-declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;
+declare const DateRange: ({ state, dispatch, key }: any) => React.JSX.Element;
 export default DateRange;

package/lib/components/booking/info/header/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const header: ({ state, dispatch }: any) => JSX.Element;
+declare const header: ({ state, dispatch }: any) => React.JSX.Element;
 export default header;

package/lib/components/booking/info/hooks/useGetHolderList.d.ts

@@ -1,2 +1,2 @@
-declare const useGetHolderList: (state: any, dispatch: any) => () => Promise<void>;
+declare const useGetHolderList: (state: any, dispatch: any) => (this: unknown) => Promise<void>;
 export default useGetHolderList;

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;
-    handleEdit: (cacheItem: any, type?: string) => void;
+    handleEdit: (this: unknown, cacheItem: any, type?: string | undefined) => void;
     dispatchService: (type: string, payload: any) => void;
-    handleAction: (dataSource: any) => void;
+    handleAction: (this: unknown, dataSource: any) => void;
     showAddTimeModal: boolean;
     editNormalServiceRef: import("react").MutableRefObject<any>;
 };

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import { InfoProps } from './main';
-declare const APP: (props: InfoProps) => JSX.Element;
+declare const APP: (props: InfoProps) => React.JSX.Element;
 export default APP;

package/lib/components/booking/info/notes/index.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const Notes: () => JSX.Element | null;
+import React from "react";
+declare const Notes: () => React.JSX.Element | null;
 export default Notes;

package/lib/components/booking/info/pet/index.d.ts

@@ -10,5 +10,5 @@ interface PetProps {
     clientChangeNotSetPet?: boolean;
     previewItemTitleRender?: (item: any, index: number, values: any[]) => React.ReactNode;
 }
-declare const Pet: (props: PetProps) => JSX.Element;
+declare const Pet: (props: PetProps) => React.JSX.Element;
 export default Pet;

package/lib/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
-declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
+import React from 'react';
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => React.JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Actions;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {
@@ -7,5 +8,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => JSX.Element;
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

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

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

package/lib/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 declare const BookingList: ({ items }: {
     items: any[];
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default BookingList;

package/lib/components/booking/info/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;
     status: string;
     onChange?: any;
     className?: string | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Like;

package/lib/components/booking/info/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ServiceList;

package/lib/components/booking/info/service2/Lists.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
+import React from 'react';
+declare const Lists: ({ onEdit, onChange }: any) => React.JSX.Element;
 export default Lists;

package/lib/components/booking/info/service2/index.d.ts

@@ -3,4 +3,4 @@ export declare const Service2Context: React.Context<any>;
 export declare const Service2Cart: ({ hideAdd, hideEdit, }: {
     hideAdd?: boolean | undefined;
     hideEdit?: boolean | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;