@aptos-scp/scp-component-store-selling-features-domain-model 1.46.3 → 1.46.5

package/lib/domain/model/FulfillmentGroup.js

@@ -93,7 +93,7 @@ class FulfillmentGroup {
         return this;
     }
     static getDeliveryAddress(contact) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
         const primaryAddress = (_a = contact.addresses) === null || _a === void 0 ? void 0 : _a.find((address) => address.primaryIndicator);
         return {
             addressLine1: ((_b = contact) === null || _b === void 0 ? void 0 : _b.address1) || ((_c = primaryAddress) === null || _c === void 0 ? void 0 : _c.address1),
@@ -106,6 +106,7 @@ class FulfillmentGroup {
             countryCode: ((_r = contact) === null || _r === void 0 ? void 0 : _r.countryCode) || ((_s = primaryAddress) === null || _s === void 0 ? void 0 : _s.countryCode),
             firstAdminDivision: ((_t = contact) === null || _t === void 0 ? void 0 : _t.firstAdminDivision) || ((_u = primaryAddress) === null || _u === void 0 ? void 0 : _u.firstAdminDivision),
             firstAdminDivisionCode: ((_v = contact) === null || _v === void 0 ? void 0 : _v.firstAdminDivisionCode) || ((_w = primaryAddress) === null || _w === void 0 ? void 0 : _w.firstAdminDivisionCode),
+            firstAdminDivisionType: ((_x = contact) === null || _x === void 0 ? void 0 : _x.firstAdminDivisionType) || ((_y = primaryAddress) === null || _y === void 0 ? void 0 : _y.firstAdminDivisionType),
         };
     }
     static getDeliveryContact(contact) {

package/lib/domain/model/TenderType.js

@@ -141,13 +141,15 @@ class TenderType {
         var _a, _b, _c, _d;
         let total = new scp_component_business_core_1.Money(0, accountingCurrency);
         (_b = (_a = displayInfo) === null || _a === void 0 ? void 0 : _a.shippingFeeDisplayLines) === null || _b === void 0 ? void 0 : _b.forEach((shippingFeeDisplayLine) => {
+            var _a;
             if (shippingFeeDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.TransactionFeeRefund) {
-                total = total.plus(shippingFeeDisplayLine.extendedAmountIncludingTax.abs());
+                total = total.plus((_a = shippingFeeDisplayLine.extendedAmountIncludingTax) === null || _a === void 0 ? void 0 : _a.abs());
             }
         });
         (_d = (_c = displayInfo) === null || _c === void 0 ? void 0 : _c.itemFeeDisplayLines) === null || _d === void 0 ? void 0 : _d.forEach((itemFeeDisplayLine) => {
+            var _a;
             if (itemFeeDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemFeeRefund) {
-                total = total.plus(itemFeeDisplayLine.extendedAmount.abs());
+                total = total.plus((_a = itemFeeDisplayLine.extendedAmountIncludingTax) === null || _a === void 0 ? void 0 : _a.abs());
             }
         });
         return total;
@@ -236,8 +238,7 @@ class TenderType {
         withoutTransactionTotal = withoutTransactionTotal.plus(withoutTransactionItemAmount);
         const withoutTransactionTenderedAmount = TenderType.getTenderedAmountsWithoutTransaction((_b = displayInfo) === null || _b === void 0 ? void 0 : _b.tenderDisplayLines, accountingCurrency, configurationManager);
         withoutTransactionTotal = withoutTransactionTotal.minus(withoutTransactionTenderedAmount);
-        const feesTotal = TenderType.getFeesTotal(displayInfo, accountingCurrency);
-        withoutTransactionTotal = withoutTransactionTotal.plus(feesTotal);
+        // shipping and item fee are not returned on RWOR
         return withoutTransactionTotal;
     }
     static getWithTransactionTotal(displayInfo, accountingCurrency, configurationManager) {
@@ -258,8 +259,7 @@ class TenderType {
         withOfflineTransactionTotal = withOfflineTransactionTotal.plus(withOfflineTransactionItemAmount);
         const withOfflineTransactionTenderedAmount = TenderType.getTenderedAmountsWithOfflineTransaction((_b = displayInfo) === null || _b === void 0 ? void 0 : _b.tenderDisplayLines, accountingCurrency, configurationManager);
         withOfflineTransactionTotal = withOfflineTransactionTotal.minus(withOfflineTransactionTenderedAmount);
-        const feesTotal = TenderType.getFeesTotal(displayInfo, accountingCurrency);
-        withOfflineTransactionTotal = withOfflineTransactionTotal.plus(feesTotal);
+        // shipping and item fee are not returned on offline returns
         return withOfflineTransactionTotal;
     }
     static getOriginalRefundableTenders(container, accountingCurrency, originalTransactionsDetails, balanceDue, itemTypes, orderTypes, isRefund, productAttributeTypes, displayInfo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-scp/scp-component-store-selling-features-domain-model",
-  "version": "1.46.3",
+  "version": "1.46.5",
   "description": "This component library provides the common components to handle the coordination of processing the business events from the UI.",
   "private": false,
   "license": "SEE LICENSE IN LICENSE.md",