@pisell/private-materials 6.7.6 → 6.7.8

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -96,7 +96,7 @@ var VoucherCard = (props) => {
       return {
         _id: item._id,
         quantity: item.num,
-        bundle: item.bundle,
+        bundle: item._bundleOrigin,
         options: item._optionsOrigin,
         product: {
           ...item._productOrigin
@@ -122,7 +122,6 @@ var VoucherCard = (props) => {
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
-    pisellos.effects.on("appointmentBooking_cart:onUpdateBookingDate", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateCartItemNums", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(

package/lib/components/appointmentBooking/context.d.ts

@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 import { TasksManager } from '../../utils/tasks';
 interface AppointmentBookingContextType {
     appointmentBooking: any;
@@ -30,6 +30,6 @@ interface AppointmentBookingContextType {
 }
 export declare const AppointmentBookingProvider: ({ children, }: {
     children: ReactNode;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export declare const useAppointmentBookingContext: () => AppointmentBookingContextType | undefined;
 export {};

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

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

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

package/lib/components/appointmentBooking/index.d.ts

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

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

@@ -51,31 +51,23 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-    const bundleDiscountList = (0, import_utils.getBundleDiscountList)(((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
-    const discount_list = [...(item == null ? void 0 : item.discount_list) || []];
-    discount_list.push(...bundleDiscountList);
+    var _a, _b, _c, _d, _e, _f, _g;
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
       price: (0, import_utils.formatProductPrice)(item),
       product_id: item.id,
-      discount_list: discount_list || [],
+      discount_list: (item == null ? void 0 : item.discount_list) || [],
       discount_amount: 0,
       product_discount_reason: "",
       is_charge_tax: item.is_charge_tax,
       note: "",
       discountway: "num",
       discount_type: "discount",
-      bundle_edit: (_c = item._extend) == null ? void 0 : _c.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
-      "product_option_item": (0, import_utils.formatProductOption)((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
-      "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
-      "source_product_price": (0, import_utils.getSourceProductPrice)(item),
-      "main_product_selling_price": (0, import_utils.getMainProductSellingPrice)(item) ?? (0, import_utils.formatProductPrice)(item),
-      "calculated_original_price": (0, import_utils.formatOriginalPrice)(item),
-      "calculated_selling_price": (0, import_utils.formatSellingPrice)(item),
-      "tax_fee": item._extend.tax_fee
+      bundle_edit: (_a = item._extend) == null ? void 0 : _a.bundle_edit,
+      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
+      "product_option_item": (0, import_utils.formatProductOption)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
+      "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0
     };
   });
   return arr;
@@ -249,12 +241,12 @@ var Addons = (0, import_model.Provider)((props) => {
           isAddons: true,
           _key: e.key,
           _extend: {
+            price: _detail.price,
             other: e,
             quantity: (e == null ? void 0 : e.quantity) || 1
           },
           quantity: (e == null ? void 0 : e.quantity) || 1
         };
-        product._extend.price = (0, import_utils2.getMainPrice)(product, _detail.price);
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
         product._extend.origin_total = _total;

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 interface TabProductProps {
     list: any[];
@@ -6,5 +6,5 @@ interface TabProductProps {
     onChange: (item: any, type: "select" | "detail") => void;
     scrollDom?: string;
 }
-declare const TabProduct: (props: TabProductProps) => JSX.Element;
+declare const TabProduct: (props: TabProductProps) => React.JSX.Element;
 export default TabProduct;

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
-declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
+declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => React.JSX.Element;
 export default ProductItem;

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
-declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
+declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => React.JSX.Element;
 export default SelectProductItem;

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

@@ -4,5 +4,5 @@ interface AuthWrapProps {
     falseRender?: React.ReactNode;
     show: boolean;
 }
-declare const AuthWrap: (props: AuthWrapProps) => JSX.Element;
+declare const AuthWrap: (props: AuthWrapProps) => React.JSX.Element;
 export default AuthWrap;

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

@@ -11,5 +11,5 @@ interface BrowserSelectProps extends React.DetailedHTMLProps<React.SelectHTMLAtt
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:43
  */
-declare const BrowserSelect: (props: BrowserSelectProps) => JSX.Element;
+declare const BrowserSelect: (props: BrowserSelectProps) => React.JSX.Element;
 export default BrowserSelect;

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

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;
+import React from "react";
+export declare const renderBundles: (item: any, amountSymbol: string) => React.JSX.Element;

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

@@ -15,5 +15,5 @@ export interface PisellDrawerProps extends DrawerProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:51
  */
-declare const Drawer: (props: PisellDrawerProps) => JSX.Element;
+declare const Drawer: (props: PisellDrawerProps) => React.JSX.Element;
 export default Drawer;

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 /**
  * @title: 空状态
  * @description:
@@ -9,5 +9,5 @@
  */
 declare const EmptyBooking: ({ description }: {
     description?: string | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default EmptyBooking;

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
-declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
+declare const FooterMenus: ({ state, menuChange, items }: any) => React.JSX.Element | null;
 export default FooterMenus;

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

@@ -33,5 +33,4 @@ export declare const getSumTotal: (state: any, options: {
     dueAmount: number;
     roundingAmount: number;
     originExpectAmount: number;
-    originExpectAmountWithoutDiscount: number;
 };