@pisell/private-materials 6.5.10 → 6.5.12

package/es/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/appointmentBooking/components/Services/index.js

@@ -99,7 +99,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-                  var product, session, startDate, endDate, _data$origin, resources, activeStatus, index, stepList, hasResourceStep, description;
+                  var product, res, session, startDate, endDate, _res, _data$origin, resources, activeStatus, _res2, index, stepList, hasResourceStep, description;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
@@ -117,7 +117,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 10;
+                          _context.next = 12;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
@@ -126,51 +126,69 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                         }
                         return _context.abrupt("return");
                       case 8:
-                        appointmentBooking.storeProduct(product);
+                        res = appointmentBooking.storeProduct(product);
+                        if (!(!res.success && res.errorCode === 'not_enough_stock')) {
+                          _context.next = 11;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 11:
                         return _context.abrupt("return");
-                      case 10:
+                      case 12:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 19;
+                          _context.next = 24;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
                         endDate = dayjs(session === null || session === void 0 ? void 0 : session.end_at).format('YYYY-MM-DD');
-                        appointmentBooking.addProductToCart({
+                        _res = appointmentBooking.addProductToCart({
                           product: _objectSpread({}, product),
                           date: {
                             startTime: "".concat(startDate, " ").concat(session === null || session === void 0 ? void 0 : session.start_time),
                             endTime: "".concat(endDate, " ").concat(session === null || session === void 0 ? void 0 : session.end_time)
                           }
                         });
-                        _context.next = 17;
+                        if (!(!_res.success && _res.errorCode === 'not_enough_stock')) {
+                          _context.next = 19;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 19:
+                        appointmentBooking.closeProductDetail();
+                        _context.next = 22;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 17:
-                        _context.next = 27;
+                      case 22:
+                        _context.next = 34;
                         break;
-                      case 19:
+                      case 24:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
-                          _context.next = 23;
+                          _context.next = 28;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 23:
-                        appointmentBooking.storeProduct(product);
-                        // duration 类型的商品，要获取一下资源，在先选日期的 duration 步骤里目前只能通过这个动作拉取
+                      case 28:
+                        _res2 = appointmentBooking.storeProduct(product);
+                        if (!(!_res2.success && _res2.errorCode === 'not_enough_stock')) {
+                          _context.next = 31;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 31:
                         if (!(type === 'duration')) {
-                          _context.next = 27;
+                          _context.next = 34;
                           break;
                         }
-                        _context.next = 27;
+                        _context.next = 34;
                         return appointmentBooking.getAvailableDate();
-                      case 27:
+                      case 34:
                         appointmentBooking.closeProductDetail();
 
                         // 先选择日期流程
@@ -199,7 +217,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             removeStep('select-time');
                           }
                         }
-                      case 29:
+                      case 36:
                       case "end":
                         return _context.stop();
                     }

package/es/components/appointmentBooking/hooks.js

@@ -206,6 +206,12 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
       if (!result) {
         return Toast(locales.getText('pisell2.appointment.unuse.date'));
       }
+      var capacityResult = appointmentBooking.checkMaxDurationCapacity();
+      if (!capacityResult.success) {
+        var getMessage = locales.getText('pisell2.appointment.unuse.capacity');
+        var message = typeof getMessage === 'function' ? getMessage(capacityResult.minAvailableCount) : getMessage;
+        return Toast(message);
+      }
     }
     if (!isRetailTemplate && currentKey !== null && currentKey !== void 0 && currentKey.startsWith('select-resource')) {
       var _currentSelectedResou;

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

@@ -44,7 +44,7 @@ import dayjs from 'dayjs';
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 import { Iconfont } from '@pisell/materials';
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
-import { useDebounceEffect, useMemoizedFn } from 'ahooks';
+import { useDebounceEffect, useDebounceFn, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
 import { useShopDiscount } from "../../../appointmentBooking/hooks";
 
@@ -608,13 +608,13 @@ var Footer = function Footer(props) {
   }, [JSON.stringify(total), JSON.stringify(orderTotalList), JSON.stringify(subTotalList), (_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id]);
 
   /**
-   * @title: 处理checkout
+   * @title: 处理checkout内部函数
    * @description:
    * @return {*}
    * @Author: zhiwei.Wang
    * @Date: 2024-01-30 16:53
    */
-  var handleCheckout = /*#__PURE__*/function () {
+  var handleCheckoutInternal = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var isNewOrder, isHasDayProducts, res, modalData, _res;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -720,11 +720,19 @@ var Footer = function Footer(props) {
         }
       }, _callee4);
     }));
-    return function handleCheckout() {
+    return function handleCheckoutInternal() {
       return _ref4.apply(this, arguments);
     };
   }();
 
+  // 使用防抖，500毫秒内不重复执行
+  var _useDebounceFn = useDebounceFn(handleCheckoutInternal, {
+      wait: 500,
+      leading: true,
+      trailing: false
+    }),
+    handleCheckout = _useDebounceFn.run;
+
   /**
    * @title: 保存额外商品
    * @description:
@@ -837,7 +845,7 @@ 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, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
+      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;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -945,6 +953,17 @@ var Footer = function Footer(props) {
               }, {
                 key: '日期',
                 value: dayjs().format('YYYY-MM-DD HH:mm')
+              }, {
+                key: '店铺id',
+                value: store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.globalConfig) === null || _store$getState === void 0 ? void 0 : _store$getState.id
+              }, {
+                key: 'shopApi',
+                value: JSON.stringify((_window7 = window) === null || _window7 === void 0 ? void 0 : _window7.shopApi, function (key, value) {
+                  if (typeof value === 'function') {
+                    return 'function';
+                  }
+                  return value;
+                })
               }]
             });
 

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

@@ -71,7 +71,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
   var getInitData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
       var _data$fromResource, _data$toResource;
-      var mockProps, _data, _initResourceVal, fromResourceFormId, toResourceFormId, _form_id, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx, _sameResource;
+      var mockProps, _data, _initResourceVal, fromResourceFormId, toResourceFormId, _form_id, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx, _sameResource, _targetIdx;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -129,7 +129,13 @@ var EditBookingModal = function EditBookingModal(props, ref) {
                       _cloned[_idx] = _targetResource; // 替换现有对象
                     }
                   } else {
-                    _cloned.push(_targetResource); // 添加新对象
+                    // 未发现原资源位置（短时间内通过其它渠道修改过资源）
+                    _targetIdx = _cloned.findIndex(function (rs) {
+                      return rs.relation_id == (_targetResource === null || _targetResource === void 0 ? void 0 : _targetResource.relation_id);
+                    }); // 判断是否已经包含了目标资源，不包含则加入进来
+                    if (_targetIdx === -1) {
+                      _cloned.push(_targetResource); // 添加新对象
+                    }
                   }
                   _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, _form_id, _cloned));
                 } else {

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

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

package/es/components/booking/info/service2/utils.d.ts

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -156,6 +156,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -458,6 +460,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -760,6 +764,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;

package/es/components/booking/locales.js

@@ -174,6 +174,10 @@ export default {
     'pisell2.text.deposit-delete-message': "It cannot be restored after deletion. Please confirm the operation.",
     'pisell2.text.deposit-paid': "Deposit paid",
     "pisell2.text.stock": "Stock",
+    'pisell2.appointment.unuse.stock': "Not enough stock",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "Only ".concat(count, " spots available. Please reduce quantity.");
+    },
     'pisell2.text.payment-link': "Payment link",
     'pisell2.text.send-mail': "Send email",
     'pisell2.text.copy-to-clipboard': "Copy to clipboard",
@@ -531,6 +535,10 @@ export default {
     'pisell2.text.deposit-delete-message': "删除后不可恢复，请确认操作",
     'pisell2.text.deposit-paid': "已付定金",
     "pisell2.text.stock": "库存",
+    'pisell2.appointment.unuse.stock': "库存不足",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "\u4EC5\u53EF\u9884\u7EA6 ".concat(count, " \u4E2A\uFF0C\u8BF7\u51CF\u5C11\u6570\u91CF");
+    },
     'pisell2.text.payment-link': "付款链接",
     'pisell2.text.send-mail': "发送邮件",
     'pisell2.text.copy-to-clipboard': "复制到剪切板",
@@ -888,6 +896,10 @@ export default {
     'pisell2.text.deposit-delete-message': "刪除後不可恢復，請確認操作",
     'pisell2.text.deposit-paid': "已付定金",
     "pisell2.text.stock": "庫存",
+    'pisell2.appointment.unuse.stock': "庫存不足",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "\u50C5\u53EF\u9810\u7D04 ".concat(count, " \u500B\uFF0C\u8ACB\u6E1B\u5C11\u6578\u91CF");
+    },
     'pisell2.text.payment-link': "付款鏈接",
     'pisell2.text.send-mail': "發送郵件",
     'pisell2.text.copy-to-clipboard': "複製到剪切板",

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};