@pisell/pisellos 2.3.23 → 2.3.25

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/solution/BaseSales/index.js

@@ -1913,9 +1913,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 26:
               this.store.order.persistTempOrder();
+              _context18.next = 29;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: nextDiscountList,
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
+            case 29:
               cb === null || cb === void 0 || cb(result);
               return _context18.abrupt("return", result);
-            case 29:
+            case 31:
             case "end":
               return _context18.stop();
           }
@@ -1993,7 +2001,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanPromotionCode",
     value: function () {
       var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(code, customerId) {
-        var raw;
+        var raw, tempOrder;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -2009,7 +2017,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 5:
               raw = _context20.sent;
               if (!raw.isAvailable) {
-                _context20.next = 10;
+                _context20.next = 13;
                 break;
               }
               _context20.next = 9;
@@ -2018,22 +2026,30 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 9:
               this.store.order.persistTempOrder();
-            case 10:
+              tempOrder = this.store.order.ensureTempOrder();
+              _context20.next = 13;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: this.store.order.getDiscountList(),
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
+            case 13:
               return _context20.abrupt("return", {
                 isAvailable: raw.isAvailable,
                 type: raw.type,
                 unavailableReason: raw.unavailableReason,
                 scannedDiscountList: raw.scannedDiscountList
               });
-            case 13:
-              _context20.prev = 13;
+            case 16:
+              _context20.prev = 16;
               _context20.t0 = _context20["catch"](0);
               throw _context20.t0;
-            case 16:
+            case 19:
             case "end":
               return _context20.stop();
           }
-        }, _callee20, this, [[0, 13]]);
+        }, _callee20, this, [[0, 16]]);
       }));
       function scanPromotionCode(_x14, _x15) {
         return _scanPromotionCode.apply(this, arguments);
@@ -2276,17 +2292,25 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 16:
               this.store.order.persistTempOrder();
-              _context22.next = 22;
-              break;
+              _context22.next = 19;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: result.discountList || [],
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
             case 19:
-              _context22.prev = 19;
+              _context22.next = 24;
+              break;
+            case 21:
+              _context22.prev = 21;
               _context22.t0 = _context22["catch"](0);
               throw _context22.t0;
-            case 22:
+            case 24:
             case "end":
               return _context22.stop();
           }
-        }, _callee22, this, [[0, 19]]);
+        }, _callee22, this, [[0, 21]]);
       }));
       function applyDiscountCalculationResult(_x17) {
         return _applyDiscountCalculationResult.apply(this, arguments);

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.js

@@ -549,7 +549,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "scanPromotionCode",
     value: function () {
       var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code, customerId) {
-        var raw, scannedList, extractedCustomerId, hasOrderCustomer;
+        var raw, scannedList, extractedCustomerId, hasOrderCustomer, tempOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -574,7 +574,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               return this.hydrateOrderCustomerFromScanDiscounts(scannedList);
             case 11:
               if (!raw.isAvailable) {
-                _context7.next = 15;
+                _context7.next = 18;
                 break;
               }
               _context7.next = 14;
@@ -583,14 +583,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               });
             case 14:
               this.store.order.persistTempOrder();
-            case 15:
+              tempOrder = this.store.order.ensureTempOrder();
+              _context7.next = 18;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: this.store.order.getDiscountList(),
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
+            case 18:
               return _context7.abrupt("return", {
                 isAvailable: raw.isAvailable,
                 type: raw.type,
                 unavailableReason: raw.unavailableReason,
                 scannedDiscountList: raw.scannedDiscountList
               });
-            case 16:
+            case 19:
             case "end":
               return _context7.stop();
           }
@@ -1519,7 +1527,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       void this.store.order.recalculateSummary({
         createIfMissing: true
       }).then(function () {
-        return _this3.store.order.persistTempOrder();
+        var _discountModule$getDi;
+        var tempOrder = _this3.store.order.ensureTempOrder();
+        _this3.store.order.persistTempOrder();
+        return _this3.effectsEmit('onDiscountApplied', {
+          productList: tempOrder.products || [],
+          discountList: (discountModule === null || discountModule === void 0 || (_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [],
+          selectedDiscountList: tempOrder.discount_list || [],
+          tempOrder: tempOrder
+        });
       }).catch(function (error) {
         console.error('Failed to recalculate summary after clearing customer:', error);
       });

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Order/index.d.ts

@@ -75,6 +75,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
+    private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
@@ -464,7 +465,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -477,6 +477,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a;
     return ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
   }
+  async syncScannedDiscountsToOriginalDiscountList(discountList) {
+    var _a, _b, _c, _d;
+    const scanDiscounts = (discountList || []).filter((discount) => discount == null ? void 0 : discount.isScan);
+    if (!scanDiscounts.length)
+      return;
+    const scanDiscountIds = new Set(scanDiscounts.map((discount) => discount == null ? void 0 : discount.id));
+    const originalDiscounts = ((_b = (_a = this.store.discount) == null ? void 0 : _a.getOriginalDiscountList) == null ? void 0 : _b.call(_a)) || [];
+    const nextOriginalDiscounts = [
+      ...scanDiscounts,
+      ...originalDiscounts.filter((discount) => !scanDiscountIds.has(discount == null ? void 0 : discount.id))
+    ];
+    await ((_d = (_c = this.store.discount) == null ? void 0 : _c.setOriginalDiscountList) == null ? void 0 : _d.call(_c, nextOriginalDiscounts));
+  }
   async ensureEditDiscountConfigForProductChange(tempOrder) {
     var _a, _b, _c, _d, _e, _f;
     const orderId = tempOrder.order_id;
@@ -525,6 +538,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }));
     const currentSelected = this.getDiscountList().filter((n) => n.isSelected);
     if (currentSelected.length && currentSelected.some((n) => withScanList.some((m) => m.id === n.id))) {
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       return {
         type: "clientCalc",
         isAvailable: true,
@@ -545,6 +559,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (isAvailable && newDiscountList) {
       (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
       this.applyDiscount();
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
     }
     return {
       type: "clientCalc",
@@ -3986,7 +4001,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async hydrateTempOrderFromRecord(record, options) {
     var _a, _b, _c;
     const raw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
-    const nextTempOrder = this.normalizeTempOrderForRuntime(raw);
+    const nextTempOrder = this.normalizeTempOrderForRuntime(raw, { makeEditMark: true });
     const rawSummary = raw.summary && typeof raw.summary === "object" ? raw.summary : {};
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map((s) => ({ ...s || {} })) : (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []);
     this.store.tempOrder = nextTempOrder;
@@ -4009,14 +4024,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.store.lastOrderInfo = raw.lastOrderInfo || raw;
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
     const currentDiscounts = typeof ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
-    const shouldSkipEmptyDiscountSync = hydratedEditDiscounts.length === 0 && currentDiscounts.length === 0;
+    const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
+    const hydratedDiscountIds = new Set(
+      hydratedEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
+    );
+    const retainedScanDiscounts = currentScanDiscounts.filter(
+      (discount) => !hydratedDiscountIds.has(discount == null ? void 0 : discount.id)
+    );
+    const nextDiscounts = [
+      ...hydratedEditDiscounts,
+      ...retainedScanDiscounts
+    ];
+    const shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
     if (!shouldSkipEmptyDiscountSync) {
       OrderModule.populateSavedAmounts(
         nextTempOrder.products,
-        hydratedEditDiscounts
+        nextDiscounts
       );
-      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(hydratedEditDiscounts));
-      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(hydratedEditDiscounts));
+      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(nextDiscounts));
+      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(nextDiscounts));
     }
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });
@@ -4073,7 +4099,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.metadata = raw.metadata && typeof raw.metadata === "object" ? { ...raw.metadata } : {};
     nextTempOrder.holder = raw.holder && typeof raw.holder === "object" ? { ...raw.holder } : null;
     const rawProducts = Array.isArray(raw.products) ? raw.products : [];
-    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
+    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p, { makeEditMark: options == null ? void 0 : options.makeEditMark })) : [];
     nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map((b) => {
       const booking = this.normalizeHydratedBookingHolder(b || {});
       return {
@@ -4219,7 +4245,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalized.id = optionItem.id;
     return normalized;
   }
-  normalizeHydratedOrderProduct(product) {
+  normalizeHydratedOrderProduct(product, options) {
     let row = { ...product || {} };
     if (row.num === void 0 && row.product_quantity !== void 0) {
       row.num = row.product_quantity;
@@ -4246,7 +4272,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!existingIdentity) {
       row.metadata.unique_identification_number = (0, import_utils.createUuidV4)();
     }
-    row.metadata.is_edit_for_runtime = true;
+    if (options == null ? void 0 : options.makeEditMark) {
+      row.metadata.is_edit_for_runtime = true;
+    }
     const normalized = (0, import_utils3.normalizeOrderProduct)(row);
     normalized.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalized.discount_list

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/solution/BaseSales/index.js

@@ -1301,6 +1301,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     }
     await this.store.order.recalculateSummary({ createIfMissing: true });
     this.store.order.persistTempOrder();
+    await this.effectsEmit("onDiscountApplied", {
+      productList: tempOrder.products || [],
+      discountList: nextDiscountList,
+      selectedDiscountList: tempOrder.discount_list || [],
+      tempOrder
+    });
     cb == null ? void 0 : cb(result);
     return result;
   }
@@ -1341,6 +1347,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       if (raw.isAvailable) {
         await this.store.order.recalculateSummary({ createIfMissing: true });
         this.store.order.persistTempOrder();
+        const tempOrder = this.store.order.ensureTempOrder();
+        await this.effectsEmit("onDiscountApplied", {
+          productList: tempOrder.products || [],
+          discountList: this.store.order.getDiscountList(),
+          selectedDiscountList: tempOrder.discount_list || [],
+          tempOrder
+        });
       }
       return {
         isAvailable: raw.isAvailable,
@@ -1499,6 +1512,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
+      await this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: result.discountList || [],
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
     } catch (error) {
       throw error;
     }

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -350,6 +350,13 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     if (raw.isAvailable) {
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
+      const tempOrder = this.store.order.ensureTempOrder();
+      await this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: this.store.order.getDiscountList(),
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
     }
     return {
       isAvailable: raw.isAvailable,
@@ -870,7 +877,17 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     void ((_a = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _a.call(discountModule, []));
     void ((_b = discountModule == null ? void 0 : discountModule.setDiscountList) == null ? void 0 : _b.call(discountModule, []));
     this.store.order.applyDiscount();
-    void this.store.order.recalculateSummary({ createIfMissing: true }).then(() => this.store.order.persistTempOrder()).catch((error) => {
+    void this.store.order.recalculateSummary({ createIfMissing: true }).then(() => {
+      var _a2;
+      const tempOrder = this.store.order.ensureTempOrder();
+      this.store.order.persistTempOrder();
+      return this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: ((_a2 = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _a2.call(discountModule)) || [],
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
+    }).catch((error) => {
       console.error("Failed to recalculate summary after clearing customer:", error);
     });
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, null);

package/package.json

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