Skip to content

Updates for statement calculation refactor on pay-api (#227) #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jxio merged 2 commits into from
Dec 9, 2025
Merged

Updates for statement calculation refactor on pay-api (#227) #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a15be50
28787 - Updates for statement calculation refactor on pay-api (#227)
Jxio Dec 4, 2025
93e8459
BCOL, CC, ONLINE_BANKING, EFT statement updates (#229)
Jxio Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion report-api/report-templates/generic_footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
{% endif %}
{% endif %}
{% endif %}
{% elif statement and statement.is_interim_statement %}
{% elif statement and statement.isInterimStatement %}
<span>Interim Account Statement #{{statement.id}}</span>
{% elif statement %}
<span>Account Statement #{{statement.id}}</span>
Expand Down
28 changes: 0 additions & 28 deletions report-api/report-templates/statement_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,6 @@
<td colspan="2">
<div>
<div><span class="font-bold">Account Number:</span> {{ account.id }}</div>
{% if not summary_header_text and groupedInvoices %}
{% if payment_method == 'PAD' %}
<div><span class="font-bold">Pre-Authorized Debit Totals:</span> <span class="font-bold">${{ '%.2f' % data.totals_summary }}</span></div>
<div><span class="font-bold">Amount Owing:</span> <span class="font-bold">${{ '%.2f' % data.due_summary }}</span></div>
{% elif payment_method == 'ONLINE_BANKING' %}
<div><span class="font-bold">Online Banking Totals:</span> <span class="font-bold">${{ '%.2f' % data.totals_summary }}</span></div>
{% elif payment_method in ['DIRECT_PAY', 'CC'] %}
<div><span class="font-bold">Credit Card Totals:</span> <span class="font-bold">${{ '%.2f' % data.totals_summary }}</span></div>
{% elif payment_method == 'DRAWDOWN' %}
<div><span class="font-bold">BC OnLine Totals:</span> <span class="font-bold">${{ '%.2f' % data.totals_summary }}</span></div>
{% elif payment_method == 'EJV' %}
<div><span class="font-bold">Electronic Journal Voucher Totals:</span> <span class="font-bold">${{ '%.2f' % data.totals_summary }}</span></div>
{% endif %}
{% if eft_payment %}
<div><span class="font-bold">EFT Totals:</span> <span class="font-bold">${{ '%.2f' % data.totals_summary }}</span></div>
<div><span class="font-bold">Amount Owing:</span> <span class="font-bold">${{ '%.2f' % data.due_summary }}</span></div>
{% if statementSummary.dueDate %}
<div><span class="font-bold">Payment Due Date:</span> {{ statementSummary.dueDate }}</div>
{% endif %}
{% else %}
<div><span class="font-bold">Amount Paid:</span> <span class="font-bold">${{ '%.2f' % data.paid_summary }}</span></div>
{% endif %}
{% if statement.is_interim_statement and payment_method == 'EFT' %}
<div><span class="font-bold">Payment Received Date:</span>
{{ statementSummary.latestStatementPaymentDate }}
</div>
{% endif %}
{% endif %}
<div><span class="font-bold">Statement Number:</span> {{statement.id}}</div>
</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions report-api/report-templates/statement_header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</div>
{% if is_payment_instructions %}
<div class="r-subtitle">BC Registries And Online Services</div>
{% elif statement.from_date or statement.to_date %}
{% elif statement.fromDate or statement.toDate %}
<div class="r-subtitle">
{{ statement.duration }}
</div>
Expand All @@ -36,7 +36,7 @@
{% if not is_payment_instructions %}
<tr class="letterhead-banner">
<td colspan="2">
<div>{{ account.name|upper }}</div>
<div>ACCOUNT NAME: {{ account.name|upper }}</div>
</td>
</tr>
<tr>
Expand Down
87 changes: 66 additions & 21 deletions report-api/report-templates/statement_report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@
width: 100%;
}

.statement-totals{
border: 3px solid #e2e7ed;
margin-top: 20px;
border-collapse: separate;
border-spacing: 0 0;
padding-top: 15px;
padding-bottom: 15px;
}

.wordmark {
font-family: Georgia, 'Times New Roman', Times, serif;
}
Expand Down Expand Up @@ -276,12 +285,17 @@
.transaction-table {
margin: 0px 24px 16px;
width: 690px;
border-bottom: 1px solid #bcbec5;
}

.transaction-table thead tr,
.transaction-table tbody tr {
line-height: 3;
font-size: 12px;
border-top: 1px solid #bcbec5;
}
.transaction-table tbody tr.no-top-border {
border-top: transparent;
border-bottom: 1px solid #bcbec5;
}

Expand Down Expand Up @@ -324,12 +338,43 @@
border-bottom: 1px solid #b3bac3;
}

.total-elements_no_border {
.total-elements-top-border {
margin: 10px 24px 0 24px;
padding: 10px 0;
font-size: 14px;
border-top: 1px solid #b3bac3;
}

.total-elements-bottom-border {
margin: 0px 24px;
font-size: 14px;
padding-bottom: 10px;
border-bottom: 2px solid #b3bac3;
}

.total-elements-no-border {
margin: 0px 24px;
font-size: 14px;
border-bottom: none;
}

.transaction-summary-row {
margin: 0px 24px;
padding: 10px 0;
font-size: 14px;
border-bottom: 2px solid #b3bac3;
}

.total-elements-last-row {
margin: 0px 24px;
padding: 0 0 10px 0;
border: none;
}

.statement-subline{
margin-left: 60px;
}

.total-elements-price {
float: right;
font-family: 'BCSans-Regular', sans-serif;
Expand Down Expand Up @@ -414,36 +459,36 @@
</style>
</head>
<body>
{% for data in groupedInvoices %}
{% set payment_method = data.payment_method %}
{% set transactions = data.transactions %}
{% set total_paid = data.total_paid %}
{% set latest_payment_date = data.latest_payment_date if 'latest_payment_date' in data else None %}
{% set due_date = data.due_date if 'due_date' in data else None %}
{% set eft_payment = payment_method == 'EFT' %}
{% set statement_header_text = data.statement_header_text %}
{% set include_service_provided = data.include_service_provided %}
<div class="page-break-before">
{% include 'report-templates/statement_header.html' with context %}
</div>

{% include 'report-templates/statement_details.html' with context %}
{% include 'report-templates/statement_transactions.html' with context %}
{% endfor %}
{% if not groupedInvoices %}
{% if not groupedInvoices or groupedInvoices|length == 0 %}
<div class="page-break-before">
{% include 'report-templates/statement_header.html' %}
</div>
{% include 'report-templates/statement_details.html' %}
{% include 'report-templates/statement_transactions.html' %}
{% endif %}
{% else %}
{% for data in groupedInvoices %}
{% set payment_method = data.paymentMethod %}
{% set transactions = data.transactions %}
{% set total_paid = data.total_paid %}
{% set latest_payment_date = data.latestPaymentDate if 'latest_payment_date' in data else None %}
{% set due_date = data.dueDate if 'due_date' in data else None %}
{% set eft_payment = payment_method == 'EFT' %}
{% set statement_header_text = data.statementHeaderText %}
{% set include_service_provided = data.includeServiceProvided %}
<div class="page-break-before">
{% include 'report-templates/statement_header.html' with context %}
</div>

{% include 'report-templates/statement_details.html' with context %}
{% include 'report-templates/statement_transactions.html' with context %}
{% endfor %}
{% endif %}
<!-- EFT Instructions -->
{% for data in groupedInvoices %}
{% if hasPaymentInstructions and data.payment_method == 'EFT' %}
{% if hasPaymentInstructions and data.paymentMethod == 'EFT' %}
{% set payment_method = 'EFT' %}
{% set is_payment_instructions = true %}
<div class="inner-wrap eft-instruction">
<div class="inner-wrap eft-instruction page-break-before">
{% include 'report-templates/statement_header.html' %}
<h2>Payment Instructions</h2>
</div>
Expand Down
Loading