@pisell/pisellos 2.3.1 → 2.3.2

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

@@ -666,6 +666,8 @@ export interface OrderModuleAPI {
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
+    /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
+    updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;

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

@@ -1,8 +1,8 @@
 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, QuotationCustomer } from './types';
+import type { QuotationItem, QuotationCustomerScopeInfo } from './types';
+export type { QuotationItem, QuotationProductData, QuotationSchedule, QuotationState, QuotationCustomer, QuotationCustomerScope, QuotationCustomerScopeInfo, } from './types';
 export declare class QuotationModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -16,6 +16,7 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Promise<void>;
     getQuotationList(): QuotationItem[];
+    getQuotationCustomerScopeInfo(): QuotationCustomerScopeInfo;
     /**
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
@@ -28,12 +29,24 @@ export declare class QuotationModule extends BaseModule implements Module {
         productId: number;
         variantId?: number;
         datetime: string;
+        channel?: string;
         customer_id?: number | string;
     }): string | null;
+    getQuotationMatchForProduct(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+        channel?: string;
+        customer_id?: number | string;
+    }): {
+        price: string | null;
+        quotationShelfId: number;
+    } | null;
     getQuotationShelfId(params: {
         productId: number;
         variantId?: number;
         datetime: string;
+        channel?: string;
         customer_id?: number | string;
     }): number;
     /**
@@ -49,6 +62,7 @@ export declare class QuotationModule extends BaseModule implements Module {
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
+    private normalizeCustomerId;
     private isQuotationActiveAt;
     private findProductData;
 }

package/dist/modules/Quotation/index.js

@@ -109,6 +109,43 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function getQuotationList() {
       return this.store.list;
     }
+  }, {
+    key: "getQuotationCustomerScopeInfo",
+    value: function getQuotationCustomerScopeInfo() {
+      var _this2 = this;
+      var customerById = new Map();
+      var quotationScopes = this.store.list.filter(function (quotation) {
+        return Array.isArray(quotation.customer) && quotation.customer.length > 0;
+      }).map(function (quotation) {
+        var customerIds = [];
+        var customers = [];
+        var localSeen = new Set();
+        var quotationCustomers = quotation.customer || [];
+        quotationCustomers.forEach(function (customer) {
+          var customerId = _this2.normalizeCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
+          if (!customerId || localSeen.has(customerId)) return;
+          localSeen.add(customerId);
+          customerIds.push(customerId);
+          customers.push(customer);
+          if (!customerById.has(customerId)) customerById.set(customerId, customer);
+        });
+        return {
+          quotationId: quotation.id,
+          quotationName: quotation.name,
+          customerIds: customerIds,
+          customers: customers
+        };
+      });
+      var result = {
+        quotationCount: this.store.list.length,
+        hasCustomerScopedQuotations: quotationScopes.length > 0,
+        allQuotationsCustomerScoped: this.store.list.length > 0 && quotationScopes.length === this.store.list.length,
+        customerIds: Array.from(customerById.keys()),
+        customers: Array.from(customerById.values()),
+        quotationScopes: quotationScopes
+      };
+      return result;
+    }
 
     /**
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
@@ -121,6 +158,12 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPriceForProduct",
     value: function getPriceForProduct(params) {
+      var _this$getQuotationMat, _this$getQuotationMat2;
+      return (_this$getQuotationMat = (_this$getQuotationMat2 = this.getQuotationMatchForProduct(params)) === null || _this$getQuotationMat2 === void 0 ? void 0 : _this$getQuotationMat2.price) !== null && _this$getQuotationMat !== void 0 ? _this$getQuotationMat : null;
+    }
+  }, {
+    key: "getQuotationMatchForProduct",
+    value: function getQuotationMatchForProduct(params) {
       var productId = params.productId,
         variantId = params.variantId,
         datetime = params.datetime,
@@ -137,7 +180,10 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
           var match = this.findProductData(quotation.product_data, productId, variantId);
           if (!match) continue;
           if (match.value === 0) continue;
-          return String(match.value);
+          return {
+            price: String(match.value),
+            quotationShelfId: quotation.id
+          };
         }
       } catch (err) {
         _iterator.e(err);
@@ -149,27 +195,8 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getQuotationShelfId",
     value: function getQuotationShelfId(params) {
-      var productId = params.productId,
-        variantId = params.variantId,
-        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;
-          return quotation.id;
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-      return 0;
+      var _this$getQuotationMat3, _this$getQuotationMat4;
+      return (_this$getQuotationMat3 = (_this$getQuotationMat4 = this.getQuotationMatchForProduct(params)) === null || _this$getQuotationMat4 === void 0 ? void 0 : _this$getQuotationMat4.quotationShelfId) !== null && _this$getQuotationMat3 !== void 0 ? _this$getQuotationMat3 : 0;
     }
 
     /**
@@ -182,16 +209,16 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function buildProductPriceMap(params) {
       var map = new Map();
       if (!this.store.list.length) return map;
-      var _iterator3 = _createForOfIteratorHelper(params.productIds),
-        _step3;
+      var _iterator2 = _createForOfIteratorHelper(params.productIds),
+        _step2;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var productId = _step3.value;
-          var _iterator4 = _createForOfIteratorHelper(params.timePoints),
-            _step4;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var productId = _step2.value;
+          var _iterator3 = _createForOfIteratorHelper(params.timePoints),
+            _step3;
           try {
-            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-              var timePoint = _step4.value;
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var timePoint = _step3.value;
               var key = "".concat(productId, ":").concat(timePoint);
               var price = this.getPriceForProduct({
                 productId: productId,
@@ -203,15 +230,15 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               }
             }
           } catch (err) {
-            _iterator4.e(err);
+            _iterator3.e(err);
           } finally {
-            _iterator4.f();
+            _iterator3.f();
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator3.f();
+        _iterator2.f();
       }
       return map;
     }
@@ -236,21 +263,27 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       if (customerId === undefined || customerId === null || customerId === '') return false;
       return Number(customerId) > 0;
     }
+  }, {
+    key: "normalizeCustomerId",
+    value: function normalizeCustomerId(customerId) {
+      if (customerId === undefined || customerId === null || customerId === '') return null;
+      return String(customerId);
+    }
   }, {
     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.forEach(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) {
           scheduleItems.push(full);
           return;
         }
-        if (_this2.scheduleResolver) {
+        if (_this3.scheduleResolver) {
           return;
         }
         var fallbackSchedule = _objectSpread(_objectSpread({}, s), {}, {

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

@@ -45,3 +45,17 @@ export interface QuotationItem {
 export interface QuotationState {
     list: QuotationItem[];
 }
+export interface QuotationCustomerScope {
+    quotationId: number;
+    quotationName: string;
+    customerIds: string[];
+    customers: QuotationCustomer[];
+}
+export interface QuotationCustomerScopeInfo {
+    quotationCount: number;
+    hasCustomerScopedQuotations: boolean;
+    allQuotationsCustomerScoped: boolean;
+    customerIds: string[];
+    customers: QuotationCustomer[];
+    quotationScopes: QuotationCustomerScope[];
+}

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

@@ -29,6 +29,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;
+        tax_country_code: string;
         product_quantity: number;
         product_original_amount: string;
         product_amount: string;

package/dist/modules/SalesSummary/index.js

@@ -201,10 +201,12 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate, shopDiscount = params.shopDiscount;
               taxConfig = this.getTaxConfig();
               summarySchedule = this.core.getModule("".concat(this.name.split('_')[0], "_schedule"));
-              needScheduleIds = (_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 || (_this$store$surcharge = _this$store$surcharge.map(function (item) {
+              needScheduleIds = (((_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 || (_this$store$surcharge = _this$store$surcharge.map(function (item) {
                 return item.available_schedule_ids;
-              })) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.flat();
-              scheduleList = summarySchedule === null || summarySchedule === void 0 ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
+              })) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.flat()) || []).filter(function (id) {
+                return id !== undefined && id !== null && id !== '';
+              });
+              scheduleList = needScheduleIds.length > 0 ? summarySchedule === null || summarySchedule === void 0 ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds) : [];
               scheduleById = {};
               if (Array.isArray(scheduleList)) {
                 _iterator = _createForOfIteratorHelper(scheduleList);
@@ -230,7 +232,8 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               });
               summaryWithTaxMeta = _objectSpread(_objectSpread({}, summary), {}, {
                 tax_title: taxConfig.taxTitle || '',
-                tax_rate: taxRate !== null && taxRate !== void 0 ? taxRate : taxConfig.taxRate
+                tax_rate: taxRate !== null && taxRate !== void 0 ? taxRate : taxConfig.taxRate,
+                tax_country_code: taxConfig.taxCountryCode || ''
               });
               this.store.summary = summaryWithTaxMeta;
               return _context4.abrupt("return", summaryWithTaxMeta);

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

@@ -9,6 +9,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     private cacheId;
     private openCache;
     private fatherModule;
+    private hasLoadedScheduleList;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
@@ -25,6 +26,9 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
      */
     loadAllSchedule(): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
+    private syncScheduleMap;
+    getScheduleList(): ScheduleItem[];
+    isScheduleListLoaded(): boolean;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: LoadScheduleAvailableDateParams): Promise<import("../Date/types").ITime[]>;
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;

package/dist/modules/Schedule/index.js

@@ -44,6 +44,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
+    _defineProperty(_assertThisInitialized(_this), "hasLoadedScheduleList", false);
     return _this;
   }
   _createClass(ScheduleModule, [{
@@ -70,10 +71,14 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               this.store = options === null || options === void 0 ? void 0 : options.store;
               if (options.initialState) {
                 this.store.scheduleList = options.initialState.scheduleList;
+                this.syncScheduleMap();
                 this.store.availabilityDateList = options.initialState.availabilityDateList;
+                this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
               } else {
                 this.store.scheduleList = [];
+                this.store.map = new Map();
                 this.store.availabilityDateList = [];
+                this.hasLoadedScheduleList = false;
               }
               if ((_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
                 this.openCache = options.otherParams.openCache;
@@ -147,6 +152,25 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "setScheduleList",
     value: function setScheduleList(list) {
       this.store.scheduleList = list;
+      this.syncScheduleMap();
+      this.hasLoadedScheduleList = true;
+    }
+  }, {
+    key: "syncScheduleMap",
+    value: function syncScheduleMap() {
+      this.store.map = new Map((this.store.scheduleList || []).map(function (schedule) {
+        return [Number(schedule.id), schedule];
+      }));
+    }
+  }, {
+    key: "getScheduleList",
+    value: function getScheduleList() {
+      return this.store.scheduleList || [];
+    }
+  }, {
+    key: "isScheduleListLoaded",
+    value: function isScheduleListLoaded() {
+      return this.hasLoadedScheduleList;
     }
   }, {
     key: "loadScheduleAvailableDate",
@@ -221,11 +245,17 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
-      var _this$store$scheduleL;
+      var _this2 = this,
+        _this$store$scheduleL;
       var idSet = new Set(ids.map(function (id) {
         return String(id);
       }));
       console.log('getScheduleListByIds', this.store.scheduleList);
+      if (this.store.map instanceof Map && this.store.map.size > 0) {
+        return ids.map(function (id) {
+          return _this2.store.map.get(Number(id));
+        }).filter(Boolean);
+      }
       var list = (_this$store$scheduleL = this.store.scheduleList) === null || _this$store$scheduleL === void 0 ? void 0 : _this$store$scheduleL.filter(function (n) {
         return idSet.has(String(n.id));
       });

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

@@ -25,6 +25,8 @@ export interface LoadScheduleAvailableDateParams {
     channel?: string;
 }
 export interface ScheduleModuleAPI {
+    getScheduleList: () => ScheduleItem[];
+    isScheduleListLoaded: () => boolean;
 }
 export type ScheduleItem = {
     /** 颜色 */

package/dist/server/index.js

@@ -3953,9 +3953,11 @@ var Server = /*#__PURE__*/function () {
               externalSaleNumber = next.external_sale_number;
               shouldClearLocalOrderId = this.isLocalCheckoutOrderId(next.order_id);
               if (shouldClearLocalOrderId) next.order_id = null;
+              // 删除 数据体中的 vouchers,对小票和后端来说他们不需要，这个字段只是单向同步给前端用的，而且目前对订单来说还没什么用
+              delete next.vouchers;
               hasCheckoutOrderNumbers = !this.isBlankCheckoutValue(next.shop_order_number) && !this.isBlankCheckoutValue(next.shop_full_order_number);
               if (!hasCheckoutOrderNumbers) {
-                _context42.next = 10;
+                _context42.next = 11;
                 break;
               }
               this.logInfo("".concat(title, ": checkout \u5DF2\u643A\u5E26\u8BA2\u5355\u53F7\uFF0C\u8DF3\u8FC7\u67E5\u91CD"), {
@@ -3966,9 +3968,9 @@ var Server = /*#__PURE__*/function () {
                 shop_full_order_number: next.shop_full_order_number
               });
               return _context42.abrupt("return", next);
-            case 10:
+            case 11:
               if (!this.isBlankCheckoutValue(externalSaleNumber)) {
-                _context42.next = 13;
+                _context42.next = 14;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -3978,9 +3980,9 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context42.abrupt("return", next);
-            case 13:
+            case 14:
               if (!(!this.order || typeof this.order.getLocalOrderFromMemoryByLookup !== 'function')) {
-                _context42.next = 16;
+                _context42.next = 17;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -3990,11 +3992,11 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context42.abrupt("return", next);
-            case 16:
-              _context42.prev = 16;
+            case 17:
+              _context42.prev = 17;
               localOrder = this.order.getLocalOrderFromMemoryByLookup(externalSaleNumber);
               if (localOrder) {
-                _context42.next = 21;
+                _context42.next = 22;
                 break;
               }
               if (shouldClearLocalOrderId) {
@@ -4005,7 +4007,7 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               return _context42.abrupt("return", next);
-            case 21:
+            case 22:
               if (this.isBlankCheckoutValue(next.shop_order_number)) {
                 next.shop_order_number = localOrder.shop_order_number;
               }
@@ -4021,11 +4023,10 @@ var Server = /*#__PURE__*/function () {
                 shop_full_order_number: next.shop_full_order_number
               });
               // 删除 数据体中的 vouchers,对小票和后端来说他们不需要，这个字段只是单向同步给前端用的，而且目前对订单来说还没什么用
-              delete next.vouchers;
               return _context42.abrupt("return", next);
             case 28:
               _context42.prev = 28;
-              _context42.t0 = _context42["catch"](16);
+              _context42.t0 = _context42["catch"](17);
               this.logWarning("".concat(title, ": checkout \u67E5\u627E\u672C\u5730\u8BA2\u5355\u5931\u8D25"), {
                 external_sale_number: externalSaleNumber,
                 error: this.getUnknownErrorMessage(_context42.t0),
@@ -4036,7 +4037,7 @@ var Server = /*#__PURE__*/function () {
             case "end":
               return _context42.stop();
           }
-        }, _callee42, this, [[16, 28]]);
+        }, _callee42, this, [[17, 28]]);
       }));
       function normalizeCheckoutSubmitData(_x44, _x45) {
         return _normalizeCheckoutSubmitData.apply(this, arguments);

package/dist/server/modules/products/index.d.ts

@@ -24,6 +24,9 @@ export declare class ProductsModule extends BaseModule implements Module {
     private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
+    private quotationScheduleCache;
+    private quotationScheduleCacheSource;
+    private quotationScheduleCacheLoaded;
     private productDataSource;
     private pendingSyncMessages;
     private syncTimer?;
@@ -75,6 +78,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     }): Promise<void>;
     private ensureQuotationBridgeReady;
     private getQuotationBridgeScopeKey;
+    private getQuotedPrice;
     private buildPriceDataFromQuotation;
     private buildVariantPriceData;
     private buildBundleGroupPriceData;