@pisell/private-materials 6.7.9 → 6.8.1

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

@@ -57,7 +57,7 @@ import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/use
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$paymentPaid2, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail, _state$bookingDetail2, _state$client2, _state$notes3, _state$bookingDetail13, _state$addons4, _state$notes4;
+  var _context$appHelper, _state$paymentPaid2, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail, _state$bookingDetail2, _state$client2, _state$notes3, _state$bookingDetail13, _state$addons4, _state$notes4, _state$bookingConfig7, _state$client3;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -619,46 +619,50 @@ var Footer = function Footer(props) {
    */
   var handleCheckoutInternal = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var isNewOrder, isHasDayProducts, res, modalData, _res;
+      var _state$bookingConfig5;
+      var isToastMode, isNewOrder, isHasDayProducts, res, modalData, _res;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            // 关闭页面上所有的PaymentResultToast
-            closeAllPaymentResultToasts();
+            // 弹窗模式判断
+            isToastMode = (state === null || state === void 0 || (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.payment_setting) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.payment_result_display_mode) !== 'modal';
+            if (isToastMode) {
+              closeAllPaymentResultToasts();
+            }
             isNewOrder = !state.bookingId; // 如果有编辑内容, 则先保存
             if (!isEdit) {
-              _context4.next = 26;
+              _context4.next = 27;
               break;
             }
             if (!isDayBooking(state)) {
-              _context4.next = 7;
+              _context4.next = 8;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context4.next = 7;
+              _context4.next = 8;
               break;
             }
             return _context4.abrupt("return");
-          case 7:
+          case 8:
             if (!state.isBookingTicket2) {
-              _context4.next = 20;
+              _context4.next = 21;
               break;
             }
-            _context4.next = 10;
+            _context4.next = 11;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal()),
               noSubmit: true
             });
-          case 10:
+          case 11:
             res = _context4.sent;
             if (res) {
-              _context4.next = 13;
+              _context4.next = 14;
               break;
             }
             return _context4.abrupt("return");
-          case 13:
+          case 14:
             // 使用新版支付弹窗
             modalData = {
               order_info: res,
@@ -700,24 +704,24 @@ var Footer = function Footer(props) {
                 }
               };
             });
-            _context4.next = 25;
+            _context4.next = 26;
             break;
-          case 20:
-            _context4.next = 22;
+          case 21:
+            _context4.next = 23;
             return handleSave({
               type: 'checkout',
               messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
             });
-          case 22:
+          case 23:
             _res = _context4.sent;
             // goCheckout2(res);
             console.log(_res);
             goCheckout((_res === null || _res === void 0 ? void 0 : _res.order_id) || state.bookingId, isNewOrder);
-          case 25:
-            return _context4.abrupt("return");
           case 26:
-            return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+            return _context4.abrupt("return");
           case 27:
+            return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+          case 28:
           case "end":
             return _context4.stop();
         }
@@ -848,31 +852,36 @@ 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$bookingConfig6;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isToastMode, isHasDayProducts, _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:
             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
-            closeAllPaymentResultToasts();
+            // 弹窗模式判断
+            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 模式留着
+            if (isToastMode) {
+              closeAllPaymentResultToasts();
+            }
             // 跨日预约验证是否有预约商品
             if (!isDayBooking(state)) {
-              _context6.next = 6;
+              _context6.next = 7;
               break;
             }
             isHasDayProducts = handleDaySubmit();
             if (!isHasDayProducts) {
-              _context6.next = 6;
+              _context6.next = 7;
               break;
             }
             return _context6.abrupt("return");
-          case 6:
+          case 7:
             if (!(isBooking4Shop && getIsSubjectRequire(state) && checkHolderIsError(state))) {
-              _context6.next = 8;
+              _context6.next = 9;
               break;
             }
             return _context6.abrupt("return");
-          case 8:
+          case 9:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -881,34 +890,34 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context6.next = 21;
+              _context6.next = 22;
               break;
             }
-            _context6.next = 17;
+            _context6.next = 18;
             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 18:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 20;
+              _context6.next = 21;
               break;
             }
             _context6.t0 = {};
-          case 20:
-            saveOtherValue = _context6.t0;
           case 21:
-            _context6.prev = 21;
+            saveOtherValue = _context6.t0;
+          case 22:
+            _context6.prev = 22;
             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 = 28;
               break;
             }
             return _context6.abrupt("return", values);
-          case 27:
+          case 28:
             checkout = pisellos.getModule('checkout'); // 如果有 orderid，则应该走更新逻辑
             if (!editOrderId) {
-              _context6.next = 37;
+              _context6.next = 38;
               break;
             }
             subtotal_info = {
@@ -917,7 +926,7 @@ var Footer = function Footer(props) {
               total: cloneDeep(total),
               showDetail: showDetail
             };
-            _context6.next = 32;
+            _context6.next = 33;
             return checkout.updateLocalOrderAsync({
               orderId: editOrderId,
               orderData: values,
@@ -925,10 +934,10 @@ var Footer = function Footer(props) {
               autoPayment: true,
               totalInfo: subtotal_info
             });
-          case 32:
-            _context6.next = 34;
+          case 33:
+            _context6.next = 35;
             return checkout.manualSyncOrderAsync();
-          case 34:
+          case 35:
             res = _context6.sent;
             if (res.success) {
               // 回调关闭弹窗
@@ -936,7 +945,7 @@ var Footer = function Footer(props) {
               _setLoading(false);
             }
             return _context6.abrupt("return");
-          case 37:
+          case 38:
             // 如果是保存，检查是否需要支付定金
             if (type === 'save') {
               isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
@@ -1000,43 +1009,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context6.next = 43;
+              _context6.next = 44;
               break;
             }
-            _context6.next = 43;
+            _context6.next = 44;
             return handleSaveAddons();
-          case 43:
+          case 44:
             if (!infoEdit) {
-              _context6.next = 48;
+              _context6.next = 49;
               break;
             }
-            _context6.next = 46;
+            _context6.next = 47;
             return api(values, state.bookingId || editOrderId);
-          case 46:
+          case 47:
             callbackData = _context6.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 48:
+          case 49:
             // 回调关闭弹窗
             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 54:
+            _context6.prev = 54;
+            _context6.t1 = _context6["catch"](22);
             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 59:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[21, 53]]);
+      }, _callee6, null, [[22, 54]]);
     }));
     return function handleSave(_x5) {
       return _ref7.apply(this, arguments);
@@ -1932,8 +1941,20 @@ var Footer = function Footer(props) {
     data: paymentModalData,
     callback: paymentCallback || undefined,
     setEditCartMode: setEditCartMode,
-    state: state,
-    dispatch: dispatch,
+    paymentResultDisplayMode: state === null || state === void 0 || (_state$bookingConfig7 = state.bookingConfig) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.config) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.payment_setting) === null || _state$bookingConfig7 === void 0 ? void 0 : _state$bookingConfig7.payment_result_display_mode,
+    shopDiscount: state.shop_discount,
+    client: (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.value,
+    currentTotalPrice: total.productAmount,
+    onChangeShopDiscount: function onChangeShopDiscount(discount) {
+      dispatch({
+        type: 'setState',
+        payload: {
+          shop_discount: discount
+        }
+      });
+    },
+    onChangeOrderNote: handleNoteConfirm,
+    onDeleteOrderNote: handleNoteDelete,
     onClose: function onClose(reset) {
       // console.log('🔄 Footer: Closing PaymentModal');
       setIsPaymentModalOpen(false);

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

@@ -16,6 +16,11 @@ export declare const formatProductOption: (option: any) => any;
  * @Date: 2024-02-19 09:26
  */
 export declare const formatProductBundle: (bundle: any) => any;
+/**
+ * 获取子商品折扣信息
+ * @param item
+ */
+export declare const getBundleDiscountList: (bundle: any[]) => any[];
 export interface ResourceItem {
     [key: string]: any;
 }
@@ -37,5 +42,19 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+/**
+ * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
+ * @param item
+ * @returns
+ */
+export declare const formatOriginalPrice: (item: any) => number;
+/**
+ * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
+ * @param item
+ * @returns
+ */
+export declare const formatSellingPrice: (item: any) => number;
+export declare const getSourceProductPrice: (item: any) => number;
+export declare const getMainProductSellingPrice: (item: any) => number | undefined;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;