@pisell/pisellos 2.2.247 → 2.2.249

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

@@ -480,6 +480,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
     private normalizeTempOrderForRuntime;
+    private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;
     private formatHydratedNamePair;
     private buildHydratedProductOptionString;

package/dist/modules/Order/index.js

@@ -445,7 +445,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, currentEditDiscountIds, mergedDiscountList;
+        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -464,29 +464,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               discountList = _context3.sent;
               if (!discountList) {
-                _context3.next = 12;
+                _context3.next = 13;
                 break;
               }
               currentEditDiscounts = (((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || []).filter(function (discount) {
                 return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
               });
-              currentEditDiscountIds = new Set(currentEditDiscounts.map(function (discount) {
-                return discount === null || discount === void 0 ? void 0 : discount.id;
-              }));
-              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(discountList.filter(function (discount) {
-                return !currentEditDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id);
-              })));
-              _context3.next = 10;
+              runtimeDiscountIds = new Set();
+              runtimeDiscounts = discountList.filter(function (discount) {
+                if (runtimeDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
+                runtimeDiscountIds.add(discount === null || discount === void 0 ? void 0 : discount.id);
+                return true;
+              });
+              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(runtimeDiscounts));
+              _context3.next = 11;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 10:
-              _context3.next = 12;
+            case 11:
+              _context3.next = 13;
               return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
-            case 12:
+            case 13:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 14:
+            case 15:
             case "end":
               return _context3.stop();
           }
@@ -5140,12 +5141,54 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _iterator22.f();
       }
       tempOrderExtend.productsByUid = productsByUid;
+      this.hydrateLinkedBookingIdentity(nextTempOrder);
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
         this.ensureExternalSaleNumber(nextTempOrder);
       }
       nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
+  }, {
+    key: "hydrateLinkedBookingIdentity",
+    value: function hydrateLinkedBookingIdentity(tempOrder) {
+      var bookingUidByProductUid = new Map();
+      var productByUid = new Map();
+      (tempOrder.products || []).forEach(function (product) {
+        var _product$metadata9;
+        var productUid = (product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
+          productByUid.set(String(productUid), product);
+        }
+      });
+      (tempOrder.bookings || []).forEach(function (booking) {
+        var _matchedProduct$metad;
+        if (!booking || _typeof(booking) !== 'object') return;
+        if (!booking.metadata || _typeof(booking.metadata) !== 'object') {
+          booking.metadata = {};
+        }
+        var productUid = booking.product_uid || booking.metadata.product_uid;
+        if (productUid === undefined || productUid === null || String(productUid) === '') return;
+        var matchedProduct = productByUid.get(String(productUid));
+        var existedProductBookingUid = (matchedProduct === null || matchedProduct === void 0 ? void 0 : matchedProduct.booking_uid) || (matchedProduct === null || matchedProduct === void 0 || (_matchedProduct$metad = matchedProduct.metadata) === null || _matchedProduct$metad === void 0 ? void 0 : _matchedProduct$metad.booking_uid);
+        // 客户端订单详情可能缺少 booking 自身 uid，这里补齐后才能反写到商品行。
+        var bookingUid = String(booking.metadata.unique_identification_number || existedProductBookingUid || createUuidV4());
+        booking.metadata.unique_identification_number = bookingUid;
+        bookingUidByProductUid.set(String(productUid), bookingUid);
+      });
+      (tempOrder.products || []).forEach(function (product) {
+        var _product$metadata10;
+        var productUid = (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        if (productUid === undefined || productUid === null || String(productUid) === '') return;
+        var bookingUid = bookingUidByProductUid.get(String(productUid));
+        if (!bookingUid) return;
+        if (!product.metadata || _typeof(product.metadata) !== 'object') {
+          product.metadata = {};
+        }
+        var linkedBookingUid = String(product.booking_uid || product.metadata.booking_uid || bookingUid);
+        product.booking_uid = linkedBookingUid;
+        product.metadata.booking_uid = linkedBookingUid;
+      });
+    }
   }, {
     key: "pickHydratedDisplayText",
     value: function pickHydratedDisplayText(value) {
@@ -5273,13 +5316,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "populateSavedAmounts",
     value: function populateSavedAmounts(productList, discountList) {
       var savedMap = new Map();
-      var addDiscountAmount = function addDiscountAmount(discount, quantity) {
+      var editModeSavedMap = new Map();
+      var runtimeSavedMap = new Map();
+      var editModeDiscountKeys = new Set((discountList || []).filter(function (discount) {
+        return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
+      }).map(function (discount) {
+        return discount === null || discount === void 0 ? void 0 : discount.id;
+      }).filter(function (id) {
+        return id !== undefined && id !== null;
+      }));
+      var addDiscountAmount = function addDiscountAmount(targetMap, discountKey, amount) {
+        targetMap.set(discountKey, (targetMap.get(discountKey) || new Decimal(0)).plus(amount));
+      };
+      var addProductDiscountAmount = function addProductDiscountAmount(discount, quantity, isPersistedProduct) {
         var _discount$discount3, _discount$metadata;
         var discountKey = ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.resource_id) || discount.id;
         if (discountKey == null) return;
         var qty = Number(quantity) || 1;
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
-        savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
+        addDiscountAmount(savedMap, discountKey, amount);
+        addDiscountAmount(isPersistedProduct || discount.order_discount_id != null ? editModeSavedMap : runtimeSavedMap, discountKey, amount);
       };
       var _iterator24 = _createForOfIteratorHelper(productList),
         _step24;
@@ -5287,12 +5343,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
           var product = _step24.value;
           var qty = product.num || 1;
+          var isPersistedProduct = Boolean(product.order_detail_id || product.orderDetailId || product.booking_id);
           var _iterator26 = _createForOfIteratorHelper(product.discount_list || []),
             _step26;
           try {
             for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
               var pd = _step26.value;
-              addDiscountAmount(pd, qty);
+              addProductDiscountAmount(pd, qty, isPersistedProduct);
             }
           } catch (err) {
             _iterator26.e(err);
@@ -5305,13 +5362,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
               var _ref75, _bundle$num3;
               var bundle = _step27.value;
+              var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
               var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref75 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref75 !== void 0 ? _ref75 : 1) || 1).toNumber();
               var _iterator28 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step28;
               try {
                 for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
                   var _pd = _step28.value;
-                  addDiscountAmount(_pd, bundleQty);
+                  addProductDiscountAmount(_pd, bundleQty, isPersistedBundleProduct);
                 }
               } catch (err) {
                 _iterator28.e(err);
@@ -5336,7 +5394,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
           var d = _step25.value;
           var key = d.id;
-          d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
+          var sourceMap = d.isEditMode ? editModeSavedMap : editModeDiscountKeys.has(key) ? runtimeSavedMap : savedMap;
+          d.savedAmount = d.isSelected && key != null && sourceMap.has(key) ? sourceMap.get(key).toNumber() : 0;
         }
       } catch (err) {
         _iterator25.e(err);

package/dist/server/index.d.ts

@@ -422,6 +422,10 @@ declare class Server {
     private canAssignStringProductTitleToLocale;
     private hasCjkText;
     private resolveFirstProductTitleValue;
+    private getPaymentCodeKey;
+    private isBlankPaymentName;
+    private shouldLookupPaymentMethodNameByCode;
+    private enrichPaymentNamesByCode;
     private withLocalSmallTicketData;
     private handleOrderSalesDetail;
     /**