@pisell/private-materials 6.5.27 → 6.6.2

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

@@ -28,7 +28,7 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import PaymentModal from "../../../checkout/PaymentModal";
 import { closeAllPaymentResultToasts } from "../../../checkout/components/PaymentResultToast";
 import { formatProducts } from "../../addons";
-import { getIsSubjectRequire, isDayBooking, isEventBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
+import { getIsSubjectRequire, isDayBooking, isEventBooking, isHasDayAppointmentProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 import { createBookings, editBookings } from "../../info2/serve";
 import AppointmentProductModal from "./AppointmentProductModal";
 import FooterMenus from "./FooterMenus";
@@ -37,6 +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 { SubTotal } from "../../../../index";
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import { sendWarningLog } from '@pisell/utils';
@@ -47,6 +48,7 @@ import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useDebounceFn, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
 import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
+import { isWalkIn } from "../../utils";
 
 /**
  * @title: 底部
@@ -261,7 +263,7 @@ var Footer = function Footer(props) {
 
   // info 是否有编辑
   var infoEdit = useMemo(function () {
-    var _state$client, _state$date, _state$pet, _state$service3, _state$notes, _state$contacts;
+    var _state$client, _state$date, _state$pet, _state$service3, _state$notes, _state$contacts, _state$contacts_info;
     if (!state.bookingId) {
       return true;
     }
@@ -283,6 +285,9 @@ var Footer = function Footer(props) {
     if ((_state$contacts = state.contacts) !== null && _state$contacts !== void 0 && _state$contacts.edit) {
       return true;
     }
+    if ((_state$contacts_info = state.contacts_info) !== null && _state$contacts_info !== void 0 && _state$contacts_info.edit) {
+      return true;
+    }
     return false;
   }, [state]);
 
@@ -845,7 +850,8 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
-      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window7, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
+      var _state$service$value2, _state$client3;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isHasDayProducts, hasUnspecifiedHolderProduct, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window7, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -864,12 +870,23 @@ var Footer = function Footer(props) {
             }
             return _context6.abrupt("return");
           case 6:
+            hasUnspecifiedHolderProduct = (_state$service$value2 = state.service.value) === null || _state$service$value2 === void 0 ? void 0 : _state$service$value2.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 = 10;
+              break;
+            }
+            _context6.next = 10;
+            return showConfirmHolderModal(state, dispatch);
+          case 10:
             if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 8;
+              _context6.next = 12;
               break;
             }
             return _context6.abrupt("return");
-          case 8:
+          case 12:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -878,34 +895,34 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 21;
+              _context6.next = 25;
               break;
             }
-            _context6.next = 17;
+            _context6.next = 21;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 17:
+          case 21:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 20;
+              _context6.next = 24;
               break;
             }
             _context6.t0 = {};
-          case 20:
+          case 24:
             saveOtherValue = _context6.t0;
-          case 21:
-            _context6.prev = 21;
+          case 25:
+            _context6.prev = 25;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // checkout 2.0 补充商品总税费字段
             values.product_tax_fee = total.tax || 0;
             if (!noSubmit) {
-              _context6.next = 27;
+              _context6.next = 31;
               break;
             }
             return _context6.abrupt("return", values);
-          case 27:
+          case 31:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context6.next = 37;
+              _context6.next = 41;
               break;
             }
             subtotal_info = {
@@ -914,7 +931,7 @@ var Footer = function Footer(props) {
               total: cloneDeep(total),
               showDetail: showDetail
             };
-            _context6.next = 32;
+            _context6.next = 36;
             return checkout.updateLocalOrderAsync({
               orderId: editOrderId,
               orderData: values,
@@ -922,10 +939,10 @@ var Footer = function Footer(props) {
               autoPayment: true,
               totalInfo: subtotal_info
             });
-          case 32:
-            _context6.next = 34;
+          case 36:
+            _context6.next = 38;
             return checkout.manualSyncOrderAsync();
-          case 34:
+          case 38:
             res = _context6.sent;
             if (res.success) {
               // 回调关闭弹窗
@@ -933,7 +950,7 @@ var Footer = function Footer(props) {
               _setLoading(false);
             }
             return _context6.abrupt("return");
-          case 37:
+          case 41:
             // 如果是保存，检查是否需要支付定金
             if (type === 'save') {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
@@ -997,43 +1014,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 43;
+              _context6.next = 47;
               break;
             }
-            _context6.next = 43;
+            _context6.next = 47;
             return handleSaveAddons();
-          case 43:
+          case 47:
             if (!infoEdit) {
-              _context6.next = 48;
+              _context6.next = 52;
               break;
             }
-            _context6.next = 46;
+            _context6.next = 50;
             return api(values, state.bookingId || editOrderId);
-          case 46:
+          case 50:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 48:
+          case 52:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context6.abrupt("return", callbackData || values);
-          case 53:
-            _context6.prev = 53;
-            _context6.t1 = _context6["catch"](21);
+          case 57:
+            _context6.prev = 57;
+            _context6.t1 = _context6["catch"](25);
             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);
             }
             _setLoading(false);
-          case 58:
+          case 62:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[21, 53]]);
+      }, _callee6, null, [[25, 57]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);
@@ -1722,6 +1739,7 @@ var Footer = function Footer(props) {
     }
   };
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
+    var _state$service4;
     dispatch({
       type: 'setClient',
       payload: {
@@ -1729,6 +1747,21 @@ var Footer = function Footer(props) {
         edit: true
       }
     });
+    if (state !== null && state !== void 0 && (_state$service4 = state.service) !== null && _state$service4 !== void 0 && (_state$service4 = _state$service4.value) !== null && _state$service4 !== void 0 && _state$service4.length) {
+      // 还需要清空商品内的 holder 信息
+      dispatch({
+        type: 'setService',
+        payload: {
+          value: state.service.value.map(function (item) {
+            return _objectSpread(_objectSpread({}, item), {}, {
+              _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+                holder_id: []
+              })
+            });
+          })
+        }
+      });
+    }
   });
   var _useCustomer = useCustomer({
       changeCustomerToGlobalState: changeCustomerToGlobalState
@@ -1958,6 +1991,6 @@ var Footer = function Footer(props) {
       //   handleClearAllAndReset();
       // }
     }
-  }));
+  }), /*#__PURE__*/React.createElement(ConfirmHolderModal, null));
 };
 export default Footer;

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

@@ -37,5 +37,12 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+/**
+ * @title: 是否包含跨日预约商品
+ * @description:
+ * @param {any} data
+ * @return {*}
+ */
+export declare const getHasMultiDayProduct: (data: any) => any;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;