@pisell/pisellos 2.2.245 → 2.2.246

package/dist/server/modules/order/index.js

@@ -1063,7 +1063,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context11.abrupt("continue", 44);
             case 40:
-              updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder);
+              updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
+                preferIncomingProducts: true
+              });
               pendingMap.delete(_storageKey);
               memoryPendingMap.delete(_storageKey);
               mergeActions[_storageKey] = 'update';
@@ -1953,7 +1955,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "mergeOrderRecords",
-    value: function mergeOrderRecords(existing, incoming) {
+    value: function mergeOrderRecords(existing, incoming, options) {
       var preferred = this.pickPreferredOrder(existing, incoming);
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
@@ -1973,6 +1975,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
+      var hasIncomingProducts = Object.prototype.hasOwnProperty.call(incomingRecord, 'products');
+      var shouldUseIncomingProductsSnapshot = (options === null || options === void 0 ? void 0 : options.preferIncomingProducts) === true && hasIncomingProducts && incomingRecord.products !== undefined && incomingRecord.products !== null;
       for (var _i4 = 0, _incomingPatchFields = incomingPatchFields; _i4 < _incomingPatchFields.length; _i4++) {
         var _field = _incomingPatchFields[_i4];
         if (!Object.prototype.hasOwnProperty.call(incomingRecord, _field)) continue;
@@ -1980,7 +1984,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
         mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
       }
-      mergedRecord.products = this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
+      mergedRecord.products = shouldUseIncomingProductsSnapshot ? cloneDeep(incomingRecord.products) : this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }

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 | 2 | 1 | 5 | 3 | 6 | 4;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -78,7 +78,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 function buildNormalProductCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const { product, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const sourcePrice = resolveSourceProductPrice(product, sourceProduct);
@@ -117,6 +117,9 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
+    metadata: {
+      product_add_schedule_time: (_e = product.metadata) == null ? void 0 : _e.product_add_schedule_time
+    },
     ...productOptionString ? { product_option_string: productOptionString } : {},
     ...(originExtend == null ? void 0 : originExtend.priceOverride) !== void 0 ? { priceOverride: originExtend.priceOverride } : {},
     ...(originExtend == null ? void 0 : originExtend.bundle_edit) !== void 0 ? { bundle_edit: originExtend.bundle_edit } : {}
@@ -132,7 +135,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,
-    title: sourceProduct == null ? void 0 : sourceProduct.title,
+    title: (sourceProduct == null ? void 0 : sourceProduct.title) ?? product.product_title ?? "",
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? sourcePrice,
     selling_price: product.selling_price,
     original_price: product.original_price,

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

@@ -179,6 +179,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private buildOrderProductsFingerprint;
     private buildProductStructuralFingerprintItem;
     private buildOrderProductsStructuralFingerprint;
+    private getManualDepositOverride;
+    private setManualDepositOverride;
+    private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
     private restoreOriginalSnapshotIfProductsUnchanged;
@@ -422,7 +425,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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -1256,6 +1256,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     items.sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
     return JSON.stringify(items);
   }
+  getManualDepositOverride(tempOrder) {
+    var _a;
+    const override = (_a = tempOrder._extend) == null ? void 0 : _a.manualDepositOverride;
+    if (!override || typeof override !== "object")
+      return null;
+    if (typeof override.amount !== "string")
+      return null;
+    if (typeof override.productStructuralFingerprint !== "string")
+      return null;
+    return override;
+  }
+  setManualDepositOverride(tempOrder, amount) {
+    tempOrder._extend = {
+      ...tempOrder._extend || {},
+      manualDepositOverride: {
+        amount,
+        productStructuralFingerprint: this.buildOrderProductsStructuralFingerprint(tempOrder.products)
+      }
+    };
+  }
+  clearManualDepositOverride(tempOrder) {
+    var _a;
+    if (!((_a = tempOrder._extend) == null ? void 0 : _a.manualDepositOverride))
+      return;
+    tempOrder._extend = { ...tempOrder._extend };
+    delete tempOrder._extend.manualDepositOverride;
+  }
   getOriginalSalesSnapshot(tempOrder) {
     var _a;
     const snapshot = (_a = tempOrder._extend) == null ? void 0 : _a.originalSalesSnapshot;
@@ -1717,18 +1744,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const depositSummary = (0, import_utils.calculateOrderProductsDeposit)(tempOrder.products || [], {
       productsByUid: (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid
     });
+    const manualDepositOverride = this.getManualDepositOverride(tempOrder);
+    const currentStructuralFingerprint = manualDepositOverride ? this.buildOrderProductsStructuralFingerprint(tempOrder.products) : "";
+    const shouldUseManualDepositOverride = Boolean(
+      manualDepositOverride && manualDepositOverride.productStructuralFingerprint === currentStructuralFingerprint
+    );
+    if (manualDepositOverride && !shouldUseManualDepositOverride) {
+      this.clearManualDepositOverride(tempOrder);
+    }
+    const depositAmount = shouldUseManualDepositOverride ? manualDepositOverride.amount : depositSummary.totalText;
+    const hasDepositAmount = new import_decimal.default(depositAmount).gt(0);
     const nextSummary = {
       ...summary,
-      deposit_amount: depositSummary.totalText,
-      deposit: depositSummary.hasDeposit ? {
-        total: depositSummary.totalText,
+      deposit_amount: depositAmount,
+      deposit: hasDepositAmount ? {
+        total: depositAmount,
         deposit_policy_ids: depositSummary.deposit_policy_ids,
         deposit_policy_data: depositSummary.protocols,
         hasDeposit: true
       } : void 0
     };
-    tempOrder.deposit_amount = depositSummary.totalText;
-    tempOrder.is_deposit = depositSummary.hasDeposit ? 1 : 0;
+    tempOrder.deposit_amount = depositAmount;
+    tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
     return nextSummary;
   }
   async recalculateSummary(options) {
@@ -1887,6 +1924,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       },
       depositAmount
     );
+    this.setManualDepositOverride(tempOrder, depositAmount);
     const paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
     const summary = {
       ...summaryWithDeposit,
@@ -2858,10 +2896,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await order.removeProductsFromOrder([identityA, identityB]);
    */
   async removeProductsFromOrder(identities) {
+    var _a, _b, _c, _d;
     const tempOrder = this.ensureTempOrder();
     if (!identities.length) {
       return tempOrder.products;
     }
+    const productsBeforeRemove = tempOrder.products || [];
+    const bookingsBeforeRemove = tempOrder.bookings || [];
+    const matchedProducts = productsBeforeRemove.filter((item) => {
+      return identities.some((identity) => (0, import_utils3.isIdentityMatch)(item, identity));
+    });
     const removedProducts = [];
     tempOrder.products = tempOrder.products.filter((item) => {
       const shouldRemove = identities.some((identity) => (0, import_utils3.isIdentityMatch)(item, identity));
@@ -2872,6 +2916,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     for (const product of removedProducts) {
       this.removeLinkedBookingsForProduct(tempOrder, product);
     }
+    const linkedBookingUidsToRemove = /* @__PURE__ */ new Set();
+    for (const product of matchedProducts) {
+      const productUid = ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.unique_identification_number) || (product == null ? void 0 : product.unique_identification_number);
+      const productBookingUid = (product == null ? void 0 : product.booking_uid) || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.booking_uid);
+      const isAddTimeProduct = ((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.product_add_schedule_time) !== void 0 && ((_d = product == null ? void 0 : product.metadata) == null ? void 0 : _d.product_add_schedule_time) !== null;
+      if (isAddTimeProduct)
+        continue;
+      if (productBookingUid !== void 0 && productBookingUid !== null && productBookingUid !== "") {
+        linkedBookingUidsToRemove.add(String(productBookingUid));
+      }
+      if (productUid !== void 0 && productUid !== null && productUid !== "") {
+        bookingsBeforeRemove.forEach((booking) => {
+          const bookingUid = this.getBookingUniqueIdentificationNumber(booking);
+          if (bookingUid && String((booking == null ? void 0 : booking.product_uid) || "") === String(productUid)) {
+            linkedBookingUidsToRemove.add(bookingUid);
+          }
+        });
+      }
+    }
+    if (linkedBookingUidsToRemove.size > 0) {
+      tempOrder.products = (tempOrder.products || []).filter((line) => {
+        var _a2, _b2, _c2;
+        const lineBookingUid = ((_a2 = line == null ? void 0 : line.metadata) == null ? void 0 : _a2.booking_uid) || (line == null ? void 0 : line.booking_uid);
+        const isAddTimeProduct = ((_b2 = line == null ? void 0 : line.metadata) == null ? void 0 : _b2.product_add_schedule_time) !== void 0 && ((_c2 = line == null ? void 0 : line.metadata) == null ? void 0 : _c2.product_add_schedule_time) !== null;
+        return !(isAddTimeProduct && lineBookingUid !== void 0 && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
+      });
+    }
     await this.finalizeAfterProductsMutation(tempOrder);
     return tempOrder.products;
   }

package/lib/server/modules/order/index.js

@@ -621,7 +621,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const matchIndex = this.findOrderIndexByIdentity(updatedList, pendingOrder);
       if (matchIndex < 0)
         continue;
-      updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder);
+      updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
+        preferIncomingProducts: true
+      });
       pendingMap.delete(storageKey);
       memoryPendingMap.delete(storageKey);
       mergeActions[storageKey] = "update";
@@ -1181,7 +1183,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return result;
   }
-  mergeOrderRecords(existing, incoming) {
+  mergeOrderRecords(existing, incoming, options) {
     const preferred = this.pickPreferredOrder(existing, incoming);
     const secondary = preferred === existing ? incoming : existing;
     const merged = {
@@ -1219,6 +1221,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         mergedRecord[field] = secondaryRecord[field];
       }
     }
+    const hasIncomingProducts = Object.prototype.hasOwnProperty.call(incomingRecord, "products");
+    const shouldUseIncomingProductsSnapshot = (options == null ? void 0 : options.preferIncomingProducts) === true && hasIncomingProducts && incomingRecord.products !== void 0 && incomingRecord.products !== null;
     for (const field of incomingPatchFields) {
       if (!Object.prototype.hasOwnProperty.call(incomingRecord, field))
         continue;
@@ -1228,7 +1232,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         continue;
       mergedRecord[field] = (0, import_lodash_es.cloneDeep)(incomingRecord[field]);
     }
-    mergedRecord.products = this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
+    mergedRecord.products = shouldUseIncomingProductsSnapshot ? (0, import_lodash_es.cloneDeep)(incomingRecord.products) : this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
     if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
       merged.need_sync = 0;
     }

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 | 2 | 1 | 5 | 3 | 6 | 4;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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