@pisell/private-materials 3.0.13 → 3.0.14-5.gray

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

@@ -38,6 +38,7 @@ var import_ArrowLeft = __toESM(require("@pisell/icon/es/ArrowLeft"));
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var Drawer = (props) => {
+  const { hideScrollBar = true, showGoBack = true } = props;
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
@@ -45,12 +46,15 @@ var Drawer = (props) => {
       closable: false,
       zIndex: 999,
       ...props,
+      className: (0, import_classnames.default)("pisell-lowcode__booking-drawer", props.className, {
+        "pisell-lowcode__booking-drawer-hide-scrollbar": hideScrollBar
+      }),
       title: false,
       bodyStyle: { padding: 0 },
       push: false,
       mask: false
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title-wrap") }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title-wrap") }, showGoBack && /* @__PURE__ */ import_react.default.createElement(
       import_ArrowLeft.default,
       {
         className: "pisell-lowcode__booking-drawer-back",

package/lib/components/booking/components/drawer/index.less

@@ -28,12 +28,19 @@
   }
 }
 
-.pisell-lowcode-drawer-body {
-  &::-webkit-scrollbar {
-    display: block;
+
+.pisell-lowcode__booking-drawer-hide-scrollbar {
+  &.pisell-lowcode-drawer-body {
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+
   }
 }
 
+
+
 .pisell-lowcode__booking-drawer-title-no-wrap {
   display: inline;
 }

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

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

package/lib/components/booking/components/footer/FooterMenus/index.js

@@ -35,27 +35,7 @@ module.exports = __toCommonJS(FooterMenus_exports);
 var import_react = __toESM(require("react"));
 var import_menuButton = __toESM(require("../../../components/menuButton"));
 var import_index = require("./index.less");
-var import_utils = require("@pisell/utils");
-var FooterMenus = ({ state, dispatch }) => {
-  const items = (0, import_react.useMemo)(() => {
-    let list = [];
-    if (state.bookingId) {
-      list.push({
-        label: import_utils.locales.getText("pisell2.text.rebook"),
-        key: "rebook"
-      });
-    }
-    return list;
-  }, [state]);
-  const handleRebook = () => {
-    var _a;
-    (_a = state.onRebook) == null ? void 0 : _a.call(state);
-  };
-  const menuChange = (e) => {
-    if (e.key === "rebook") {
-      handleRebook();
-    }
-  };
+var FooterMenus = ({ state, menuChange, items }) => {
   return items.length ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-buttons-item-rebook" }, /* @__PURE__ */ import_react.default.createElement(
     import_menuButton.default,
     {
@@ -63,6 +43,9 @@ var FooterMenus = ({ state, dispatch }) => {
       dropdownProps: {
         placement: "bottomLeft",
         menu: {
+          style: {
+            minWidth: 200
+          },
           items,
           onClick: menuChange
         }

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

@@ -19,4 +19,5 @@ export declare const getSumTotal: (state: any, isEdit: boolean) => {
     orderPaidAmount: number;
     totalRefundAmount: number;
     dueAmount: number;
+    roundingAmount: number;
 };

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

@@ -25,6 +25,15 @@ __export(amount_exports, {
 module.exports = __toCommonJS(amount_exports);
 var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
+var getRelationDetailsTotal = (relation_details) => {
+  let total = 0;
+  for (let item of relation_details) {
+    const number = item.product_quantity || item.num;
+    const price = item.payment_price || item.price;
+    total += Number(price) * Number(number);
+  }
+  return total;
+};
 var getProductAmount = (state, isEdit) => {
   var _a, _b;
   let price = 0;
@@ -32,11 +41,12 @@ var getProductAmount = (state, isEdit) => {
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       for (let item of state == null ? void 0 : state.service.value) {
-        price += Number(item._extend.price) * (item._extend.quantity || 1);
+        price += Number(item._extend.total);
+        price += getRelationDetailsTotal(item._extend.relation_details || []);
         duration += import_utils.flexibleObj.getValue(item._extend.duration);
       }
       for (let item of state.addons.value) {
-        price += Number(item.price) * item.quantity;
+        price += Number(item._extend.total) * item._extend.quantity;
       }
     }
   } else {
@@ -53,7 +63,7 @@ var getProductAmount = (state, isEdit) => {
 };
 var getProductItemTax = (item, bookingDetail) => {
   let price = 0;
-  const productDiscountPrice = Number(item.price);
+  const productDiscountPrice = Number(item.total);
   const shopTax = productDiscountPrice * Number(bookingDetail.tax_rate) * Number(item.is_charge_tax);
   const shopTaxRate = 1 + bookingDetail.tax_rate * bookingDetail.is_price_include_tax;
   const res = shopTax / shopTaxRate * item.quantity;
@@ -61,10 +71,7 @@ var getProductItemTax = (item, bookingDetail) => {
   return price;
 };
 var getTotal = (item) => {
-  return item._extend.payment_price !== void 0 ? item._extend.payment_price : item._extend.price;
-};
-var getAddonsTotal = (item) => {
-  return item.payment_price !== void 0 ? item.payment_price : item.price;
+  return item._extend.payment_price !== void 0 ? item._extend.payment_price : item._extend.total;
 };
 var getTax = (state, isEdit) => {
   var _a;
@@ -80,7 +87,8 @@ var getTax = (state, isEdit) => {
       price += getProductItemTax(
         {
           ...item,
-          price: getTotal(item),
+          total: getTotal(item),
+          price: item._extend.price,
           quantity: item._extend.quantity
         },
         state.bookingDetail
@@ -89,8 +97,9 @@ var getTax = (state, isEdit) => {
     for (let item of state.addons.value) {
       price += getProductItemTax({
         ...item,
-        price: getAddonsTotal(item),
-        quantity: item.quantity
+        total: getTotal(item),
+        price: item._extend.price,
+        quantity: item._extend.quantity
       }, state.bookingDetail);
     }
   }
@@ -145,8 +154,16 @@ var getShopDiscount = (state) => {
   var _a;
   return Number((_a = state.bookingDetail) == null ? void 0 : _a.shop_discount) || 0;
 };
+var getRoundingAmount = (state) => {
+  var _a;
+  return Number((_a = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a.rounding_amount) || 0;
+};
+var getSumTotalAmount = ({ expectAmount, roundingAmount }) => {
+  return expectAmount + roundingAmount;
+};
 var getSumTotal = (state, isEdit) => {
   const { price, duration } = getProductAmount(state, isEdit);
+  const roundingAmount = getRoundingAmount(state);
   const tax = getTax(state, isEdit);
   const paySurchargeFee = getPaySurchargeFee(state);
   const otherAmount = getOtherAmount(state);
@@ -155,7 +172,7 @@ var getSumTotal = (state, isEdit) => {
   const totalRefundAmount = getTotalRefundAmount(state);
   const shopDiscount = getShopDiscount(state);
   const expectAmount = getExpectAmount({ price, tax, otherAmount, shopDiscount, state, isEdit });
-  const sumTotalAmount = expectAmount;
+  const sumTotalAmount = getSumTotalAmount({ expectAmount, roundingAmount });
   const notPaidAmount = Number((0, import_utils2.formatAmount)(sumTotalAmount, 2, "")) - orderPaidAmount;
   const actualPaidAmount = paidAmount;
   const dueAmount = notPaidAmount < 0 ? Number((0, import_utils2.formatAmount)(notPaidAmount + totalRefundAmount, 2, "")) : 0;
@@ -174,7 +191,8 @@ var getSumTotal = (state, isEdit) => {
     actualPaidAmount,
     orderPaidAmount,
     totalRefundAmount,
-    dueAmount
+    dueAmount,
+    roundingAmount
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,5 +1,5 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 /**
  * @title: 底部
  * @description: