diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.ts index 78fbbf1e0..e71508898 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.ts @@ -92,7 +92,7 @@ export class TransactionsTabComponent implements OnInit { */ showTransactions(transactionsData: any) { if (transactionsData.transfer) { - this.router.navigate([`account-transfers/account-transfers/${transactionsData.transfer.id}`], { relativeTo: this.route }); + this.router.navigate([`../transfer-funds/account-transfers/${transactionsData.transfer.id}`], { relativeTo: this.route }); } else { this.router.navigate([transactionsData.id], { relativeTo: this.route }); } diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/view-transaction/view-transaction.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/view-transaction/view-transaction.component.html index 8eecd3304..df415e8bf 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/view-transaction/view-transaction.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/view-transaction/view-transaction.component.html @@ -21,6 +21,8 @@
+
+
{{"labels.inputs.Transaction Id" | translate }} @@ -126,6 +128,9 @@ + + +
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/view-transaction/view-transaction.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/view-transaction/view-transaction.component.ts index 549ed3def..2e537e809 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/view-transaction/view-transaction.component.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/view-transaction/view-transaction.component.ts @@ -11,6 +11,7 @@ import { SettingsService } from 'app/settings/settings.service'; import { RecurringDepositConfirmationDialogComponent } from '../../custom-dialogs/recurring-deposit-confirmation-dialog/recurring-deposit-confirmation-dialog.component'; import { Dates } from 'app/core/utils/dates'; import { TranslateService } from '@ngx-translate/core'; +import { Location } from '@angular/common'; /** * View Transaction Component. @@ -37,6 +38,7 @@ export class ViewTransactionComponent { */ constructor(private recurringDepositsService: RecurringDepositsService, private route: ActivatedRoute, + private location: Location, private dateUtils: Dates, private router: Router, public dialog: MatDialog, @@ -70,4 +72,14 @@ export class ViewTransactionComponent { }); } + transactionColor(): string { + if (this.transactionData.manuallyReversed) { + return 'undo'; + } + return 'active'; + } + + goBack(): void { + this.location.back(); + } } diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-routing.module.ts b/src/app/deposits/recurring-deposits/recurring-deposits-routing.module.ts index dd9cdea52..5fb2ba171 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-routing.module.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits-routing.module.ts @@ -130,10 +130,6 @@ const routes: Routes = [ resolve: { recurringDepositsAccountTransactionTemplate: RecurringDepositsAccountTransactionTemplateResolver } - }, - { - path: 'account-transfers', - loadChildren: () => import('../../account-transfers/account-transfers.module').then(m => m.AccountTransfersModule) } ] } @@ -148,6 +144,10 @@ const routes: Routes = [ } } ] + }, + { + path: ':recurringDepositAccountId/transfer-funds', + loadChildren: () => import('../../account-transfers/account-transfers.module').then(m => m.AccountTransfersModule) } ] }, diff --git a/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.html b/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.html index 7e2ac3576..0092c527a 100644 --- a/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.html +++ b/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.html @@ -22,11 +22,16 @@ {{"labels.inputs.Transaction Amount" | translate}} - + {{"labels.inputs.Transaction Amount" | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} + + {{"labels.inputs.External Id" | translate}} + + + {{"labels.inputs.Payment Type" | translate}} diff --git a/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.ts b/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.ts index 05730ea72..777963d5d 100644 --- a/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.ts @@ -65,6 +65,7 @@ export class RecoveryRepaymentComponent implements OnInit { this.recoveryRepaymentLoanForm = this.formBuilder.group({ 'transactionDate': [new Date(), Validators.required], 'transactionAmount': ['', Validators.required], + 'externalId': [''], 'paymentTypeId': [''], 'note': [''] }); diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html index 0a00d97ef..5c78c8fae 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html @@ -18,37 +18,37 @@ Id - {{ transaction.id }} + {{ transaction.id }} Transaction Date - {{ transaction.date | dateFormat }} + {{ transaction.date | dateFormat }} Transaction Type - {{ transaction.transactionType.value }} + {{ transaction.transactionType.value }} Debit - {{ isDebit(transaction.transactionType) ? (transaction.amount | formatNumber) : 'N/A'}} + {{ isDebit(transaction.transactionType) ? (transaction.amount | formatNumber) : 'N/A'}} Credit - {{ !isDebit(transaction.transactionType) ? (transaction.amount | formatNumber) : 'N/A' }} + {{ !isDebit(transaction.transactionType) ? (transaction.amount | formatNumber) : 'N/A' }} Balance - {{ transaction.runningBalance | formatNumber }} + {{ transaction.runningBalance | formatNumber }} Actions - + diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.scss b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.scss index 83f2418c0..72ec04a33 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.scss +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.scss @@ -23,3 +23,8 @@ } } } + +.strike { + text-decoration: line-through; + color: red; +} \ No newline at end of file diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts index 8671528b6..1ccdf8dd4 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts @@ -40,7 +40,7 @@ export class TransactionsTabComponent implements OnInit { constructor(private route: ActivatedRoute, private router: Router) { this.route.parent.parent.data.subscribe((data: { savingsAccountData: any }) => { - this.transactionsData = data.savingsAccountData.transactions?.filter((transaction: any) => !transaction.reversed); + this.transactionsData = data.savingsAccountData.transactions; this.tempTransaction = this.transactionsData; this.status = data.savingsAccountData.status.value; });