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 5e0b49b32..ad41979c4 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,6 +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; 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 new file mode 100644 index 000000000..9e323a2ca --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html @@ -0,0 +1,114 @@ +
+ + + +
+ + + +
+ +

{{title}}

+ + + Closed On + + + + + Transaction Date is required + + + + + Maturity Amount + + + Maturity Amount is required + + + + + Action + + + {{ onAccountClosureOption.value }} + + + + Action is required + + + + + Payment Type Id + + + {{ paymentType.name }} + + + + Payment Type is required + + + +
+ Show Payment Details + + + + +
+ + + + Account # + + + + + Cheque # + + + + + Routing Code + + + + + Reciept # + + + + + Bank # + + + + + + Note + + + +
+ +
+ + + + + + +
+ +
+ +
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.scss b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.scss new file mode 100644 index 000000000..f76218e04 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-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/close-recurring-deposits-account/close-recurring-deposits-account.component.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.spec.ts new file mode 100644 index 000000000..f66183da7 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CloseRecurringDepositsAccountComponent } from './close-recurring-deposits-account.component'; + +describe('CloseRecurringDepositsAccountComponent', () => { + let component: CloseRecurringDepositsAccountComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CloseRecurringDepositsAccountComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CloseRecurringDepositsAccountComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.ts new file mode 100644 index 000000000..5996d0848 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.ts @@ -0,0 +1,115 @@ +/** 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'; + +/** + * Close Recurring Deposits Account Component + */ +@Component({ + selector: 'mifosx-close-recurring-deposits-account', + templateUrl: './close-recurring-deposits-account.component.html', + styleUrls: ['./close-recurring-deposits-account.component.scss'] +}) +export class CloseRecurringDepositsAccountComponent implements OnInit { + + /** Maturity Amount */ + maturityAmount: any; + /** On Account Closure Options */ + onAccountClosureOptions: any; + /** Payment Types */ + paymentTypes: any; + /** Title */ + title: string; + /** Account Id */ + accountId: string; + /** Show payment details */ + showPaymentDetails = false; + /** Minimum Date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum Date allowed. */ + maxDate = new Date(); + /** Close Recurring Deposit Account form. */ + closeRecurringDepositForm: FormGroup; + + /** + * Retrieves action details 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.maturityAmount = data.recurringDepositsAccountActionData.maturityAmount; + this.onAccountClosureOptions = data.recurringDepositsAccountActionData.onAccountClosureOptions; + this.paymentTypes = data.recurringDepositsAccountActionData.paymentTypeOptions; + if (data.recurringDepositsAccountActionData.maturityAmount) { + this.title = 'Recurring Deposit Closure on Maturity'; + } else { + this.title = 'Recurring Deposit Closure'; + } + }); + this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId']; + } + + ngOnInit() { + this.createcloseRecurringDepositForm(); + } + + /** + * Creates the close form. + */ + createcloseRecurringDepositForm() { + this.closeRecurringDepositForm = this.formBuilder.group({ + 'closedOnDate': [new Date(), Validators.required], + 'maturityAmount': [{ value: this.maturityAmount, disabled: true}], + 'onAccountClosureId': ['', Validators.required], + 'paymentTypeId': ['', Validators.required], + 'accountNumber': '', + 'chequeNumber': '', + 'routingCode': '', + 'receiptNumber': '', + 'bankNumber': '', + 'note': '' + }); + } + + /** + * Toggles the display of payment details + */ + toggleDisplay() { + this.showPaymentDetails = !(this.showPaymentDetails); + } + + /** + * Submits the close recurring deposit form + */ + submit() { + const closedOnDate = this.closeRecurringDepositForm.value.closedOnDate; + const dateFormat = 'yyyy-MM-dd'; + const locale = 'en'; + this.closeRecurringDepositForm.patchValue({ + closedOnDate: this.datePipe.transform(closedOnDate, dateFormat) + }); + const data = { + ...this.closeRecurringDepositForm.value, + dateFormat, + locale + }; + this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'close', 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 c83a2570b..d009effbe 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 @@ -4,4 +4,5 @@ - \ No newline at end of file + + 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 214435386..60f984cf2 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 @@ -16,13 +16,17 @@ export class RecurringDepositsAccountActionsComponent { 'Reject': boolean 'Withdraw By Client': boolean 'Add Charge': boolean + 'Premature Close': boolean + 'Close': boolean } = { 'Activate': false, 'Undo Approval': false, 'Approve': false, 'Reject': false, 'Withdraw By Client': false, - 'Add Charge': false + 'Add Charge': false, + 'Premature Close': false, + 'Close': 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 a876ebc2e..7b203d297 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 @@ -146,6 +146,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit { case 'Add Charge': case 'Withdraw By Client': case 'Premature Close': + case 'Close': 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 bd610dbf3..54e9ae4f2 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits.module.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts @@ -37,6 +37,7 @@ import { AddChargeRecurringDepositsAccountComponent } from './recurring-deposits import { RecurringDepositConfirmationDialogComponent } from './recurring-deposits-account-view/custom-dialogs/recurring-deposit-confirmation-dialog/recurring-deposit-confirmation-dialog.component'; 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'; /** @@ -77,7 +78,8 @@ import { PrematureCloseRecurringDepositAccountComponent } from './recurring-depo AddChargeRecurringDepositsAccountComponent, RecurringDepositConfirmationDialogComponent, EditRecurringDepositAccountComponent, - PrematureCloseRecurringDepositAccountComponent + PrematureCloseRecurringDepositAccountComponent, + CloseRecurringDepositsAccountComponent ], 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 25c71534c..cab026a06 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits.service.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits.service.ts @@ -103,4 +103,13 @@ export class RecurringDepositsService { return this.http.put(`/recurringdepositaccounts/${accountId}`, recurringDepositAccountData); } + /** + * Returns the template for the recurring deposits action + * @param accountId Account Id + * @param command Command + */ + getRecurringDepositAccountActionResource(accountId: any, command: string): Observable { + const httpParams = new HttpParams().set('command', command); + return this.http.get(`/recurringdepositaccounts/${accountId}/template`, { params: httpParams }); + } }