@pisell/private-materials 3.3.83 → 3.3.85

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

@@ -71,7 +71,7 @@ var Header = function Header() {
   var handleBack = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _currentStep$step4;
-      var key, types, _carts$, type, form_key, booking_form, prevStepData, currentStepData, _key;
+      var key, types, form_key, booking_form, prevStepData, currentStepData, _key;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -91,19 +91,13 @@ var Header = function Header() {
             }
 
             // 3. 清空商品
-            if (!(key === 'select-service')) {
-              _context.next = 10;
-              break;
-            }
-            appointmentBooking.clearCart();
-            _context.next = 8;
-            return checkProductType(carts === null || carts === void 0 || (_carts$ = carts[0]) === null || _carts$ === void 0 ? void 0 : _carts$.id);
-          case 8:
-            type = _context.sent;
-            if (type === 'duration') {
-              appointmentBooking.deleteCartItemInfo('time');
+            if (key === 'select-service') {
+              appointmentBooking.clearCart();
+              if (appointmentBooking.isCartHasDurationProduct()) {
+                appointmentBooking.deleteCartItemInfo('time');
+              }
             }
-          case 10:
+
             // 4. 清理本地状态
             if (key === 'select-time') {
               setTimes([]);
@@ -165,7 +159,7 @@ var Header = function Header() {
             //     isSkip: false,
             //   });
             // }
-          case 18:
+          case 13:
           case "end":
             return _context.stop();
         }

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

@@ -101,7 +101,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, description;
+                  var product, session, startDate, endDate, _data$origin, resources, activeStatus, index, stepList, hasResourceStep, description;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
@@ -169,7 +169,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
                       case 24:
                         appointmentBooking.storeProduct(product);
-                        // duration 类型的商品，要获取一下资源
+                        // duration 类型的商品，要获取一下资源，在先选日期的 duration 步骤里目前只能通过这个动作拉取
                         if (!(type === 'duration')) {
                           _context.next = 28;
                           break;
@@ -180,13 +180,19 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                         // 先选择日期流程
                         if (isDateSelectedFirst) {
                           index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2; //先选择日期流程：如果商品类型是duration的商品，则需要增加选择时间步骤
-                          if (type === 'duration') {
-                            description = locales.getText('pisell2.appointment.select.time');
-                            appointmentBooking.addStep({
-                              index: index,
-                              key: 'select-time',
-                              description: description
-                            }, 'select-resource');
+                          if (type === 'duration' || appointmentBooking.isCartHasDurationProduct()) {
+                            stepList = appointmentBooking.getStepList();
+                            hasResourceStep = stepList === null || stepList === void 0 ? void 0 : stepList.find(function (item) {
+                              return (item === null || item === void 0 ? void 0 : item.key) === "select-resource";
+                            });
+                            if (hasResourceStep) {
+                              description = locales.getText('pisell2.appointment.select.time');
+                              appointmentBooking.addStep({
+                                index: index,
+                                key: 'select-time',
+                                description: description
+                              }, 'select-resource');
+                            }
                           } else {
                             removeStep('select-time');
                           }

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

@@ -244,4 +244,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/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 {};

package/lib/components/appointmentBooking/components/Header/index.js

@@ -74,7 +74,7 @@ var Header = () => {
     return ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.description) || "";
   }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, currentSelectedResources]);
   const handleBack = async () => {
-    var _a2, _b;
+    var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     const types = {
       "select-time": "time",
@@ -89,8 +89,7 @@ var Header = () => {
     }
     if (key === "select-service") {
       appointmentBooking.clearCart();
-      const type = await checkProductType((_b = carts == null ? void 0 : carts[0]) == null ? void 0 : _b.id);
-      if (type === "duration") {
+      if (appointmentBooking.isCartHasDurationProduct()) {
         appointmentBooking.deleteCartItemInfo("time");
       }
     }

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

@@ -134,14 +134,20 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         }
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
-          if (type === "duration") {
-            const description = import_utils.locales.getText(
-              "pisell2.appointment.select.time"
-            );
-            appointmentBooking.addStep(
-              { index, key: "select-time", description },
-              "select-resource"
+          if (type === "duration" || appointmentBooking.isCartHasDurationProduct()) {
+            const stepList = appointmentBooking.getStepList();
+            const hasResourceStep = stepList == null ? void 0 : stepList.find(
+              (item2) => (item2 == null ? void 0 : item2.key) === "select-resource"
             );
+            if (hasResourceStep) {
+              const description = import_utils.locales.getText(
+                "pisell2.appointment.select.time"
+              );
+              appointmentBooking.addStep(
+                { index, key: "select-time", description },
+                "select-resource"
+              );
+            }
           } else {
             removeStep("select-time");
           }

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

@@ -244,4 +244,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/lib/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 {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.83",
+  "version": "3.3.85",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,8 +61,8 @@
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
     "@pisell/materials": "3.3.30",
-    "@pisell/date-picker": "3.0.2",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/appointmentBooking/components/Header/index.d.ts

@@ -1,3 +0,0 @@
-import './index.less';
-declare const Header: () => JSX.Element;
-export default Header;

package/lib/components/appointmentBooking/components/Header/index.d.ts

@@ -1,3 +0,0 @@
-import './index.less';
-declare const Header: () => JSX.Element;
-export default Header;