@pisell/private-materials 6.6.70 → 6.6.73

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

@@ -37,7 +37,7 @@ import "./index.less";
 import { createEventBooking, editEventBooking } from "./serve";
 import { checkHolderIsError, formatValues } from "./utils";
 import NoteModal from "../../../../plus/noteModal";
-import { showConfirmHolderModal, ConfirmHolderModal } from "../../utils/confirmHolderModal";
+import { showHolderAssignmentConfirmModal } from "../../utils/holderAssignmentConfirmModal";
 import { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import dayjs from 'dayjs';
@@ -96,6 +96,8 @@ var Footer = function Footer(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     paymentCallback = _useState14[0],
     setPaymentCallback = _useState14[1];
+  var stateRef = useRef(state);
+  stateRef.current = state;
 
   // edit order id
   var _useState15 = useState(0),
@@ -869,47 +871,56 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
-      var _state$bookingConfig6, _state$service$value2, _state$client3;
-      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isToastMode, isHasDayProducts, hasUnspecifiedHolderProduct, _setLoading, loadingTimer, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window7, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
+      var _submitState, _submitState$service, _submitState$client;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, submitState, isToastMode, isHasDayProducts, hasUnspecifiedHolderProduct, shouldContinue, _setLoading, loadingTimer, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _submitState2, _submitState2$onSave, _store$getState, _window7, _submitState4, callbackData, values, checkout, subtotal_info, res, _submitState3, isNeedDeposit, api;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             type = _ref6.type, _ref6$messageShow = _ref6.messageShow, messageShow = _ref6$messageShow === void 0 ? true : _ref6$messageShow, _ref6$noSubmit = _ref6.noSubmit, noSubmit = _ref6$noSubmit === void 0 ? false : _ref6$noSubmit;
-            // 关闭页面上所有的PaymentResultToast
+            submitState = stateRef.current; // 关闭页面上所有的PaymentResultToast
             // 弹窗模式判断
-            isToastMode = (state === null || state === void 0 || (_state$bookingConfig6 = state.bookingConfig) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.config) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.payment_setting) === null || _state$bookingConfig6 === void 0 ? void 0 : _state$bookingConfig6.payment_result_display_mode) !== 'modal'; // 只有 toast 模式才关闭，modal 模式留着
+            isToastMode = ((_submitState = submitState) === null || _submitState === void 0 || (_submitState = _submitState.bookingConfig) === null || _submitState === void 0 || (_submitState = _submitState.config) === null || _submitState === void 0 || (_submitState = _submitState.payment_setting) === null || _submitState === void 0 ? void 0 : _submitState.payment_result_display_mode) !== 'modal'; // 只有 toast 模式才关闭，modal 模式留着
             if (isToastMode) {
               closeAllPaymentResultToasts();
             }
             // 跨日预约验证是否有预约商品
-            if (!isDayBooking(state)) {
-              _context6.next = 7;
+            if (!isDayBooking(submitState)) {
+              _context6.next = 8;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context6.next = 7;
+              _context6.next = 8;
               break;
             }
             return _context6.abrupt("return");
-          case 7:
-            hasUnspecifiedHolderProduct = (_state$service$value2 = state.service.value) === null || _state$service$value2 === void 0 ? void 0 : _state$service$value2.some(function (item) {
+          case 8:
+            hasUnspecifiedHolderProduct = (_submitState$service = submitState.service) === null || _submitState$service === void 0 || (_submitState$service = _submitState$service.value) === null || _submitState$service === void 0 ? void 0 : _submitState$service.some(function (item) {
               var _item$_extend, _item$_extend2;
               return (!((_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.holder_id) || ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.holder_id) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.length) === 0) && !isNormalProductByDurationSchedule(item);
             });
-            if (!(!isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id) && getIsSubjectRequire(state) && hasUnspecifiedHolderProduct)) {
-              _context6.next = 11;
+            if (!(!isWalkIn((_submitState$client = submitState.client) === null || _submitState$client === void 0 || (_submitState$client = _submitState$client.value) === null || _submitState$client === void 0 ? void 0 : _submitState$client.id) && getIsSubjectRequire(submitState) && hasUnspecifiedHolderProduct)) {
+              _context6.next = 16;
               break;
             }
-            _context6.next = 11;
-            return showConfirmHolderModal(state, dispatch);
-          case 11:
-            if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 13;
+            _context6.next = 12;
+            return showHolderAssignmentConfirmModal(submitState);
+          case 12:
+            shouldContinue = _context6.sent;
+            if (shouldContinue) {
+              _context6.next = 15;
               break;
             }
             return _context6.abrupt("return");
-          case 13:
+          case 15:
+            submitState = stateRef.current;
+          case 16:
+            if (!(isBooking4Shop && getIsSubjectRequire(submitState) && checkHolderIsError(submitState))) {
+              _context6.next = 18;
+              break;
+            }
+            return _context6.abrupt("return");
+          case 18:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -918,38 +929,39 @@ var Footer = function Footer(props) {
               _setLoading(false);
             }, 20000);
             _getApis = getApis(), createBooking = _getApis.createBooking, editBooking = _getApis.editBooking;
-            editApi = state.renderType === 'eventBooking' ? editEventBooking : editBooking;
-            createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
+            editApi = submitState.renderType === 'eventBooking' ? editEventBooking : editBooking;
+            createApi = submitState.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 27;
+              _context6.next = 33;
               break;
             }
-            _context6.next = 23;
-            return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 23:
+            _context6.next = 28;
+            return (_submitState2 = submitState) === null || _submitState2 === void 0 || (_submitState2$onSave = _submitState2.onSave) === null || _submitState2$onSave === void 0 ? void 0 : _submitState2$onSave.call(_submitState2, submitState.client);
+          case 28:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 26;
+              _context6.next = 31;
               break;
             }
             _context6.t0 = {};
-          case 26:
+          case 31:
             saveOtherValue = _context6.t0;
-          case 27:
-            _context6.prev = 27;
+            submitState = stateRef.current;
+          case 33:
+            _context6.prev = 33;
             callbackData = null; // 格式化提交的参数
-            values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // checkout 2.0 补充商品总税费字段
+            values = formatValues(_objectSpread(_objectSpread({}, submitState), saveOtherValue)); // checkout 2.0 补充商品总税费字段
             values.product_tax_fee = total.tax || 0;
             if (!noSubmit) {
-              _context6.next = 33;
+              _context6.next = 39;
               break;
             }
             return _context6.abrupt("return", values);
-          case 33:
+          case 39:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context6.next = 43;
+              _context6.next = 49;
               break;
             }
             subtotal_info = {
@@ -958,7 +970,7 @@ var Footer = function Footer(props) {
               total: cloneDeep(total),
               showDetail: showDetail
             };
-            _context6.next = 38;
+            _context6.next = 44;
             return checkout.updateLocalOrderAsync({
               orderId: editOrderId,
               orderData: values,
@@ -966,20 +978,20 @@ var Footer = function Footer(props) {
               autoPayment: true,
               totalInfo: subtotal_info
             });
-          case 38:
-            _context6.next = 40;
+          case 44:
+            _context6.next = 46;
             return checkout.manualSyncOrderAsync();
-          case 40:
+          case 46:
             res = _context6.sent;
             if (res.success) {
               // 回调关闭弹窗
-              state === null || state === void 0 || state.callback(res, type);
+              (_submitState3 = submitState) === null || _submitState3 === void 0 || _submitState3.callback(res, type);
               _setLoading(false);
             }
             return _context6.abrupt("return");
-          case 43:
+          case 49:
             // 如果是保存，检查是否需要支付定金
-            if (type === 'save' && !state.bookingId) {
+            if (type === 'save' && !submitState.bookingId) {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
               if (isNeedDeposit !== null && isNeedDeposit !== void 0 && isNeedDeposit.hasDeposit) {
                 values.is_deposit = 1;
@@ -988,7 +1000,7 @@ var Footer = function Footer(props) {
             }
 
             // 区分是新增还是编辑
-            api = state.bookingId ? editApi : createApi; // 增加日志记录
+            api = submitState.bookingId ? editApi : createApi; // 增加日志记录
             sendWarningLog({
               title: 'saveBooking',
               content: [{
@@ -1012,7 +1024,7 @@ var Footer = function Footer(props) {
             });
 
             // 活动预约新建时校验重复 -- 暂不处理
-            // if (!state.bookingId && state.renderType === 'eventBooking') {
+            // if (!submitState.bookingId && submitState.renderType === 'eventBooking') {
             //   const { data } = await eventBookingCheck(values);
             //   if (data.list.length) {
             //     const confirmed = await modal.confirm({
@@ -1041,45 +1053,45 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 49;
+              _context6.next = 55;
               break;
             }
-            _context6.next = 49;
+            _context6.next = 55;
             return handleSaveAddons();
-          case 49:
+          case 55:
             if (!infoEdit) {
-              _context6.next = 54;
+              _context6.next = 60;
               break;
             }
-            _context6.next = 52;
-            return api(values, state.bookingId || editOrderId);
-          case 52:
+            _context6.next = 58;
+            return api(values, submitState.bookingId || editOrderId);
+          case 58:
             callbackData = _context6.sent;
             if (messageShow) {
-              message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
+              message.success(locales.getText(submitState.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 54:
+          case 60:
             // 回调关闭弹窗
-            state === null || state === void 0 || state.callback(callbackData, type);
+            (_submitState4 = submitState) === null || _submitState4 === void 0 || _submitState4.callback(callbackData, type);
             clearTimeout(loadingTimer);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context6.abrupt("return", callbackData || values);
-          case 60:
-            _context6.prev = 60;
-            _context6.t1 = _context6["catch"](27);
+          case 66:
+            _context6.prev = 66;
+            _context6.t1 = _context6["catch"](33);
             console.log(_context6.t1);
             if ((_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.code) === 70101) {
               message.error(_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.message);
             }
             clearTimeout(loadingTimer);
             _setLoading(false);
-          case 66:
+          case 72:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[27, 60]]);
+      }, _callee6, null, [[33, 66]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);
@@ -1768,8 +1780,8 @@ var Footer = function Footer(props) {
     }
   };
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
-    var _state$client4, _state$service6;
-    var beforeValue = state === null || state === void 0 || (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : _state$client4.value;
+    var _state$client3, _state$service6;
+    var beforeValue = state === null || state === void 0 || (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.value;
     dispatch({
       type: 'setClient',
       payload: {
@@ -2024,6 +2036,6 @@ var Footer = function Footer(props) {
       //   handleClearAllAndReset();
       // }
     }
-  }), /*#__PURE__*/React.createElement(ConfirmHolderModal, null));
+  }));
 };
 export default Footer;

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

@@ -108,6 +108,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
     }
   } catch (error) {}
   return bundle.map(function (d) {
+    var _d$original_price;
     var option = formatProductOption(d.option);
     var option_price = option.reduce(function (temp, item) {
       return temp + Number(item.num) * item.custom_add_price;
@@ -129,7 +130,7 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "price": Number(d === null || d === void 0 ? void 0 : d.product_price),
       "price_type": d === null || d === void 0 ? void 0 : d.price_type,
       "price_type_ext": d === null || d === void 0 ? void 0 : d.price_type_ext,
-      "custom_price": (d === null || d === void 0 ? void 0 : d.custom_price) || Math.abs(new Decimal((d === null || d === void 0 ? void 0 : d.original_price) || (d === null || d === void 0 ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
+      "custom_price": (d === null || d === void 0 ? void 0 : d.custom_price) || Math.abs(new Decimal((_d$original_price = d === null || d === void 0 ? void 0 : d.original_price) !== null && _d$original_price !== void 0 ? _d$original_price : d === null || d === void 0 ? void 0 : d.product_price).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
       "option": option,
       "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),

package/es/components/booking/info/hooks/useAddHolder.js

@@ -84,6 +84,7 @@ var useAddHolder = function useAddHolder(state, dispatch) {
   var handleAddHolder = function handleAddHolder(products, currentItem) {
     var _state$client, _state$client2;
     var _data = {
+      zIndex: 1300,
       formDataConfig: isMinorAndWaiver ? _objectSpread(_objectSpread({}, waiverForm), {}, {
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
         is_franchisor: formDataConfig.is_franchisor

package/es/components/booking/info/main.js

@@ -27,6 +27,7 @@ import Notes from "./notes";
 import { Service2Cart } from "./service2";
 import { isDayBooking, isEventBooking, isTerminalDayBooking } from "./service2/utils";
 import ContactInfoMode from "../info2/service/contactInfoMode";
+import { HolderAssignmentConfirmModal } from "../utils/holderAssignmentConfirmModal";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -127,7 +128,7 @@ var Info = Provider(function (props) {
     // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
     null;
   }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(HolderAssignmentConfirmModal, null), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
     style: _objectSpread(_objectSpread({}, style), {}, {
       height: '100%'
     }),

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

@@ -36,6 +36,7 @@ import { useDebounceEffect } from 'ahooks';
 import CartClientCard from "./cartClientCard";
 import { Iconfont, useToast } from '@pisell/materials';
 import ContactInfoMode from "./service/contactInfoMode";
+import { HolderAssignmentConfirmModal } from "../utils/holderAssignmentConfirmModal";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -291,7 +292,7 @@ var Info = Provider(function (props) {
   }, [currentDate], {
     wait: 300
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ReloadResourceModal, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(HolderAssignmentConfirmModal, null), /*#__PURE__*/React.createElement(ReloadResourceModal, {
     modal: modal,
     onReload: getResourcesData,
     onCancel: function onCancel() {

package/es/components/booking/utils/holderAssignmentConfirmModal.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import './confirmHolderModal.less';
+export declare const HolderAssignmentConfirmModal: React.FC;
+/**
+ * 通过 await 调起保存前 holder 分配确认弹窗。
+ */
+export declare function showHolderAssignmentConfirmModal(state: any): Promise<boolean>;