@aptos-scp/scp-component-store-selling-features-domain-model 2.49.0 → 2.49.2

package/lib/domain/model/MerchandiseTransaction.js

@@ -835,11 +835,17 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
         const transactionChangeDue = this.transactionTotalTendered
             .plus(this.denominationRounding)
             .minus(this.transactionTotal);
-        if (transactionChangeDue.isPositive() && this.transactionTotal.isPositive()) {
-            return transactionChangeDue;
+        // Reward card tenders do not generate change; the remaining balance is handled separately.
+        if (utils_1.isLastTenderRewardCard(this)) {
+            return new scp_component_business_core_1.Money(0, this._accountingCurrency);
         }
         else {
-            return new scp_component_business_core_1.Money(0, this._accountingCurrency);
+            if (transactionChangeDue.isPositive() && this.transactionTotal.isPositive()) {
+                return transactionChangeDue;
+            }
+            else {
+                return new scp_component_business_core_1.Money(0, this._accountingCurrency);
+            }
         }
     }
     get returnTotal() {
@@ -1377,12 +1383,20 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
         if (removeTotalTendered) {
             balanceDue = balanceDue.minus(totalTendered.plus(this.denominationRounding));
         }
-        if ((totalAmount.isPositive() && balanceDue.isPositive()) ||
-            (totalAmount.isNegative() && balanceDue.isNegative())) {
+        // When the last tender is a reward card, return the raw balance without clamping to zero.
+        // This allows the UI to display the outstanding balance that remains after the reward card
+        // was applied, even when the signed balance would normally be suppressed.
+        if (utils_1.isLastTenderRewardCard(this)) {
             return balanceDue;
         }
         else {
-            return new scp_component_business_core_1.Money(0, this._accountingCurrency);
+            if ((totalAmount.isPositive() && balanceDue.isPositive()) ||
+                (totalAmount.isNegative() && balanceDue.isNegative())) {
+                return balanceDue;
+            }
+            else {
+                return new scp_component_business_core_1.Money(0, this._accountingCurrency);
+            }
         }
     }
     generateTransactionReferenceNumber(transaction) {

package/lib/domain/utility/subscriptionFrequencyUtils.js

@@ -23,18 +23,7 @@ function buildTimeIntervalFromCode(code) {
 }
 exports.buildTimeIntervalFromCode = buildTimeIntervalFromCode;
 function buildDeliveryFrequencyTextFromTimeInterval(interval) {
-    var _a;
-    const labels = {
-        Day: ["day", "days"],
-        Week: ["week", "weeks"],
-        Month: ["month", "months"],
-        Year: ["year", "years"],
-    };
-    const [singular, plural] = (_a = labels[interval.unit], (_a !== null && _a !== void 0 ? _a : [
-        interval.unit.toLowerCase(),
-        `${interval.unit.toLowerCase()}s`,
-    ]));
-    return interval.value === 1 ? `Every ${singular}` : `Every ${interval.value} ${plural}`;
+    return `${interval.value} ${interval.unit}`;
 }
 exports.buildDeliveryFrequencyTextFromTimeInterval = buildDeliveryFrequencyTextFromTimeInterval;
 //# sourceMappingURL=subscriptionFrequencyUtils.js.map

package/lib/domain/utility/utils.d.ts

@@ -6,3 +6,17 @@ export declare function getLocaleCodeForTranslationSet<T>(translationSet: {
 export declare const getTradeType: (transaction: ITransaction) => MerchandiseTransactionTradeType;
 export declare const isTimeOutError: (error: PosError) => boolean;
 export declare const getServiceResult: (isSuccess: boolean, error?: Error, statusCode?: number) => IServiceResult;
+/**
+ * Returns true when the most recently applied non-voided tender in the transaction was a
+ * reward card (RewardCardTenderLine or RewardCardTenderRefundLine).
+ *
+ * The check follows a three-step reference chain that is written by the authorization flow:
+ *   TenderLine.transactionLineReference
+ *       → TenderAuthorizationStatusLine.transactionLineReference
+ *           → RewardCardTenderLine | RewardCardTenderRefundLine
+ *
+ * When a reward card tender is the last tender, callers suppress change-due and skip the
+ * balance-due sign-clamp so the remaining balance is shown correctly to the cashier during
+ * a return/RWR flow where the original sale included a reward card tender.
+ */
+export declare const isLastTenderRewardCard: (transaction: ITransaction) => boolean;

package/lib/domain/utility/utils.js

@@ -85,4 +85,36 @@ exports.getServiceResult = (isSuccess, error, statusCode) => {
         };
     }
 };
+/**
+ * Returns true when the most recently applied non-voided tender in the transaction was a
+ * reward card (RewardCardTenderLine or RewardCardTenderRefundLine).
+ *
+ * The check follows a three-step reference chain that is written by the authorization flow:
+ *   TenderLine.transactionLineReference
+ *       → TenderAuthorizationStatusLine.transactionLineReference
+ *           → RewardCardTenderLine | RewardCardTenderRefundLine
+ *
+ * When a reward card tender is the last tender, callers suppress change-due and skip the
+ * balance-due sign-clamp so the remaining balance is shown correctly to the cashier during
+ * a return/RWR flow where the original sale included a reward card tender.
+ */
+exports.isLastTenderRewardCard = (transaction) => {
+    var _a, _b, _c, _d, _e;
+    if (model_1.isMerchandiseTransaction(transaction)) {
+        const tenderLines = (_a = transaction.lines) === null || _a === void 0 ? void 0 : _a.filter((line) => model_1.isTenderLine(line) && !line.voided);
+        if (((_b = tenderLines) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+            const lastTenderLine = tenderLines[tenderLines.length - 1];
+            if ((_c = lastTenderLine.transactionLineReference) === null || _c === void 0 ? void 0 : _c.lineNumber) {
+                const transactionStatusLine = transaction.findLineByLineNumber(lastTenderLine.transactionLineReference.lineNumber);
+                if (transactionStatusLine &&
+                    model_1.isTenderAuthorizationStatusLine(transactionStatusLine) && ((_d = transactionStatusLine.transactionLineReference) === null || _d === void 0 ? void 0 : _d.lineNumber)) {
+                    const transactionLine = transaction.findLineByLineNumber((_e = transactionStatusLine.transactionLineReference) === null || _e === void 0 ? void 0 : _e.lineNumber);
+                    return (transactionLine &&
+                        (model_1.isRewardCardTenderLine(transactionLine) || model_1.isRewardCardTenderRefundLine(transactionLine)));
+                }
+            }
+        }
+    }
+    return false;
+};
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-scp/scp-component-store-selling-features-domain-model",
-  "version": "2.49.0",
+  "version": "2.49.2",
   "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",