@pisell/pisellos 2.2.147 → 2.2.149

package/dist/modules/Product/utils.js

@@ -8,12 +8,12 @@
 export function isNormalProduct(product) {
   var _product$scheduleIds;
   // 如果有 duration 配置，则不是普通商品
-  if (product.duration) {
+  if (product !== null && product !== void 0 && product.duration) {
     return false;
   }
 
   // 如果有 schedule.ids 且长度大于0，则不是普通商品
-  if ((_product$scheduleIds = product['schedule.ids']) !== null && _product$scheduleIds !== void 0 && _product$scheduleIds.length) {
+  if (product !== null && product !== void 0 && (_product$scheduleIds = product['schedule.ids']) !== null && _product$scheduleIds !== void 0 && _product$scheduleIds.length) {
     return false;
   }
 

package/dist/modules/ProductList/index.js

@@ -136,7 +136,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               }, {
                 osServer: true,
                 callback: options === null || options === void 0 ? void 0 : options.callback,
-                subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId
+                subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
+                customToast: function customToast() {}
               });
             case 6:
               productsData = _context3.sent;

package/dist/modules/Quotation/index.d.ts

@@ -2,7 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import type { ScheduleItem } from '../Schedule/types';
 import type { QuotationItem } from './types';
-export type { QuotationItem, QuotationProductData, QuotationSchedule, QuotationState } from './types';
+export type { QuotationItem, QuotationProductData, QuotationSchedule, QuotationState, QuotationCustomer } from './types';
 export declare class QuotationModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -13,6 +13,7 @@ export declare class QuotationModule extends BaseModule implements Module {
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     loadQuotations(params?: {
         channel?: string;
+        customer_id?: number | string;
     }): Promise<void>;
     getQuotationList(): QuotationItem[];
     /**
@@ -27,11 +28,13 @@ export declare class QuotationModule extends BaseModule implements Module {
         productId: number;
         variantId?: number;
         datetime: string;
+        customer_id?: number | string;
     }): string | null;
     getQuotationShelfId(params: {
         productId: number;
         variantId?: number;
         datetime: string;
+        customer_id?: number | string;
     }): number;
     /**
      * Batch pre-compute quotation prices for a set of products across multiple time points.
@@ -41,8 +44,12 @@ export declare class QuotationModule extends BaseModule implements Module {
     buildProductPriceMap(params: {
         productIds: number[];
         timePoints: string[];
+        customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
+    private filterQuotationsByCustomer;
+    private isQuotationVisibleForCustomer;
+    private hasValidCustomerId;
     private isQuotationActiveAt;
     private findProductData;
 }

package/dist/modules/Quotation/index.js

@@ -78,21 +78,22 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               query = {};
               if (params !== null && params !== void 0 && params.channel) query.channel = params.channel;
+              if (params !== null && params !== void 0 && params.customer_id) query.customer_id = String(params.customer_id);
               if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
                 query.channel = 'online-store';
               }
-              _context2.next = 5;
+              _context2.next = 6;
               return this.request.get('/quotation/available', query, {
                 useCache: false
               });
-            case 5:
+            case 6:
               res = _context2.sent;
-              list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
+              list = this.filterQuotationsByCustomer((res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [], params === null || params === void 0 ? void 0 : params.customer_id);
               list.sort(function (a, b) {
                 return a.sort - b.sort;
               });
               this.store.list = list;
-            case 9:
+            case 10:
             case "end":
               return _context2.stop();
           }
@@ -122,12 +123,14 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function getPriceForProduct(params) {
       var productId = params.productId,
         variantId = params.variantId,
-        datetime = params.datetime;
+        datetime = params.datetime,
+        customer_id = params.customer_id;
       var _iterator = _createForOfIteratorHelper(this.store.list),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var quotation = _step.value;
+          if (!this.isQuotationVisibleForCustomer(quotation, customer_id)) continue;
           if (!this.isQuotationActiveAt(quotation, datetime)) continue;
           var match = this.findProductData(quotation.product_data, productId, variantId);
           if (!match) continue;
@@ -146,12 +149,14 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function getQuotationShelfId(params) {
       var productId = params.productId,
         variantId = params.variantId,
-        datetime = params.datetime;
+        datetime = params.datetime,
+        customer_id = params.customer_id;
       var _iterator2 = _createForOfIteratorHelper(this.store.list),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var quotation = _step2.value;
+          if (!this.isQuotationVisibleForCustomer(quotation, customer_id)) continue;
           if (!this.isQuotationActiveAt(quotation, datetime)) continue;
           var match = this.findProductData(quotation.product_data, productId, variantId);
           if (!match || match.value === 0) continue;
@@ -188,7 +193,8 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               var key = "".concat(productId, ":").concat(timePoint);
               var price = this.getPriceForProduct({
                 productId: productId,
-                datetime: timePoint
+                datetime: timePoint,
+                customer_id: params.customer_id
               });
               if (price !== null) {
                 map.set(key, price);
@@ -212,15 +218,39 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
+  }, {
+    key: "filterQuotationsByCustomer",
+    value: function filterQuotationsByCustomer(list, customerId) {
+      var _this2 = this;
+      return list.filter(function (quotation) {
+        return _this2.isQuotationVisibleForCustomer(quotation, customerId);
+      });
+    }
+  }, {
+    key: "isQuotationVisibleForCustomer",
+    value: function isQuotationVisibleForCustomer(quotation, customerId) {
+      var customers = quotation.customer || [];
+      if (customers.length === 0) return true;
+      if (!this.hasValidCustomerId(customerId)) return false;
+      return customers.some(function (customer) {
+        return String(customer.id) === String(customerId);
+      });
+    }
+  }, {
+    key: "hasValidCustomerId",
+    value: function hasValidCustomerId(customerId) {
+      if (customerId === undefined || customerId === null || customerId === '') return false;
+      return Number(customerId) > 0;
+    }
   }, {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this2 = this;
+        _this3 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
       var scheduleItems = quotation.schedule.map(function (s) {
-        var _this2$scheduleResolv;
-        var full = (_this2$scheduleResolv = _this2.scheduleResolver) === null || _this2$scheduleResolv === void 0 ? void 0 : _this2$scheduleResolv.call(_this2, s.id);
+        var _this3$scheduleResolv;
+        var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
         if (full) return full;
         return _objectSpread(_objectSpread({}, s), {}, {
           repeat_type: s.repeat_type || 'none',

package/dist/modules/Quotation/types.d.ts

@@ -22,6 +22,10 @@ export interface QuotationSchedule {
     }>;
     pivot?: Record<string, any>;
 }
+export interface QuotationCustomer {
+    id: number | string;
+    [key: string]: any;
+}
 export interface QuotationItem {
     id: number;
     shop_id: number;
@@ -34,6 +38,7 @@ export interface QuotationItem {
     created_at?: string;
     updated_at?: string;
     deleted_at?: string | null;
+    customer?: QuotationCustomer[];
     schedule: QuotationSchedule[];
     product_data: QuotationProductData[];
 }

package/dist/modules/Rules/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
@@ -29,8 +29,10 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
+        unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
+    private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];
         productList: any[];