@pisell/private-materials 6.7.5 → 6.7.7

package/es/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
-declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
+import React from 'react';
+declare const SalesModel: ({ children, hooks, config }: any) => React.JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/Sales/index.d.ts

@@ -15,6 +15,6 @@ declare const SalesPage: ({ config, children, }: {
     config?: {
         useSessionStorage?: boolean | undefined;
     } | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default SalesPage;
 export { useCustomer, useInit, useSales, useStep, useResource, useEvent, useEventDetail, useHolder, useSummary, useCheckout, useCart, };

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

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

package/es/components/appointmentBooking/components/Cart/index.d.ts

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

package/es/components/appointmentBooking/components/Content/index.d.ts

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

package/es/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,9 +1,10 @@
+import React from 'react';
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;
     setIsAgreeDepositPolicy: (value: boolean) => void;
     deposit: any;
     depositProtocolRequest?: any;
-}) => JSX.Element;
-declare const Deposit: () => JSX.Element;
+}) => React.JSX.Element;
+declare const Deposit: () => React.JSX.Element;
 export default Deposit;

package/es/components/appointmentBooking/components/Footer/index.d.ts

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

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

package/es/components/appointmentBooking/components/Header/index.d.ts

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

package/es/components/appointmentBooking/components/Voucher/index.d.ts

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

package/es/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/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,3 +1,4 @@
+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/es/components/appointmentBooking/deposit/index.d.ts

@@ -1,3 +1,4 @@
+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/es/components/appointmentBooking/index.d.ts

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

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

@@ -35,7 +35,7 @@ import ProductItem from "../components/TabProduct/selectProductItem";
 import TabProduct from "../components/TabProduct";
 import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
-import { formatOriginalPrice, formatProductBundle, formatProductOption, formatProductPrice, formatSellingPrice, getBundleDiscountList, getMainProductSellingPrice, getSourceProductPrice } from "../components/footer/utils";
+import { formatOriginalPrice, formatProductBundle, formatProductOption, formatProductPrice, formatSellingPrice, getBundleDiscountList, getSourceProductPrice, getMainProductSellingPrice } from "../components/footer/utils";
 import { formatProductListByCategory, getIsEject, getIsOnlySession, getMainPrice, getProductTotalPrice, isSessionProduct, request } from "../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";

package/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/components/booking/components/footer/amount.d.ts

@@ -0,0 +1,37 @@
+export declare const getRelationDetailsTotal: (relation_details: any) => number;
+export declare const getIsPriceIncludeTax: (state: any) => any;
+/**
+ * 总金额
+ * @param state
+ * @param options isEdit: 预约信息是否发生变动
+ * @returns
+ */
+export declare const getSumTotal: (state: any, options: {
+    [key: string]: any;
+    isEdit: boolean;
+    ScheduleModule: any;
+}) => {
+    productAmount: number;
+    duration: string;
+    tax: number;
+    taxInfo: {
+        title: any;
+        rate: any;
+        is_price_include_tax: any;
+    };
+    shopDiscount: number;
+    surcharge: any;
+    otherAmount: any;
+    sumTotalAmount: number;
+    paidAmount: any;
+    notPaidAmount: number;
+    paySurchargeFee: number;
+    expectAmount: number;
+    actualPaidAmount: any;
+    orderPaidAmount: any;
+    totalRefundAmount: number;
+    dueAmount: number;
+    roundingAmount: number;
+    originExpectAmount: number;
+    originExpectAmountWithoutDiscount: number;
+};

package/es/components/booking/components/footer/amount.js

@@ -605,16 +605,8 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _item$_extend$other2, _item$_extend$other3, _item$_extend$other5;
-  var total = new Decimal(item._extend.main_product_selling_price || item._extend.price || 0);
-
-  // 如果主商品没有main_product_selling_price 则通过discount_list计算
-  if (!item._extend.main_product_selling_price) {
-    // 主商品折扣金额
-    var discountAmount = getDiscountAmount(item.discount_list);
-    // 主商品总价 - 主商品折扣金额
-    total = total.minus(discountAmount);
-  }
+  var _ref3, _ref4, _item$_extend$main_pr, _item$_extend3, _item$metadata, _item$_extend$other2, _item$_extend$other3, _item$_extend$other5;
+  var total = new Decimal((_ref3 = (_ref4 = (_item$_extend$main_pr = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.main_product_selling_price) !== null && _item$_extend$main_pr !== void 0 ? _item$_extend$main_pr : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item._extend.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
 
   // 单规格 
   if ((_item$_extend$other2 = item._extend.other) !== null && _item$_extend$other2 !== void 0 && _item$_extend$other2.option && Array.isArray((_item$_extend$other3 = item._extend.other) === null || _item$_extend$other3 === void 0 ? void 0 : _item$_extend$other3.option)) {
@@ -629,13 +621,13 @@ var getMainProductTotal = function getMainProductTotal(item) {
     for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
       var bundleItem = _step8.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref3, _bundleItem$bundle_se2;
+        var _ref5, _bundleItem$bundle_se2;
         // 子商品折扣金额
-        var _discountAmount = getDiscountAmount(bundleItem.discount_list);
+        var discountAmount = getDiscountAmount(bundleItem.discount_list);
         // 子商品价格
-        var bundleItemPrice = new Decimal((_ref3 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
+        var bundleItemPrice = new Decimal((_ref5 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
         // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice.minus(_discountAmount);
+        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
         total = total.add(bundleItemTotal);
       }
     }
@@ -837,11 +829,11 @@ var getSurcharge = function getSurcharge(state, options) {
                 scheduleById: scheduleById || {},
                 ScheduleModule: ScheduleModule
               })) {
-                var _ref4, _bundleItem$bundle_se3;
+                var _ref6, _bundleItem$bundle_se3;
                 var _mainQuantity = item._extend.quantity || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref4 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0),
+                  total: Number((_ref6 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref6 !== void 0 ? _ref6 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -936,10 +928,17 @@ var getSurcharge = function getSurcharge(state, options) {
 
     // 追加进入的固定附加费总值
     var fixedTotal = new Decimal(0);
+    // 追加到商品的附加费总值 用于追加抹平字段
+    var productTotalSurcharge = new Decimal(0);
     if (matchedItems.length > 0) {
       // 基于每个商品计算附加费：max(0, 商品价格) * rate + fixed
       var configTotal = new Decimal(0);
 
+      // 计算固定附加费 - 只加一次
+      if (fixed && new Decimal(fixed).gt(0)) {
+        configTotal = configTotal.plus(fixed);
+      }
+
       // 计算百分比附加费 - 对每个商品单独计算
       if (percentage && new Decimal(percentage).gt(0) || fixed) {
         var percentageRate = new Decimal(percentage);
@@ -957,6 +956,7 @@ var getSurcharge = function getSurcharge(state, options) {
             var addTimeTotal = new Decimal(_item4.addTimeTotal || 0);
             // 单个商品总附加费
             var itemTotalSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
+            configTotal = configTotal.plus(itemTotalSurcharge);
 
             // 单个商品单数量附加费
             var itemSurcharge = itemPrice.times(percentageRate);
@@ -965,10 +965,12 @@ var getSurcharge = function getSurcharge(state, options) {
             var fixedSurcharge = new Decimal(1).div(productCount).times(fixed).times(100).floor().div(100).toFixed(2);
             var quantity = _item4.isMain ? _item4.quantity : _item4.quantity * _item4.mainQuantity;
             fixedTotal = fixedTotal.plus(new Decimal(fixedSurcharge).times(quantity).toNumber());
+
             // 如果是最后一个商品 判断fixed - fixedTotal 是否有剩余小数 如果有的话，追加抹平字段
             if (isLast && fixedTotal.gt(0)) {
               var remaining = new Decimal(fixed).minus(fixedTotal).toNumber();
               if (remaining > 0) {
+                productTotalSurcharge = productTotalSurcharge.plus(remaining);
                 if (_item4.isMain) {
                   _item4.item._extend.surcharge_rounding_remainder = remaining;
                 } else {
@@ -983,17 +985,34 @@ var getSurcharge = function getSurcharge(state, options) {
                 var _item4$item$_extend;
                 var originSurchargeFee = new Decimal(_item4.item._extend.surcharge_fee || 0);
                 // 保留两位小数
-                _item4.item._extend.surcharge_fee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toNumber();
+                var surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+                productTotalSurcharge = productTotalSurcharge.plus(new Decimal(surchargeFee).times(itemQuantity).toNumber());
+                _item4.item._extend.surcharge_fee = surchargeFee;
                 _item4.item._extend.relation_surcharge_ids = [].concat(_toConsumableArray(((_item4$item$_extend = _item4.item._extend) === null || _item4$item$_extend === void 0 ? void 0 : _item4$item$_extend.relation_surcharge_ids) || []), [id]);
               } else {
                 var _item4$item;
                 var _originSurchargeFee = new Decimal(_item4.item.surcharge_fee || 0);
                 // 保留两位小数
-                _item4.item.surcharge_fee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toNumber();
+                var _surchargeFee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+                productTotalSurcharge = productTotalSurcharge.plus(new Decimal(_surchargeFee).times(itemQuantity).toNumber());
+                _item4.item.surcharge_fee = _surchargeFee;
                 _item4.item.relation_surcharge_ids = [].concat(_toConsumableArray(((_item4$item = _item4.item) === null || _item4$item === void 0 ? void 0 : _item4$item.relation_surcharge_ids) || []), [id]);
               }
             }
-            configTotal = configTotal.plus(itemTotalSurcharge);
+            // 最后一个商品 判断configTotal - productTotalSurcharge 是否有剩余小数 如果有的话，追加抹平字段
+            if (isLast && configTotal.minus(productTotalSurcharge).gt(0)) {
+              // 四舍五入configTotal
+              var configTotalRounded = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+              if (_item4.isMain) {
+                var newRoundingRemainder = new Decimal(_item4.item._extend.surcharge_rounding_remainder || 0);
+                newRoundingRemainder = newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
+                _item4.item._extend.surcharge_rounding_remainder = newRoundingRemainder.toNumber();
+              } else {
+                var _newRoundingRemainder = new Decimal(_item4.item.surcharge_rounding_remainder || 0);
+                _newRoundingRemainder = _newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
+                _item4.item.surcharge_rounding_remainder = _newRoundingRemainder.toNumber();
+              }
+            }
           }
         } catch (err) {
           _iterator18.e(err);
@@ -1002,11 +1021,6 @@ var getSurcharge = function getSurcharge(state, options) {
         }
       }
 
-      // 计算固定附加费 - 只加一次
-      if (fixed && new Decimal(fixed).gt(0)) {
-        configTotal = configTotal.plus(fixed);
-      }
-
       // 如果该配置有金额，则添加到结果中
       finalAmount = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
     }
@@ -1099,13 +1113,13 @@ export var getIsPriceIncludeTax = function getIsPriceIncludeTax(state) {
   var _state$bookingDetail$, _state$bookingDetail6;
   return (_state$bookingDetail$ = (_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.is_price_include_tax) !== null && _state$bookingDetail$ !== void 0 ? _state$bookingDetail$ : 0;
 };
-var getExpectAmount = function getExpectAmount(_ref5) {
-  var price = _ref5.price,
-    tax = _ref5.tax,
-    surchargeAmount = _ref5.surchargeAmount,
-    shopDiscount = _ref5.shopDiscount,
-    state = _ref5.state,
-    options = _ref5.options;
+var getExpectAmount = function getExpectAmount(_ref7) {
+  var price = _ref7.price,
+    tax = _ref7.tax,
+    surchargeAmount = _ref7.surchargeAmount,
+    shopDiscount = _ref7.shopDiscount,
+    state = _ref7.state,
+    options = _ref7.options;
   var _tax = tax;
   // 如果价格含税, 则将税费改为0
   if (getIsPriceIncludeTax(state) || options !== null && options !== void 0 && options.is_price_include_tax) {
@@ -1127,9 +1141,9 @@ var getRoundingAmount = function getRoundingAmount(state) {
   var _state$bookingDetail9;
   return Number(state === null || state === void 0 || (_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.rounding_amount) || 0;
 };
-var getSumTotalAmount = function getSumTotalAmount(_ref6) {
-  var expectAmount = _ref6.expectAmount,
-    roundingAmount = _ref6.roundingAmount;
+var getSumTotalAmount = function getSumTotalAmount(_ref8) {
+  var expectAmount = _ref8.expectAmount,
+    roundingAmount = _ref8.roundingAmount;
   return expectAmount + roundingAmount;
 };
 

package/es/components/booking/components/footer/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 /**
  * @title: 底部
@@ -7,5 +8,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:51
  */
-declare const Footer: (props: any) => JSX.Element;
+declare const Footer: (props: any) => React.JSX.Element;
 export default Footer;