From 9c9b94199bc5874a45428470cb930970daf0b7c9 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 24 Apr 2025 13:00:43 -0400 Subject: [PATCH] highlight overpayment --- public/javascripts/contract.editFees.js | 11 ++++++++--- public/javascripts/contract.editFees.ts | 14 ++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/public/javascripts/contract.editFees.js b/public/javascripts/contract.editFees.js index 3dbfc349..0644afee 100644 --- a/public/javascripts/contract.editFees.js +++ b/public/javascripts/contract.editFees.js @@ -553,15 +553,20 @@ Object.defineProperty(exports, "__esModule", { value: true }); contractTransactionsContainerElement.querySelector('#contractTransactions--grandTotal').textContent = `$${transactionGrandTotal.toFixed(2)}`; const feeGrandTotal = getFeeGrandTotal(); if (feeGrandTotal.toFixed(2) !== transactionGrandTotal.toFixed(2)) { - contractTransactionsContainerElement.insertAdjacentHTML('afterbegin', `
+ const difference = feeGrandTotal - transactionGrandTotal; + const differenceClassName = difference < 0 ? 'is-danger' : 'is-warning'; + // eslint-disable-next-line no-unsanitized/method + contractTransactionsContainerElement.insertAdjacentHTML('afterbegin', `
-
Outstanding Balance
+
+ ${difference < 0 ? 'Overpayment' : 'Outstanding Balance'} +
- $${cityssm.escapeHTML((feeGrandTotal - transactionGrandTotal).toFixed(2))} + $${cityssm.escapeHTML(Math.abs(difference).toFixed(2))}
diff --git a/public/javascripts/contract.editFees.ts b/public/javascripts/contract.editFees.ts index eee5e7fc..bd2fd221 100644 --- a/public/javascripts/contract.editFees.ts +++ b/public/javascripts/contract.editFees.ts @@ -577,7 +577,7 @@ declare const exports: Record onshown() { bulmaJS.toggleHtmlClipped() }, - + onhidden() { renderContractFees() }, @@ -864,17 +864,23 @@ declare const exports: Record const feeGrandTotal = getFeeGrandTotal() if (feeGrandTotal.toFixed(2) !== transactionGrandTotal.toFixed(2)) { + const difference = feeGrandTotal - transactionGrandTotal + const differenceClassName = difference < 0 ? 'is-danger' : 'is-warning' + + // eslint-disable-next-line no-unsanitized/method contractTransactionsContainerElement.insertAdjacentHTML( 'afterbegin', - `
+ `
-
Outstanding Balance
+
+ ${difference < 0 ? 'Overpayment' : 'Outstanding Balance'} +
- $${cityssm.escapeHTML((feeGrandTotal - transactionGrandTotal).toFixed(2))} + $${cityssm.escapeHTML(Math.abs(difference).toFixed(2))}