Skip to content

Commit 177d45a

Browse files
steinwindesteinwinde
authored
Merge pull request #2545 from JohnAlva/saving_changes
WEB-241: Front End fix on Savings Accounts
2 parents c2ca61e + 85c4b31 commit 177d45a

File tree

3 files changed

+113
-86
lines changed

3 files changed

+113
-86
lines changed

‎src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,16 @@ <h4 class="mat-h4 flex-98">{{ 'labels.heading.Assets' | translate }}</h4>
5252
>
5353
</mifosx-gl-account-selector>
5454

55+
<mifosx-gl-account-selector
56+
class="flex-48"
57+
*ngIf="isAccrualAccounting()"
58+
[inputFormControl]="savingProductAccountingForm.controls.interestReceivableAccountId"
59+
[glAccountList]="assetAccountData"
60+
[required]="true"
61+
[inputLabel]="'Interest Receivable'"
62+
>
63+
</mifosx-gl-account-selector>
64+
5565
<mat-divider class="flex-98"></mat-divider>
5666

5767
<h4 class="mat-h4 flex-98">{{ 'labels.heading.Liabilities' | translate }}</h4>
@@ -153,7 +163,7 @@ <h4 class="mat-h4 flex-98">{{ 'labels.heading.Income' | translate }}</h4>
153163

154164
<div
155165
*ngIf="savingProductAccountingForm.value.advancedAccountingRules"
156-
class="flex-fill layout-row-wrap gap-2percent responsive-column"
166+
class="flex-fill layout-row-wrap gap-1percent responsive-column"
157167
>
158168
<div class="layout-row flex-100">
159169
<h4 class="mat-h4 flex-63">
@@ -215,7 +225,7 @@ <h4 class="mat-h4 flex-63">
215225
</table>
216226
</div>
217227

218-
<div class="flex-100" *ngIf="existCharges()">
228+
<div class="flex-100 layout-row-wrap gap-0percent responsive-column" *ngIf="existCharges()">
219229
<h4 class="mat-h4 flex-63">{{ 'labels.heading.Map Fees to Specific Income Accounts' | translate }}</h4>
220230

221231
<div class="flex-33" *ngIf="existCharges()">
@@ -267,7 +277,7 @@ <h4 class="mat-h4 flex-63">{{ 'labels.heading.Map Fees to Specific Income Accoun
267277
</table>
268278
</div>
269279

270-
<div class="flex-100" *ngIf="existCharges()">
280+
<div class="flex-100 layout-row-wrap gap-0percent responsive-column" *ngIf="existCharges()">
271281
<h4 class="mat-h4 flex-63">
272282
{{ 'labels.heading.Map Penalties to Specific Income Accounts' | translate }}
273283
</h4>

‎src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,10 @@ export class SavingProductAccountingStepComponent implements OnInit {
157157
this.savingProductAccountingForm.patchValue({
158158
feesReceivableAccountId: this.savingProductsTemplate.accountingMappings.feeReceivableAccount.id,
159159
penaltiesReceivableAccountId: this.savingProductsTemplate.accountingMappings.penaltyReceivableAccount.id,
160+
interestReceivableAccountId:
161+
this.savingProductsTemplate.accountingMappings.interestReceivableAccount == null || undefined
162+
? ''
163+
: this.savingProductsTemplate.accountingMappings.interestReceivableAccount.id,
160164
interestPayableAccountId: this.savingProductsTemplate.accountingMappings.interestPayableAccount.id
161165
});
162166
}
@@ -252,6 +256,10 @@ export class SavingProductAccountingStepComponent implements OnInit {
252256
'penaltiesReceivableAccountId',
253257
new UntypedFormControl('', Validators.required)
254258
);
259+
this.savingProductAccountingForm.addControl(
260+
'interestReceivableAccountId',
261+
new UntypedFormControl('', Validators.required)
262+
);
255263
this.savingProductAccountingForm.addControl(
256264
'interestPayableAccountId',
257265
new UntypedFormControl('', Validators.required)
@@ -311,6 +319,7 @@ export class SavingProductAccountingStepComponent implements OnInit {
311319
this.savingProductAccountingForm.removeControl('escheatLiabilityId');
312320
this.savingProductAccountingForm.removeControl('feesReceivableAccountId');
313321
this.savingProductAccountingForm.removeControl('penaltiesReceivableAccountId');
322+
this.savingProductAccountingForm.removeControl('interestReceivableAccountId');
314323
this.savingProductAccountingForm.removeControl('interestPayableAccountId');
315324
}
316325
});

‎src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html‎

Lines changed: 91 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -45,97 +45,105 @@ <h4 class="mat-h4 flex-100">{{ 'labels.heading.Assets' | translate }}</h4>
4545
[withTitle]="'40%'"
4646
>
4747
</mifosx-gl-account-display>
48-
</div>
49-
50-
<h4 class="mat-h4 flex-100">{{ 'labels.heading.Liabilities' | translate }}</h4>
51-
<div class="flex-100 layout-row-wrap responsive-column">
52-
<mifosx-gl-account-display
53-
class="flex-100"
54-
[accountTitle]="'Saving control'"
55-
[glAccount]="accountingMappings.savingsControlAccount"
56-
[withTitle]="'40%'"
57-
>
58-
</mifosx-gl-account-display>
59-
</div>
60-
<div class="flex-100 layout-row-wrap responsive-column">
61-
<mifosx-gl-account-display
62-
class="flex-100"
63-
[accountTitle]="'Savings transfers in suspense'"
64-
[glAccount]="accountingMappings.transfersInSuspenseAccount"
65-
[withTitle]="'40%'"
66-
>
67-
</mifosx-gl-account-display>
68-
</div>
69-
<div class="flex-100 layout-row-wrap responsive-column">
7048
<mifosx-gl-account-display
7149
class="flex-100"
72-
[accountTitle]="'Interest Payable'"
50+
[accountTitle]="'Interest Receivable'"
7351
*ngIf="isAccrualAccounting()"
74-
[glAccount]="accountingMappings.interestPayableAccount"
52+
[glAccount]="accountingMappings.interestReceivableAccount"
7553
[withTitle]="'40%'"
7654
>
7755
</mifosx-gl-account-display>
78-
</div>
79-
<div class="flex-100 layout-row-wrap responsive-column">
80-
<mifosx-gl-account-display
81-
class="flex-100"
82-
[accountTitle]="'Escheat liability'"
83-
*ngIf="accountingMappings.escheatLiabilityAccount"
84-
[glAccount]="accountingMappings.escheatLiabilityAccount"
85-
[withTitle]="'40%'"
86-
>
87-
</mifosx-gl-account-display>
88-
</div>
8956

90-
<h4 class="mat-h4 flex-100">{{ 'labels.heading.Income' | translate }}</h4>
91-
<div class="flex-100 layout-row-wrap responsive-column">
92-
<mifosx-gl-account-display
93-
class="flex-100"
94-
[accountTitle]="'Income from fees'"
95-
[glAccount]="accountingMappings.incomeFromFeeAccount"
96-
[withTitle]="'40%'"
97-
>
98-
</mifosx-gl-account-display>
99-
</div>
100-
<div class="flex-100 layout-row-wrap responsive-column">
101-
<mifosx-gl-account-display
102-
class="flex-100"
103-
[accountTitle]="'Income from penalties'"
104-
[glAccount]="accountingMappings.incomeFromPenaltyAccount"
105-
[withTitle]="'40%'"
106-
>
107-
</mifosx-gl-account-display>
108-
</div>
109-
<div class="flex-100 layout-row-wrap responsive-column">
110-
<mifosx-gl-account-display
111-
class="flex-100"
112-
[accountTitle]="'Income from Interest'"
113-
*ngIf="accountingMappings.incomeFromInterest"
114-
[glAccount]="accountingMappings.incomeFromInterest"
115-
[withTitle]="'40%'"
116-
>
117-
</mifosx-gl-account-display>
118-
</div>
57+
<h4 class="mat-h4 flex-100">{{ 'labels.heading.Liabilities' | translate }}</h4>
58+
<div class="flex-100 layout-row-wrap responsive-column">
59+
<mifosx-gl-account-display
60+
class="flex-100"
61+
[accountTitle]="'Saving control'"
62+
[glAccount]="accountingMappings.savingsControlAccount"
63+
[withTitle]="'40%'"
64+
>
65+
</mifosx-gl-account-display>
66+
</div>
67+
<div class="flex-100 layout-row-wrap responsive-column">
68+
<mifosx-gl-account-display
69+
class="flex-100"
70+
[accountTitle]="'Savings transfers in suspense'"
71+
[glAccount]="accountingMappings.transfersInSuspenseAccount"
72+
[withTitle]="'40%'"
73+
>
74+
</mifosx-gl-account-display>
75+
</div>
76+
<div class="flex-100 layout-row-wrap responsive-column">
77+
<mifosx-gl-account-display
78+
class="flex-100"
79+
[accountTitle]="'Interest Payable'"
80+
*ngIf="isAccrualAccounting()"
81+
[glAccount]="accountingMappings.interestPayableAccount"
82+
[withTitle]="'40%'"
83+
>
84+
</mifosx-gl-account-display>
85+
</div>
86+
<div class="flex-100 layout-row-wrap responsive-column">
87+
<mifosx-gl-account-display
88+
class="flex-100"
89+
[accountTitle]="'Escheat liability'"
90+
*ngIf="accountingMappings.escheatLiabilityAccount"
91+
[glAccount]="accountingMappings.escheatLiabilityAccount"
92+
[withTitle]="'40%'"
93+
>
94+
</mifosx-gl-account-display>
95+
</div>
11996

120-
<h4 class="mat-h4 flex-100">{{ 'labels.heading.Expenses' | translate }}</h4>
121-
<div class="flex-100 layout-row-wrap responsive-column">
122-
<mifosx-gl-account-display
123-
class="flex-100"
124-
[accountTitle]="'Interest on savings'"
125-
[glAccount]="accountingMappings.interestOnSavingsAccount"
126-
[withTitle]="'40%'"
127-
>
128-
</mifosx-gl-account-display>
129-
</div>
130-
<div class="flex-100 layout-row-wrap responsive-column">
131-
<mifosx-gl-account-display
132-
class="flex-100"
133-
[accountTitle]="'Write-off'"
134-
*ngIf="accountingMappings.writeOffAccount"
135-
[glAccount]="accountingMappings.writeOffAccount"
136-
[withTitle]="'40%'"
137-
>
138-
</mifosx-gl-account-display>
97+
<h4 class="mat-h4 flex-100">{{ 'labels.heading.Income' | translate }}</h4>
98+
<div class="flex-100 layout-row-wrap responsive-column">
99+
<mifosx-gl-account-display
100+
class="flex-100"
101+
[accountTitle]="'Income from fees'"
102+
[glAccount]="accountingMappings.incomeFromFeeAccount"
103+
[withTitle]="'40%'"
104+
>
105+
</mifosx-gl-account-display>
106+
</div>
107+
<div class="flex-100 layout-row-wrap responsive-column">
108+
<mifosx-gl-account-display
109+
class="flex-100"
110+
[accountTitle]="'Income from penalties'"
111+
[glAccount]="accountingMappings.incomeFromPenaltyAccount"
112+
[withTitle]="'40%'"
113+
>
114+
</mifosx-gl-account-display>
115+
</div>
116+
<div class="flex-100 layout-row-wrap responsive-column">
117+
<mifosx-gl-account-display
118+
class="flex-100"
119+
[accountTitle]="'Income from Interest'"
120+
*ngIf="accountingMappings.incomeFromInterest"
121+
[glAccount]="accountingMappings.incomeFromInterest"
122+
[withTitle]="'40%'"
123+
>
124+
</mifosx-gl-account-display>
125+
</div>
126+
127+
<h4 class="mat-h4 flex-100">{{ 'labels.heading.Expenses' | translate }}</h4>
128+
<div class="flex-100 layout-row-wrap responsive-column">
129+
<mifosx-gl-account-display
130+
class="flex-100"
131+
[accountTitle]="'Interest on savings'"
132+
[glAccount]="accountingMappings.interestOnSavingsAccount"
133+
[withTitle]="'40%'"
134+
>
135+
</mifosx-gl-account-display>
136+
</div>
137+
<div class="flex-100 layout-row-wrap responsive-column">
138+
<mifosx-gl-account-display
139+
class="flex-100"
140+
[accountTitle]="'Write-off'"
141+
*ngIf="accountingMappings.writeOffAccount"
142+
[glAccount]="accountingMappings.writeOffAccount"
143+
[withTitle]="'40%'"
144+
>
145+
</mifosx-gl-account-display>
146+
</div>
139147
</div>
140148
</div>
141149
</div>

0 commit comments

Comments
 (0)