@pisell/private-materials 6.1.1 → 6.2.2

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

@@ -152,7 +152,7 @@ export var checkSubResourcesCapacity = function checkSubResourcesCapacity(resour
     });
   }
 };
-var checkResourcesFormat = function checkResourcesFormat(resources, service, isChild) {
+export var checkResourcesFormat = function checkResourcesFormat(resources, service, isChild) {
   return resources.map(function (resource) {
     var _resource$children;
     if (!isChild) {
@@ -227,9 +227,20 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend6, _item$_extend7;
+  var _item$_extend6, _item$_extend7, _item$variant;
   var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
   var price = Number((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
+
+  // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
+  if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant = item.variant) === null || _item$variant === void 0 ? void 0 : _item$variant.length) > 0) {
+    var variant = item.variant.find(function (d) {
+      return d.id === (other === null || other === void 0 ? void 0 : other.product_variant_id);
+    });
+    if (variant) {
+      price = Number(variant === null || variant === void 0 ? void 0 : variant.price) || 0;
+    }
+  }
+
   // 单规格， 单价 + 单规格价格
   if (other !== null && other !== void 0 && other.option) {
     var _other$option;
@@ -273,6 +284,24 @@ var formatMetaData = function formatMetaData(item) {
 //   })
 // }
 
+// 获取商品价格 包含组合规格
+var getSourceProductPrice = function getSourceProductPrice(item) {
+  var _item$_extend13, _item$_extend14, _item$variant2;
+  var other = (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.other;
+  var price = Number((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price);
+
+  // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
+  if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant2 = item.variant) === null || _item$variant2 === void 0 ? void 0 : _item$variant2.length) > 0) {
+    var variant = item.variant.find(function (d) {
+      return d.id === (other === null || other === void 0 ? void 0 : other.product_variant_id);
+    });
+    if (variant) {
+      price = Number(variant === null || variant === void 0 ? void 0 : variant.price) || 0;
+    }
+  }
+  return price;
+};
+
 /**
  * @title: 格式化商品数据
  * @description: 
@@ -282,7 +311,7 @@ var formatMetaData = function formatMetaData(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16;
+  var _item$_extend15, _item$_extend16, _item$_extend17;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -298,7 +327,7 @@ var formatProducts = function formatProducts(item, quantity) {
   return {
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
-    "source_product_price": (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.price,
+    "source_product_price": getSourceProductPrice(item),
     "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
@@ -308,10 +337,10 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 || (_item$_extend14 = _item$_extend14.other) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.bundle),
+    "product_bundle": formatProductBundle((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.option),
-    "product_variant_id": ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.option),
+    "product_variant_id": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -331,8 +360,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend17;
-    var holderId = (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.holder_id;
+    var _item$_extend18;
+    var holderId = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -358,15 +387,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend18;
-      return ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend19;
+      return ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend19;
-      var key = (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id; // 分组键
+      var _item$_extend20;
+      var key = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -439,9 +468,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23;
-      var startDate = ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.startDate) || ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.start_date);
-      var endDate = ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.endDate) || ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.end_date);
+      var _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24;
+      var startDate = ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.startDate) || ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.start_date);
+      var endDate = ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.endDate) || ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -644,7 +673,7 @@ export var formatValues = function formatValues(state) {
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend24;
+    var _item$_extend25;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
@@ -652,7 +681,7 @@ export var checkHolderIsError = function checkHolderIsError(state) {
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 || (_item$_extend24 = _item$_extend24.holder_id) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.length) !== item._extend.quantity) {
+    if (item._extend.quantity > 1 && ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 || (_item$_extend25 = _item$_extend25.holder_id) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.length) !== item._extend.quantity) {
       return true;
     }
     return false;

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

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

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

@@ -0,0 +1,8 @@
+import './index.less';
+interface IProps {
+    modal: any;
+    onReload: () => Promise<any>;
+    onCancel: () => void;
+}
+declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => JSX.Element;
+export default ReloadResourceModal;

package/es/components/{pay/toB/store/provider.js → booking/components/reloadResourceModal/index.js}

@@ -9,69 +9,65 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
-import { ToBPayContext, useOSPayment } from "./index";
-import { handlePayMethodList } from "./utils";
-export var ToBPayProvider = function ToBPayProvider(_ref) {
-  var children = _ref.children;
-  var osPayment = useOSPayment();
-  var _useState = useState({}),
+import { Modal } from 'antd';
+import { locales } from '@pisell/utils';
+import { WarningOutlined } from '@ant-design/icons';
+import "./index.less";
+var ReloadResourceModal = function ReloadResourceModal(_ref) {
+  var _modal$state$service;
+  var modal = _ref.modal,
+    onReload = _ref.onReload,
+    onCancel = _ref.onCancel;
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    order = _useState2[0],
-    setOrder = _useState2[1];
-  var _useState3 = useState({}),
-    _useState4 = _slicedToArray(_useState3, 2),
-    orderInfo = _useState4[0],
-    setOrderInfo = _useState4[1];
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    payMethodGroupList = _useState6[0],
-    setPayMethodGroupList = _useState6[1];
-  var getPayMethodList = /*#__PURE__*/function () {
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var handleReload = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var payMethodList;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (osPayment) {
-              _context.next = 4;
-              break;
-            }
-            setPayMethodGroupList([]);
-            console.error('osPayment is not initialized');
-            return _context.abrupt("return");
+            setLoading(true);
+            _context.prev = 1;
+            _context.next = 4;
+            return onReload === null || onReload === void 0 ? void 0 : onReload();
           case 4:
-            _context.prev = 4;
-            _context.next = 7;
-            return osPayment.getPayMethodListAsync();
-          case 7:
-            payMethodList = _context.sent;
-            console.log('payMethodList', payMethodList);
-            setPayMethodGroupList(handlePayMethodList(payMethodList));
-            _context.next = 15;
+            _context.next = 8;
             break;
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](4);
-            console.error(_context.t0);
-          case 15:
+          case 6:
+            _context.prev = 6;
+            _context.t0 = _context["catch"](1);
+          case 8:
+            setLoading(false);
+          case 9:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 12]]);
+      }, _callee, null, [[1, 6]]);
     }));
-    return function getPayMethodList() {
+    return function handleReload() {
       return _ref2.apply(this, arguments);
     };
   }();
-  var contextValue = {
-    order: order,
-    setOrder: setOrder,
-    orderInfo: orderInfo,
-    setOrderInfo: setOrderInfo,
-    payMethodGroupList: payMethodGroupList,
-    getPayMethodList: getPayMethodList
-  };
-  return /*#__PURE__*/React.createElement(ToBPayContext.Provider, {
-    value: contextValue
-  }, children);
-};
+  return /*#__PURE__*/React.createElement(Modal, {
+    className: "pisell-resource-reload-modal",
+    title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(WarningOutlined, {
+      style: {
+        color: '#d89614',
+        marginRight: 8
+      }
+    }), locales.getText('pisell2.booking.info.resource.warning-title')),
+    cancelText: null,
+    okText: locales.getText('pisell2.booking.info.resource.retry'),
+    confirmLoading: loading,
+    open: (_modal$state$service = modal.state.service) === null || _modal$state$service === void 0 ? void 0 : _modal$state$service.reloadResourceModal,
+    onOk: handleReload,
+    cancelButtonProps: {
+      style: {
+        display: 'none'
+      }
+    },
+    onCancel: onCancel
+  }, /*#__PURE__*/React.createElement("div", null, locales.getText('pisell2.booking.info.resource.warning-content')));
+};
+export default ReloadResourceModal;

package/es/components/booking/components/reloadResourceModal/index.less

@@ -0,0 +1,6 @@
+.pisell-resource-reload-modal {
+
+  .pisell-lowcode-modal-header {
+    padding: 0;
+  }
+}

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

@@ -26,8 +26,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { getServiceAddons } from "./utils";
 import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
+import { getServiceAddons } from "./utils";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -275,8 +275,8 @@ var VoucherCard = function VoucherCard(props) {
     style: {
       width: '100%'
     },
-    mixedSort: mixedSort,
     dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
+    mixedSort: mixedSort,
     onChange: function onChange(val) {
       var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({

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

@@ -0,0 +1,5 @@
+import React from 'react';
+import { EditBookingModalProps } from './type';
+import './index.less';
+declare const _default: React.ForwardRefExoticComponent<EditBookingModalProps & React.RefAttributes<unknown>>;
+export default _default;