@pisell/pisellos 2.2.187 → 2.2.189

package/dist/modules/Order/index.js

@@ -1121,15 +1121,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _ref3, _ref4, _ref5, _result$data$order_id, _result$data, _result$data2;
       return (_ref3 = (_ref4 = (_ref5 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref5 !== void 0 ? _ref5 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref4 !== void 0 ? _ref4 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref3 !== void 0 ? _ref3 : null;
     }
+  }, {
+    key: "calculatePaymentEffectiveAmount",
+    value: function calculatePaymentEffectiveAmount(payment) {
+      var amount = new Decimal(payment.amount || 0).minus(new Decimal(payment.service_fee || 0));
+      var rounding = new Decimal(payment.rounding_amount || 0);
+      return amount.minus(rounding);
+    }
   }, {
     key: "calculatePaymentTotal",
     value: function calculatePaymentTotal(payments) {
+      var _this3 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
-        var amount = new Decimal(payment.amount || 0);
-        var rounding = new Decimal(payment.rounding_amount || 0);
-        return sum.plus(amount.minus(rounding));
+        return sum.plus(_this3.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
   }, {
@@ -1170,18 +1176,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this3 = this;
+      var _this4 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if ((paymentRecord === null || paymentRecord === void 0 ? void 0 : paymentRecord.status) !== 'paid') return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this3.calculatePaymentServiceFee(paymentRecord))
+          gapPaidAmount: summary.gapPaidAmount.plus(_this4.calculatePaymentEffectiveAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this4.calculatePaymentServiceFee(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
         orderPaidAmount: new Decimal(0),
+        gapPaidAmount: new Decimal(0),
         payServiceChargeAmount: new Decimal(0)
       });
     }
@@ -1565,9 +1573,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this4 = this;
+      var _this5 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this4.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this5.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -1575,12 +1583,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata4,
         _product$metadata5,
-        _this5 = this;
+        _this6 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this5.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this6.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -1623,7 +1631,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 amount_gap: this.calculateSummaryAmountGap({
                   tempOrder: tempOrder,
                   summary: createEmptySummary(),
-                  orderPaidAmount: paidPaymentSummary.orderPaidAmount
+                  orderPaidAmount: paidPaymentSummary.gapPaidAmount
                 }),
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
@@ -1647,7 +1655,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 amount_gap: this.calculateSummaryAmountGap({
                   tempOrder: tempOrder,
                   summary: salesSummaryResult,
-                  orderPaidAmount: paidPaymentSummary.orderPaidAmount
+                  orderPaidAmount: paidPaymentSummary.gapPaidAmount
                 }),
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
@@ -1952,7 +1960,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var _this6 = this;
+      var _this7 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -1965,7 +1973,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this6.logError('recalculate summary after addOrderPayment failed', {
+        _this7.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -2030,10 +2038,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments) {
-      var _this7 = this;
+      var _this8 = this;
       var tempOrder = this.ensureTempOrder();
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this7.normalizePaymentSource(payment, {
+        return _this8.normalizePaymentSource(payment, {
           defaultPaid: false
         });
       })).filter(function (payment) {
@@ -2048,7 +2056,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this7.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this8.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -2104,7 +2112,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(product, booking) {
-        var _this8 = this;
+        var _this9 = this;
         var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct;
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -2122,7 +2130,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               shouldForceNewLine = !!booking;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this8.hasGoodPassDiscount(item)) return false;
+                if (_this9.hasGoodPassDiscount(item)) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
                 var existedFingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
@@ -2229,8 +2237,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProduct",
     value: function () {
       var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
-        var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _nextProduct$metadata, _targetProduct$metada3, _tempOrder$products$p;
-        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_option_item, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada4, productUid, linked;
+        var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _nextProduct$metadata, _targetProduct$metada7, _tempOrder$products$p;
+        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_option_item, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, isPersistedOrderLine, callerUpdatesManualPrice, _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada8, productUid, linked;
         return _regeneratorRuntime().wrap(function _callee17$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -2285,7 +2293,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 如果 caller 走推荐路径（updates.metadata.* 显式指定主价），保留 metadata 由 normalize 认它。
               callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, 'selling_price') || Object.prototype.hasOwnProperty.call(updates || {}, 'original_price');
               callerUpdatesMainMeta = (updates === null || updates === void 0 || (_metadata = updates.metadata) === null || _metadata === void 0 ? void 0 : _metadata.main_product_selling_price) !== undefined || (updates === null || updates === void 0 || (_metadata2 = updates.metadata) === null || _metadata2 === void 0 ? void 0 : _metadata2.main_product_original_price) !== undefined || (updates === null || updates === void 0 || (_metadata3 = updates.metadata) === null || _metadata3 === void 0 ? void 0 : _metadata3.source_product_price) !== undefined;
-              if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+              isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
+              callerUpdatesManualPrice = (updates === null || updates === void 0 || (_metadata4 = updates.metadata) === null || _metadata4 === void 0 ? void 0 : _metadata4.price_override) !== undefined || (updates === null || updates === void 0 || (_metadata5 = updates.metadata) === null || _metadata5 === void 0 ? void 0 : _metadata5.is_manual_discount) !== undefined || (updates === null || updates === void 0 || (_metadata6 = updates.metadata) === null || _metadata6 === void 0 ? void 0 : _metadata6.product_discount_reason) !== undefined || Array.isArray(updates === null || updates === void 0 ? void 0 : updates.discount_list) && updates.discount_list.length > 0;
+              if (isPersistedOrderLine && !callerUpdatesManualPrice) {
+                nextProduct.selling_price = targetProduct.selling_price;
+                nextProduct.original_price = targetProduct.original_price;
+                nextProduct.payment_price = targetProduct.payment_price;
+                nextProduct.metadata = _objectSpread(_objectSpread({}, nextProduct.metadata || {}), {}, {
+                  source_product_price: (_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.source_product_price,
+                  main_product_selling_price: (_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.main_product_selling_price,
+                  main_product_original_price: (_targetProduct$metada5 = targetProduct.metadata) === null || _targetProduct$metada5 === void 0 ? void 0 : _targetProduct$metada5.main_product_original_price,
+                  price_schema_version: (_targetProduct$metada6 = targetProduct.metadata) === null || _targetProduct$metada6 === void 0 ? void 0 : _targetProduct$metada6.price_schema_version
+                });
+              } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
                 existedMeta = nextProduct.metadata || {};
                 nextProduct.metadata = _objectSpread({}, existedMeta);
                 delete nextProduct.metadata.source_product_price;
@@ -2297,7 +2317,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
               normalizedProduct = mergeOrderProductDisplayFields(nextProduct, normalizeOrderProduct(nextProduct));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
-              preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.booking_uid);
+              preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada7 = targetProduct.metadata) === null || _targetProduct$metada7 === void 0 ? void 0 : _targetProduct$metada7.booking_uid);
               if (!booking && preservedBookingUid) {
                 normalizedProduct.booking_uid = preservedBookingUid;
                 normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
@@ -2305,7 +2325,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               if (booking) {
-                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.unique_identification_number) || unique_identification_number || createUuidV4());
+                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.unique_identification_number) || unique_identification_number || createUuidV4());
                 normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
                   unique_identification_number: productUid
                 });
@@ -2327,18 +2347,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               tempOrder.products[productIndex] = normalizedProduct;
               this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
-              _context19.next = 27;
+              _context19.next = 29;
               return this.applyPromotion();
-            case 27:
+            case 29:
               this.applyDiscount();
-              _context19.next = 30;
+              _context19.next = 32;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 30:
+            case 32:
               this.persistTempOrder();
               return _context19.abrupt("return", tempOrder.products);
-            case 32:
+            case 34:
             case "end":
               return _context19.stop();
           }
@@ -2353,7 +2373,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProductQuantity",
     value: function () {
       var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _targetProduct$metada5;
+        var _targetProduct$metada9;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
         return _regeneratorRuntime().wrap(function _callee18$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -2394,7 +2414,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
-                  unique_identification_number: ((_targetProduct$metada5 = targetProduct.metadata) === null || _targetProduct$metada5 === void 0 ? void 0 : _targetProduct$metada5.unique_identification_number) || unique_identification_number
+                  unique_identification_number: ((_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.unique_identification_number) || unique_identification_number
                 })
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
@@ -2687,10 +2707,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this9 = this;
+        _this10 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this9.isSubmitErrorResponse(candidate);
+        return _this10.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -3268,7 +3288,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this10 = this;
+      var _this11 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
@@ -3287,7 +3307,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this10.normalizeHydratedOrderProduct(p);
+        return _this11.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
         return _objectSpread(_objectSpread({}, b || {}), {}, {
@@ -3328,8 +3348,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
           var origin = (_ref23 = (_ref24 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref24 !== void 0 ? _ref24 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref23 !== void 0 ? _ref23 : rawProduct;
+          var originSnapshot = cloneDeep(origin);
+          var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
+          if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
+            if (originSnapshot.product_option_string === undefined) {
+              originSnapshot.product_option_string = productOptionString;
+            }
+            if (originSnapshot.product_options_stirng === undefined) {
+              originSnapshot.product_options_stirng = productOptionString;
+            }
+          }
           productsByUid[uid] = _objectSpread(_objectSpread({}, existed), {}, {
-            origin: cloneDeep(origin)
+            origin: originSnapshot
           });
         }
       } catch (err) {
@@ -3344,6 +3374,44 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
+  }, {
+    key: "pickHydratedDisplayText",
+    value: function pickHydratedDisplayText(value) {
+      if (value === undefined || value === null) return '';
+      if (typeof value === 'string') return value;
+      if (_typeof(value) !== 'object') return String(value);
+      return value.auto || value.original || value.en || value['zh-CN'] || value['zh-HK'] || '';
+    }
+  }, {
+    key: "formatHydratedNamePair",
+    value: function formatHydratedNamePair(group, item) {
+      var groupText = this.pickHydratedDisplayText(group);
+      var itemText = this.pickHydratedDisplayText(item);
+      if (groupText && itemText) return "".concat(groupText, ":").concat(itemText);
+      return groupText || itemText;
+    }
+  }, {
+    key: "buildHydratedProductOptionString",
+    value: function buildHydratedProductOptionString(product) {
+      var segments = [];
+      var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
+      if (Array.isArray(sku.variant)) {
+        var _iterator9 = _createForOfIteratorHelper(sku.variant),
+          _step9;
+        try {
+          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+            var variant = _step9.value;
+            var segment = this.formatHydratedNamePair(variant === null || variant === void 0 ? void 0 : variant.group, variant === null || variant === void 0 ? void 0 : variant.item);
+            if (segment) segments.push(segment);
+          }
+        } catch (err) {
+          _iterator9.e(err);
+        } finally {
+          _iterator9.f();
+        }
+      }
+      return segments.join(', ');
+    }
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
@@ -3352,25 +3420,61 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var parsedNum = Number(rawNum);
       var rawPrice = (_ref26 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref26 !== void 0 ? _ref26 : 0;
       var parsedPrice = Number(rawPrice);
-      return {
+      var normalized = {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
         option_group_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_id,
         num: Number.isFinite(parsedNum) && parsedNum > 0 ? parsedNum : 1,
         price: Number.isFinite(parsedPrice) ? parsedPrice : 0
       };
+      if ((optionItem === null || optionItem === void 0 ? void 0 : optionItem.name) !== undefined) normalized.name = optionItem.name;
+      if ((optionItem === null || optionItem === void 0 ? void 0 : optionItem.group_name) !== undefined) normalized.group_name = optionItem.group_name;
+      if ((optionItem === null || optionItem === void 0 ? void 0 : optionItem.id) !== undefined) normalized.id = optionItem.id;
+      return normalized;
+    }
+  }, {
+    key: "mergeHydratedProductOptionDisplayFields",
+    value: function mergeHydratedProductOptionDisplayFields(options, skuOptions) {
+      if (!Array.isArray(skuOptions) || skuOptions.length === 0) return options;
+      var displayByItemId = new Map();
+      var _iterator10 = _createForOfIteratorHelper(skuOptions),
+        _step10;
+      try {
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var option = _step10.value;
+          var key = option === null || option === void 0 ? void 0 : option.option_group_item_id;
+          if (key === undefined || key === null || key === '') continue;
+          displayByItemId.set(String(key), option);
+        }
+      } catch (err) {
+        _iterator10.e(err);
+      } finally {
+        _iterator10.f();
+      }
+      return options.map(function (option) {
+        var _option$option_group_;
+        var display = displayByItemId.get(String((_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : ''));
+        if (!display) return option;
+        return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, option), option.name === undefined && display.name !== undefined ? {
+          name: display.name
+        } : {}), option.group_name === undefined && display.group_name !== undefined ? {
+          group_name: display.group_name
+        } : {}), option.id === undefined && display.id !== undefined ? {
+          id: display.id
+        } : {});
+      });
     }
   }, {
     key: "resolveHydratedProductOptions",
     value: function resolveHydratedProductOptions(row) {
       var _row$product_sku,
-        _this11 = this;
+        _this12 = this;
+      var skuOptions = (_row$product_sku = row.product_sku) === null || _row$product_sku === void 0 ? void 0 : _row$product_sku.option;
       if (Array.isArray(row.product_option_item) && row.product_option_item.length > 0) {
-        return row.product_option_item;
+        return this.mergeHydratedProductOptionDisplayFields(row.product_option_item, skuOptions);
       }
-      var skuOptions = (_row$product_sku = row.product_sku) === null || _row$product_sku === void 0 ? void 0 : _row$product_sku.option;
       if (!Array.isArray(skuOptions)) return [];
       return skuOptions.map(function (optionItem) {
-        return _this11.normalizeHydratedProductOptionItem(optionItem || {});
+        return _this12.normalizeHydratedProductOptionItem(optionItem || {});
       });
     }
   }, {
@@ -3448,67 +3552,67 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         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));
       };
-      var _iterator9 = _createForOfIteratorHelper(productList),
-        _step9;
+      var _iterator11 = _createForOfIteratorHelper(productList),
+        _step11;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var product = _step9.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var product = _step11.value;
           var qty = product.num || 1;
-          var _iterator11 = _createForOfIteratorHelper(product.discount_list || []),
-            _step11;
+          var _iterator13 = _createForOfIteratorHelper(product.discount_list || []),
+            _step13;
           try {
-            for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-              var pd = _step11.value;
+            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+              var pd = _step13.value;
               addDiscountAmount(pd, qty);
             }
           } catch (err) {
-            _iterator11.e(err);
+            _iterator13.e(err);
           } finally {
-            _iterator11.f();
+            _iterator13.f();
           }
-          var _iterator12 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step12;
+          var _iterator14 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step14;
           try {
-            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
               var _ref27, _bundle$num;
-              var bundle = _step12.value;
+              var bundle = _step14.value;
               var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref27 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref27 !== void 0 ? _ref27 : 1) || 1).toNumber();
-              var _iterator13 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step13;
+              var _iterator15 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step15;
               try {
-                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                  var _pd = _step13.value;
+                for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+                  var _pd = _step15.value;
                   addDiscountAmount(_pd, bundleQty);
                 }
               } catch (err) {
-                _iterator13.e(err);
+                _iterator15.e(err);
               } finally {
-                _iterator13.f();
+                _iterator15.f();
               }
             }
           } catch (err) {
-            _iterator12.e(err);
+            _iterator14.e(err);
           } finally {
-            _iterator12.f();
+            _iterator14.f();
           }
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator9.f();
+        _iterator11.f();
       }
-      var _iterator10 = _createForOfIteratorHelper(discountList),
-        _step10;
+      var _iterator12 = _createForOfIteratorHelper(discountList),
+        _step12;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var d = _step10.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var d = _step12.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator10.f();
+        _iterator12.f();
       }
     }
   }]);

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

@@ -439,6 +439,7 @@ export interface OrderPaymentMetadata {
     [key: string]: any;
 }
 export interface OrderPaymentData {
+    order_payment_id?: number | string;
     amount: string;
     code: string;
     custom_payment_id: number;

package/dist/modules/Order/utils.js

@@ -825,7 +825,9 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
       metadata[key] = item[key];
     }
   }
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
+    order_payment_id: item.order_payment_id
+  } : {}), {}, {
     amount: String((_item$amount = item.amount) !== null && _item$amount !== void 0 ? _item$amount : '0.00'),
     code: String(item.code || ''),
     custom_payment_id: Number(customPaymentId !== null && customPaymentId !== void 0 ? customPaymentId : 0),