@pisell/pisellos 3.0.77 → 3.0.79

package/lib/solution/BookingByStep/utils/capacity.js

@@ -230,7 +230,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       let totalAvailableCapacity = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || resource.onlyComputed && (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           totalAvailableCapacity += resource.capacity || 0;

package/lib/solution/BookingByStep/utils/resources.js

@@ -353,7 +353,10 @@ var getTimeSlicesByResource = ({
   });
   times.forEach((time) => {
     const startTime = (0, import_dayjs.default)(`${time.start_at}`);
-    const endTime = (0, import_dayjs.default)(`${time.end_at}`);
+    let endTime = (0, import_dayjs.default)(`${time.end_at}`);
+    if (endTime.isAfter((0, import_dayjs.default)(currentDate).endOf("day"))) {
+      endTime = (0, import_dayjs.default)(currentDate).endOf("day");
+    }
     let currentStart = startTime;
     while (true) {
       const currentEnd = currentStart.add(duration, "minute");

package/lib/solution/ShopDiscount/index.d.ts

@@ -2,6 +2,7 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { Customer } from './types';
 import { Discount } from '../../modules/Discount/types';
+import { UnavailableReason } from '../../modules/Rules/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -48,6 +49,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
+        unavailableReason?: UnavailableReason;
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/lib/solution/ShopDiscount/index.js

@@ -38,6 +38,7 @@ var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
 var import_utils = require("./utils");
+var import_types2 = require("../../modules/Rules/types");
 var import_decimal = __toESM(require("decimal.js"));
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -262,7 +263,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           type: "clientCalc",
           isAvailable: false,
           productList: this.store.productList || [],
-          discountList: this.getDiscountList()
+          discountList: this.getDiscountList(),
+          unavailableReason: import_types2.UnavailableReason.Unknown
         };
       }
       if (!resultDiscountList.length) {
@@ -291,7 +293,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const {
         productList: newProductList,
         discountList: newDiscountList,
-        isAvailable
+        isAvailable,
+        unavailableReason
       } = rulesModule.isDiscountListAvailable({
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
@@ -316,7 +319,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         type: "clientCalc",
         isAvailable: isAvailable || false,
         productList: newProductList || this.store.productList || [],
-        discountList: newDiscountList || this.getDiscountList()
+        discountList: newDiscountList || this.getDiscountList(),
+        unavailableReason
       };
     } catch (error) {
       console.error("[ShopDiscount] 扫码出错:", error);
@@ -324,7 +328,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         type: "clientCalc",
         isAvailable: false,
         productList: this.store.productList || [],
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        unavailableReason: import_types2.UnavailableReason.Unknown
       };
     }
   }
@@ -464,7 +469,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         action: "create",
         with_good_pass: 1,
         with_discount_card: 1,
-        with_wallet_pass_holder: 1
+        with_wallet_pass_holder: 1,
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "3.0.77",
+  "version": "3.0.79",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",