@pisell/pisellos 2.3.149 → 2.3.151

package/dist/modules/Order/index.js

@@ -5360,7 +5360,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var uid = ((_line$metadata = line.metadata) === null || _line$metadata === void 0 ? void 0 : _line$metadata.unique_identification_number) || line.unique_identification_number;
                 return uid !== undefined && uid !== null && String(uid) === String(insertAfterProductUid);
               }) : -1;
-              insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
+              insertAtIndex = options !== null && options !== void 0 && options.insertAtStart ? 0 : anchorIndex >= 0 ? anchorIndex + 1 : undefined;
               _context25.prev = 15;
               if (!booking) {
                 _context25.next = 42;
@@ -6093,12 +6093,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderProductQuantity",
     value: function () {
-      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
-        var _targetProduct$metada22;
-        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, isPersistedOrderLine, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance, isVirtualSettlement, promotionPayload;
+      var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params, options) {
+        var _this$store$tempOrder9, _targetProduct$metada22;
+        var isCurrentOrder, product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, isPersistedOrderLine, normalizedProduct, settlementSnapshot, currencyProductId, asset, requiredAmount, balance, isVirtualSettlement, promotionPayload;
         return _regeneratorRuntime().wrap(function _callee27$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
+              isCurrentOrder = options === null || options === void 0 ? void 0 : options.isCurrentOrder;
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context29.next = 3;
+                break;
+              }
+              return _context29.abrupt("return", ((_this$store$tempOrder9 = this.store.tempOrder) === null || _this$store$tempOrder9 === void 0 ? void 0 : _this$store$tempOrder9.products) || []);
+            case 3:
               product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
               this.repairDuplicateProductLineIdentities(tempOrder);
@@ -6127,11 +6134,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context29.next = 13;
+                _context29.next = 16;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
-            case 13:
+            case 16:
               targetProduct = tempOrder.products[productIndex];
               isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
               normalizedProduct = this.normalizeVirtualSettlementProductIfEnabled(normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
@@ -6143,7 +6150,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(isPersistedOrderLine ? syncReducedEntitlementPassUsageCount(normalizedProduct.discount_list, targetProduct.num, normalizedProduct.num) : normalizedProduct.discount_list);
               settlementSnapshot = getSelectedSettlementSnapshot(normalizedProduct);
               if (!(this.isMultiCurrencySettlementEnabled() && (settlementSnapshot === null || settlementSnapshot === void 0 ? void 0 : settlementSnapshot.settlement_type) === 'virtual_currency' && tempOrder.customer_id && Number(tempOrder.customer_id) !== 1)) {
-                _context29.next = 27;
+                _context29.next = 30;
                 break;
               }
               currencyProductId = Number(settlementSnapshot.currency_product_id);
@@ -6151,11 +6158,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return Number(item === null || item === void 0 ? void 0 : item.product_id) === currencyProductId;
               });
               if (asset) {
-                _context29.next = 23;
+                _context29.next = 26;
                 break;
               }
               throw new VirtualCurrencyAssetNotFoundError(currencyProductId);
-            case 23:
+            case 26:
               requiredAmount = tempOrder.products.reduce(function (sum, item, index) {
                 var current = index === productIndex ? normalizedProduct : item;
                 var currentSnapshot = getSelectedSettlementSnapshot(current);
@@ -6163,53 +6170,73 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               balance = new Decimal(asset.balance || 0);
               if (!balance.lt(requiredAmount)) {
-                _context29.next = 27;
+                _context29.next = 30;
                 break;
               }
               throw new VirtualCurrencyBalanceError(balance.toFixed(2), requiredAmount.toFixed(2));
-            case 27:
+            case 30:
               if (normalizedProduct.num > targetProduct.num) {
                 this.createCartIntentCommitGuard('increase_quantity', tempOrder)();
               }
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context29.next = 33;
+                break;
+              }
+              return _context29.abrupt("return", tempOrder.products);
+            case 33:
               tempOrder.products[productIndex] = normalizedProduct;
+              if (!isCurrentOrder) {
+                _context29.next = 39;
+                break;
+              }
+              _context29.next = 37;
+              return this.finalizeProductOrderMutation(tempOrder, {
+                skipEditDiscountConfigRefresh: true,
+                isCurrentOrder: isCurrentOrder
+              });
+            case 37:
+              _context29.next = 55;
+              break;
+            case 39:
               this.prepareVirtualSettlementTempOrder(tempOrder);
               isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder);
               if (isVirtualSettlement) {
-                _context29.next = 37;
+                _context29.next = 47;
                 break;
               }
-              _context29.next = 34;
+              _context29.next = 44;
               return this.evaluatePromotion();
-            case 34:
+            case 44:
               _context29.t0 = _context29.sent;
-              _context29.next = 38;
+              _context29.next = 48;
               break;
-            case 37:
+            case 47:
               _context29.t0 = null;
-            case 38:
+            case 48:
               promotionPayload = _context29.t0;
               if (!isVirtualSettlement) {
                 this.applyDiscount();
               }
               this.sanitizeTempOrderProducts(tempOrder);
-              _context29.next = 43;
+              _context29.next = 53;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 43:
+            case 53:
               this.persistTempOrder();
               this.emitPromotionApplied(promotionPayload);
+            case 55:
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
               return _context29.abrupt("return", tempOrder.products);
-            case 47:
+            case 57:
             case "end":
               return _context29.stop();
           }
         }, _callee27, this);
       }));
-      function updateOrderProductQuantity(_x31) {
+      function updateOrderProductQuantity(_x31, _x32) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -6278,7 +6305,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee28, this);
       }));
-      function finalizeAfterProductsMutation(_x32, _x33) {
+      function finalizeAfterProductsMutation(_x33, _x34) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -6294,18 +6321,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsFromOrder",
     value: (function () {
       var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(identities, options) {
-        var _this38 = this;
-        var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
+        var _this$store$tempOrder10,
+          _this38 = this;
+        var isCurrentOrder, tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
         return _regeneratorRuntime().wrap(function _callee29$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
+              isCurrentOrder = options === null || options === void 0 ? void 0 : options.isCurrentOrder;
+              if (!(isCurrentOrder && !isCurrentOrder())) {
+                _context32.next = 3;
+                break;
+              }
+              return _context32.abrupt("return", ((_this$store$tempOrder10 = this.store.tempOrder) === null || _this$store$tempOrder10 === void 0 ? void 0 : _this$store$tempOrder10.products) || []);
+            case 3:
               tempOrder = this.ensureTempOrder();
               if (identities.length) {
-                _context32.next = 3;
+                _context32.next = 6;
                 break;
               }
               return _context32.abrupt("return", tempOrder.products);
-            case 3:
+            case 6:
               // 商品删除会同步删除以商品行为主关系的 Notes；快照不完整时禁止产生孤儿 Relation。
               this.ensureSalesNotesLoadedForMutation(tempOrder);
               this.repairDuplicateProductLineIdentities(tempOrder);
@@ -6337,7 +6372,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context32.prev = 16;
+              _context32.prev = 19;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
@@ -6372,33 +6407,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _loop3);
               });
               _iterator21.s();
-            case 19:
+            case 22:
               if ((_step21 = _iterator21.n()).done) {
-                _context32.next = 25;
+                _context32.next = 28;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 21);
-            case 21:
+              return _context32.delegateYield(_loop3(), "t0", 24);
+            case 24:
               if (!_context32.t0) {
-                _context32.next = 23;
+                _context32.next = 26;
                 break;
               }
-              return _context32.abrupt("continue", 23);
-            case 23:
-              _context32.next = 19;
+              return _context32.abrupt("continue", 26);
+            case 26:
+              _context32.next = 22;
               break;
-            case 25:
-              _context32.next = 30;
+            case 28:
+              _context32.next = 33;
               break;
-            case 27:
-              _context32.prev = 27;
-              _context32.t1 = _context32["catch"](16);
-              _iterator21.e(_context32.t1);
             case 30:
               _context32.prev = 30;
-              _iterator21.f();
-              return _context32.finish(30);
+              _context32.t1 = _context32["catch"](19);
+              _iterator21.e(_context32.t1);
             case 33:
+              _context32.prev = 33;
+              _iterator21.f();
+              return _context32.finish(33);
+            case 36:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
@@ -6425,20 +6460,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.removeSalesNotesForMissingProductLines(tempOrder);
-              _context32.next = 38;
+              if (!isCurrentOrder) {
+                _context32.next = 44;
+                break;
+              }
+              _context32.next = 42;
+              return this.finalizeProductOrderMutation(tempOrder, {
+                skipEditDiscountConfigRefresh: true,
+                isCurrentOrder: isCurrentOrder
+              });
+            case 42:
+              _context32.next = 46;
+              break;
+            case 44:
+              _context32.next = 46;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 38:
+            case 46:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
               return _context32.abrupt("return", tempOrder.products);
-            case 40:
+            case 48:
             case "end":
               return _context32.stop();
           }
-        }, _callee29, this, [[16, 27, 30, 33]]);
+        }, _callee29, this, [[19, 30, 33, 36]]);
       }));
-      function removeProductsFromOrder(_x34, _x35) {
+      function removeProductsFromOrder(_x35, _x36) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -6457,7 +6505,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee30, this);
       }));
-      function removeProductFromOrder(_x36, _x37) {
+      function removeProductFromOrder(_x37, _x38) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -6632,7 +6680,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee33, this);
       }));
-      function applyLocalPrintOrderNumbers(_x38) {
+      function applyLocalPrintOrderNumbers(_x39) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -6699,7 +6747,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee34, this);
       }));
-      function saveTempOrderAsDraft(_x39) {
+      function saveTempOrderAsDraft(_x40) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -6724,7 +6772,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee35, this);
       }));
-      function submitTempOrder(_x40) {
+      function submitTempOrder(_x41) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -6745,7 +6793,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee36, this);
       }));
-      function submitTempOrderAsync(_x41) {
+      function submitTempOrderAsync(_x42) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -6921,7 +6969,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee37, this, [[28, 35]]);
       }));
-      function runSubmitTempOrder(_x42) {
+      function runSubmitTempOrder(_x43) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -6948,7 +6996,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee38, this);
       }));
-      function markLocalOrderSynced(_x43, _x44) {
+      function markLocalOrderSynced(_x44, _x45) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -7118,7 +7166,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee39, this);
       }));
-      function syncPaymentsToOrder(_x45) {
+      function syncPaymentsToOrder(_x46) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -7246,7 +7294,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee40, this);
       }));
-      function submitOrder(_x46) {
+      function submitOrder(_x47) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -7285,7 +7333,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee41, this);
       }));
-      function cancelOrder(_x47) {
+      function cancelOrder(_x48) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -7329,7 +7377,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee42, this);
       }));
-      function changeBookingStatus(_x48) {
+      function changeBookingStatus(_x49) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -7449,7 +7497,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee43, this, [[3, 15]]);
       }));
-      function createOrderByCheckout(_x49) {
+      function createOrderByCheckout(_x50) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -7475,7 +7523,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee44, this);
       }));
-      function submitSalesOrder(_x50) {
+      function submitSalesOrder(_x51) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -7532,7 +7580,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee45, this);
       }));
-      function sendCustomerPayLink(_x51) {
+      function sendCustomerPayLink(_x52) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -7574,7 +7622,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee46, this);
       }));
-      function getSalesOrderByLookup(_x52) {
+      function getSalesOrderByLookup(_x53) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -7745,7 +7793,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee47, this);
       }));
-      function hydrateTempOrderFromRecord(_x53, _x54) {
+      function hydrateTempOrderFromRecord(_x54, _x55) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -8184,7 +8232,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee48, this);
       }));
-      function getOrderInfo(_x55) {
+      function getOrderInfo(_x56) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;
@@ -8192,8 +8240,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getVouchers",
     value: function getVouchers() {
-      var _this$store$tempOrder9;
-      return ((_this$store$tempOrder9 = this.store.tempOrder) === null || _this$store$tempOrder9 === void 0 ? void 0 : _this$store$tempOrder9.vouchers) || [];
+      var _this$store$tempOrder11;
+      return ((_this$store$tempOrder11 = this.store.tempOrder) === null || _this$store$tempOrder11 === void 0 ? void 0 : _this$store$tempOrder11.vouchers) || [];
     }
   }], [{
     key: "populateSavedAmounts",

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

@@ -441,6 +441,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 新增商品行插入 products 首位，优先于 insertAfterProductUid。 */
+    insertAtStart?: boolean;
     /** 跳过同商品/规格匹配，始终新增购物车行。 */
     disableMerge?: boolean;
     /** 商品行 UID 落定后，由 OrderModule 原子绑定到该行的 Sales Notes 草稿。 */
@@ -460,6 +462,8 @@ export interface AddProductToOrderOptions {
  * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
  */
 export interface RemoveProductsFromOrderOptions {
+    /** 自动购物车写入的订单归属检查；失效时不再变更或发布异步收尾结果。 */
+    isCurrentOrder?: () => boolean;
     preserveDisplayPosition?: {
         remainingProductUid: string;
         anchorProductUid: string;
@@ -897,7 +901,9 @@ export interface OrderModuleAPI {
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
-    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
+    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams, options?: {
+        isCurrentOrder?: () => boolean;
+    }) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */