@pisell/private-materials 3.0.72 → 3.0.74

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

@@ -13,5 +13,5 @@ export interface InfoProps {
     setGlobalState: any;
 }
 export declare const formatProducts: (values: any) => any;
-declare const Addons: (props: any) => any;
+declare const Addons: (props: any) => JSX.Element;
 export default Addons;

package/es/components/booking/addons/model.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -9,6 +9,24 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
+var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
+  var total = 0;
+  var _iterator = _createForOfIteratorHelper(relation_details),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      var number = item.product_quantity || item.num;
+      var price = item.payment_price || item.price;
+      total += Number(price) * Number(number);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return total;
+};
 /**
  * 总金额
  * @param state 
@@ -20,30 +38,35 @@ var getProductAmount = function getProductAmount(state, isEdit) {
   if (isEdit) {
     // 计算总价  服务 和 附加商品
     if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
-      var _iterator = _createForOfIteratorHelper(state === null || state === void 0 ? void 0 : state.service.value),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(state === null || state === void 0 ? void 0 : state.service.value),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var item = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var item = _step2.value;
+          // 预约商品
           price += Number(item._extend.total);
+
+          // 附加商品
+          price += getRelationDetailsTotal(item._extend.relation_details || []);
+          // price += 
           duration += flexibleObj.getValue(item._extend.duration);
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
-      var _iterator2 = _createForOfIteratorHelper(state.addons.value),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(state.addons.value),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _item = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _item = _step3.value;
           price += Number(_item._extend.total) * _item._extend.quantity;
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
     }
   } else {
@@ -103,11 +126,11 @@ var getTax = function getTax(state, isEdit) {
     return Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.tax_fee);
   }
   if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
-    var _iterator3 = _createForOfIteratorHelper(state === null || state === void 0 ? void 0 : state.service.value),
-      _step3;
+    var _iterator4 = _createForOfIteratorHelper(state === null || state === void 0 ? void 0 : state.service.value),
+      _step4;
     try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var item = _step3.value;
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        var item = _step4.value;
         price += getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
           total: getTotal(item),
           price: item._extend.price,
@@ -115,15 +138,15 @@ var getTax = function getTax(state, isEdit) {
         }), state.bookingDetail);
       }
     } catch (err) {
-      _iterator3.e(err);
+      _iterator4.e(err);
     } finally {
-      _iterator3.f();
+      _iterator4.f();
     }
-    var _iterator4 = _createForOfIteratorHelper(state.addons.value),
-      _step4;
+    var _iterator5 = _createForOfIteratorHelper(state.addons.value),
+      _step5;
     try {
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        var _item2 = _step4.value;
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var _item2 = _step5.value;
         price += getProductItemTax(_objectSpread(_objectSpread({}, _item2), {}, {
           total: getTotal(_item2),
           price: _item2._extend.price,
@@ -131,9 +154,9 @@ var getTax = function getTax(state, isEdit) {
         }), state.bookingDetail);
       }
     } catch (err) {
-      _iterator4.e(err);
+      _iterator5.e(err);
     } finally {
-      _iterator4.f();
+      _iterator5.f();
     }
   }
   return price;

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

@@ -859,6 +859,11 @@ var Footer = function Footer(props) {
       }
       return _arr3;
     }
+    if (source === "addTime") {
+      var _arr4 = [];
+      _arr4 = _toConsumableArray(buttons);
+      return _arr4;
+    }
     return [];
   }, [buttons, total, isEdit, checkoutLoading, isDisabled, source, buttonMap, loading, isCheckout, state]);
 

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

@@ -71,6 +71,26 @@ export var formatProductBundle = function formatProductBundle(bundle) {
     };
   });
 };
+var getSubType = function getSubType(item) {
+  var _item$duration;
+  var _type = (_item$duration = item.duration) === null || _item$duration === void 0 ? void 0 : _item$duration.type;
+  // 目前不支持跨天
+  if (_type && _type !== 'days') {
+    return _type;
+  }
+  return 'minutes';
+};
+var formatRelationDetails = function formatRelationDetails(list) {
+  return (list || []).map(function (item) {
+    return {
+      num: item.product_quantity,
+      price: item.payment_price || 0,
+      product_id: item.product_id,
+      is_charge_tax: item.is_charge_tax,
+      order_detail_id: item.order_detail_id
+    };
+  });
+};
 
 /**
  * @title: 预约商品信息
@@ -113,6 +133,7 @@ var formatBookings = function formatBookings(data) {
         "product_bundle": formatProductBundle((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.bundle),
         "bundle_edit": item._extend.bundle_edit
       },
+      "relation_products": formatRelationDetails(item._extend.relation_details),
       'id': item.booking_id || 0,
       "relation_id": item._extend.relation_id,
       "like_status": item._extend.like_status || 'common',
@@ -120,7 +141,7 @@ var formatBookings = function formatBookings(data) {
       "is_all": false,
       "schedule_id": item._extend.schedule_id,
       "end_time": end_time,
-      "sub_type": 'days',
+      "sub_type": getSubType(item),
       "select_date": start_date,
       "start_time": start_time,
       "end_date": end_date,

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

@@ -46,7 +46,8 @@ var Deposit = function Deposit(props) {
     bookingId = globalState.bookingId,
     amountSymbol = globalState.amountSymbol,
     generatePaymentLink = globalState.generatePaymentLink,
-    locale = globalState.locale;
+    locale = globalState.locale,
+    callback = globalState.callback;
   var sendEmail = function sendEmail(id) {
     action({
       type: 'pisell1.sendPayLinkEmail',
@@ -77,6 +78,10 @@ var Deposit = function Deposit(props) {
               deposit_amount: 0
             })
           });
+          callback === null || callback === void 0 ? void 0 : callback({
+            order_id: bookingId,
+            afterCloseUpdate: true
+          });
         });
       }
     });
@@ -130,6 +135,10 @@ var Deposit = function Deposit(props) {
           deposit_amount: amount
         })
       });
+      callback === null || callback === void 0 ? void 0 : callback({
+        order_id: bookingId,
+        afterCloseUpdate: true
+      });
     });
   };
   var handleGoOrderDetail = function handleGoOrderDetail() {

package/es/components/booking/forms/forms.d.ts

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => any;
+declare const Forms: (props: any) => JSX.Element;
 export default Forms;

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Forms: (props: any) => any;
+declare const Forms: (props: any) => JSX.Element;
 export default Forms;

package/es/components/booking/forms/model.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => any;
+declare const Booking: (props: any) => JSX.Element;
 export default Booking;

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

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => any;
+declare const Info: (props: any) => JSX.Element;
 export default Info;

package/es/components/booking/info/model.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

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

package/es/components/booking/info/service/actions/index.js

@@ -0,0 +1,73 @@
+import React, { useMemo, useContext } from "react";
+import { Context } from "../../model";
+import { Button } from "antd";
+import { getIsEdit } from "../../../utils";
+import { isUsableProduct } from "../addTimeModal/utils";
+import "./index.less";
+import { locales } from "@pisell/utils";
+var Actions = function Actions(_ref) {
+  var _state$bookingConfig2, _state$bookingConfig3;
+  var currentService = _ref.currentService;
+  var _useContext = useContext(Context),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  var appointment_card = useMemo(function () {
+    var _state$bookingConfig, _state$bookingConfig$, _state$bookingConfig$2;
+    return (state === null || state === void 0 ? void 0 : (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : (_state$bookingConfig$ = _state$bookingConfig.config) === null || _state$bookingConfig$ === void 0 ? void 0 : (_state$bookingConfig$2 = _state$bookingConfig$.information_tab) === null || _state$bookingConfig$2 === void 0 ? void 0 : _state$bookingConfig$2.appointment_card) || {
+      quick_time: 1
+    };
+  }, [state === null || state === void 0 ? void 0 : (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 ? void 0 : (_state$bookingConfig3 = _state$bookingConfig2.config) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.information_tab]);
+  var onAddTime = function onAddTime() {
+    dispatch({
+      type: "setService",
+      payload: {
+        addTimeModal: true,
+        cacheItem: currentService
+      }
+    });
+  };
+  var addTimeProducts = useMemo(function () {
+    return (state.addTimeProducts || []).some(function (item) {
+      return isUsableProduct(item.add_time.relation_product, currentService);
+    });
+  }, [state.addTimeProducts, currentService]);
+  var showAddTimeButton = useMemo(function () {
+    // event预约不需要
+    if (state.renderType === "eventBooking") {
+      return false;
+    }
+
+    // 禁止编辑
+    if (state.disabledEdit) {
+      return false;
+    }
+
+    // 未开启加时
+    if (appointment_card.quick_time !== 1) {
+      return false;
+    }
+
+    // 如果在编辑态, 不展示加时
+    if (getIsEdit(state)) {
+      return false;
+    }
+
+    // 如果该服务没有符合的加时商品, 不展示加时
+    if (!addTimeProducts) {
+      return false;
+    }
+    return true;
+  }, [state, appointment_card.quick_time, addTimeProducts]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: "actions-wrap"
+  }, showAddTimeButton && /*#__PURE__*/React.createElement(Button, {
+    className: "action-item",
+    size: "large",
+    onClick: function onClick(e) {
+      e.preventDefault();
+      e.stopPropagation();
+      onAddTime();
+    }
+  }, locales.getText("page.booking.text.add-time")));
+};
+export default Actions;

package/es/components/booking/info/service/actions/index.less

@@ -0,0 +1,9 @@
+.actions-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .action-item {
+    flex: 1;
+  }
+}

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

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