diff --git a/src/app/deposits/recurring-deposits/common-resolvers/recurring-deposit-account-actions.resolver.ts b/src/app/deposits/recurring-deposits/common-resolvers/recurring-deposit-account-actions.resolver.ts index ad41979c4..02e9ae251 100644 --- a/src/app/deposits/recurring-deposits/common-resolvers/recurring-deposit-account-actions.resolver.ts +++ b/src/app/deposits/recurring-deposits/common-resolvers/recurring-deposit-account-actions.resolver.ts @@ -33,10 +33,10 @@ export class RecurringDepositsAccountActionsResolver implements Resolve switch (actionName) { case 'Add Charge': return this.savingsService.getSavingsChargeTemplateResource(recurringDepositAccountId); - break; case 'Close': return this.recurringDepositsService.getRecurringDepositAccountActionResource(recurringDepositAccountId, 'close'); - break; + case 'Deposit': + return this.recurringDepositsService.getRecurringDepositAccountTransactionTemplateResource(recurringDepositAccountId, 'deposit'); default: return undefined; } diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html index 9e323a2ca..31ac6c826 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html @@ -17,7 +17,7 @@ - Transaction Date is required + Closed On is required diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.html new file mode 100644 index 000000000..028b3959d --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.html @@ -0,0 +1,99 @@ +
+ + + +
+ + + +
+ + + Transaction Date + + + + + Transaction Date is required + + + + + Transaction Amount + + + Transaction Amount is required + + + + + Payment Type Id + + + {{ paymentType.name }} + + + + Payment Type is required + + + +
+ Show Payment Details + + + + +
+ + + + Account # + + + + + Cheque # + + + + + Routing Code + + + + + Reciept # + + + + + Bank # + + + + + + Note + + + +
+ +
+ + + + + + +
+ +
+ +
\ No newline at end of file diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.scss b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.scss new file mode 100644 index 000000000..f76218e04 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.scss @@ -0,0 +1,8 @@ +.container { + max-width: 37rem; +} + +.expandCollapsebutton { + margin-top: -7px; + margin-left: 2%; +} diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.spec.ts new file mode 100644 index 000000000..f9ce37f41 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DepositRecurringDepositsAccountComponent } from './deposit-recurring-deposits-account.component'; + +describe('DepositRecurringDepositsAccountComponent', () => { + let component: DepositRecurringDepositsAccountComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DepositRecurringDepositsAccountComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DepositRecurringDepositsAccountComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.ts new file mode 100644 index 000000000..f74f374db --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.ts @@ -0,0 +1,110 @@ +/** Angular Imports */ +import { Component, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { DatePipe } from '@angular/common'; +import { ActivatedRoute, Router } from '@angular/router'; + +/** Custom Services */ +import { RecurringDepositsService } from '../../recurring-deposits.service'; + +/** + * Deposits Recurring Deposits Account Component + */ +@Component({ + selector: 'mifosx-deposit-recurring-deposits-account', + templateUrl: './deposit-recurring-deposits-account.component.html', + styleUrls: ['./deposit-recurring-deposits-account.component.scss'] +}) +export class DepositRecurringDepositsAccountComponent implements OnInit { + + /** Transactions Amount */ + transactionAmount: any; + /** Outstanding Charge Amount */ + outstandingChargeAmount: any; + /** Payment Types */ + paymentTypes: any; + /** Account Id */ + accountId: string; + /** Show payment details */ + showPaymentDetails = false; + /** Minimum Date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum Date allowed. */ + maxDate = new Date(); + /** Deposits Recurring Deposit Account form. */ + depositRecurringDepositForm: FormGroup; + + /** + * Retrieves action details transactions template data from `resolve` + * @param {FormBuilder} formBuilder Form Builder + * @param {ActivatedRoute} route Activated Route + * @param {Router} router Router + * @param {DatePipe} datePipe Date Pipe + */ + constructor( + private formBuilder: FormBuilder, + private route: ActivatedRoute, + private router: Router, + private datePipe: DatePipe, + private recurringDepositsService: RecurringDepositsService + ) { + this.route.data.subscribe((data: { recurringDepositsAccountActionData: any }) => { + this.transactionAmount = data.recurringDepositsAccountActionData.amount; + this.paymentTypes = data.recurringDepositsAccountActionData.paymentTypeOptions; + if (data.recurringDepositsAccountActionData.outstandingChargeAmount && data.recurringDepositsAccountActionData.outstandingChargeAmount > 0) { + this.outstandingChargeAmount = data.recurringDepositsAccountActionData.outstandingChargeAmount; + this.transactionAmount = this.transactionAmount + this.outstandingChargeAmount; + } + }); + this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId']; + } + + ngOnInit() { + this.createdepositRecurringDepositForm(); + } + + /** + * Creates the deposits form. + */ + createdepositRecurringDepositForm() { + this.depositRecurringDepositForm = this.formBuilder.group({ + 'transactionDate': [new Date(), Validators.required], + 'transactionAmount': [this.transactionAmount, Validators.required], + 'paymentTypeId': ['', Validators.required], + 'accountNumber': '', + 'chequeNumber': '', + 'routingCode': '', + 'receiptNumber': '', + 'bankNumber': '', + 'note': '' + }); + } + + /** + * Toggles the display of payment details + */ + toggleDisplay() { + this.showPaymentDetails = !(this.showPaymentDetails); + } + + /** + * Submits the deposits recurring deposit form + */ + submit() { + const transactionDate = this.depositRecurringDepositForm.value.transactionDate; + const dateFormat = 'yyyy-MM-dd'; + const locale = 'en'; + this.depositRecurringDepositForm.patchValue({ + transactionDate: this.datePipe.transform(transactionDate, dateFormat) + }); + const data = { + ...this.depositRecurringDepositForm.value, + dateFormat, + locale + }; + this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'deposit', data).subscribe(() => { + this.router.navigate(['../../'], { relativeTo: this.route }); + }); + } + +} diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html index d009effbe..cd80325ac 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html @@ -6,3 +6,4 @@ + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts index 60f984cf2..ff5c015c2 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts @@ -18,6 +18,7 @@ export class RecurringDepositsAccountActionsComponent { 'Add Charge': boolean 'Premature Close': boolean 'Close': boolean + 'Deposit': boolean } = { 'Activate': false, 'Undo Approval': false, @@ -26,7 +27,8 @@ export class RecurringDepositsAccountActionsComponent { 'Withdraw By Client': false, 'Add Charge': false, 'Premature Close': false, - 'Close': false + 'Close': false, + 'Deposit': false }; /** diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts index 7b203d297..1031fa98e 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts @@ -147,6 +147,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit { case 'Withdraw By Client': case 'Premature Close': case 'Close': + case 'Deposit': this.router.navigate([`actions/${name}`], { relativeTo: this.route }); break; case 'Modify Application': diff --git a/src/app/deposits/recurring-deposits/recurring-deposits.module.ts b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts index 54e9ae4f2..da97e45cd 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits.module.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts @@ -38,6 +38,7 @@ import { RecurringDepositConfirmationDialogComponent } from './recurring-deposit import { EditRecurringDepositAccountComponent } from './edit-recurring-deposit-account/edit-recurring-deposit-account.component'; import { PrematureCloseRecurringDepositAccountComponent } from './recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component'; import { CloseRecurringDepositsAccountComponent } from './recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component'; +import { DepositRecurringDepositsAccountComponent } from './recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component'; /** @@ -79,7 +80,8 @@ import { CloseRecurringDepositsAccountComponent } from './recurring-deposits-acc RecurringDepositConfirmationDialogComponent, EditRecurringDepositAccountComponent, PrematureCloseRecurringDepositAccountComponent, - CloseRecurringDepositsAccountComponent + CloseRecurringDepositsAccountComponent, + DepositRecurringDepositsAccountComponent ], entryComponents: [ RecurringDepositConfirmationDialogComponent diff --git a/src/app/deposits/recurring-deposits/recurring-deposits.service.ts b/src/app/deposits/recurring-deposits/recurring-deposits.service.ts index cab026a06..29df416c2 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits.service.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits.service.ts @@ -112,4 +112,14 @@ export class RecurringDepositsService { const httpParams = new HttpParams().set('command', command); return this.http.get(`/recurringdepositaccounts/${accountId}/template`, { params: httpParams }); } + + /** + * Returns the transaction template for the recurring deposits action + * @param accountId Account Id + * @param command Command + */ + getRecurringDepositAccountTransactionTemplateResource(accountId: any, command: string): Observable { + const httpParams = new HttpParams().set('command', command); + return this.http.get(`/recurringdepositaccounts/${accountId}/transactions/template`, { params: httpParams }); + } }