fix: update sponsor DD approvals, cashier transaction entry, FIU and dividend declaration
This commit is contained in:
@@ -319,9 +319,13 @@
|
||||
[value]="row.amount ?? ''"
|
||||
(input)="row.amount = +$any($event.target).value; syncShareLinkedAmounts()"
|
||||
(click)="$event.stopPropagation()"
|
||||
[placeholder]="row.acTyp === 'SHR' ? '0' : '0.00'"
|
||||
[readonly]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
|
||||
[class.ws-amt-input--locked]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
|
||||
[placeholder]="isMultiDdRow(row) ? 'Per draft' : row.acTyp === 'SHR' ? '0' : '0.00'"
|
||||
[readonly]="
|
||||
isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
|
||||
"
|
||||
[class.ws-amt-input--locked]="
|
||||
isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
|
||||
"
|
||||
/>
|
||||
</div>
|
||||
@if (row.acTyp === 'SHR' && rowSharePrices[row.acNo]) {
|
||||
@@ -331,6 +335,19 @@
|
||||
}}/share</span
|
||||
>
|
||||
}
|
||||
<!-- On a slip the face value belongs to each draft, so the row total is the sum of
|
||||
them and is filled in by the dialog rather than typed here. A clerk-typed
|
||||
figure could disagree with the drafts, and the account would be debited for
|
||||
a total the drafts do not add up to. -->
|
||||
@if (isMultiDdRow(row)) {
|
||||
<span class="ws-f__hint">
|
||||
{{
|
||||
row.ddLines?.length
|
||||
? 'Total of ' + row.ddLines?.length + ' drafts'
|
||||
: 'Set per draft in Fill DD Details'
|
||||
}}
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
@if (row.acTyp === 'SHR' && (row.typ === 'Enter Bank Transfer' || row.typ === 'Fund Transfer')) {
|
||||
<div class="ws-f ws-f--cheqno">
|
||||
@@ -410,9 +427,36 @@
|
||||
<div class="ws-group ws-group--flex">
|
||||
<span class="ws-caption">DD Charges & GST — Admin Rate {{ ddGstPercentage }}%</span>
|
||||
<div class="ws-group__fields">
|
||||
<!-- How many drafts this one debit funds. Typed before the details are filled in,
|
||||
because it is what decides how many beneficiary forms the dialog presents.
|
||||
Offered only where the server can honour it: a member savings/current
|
||||
account debit, never a GL or cash draft. -->
|
||||
@if (canRowBeMultiDd(row)) {
|
||||
<div class="ws-f ws-f--amt">
|
||||
<label class="ws-f__lbl" title="Number of demand drafts to raise against this single debit"
|
||||
>NO. OF DD</label
|
||||
>
|
||||
<div class="ws-amt-wrap">
|
||||
<input
|
||||
class="ws-f__ctl ws-amt-input"
|
||||
type="number"
|
||||
min="1"
|
||||
[max]="maxDdSlipLines"
|
||||
step="1"
|
||||
[value]="ddCountFor(row)"
|
||||
(input)="onDdCountChange(row, +$any($event.target).value)"
|
||||
(click)="$event.stopPropagation()"
|
||||
placeholder="1"
|
||||
/>
|
||||
</div>
|
||||
@if (isMultiDdRow(row)) {
|
||||
<span class="ws-f__hint">One debit · {{ ddCountFor(row) }} drafts</span>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
<div class="ws-f ws-f--amt">
|
||||
<label class="ws-f__lbl" title="DD issuance charges / commission">CHARGES</label>
|
||||
<div class="ws-amt-wrap">
|
||||
<div class="ws-amt-wrap" [class.ws-amt-wrap--locked]="isMultiDdRow(row)">
|
||||
<span class="ws-amt-prefix">₹</span>
|
||||
<input
|
||||
class="ws-f__ctl ws-amt-input"
|
||||
@@ -421,8 +465,15 @@
|
||||
(input)="row.ddCharges = +$any($event.target).value"
|
||||
(click)="$event.stopPropagation()"
|
||||
placeholder="0.00"
|
||||
[readonly]="isMultiDdRow(row)"
|
||||
[class.ws-amt-input--locked]="isMultiDdRow(row)"
|
||||
/>
|
||||
</div>
|
||||
<!-- Charges are levied per draft and can differ between them, so on a slip they
|
||||
are entered against each draft and totalled here. -->
|
||||
@if (isMultiDdRow(row)) {
|
||||
<span class="ws-f__hint">Set per draft</span>
|
||||
}
|
||||
</div>
|
||||
<div class="ws-f ws-f--amt">
|
||||
<label class="ws-f__lbl" title="GST on charges, at the admin-configured rate">
|
||||
@@ -433,7 +484,7 @@
|
||||
<input
|
||||
class="ws-f__ctl ws-amt-input ws-amt-input--locked"
|
||||
type="text"
|
||||
[value]="ddGstAmountFor(row) | number: '1.2-2'"
|
||||
[value]="ddGstDisplayFor(row)"
|
||||
readonly
|
||||
/>
|
||||
</div>
|
||||
@@ -447,7 +498,7 @@
|
||||
<input
|
||||
class="ws-f__ctl ws-amt-input ws-amt-input--locked"
|
||||
type="text"
|
||||
[value]="ddTotalPayableFor(row)"
|
||||
[value]="ddTotalDisplayFor(row)"
|
||||
readonly
|
||||
/>
|
||||
</div>
|
||||
@@ -460,18 +511,27 @@
|
||||
[disabled]="saving"
|
||||
(click)="openIssueWalkinDd(row); $event.stopPropagation()"
|
||||
[title]="
|
||||
isDdAccountDebitRow(row)
|
||||
? 'Auto-selects next available leaflet and opens the beneficiary form'
|
||||
: 'Auto-selects next available leaflet and opens walk-in purchaser form'
|
||||
isMultiDdRow(row)
|
||||
? 'Opens one beneficiary form per draft; DD numbers are allocated on submission'
|
||||
: isDdAccountDebitRow(row)
|
||||
? 'Auto-selects next available leaflet and opens the beneficiary form'
|
||||
: 'Auto-selects next available leaflet and opens walk-in purchaser form'
|
||||
"
|
||||
>
|
||||
<mat-icon style="font-size: 18px; width: 18px; height: 18px">{{
|
||||
row.ddDetails ? 'edit_note' : 'post_add'
|
||||
row.ddDetails || row.ddLines?.length ? 'edit_note' : 'post_add'
|
||||
}}</mat-icon>
|
||||
<!-- Names the leaflet once details are captured, so the clerk can see at a
|
||||
glance which rows are ready before pressing Save. -->
|
||||
glance which rows are ready before pressing Save. A slip names the count
|
||||
instead: its numbers are not allocated until it is submitted. -->
|
||||
<span>{{
|
||||
row.ddDetails ? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details' : 'Fill DD Details'
|
||||
row.ddLines?.length
|
||||
? row.ddLines?.length + ' Drafts Captured · Edit Slip'
|
||||
: row.ddDetails
|
||||
? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details'
|
||||
: isMultiDdRow(row)
|
||||
? 'Fill ' + ddCountFor(row) + ' DD Details'
|
||||
: 'Fill DD Details'
|
||||
}}</span>
|
||||
</button>
|
||||
</div>
|
||||
@@ -1694,10 +1754,12 @@
|
||||
[value]="row.amount ?? ''"
|
||||
(input)="row.amount = +$any($event.target).value; syncShareLinkedAmounts()"
|
||||
(click)="$event.stopPropagation()"
|
||||
[placeholder]="row.acTyp === 'SHR' ? '0' : '0.00'"
|
||||
[readonly]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
|
||||
[placeholder]="isMultiDdRow(row) ? 'Per draft' : row.acTyp === 'SHR' ? '0' : '0.00'"
|
||||
[readonly]="
|
||||
isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
|
||||
"
|
||||
[class.ws-amt-input--locked]="
|
||||
!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)
|
||||
isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
|
||||
"
|
||||
/>
|
||||
</div>
|
||||
@@ -1708,6 +1770,19 @@
|
||||
}}/share</span
|
||||
>
|
||||
}
|
||||
<!-- On a slip the face value belongs to each draft, so the row total is the
|
||||
sum of them and is filled in by the dialog rather than typed here. A
|
||||
clerk-typed figure could disagree with the drafts, and the account would
|
||||
be debited for a total the drafts do not add up to. -->
|
||||
@if (isMultiDdRow(row)) {
|
||||
<span class="ws-f__hint">
|
||||
{{
|
||||
row.ddLines?.length
|
||||
? 'Total of ' + row.ddLines?.length + ' drafts'
|
||||
: 'Set per draft in Fill DD Details'
|
||||
}}
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
@if (
|
||||
row.acTyp === 'SHR' && (row.typ === 'Enter Bank Transfer' || row.typ === 'Fund Transfer')
|
||||
@@ -1772,9 +1847,38 @@
|
||||
<div class="ws-group ws-group--flex">
|
||||
<span class="ws-caption">DD Charges & GST — Admin Rate {{ ddGstPercentage }}%</span>
|
||||
<div class="ws-group__fields">
|
||||
<!-- How many drafts this one debit funds. Typed before the details are filled
|
||||
in, because it is what decides how many beneficiary forms the dialog
|
||||
presents. Offered only where the server can honour it: a member
|
||||
savings/current account debit, never a GL or cash draft. -->
|
||||
@if (canRowBeMultiDd(row)) {
|
||||
<div class="ws-f ws-f--amt">
|
||||
<label
|
||||
class="ws-f__lbl"
|
||||
title="Number of demand drafts to raise against this single debit"
|
||||
>NO. OF DD</label
|
||||
>
|
||||
<div class="ws-amt-wrap">
|
||||
<input
|
||||
class="ws-f__ctl ws-amt-input"
|
||||
type="number"
|
||||
min="1"
|
||||
[max]="maxDdSlipLines"
|
||||
step="1"
|
||||
[value]="ddCountFor(row)"
|
||||
(input)="onDdCountChange(row, +$any($event.target).value)"
|
||||
(click)="$event.stopPropagation()"
|
||||
placeholder="1"
|
||||
/>
|
||||
</div>
|
||||
@if (isMultiDdRow(row)) {
|
||||
<span class="ws-f__hint">One debit · {{ ddCountFor(row) }} drafts</span>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
<div class="ws-f ws-f--amt">
|
||||
<label class="ws-f__lbl" title="DD issuance charges / commission">CHARGES</label>
|
||||
<div class="ws-amt-wrap">
|
||||
<div class="ws-amt-wrap" [class.ws-amt-wrap--locked]="isMultiDdRow(row)">
|
||||
<span class="ws-amt-prefix">₹</span>
|
||||
<input
|
||||
class="ws-f__ctl ws-amt-input"
|
||||
@@ -1783,8 +1887,15 @@
|
||||
(input)="row.ddCharges = +$any($event.target).value"
|
||||
(click)="$event.stopPropagation()"
|
||||
placeholder="0.00"
|
||||
[readonly]="isMultiDdRow(row)"
|
||||
[class.ws-amt-input--locked]="isMultiDdRow(row)"
|
||||
/>
|
||||
</div>
|
||||
<!-- Charges are levied per draft and can differ between them, so on a slip
|
||||
they are entered against each draft and totalled here. -->
|
||||
@if (isMultiDdRow(row)) {
|
||||
<span class="ws-f__hint">Set per draft</span>
|
||||
}
|
||||
</div>
|
||||
<div class="ws-f ws-f--amt">
|
||||
<label class="ws-f__lbl" title="GST on charges, at the admin-configured rate">
|
||||
@@ -1795,7 +1906,7 @@
|
||||
<input
|
||||
class="ws-f__ctl ws-amt-input ws-amt-input--locked"
|
||||
type="text"
|
||||
[value]="ddGstAmountFor(row) | number: '1.2-2'"
|
||||
[value]="ddGstDisplayFor(row)"
|
||||
readonly
|
||||
/>
|
||||
</div>
|
||||
@@ -1809,7 +1920,7 @@
|
||||
<input
|
||||
class="ws-f__ctl ws-amt-input ws-amt-input--locked"
|
||||
type="text"
|
||||
[value]="ddTotalPayableFor(row)"
|
||||
[value]="ddTotalDisplayFor(row)"
|
||||
readonly
|
||||
/>
|
||||
</div>
|
||||
@@ -1822,13 +1933,28 @@
|
||||
[disabled]="saving"
|
||||
(click)="openIssueWalkinDd(row); $event.stopPropagation()"
|
||||
[title]="
|
||||
isDdAccountDebitRow(row)
|
||||
? 'Auto-selects next available leaflet and opens the beneficiary form'
|
||||
: 'Auto-selects next available leaflet and opens walk-in purchaser form'
|
||||
isMultiDdRow(row)
|
||||
? 'Opens one beneficiary form per draft; DD numbers are allocated on submission'
|
||||
: isDdAccountDebitRow(row)
|
||||
? 'Auto-selects next available leaflet and opens the beneficiary form'
|
||||
: 'Auto-selects next available leaflet and opens walk-in purchaser form'
|
||||
"
|
||||
>
|
||||
<mat-icon style="font-size: 18px; width: 18px; height: 18px">post_add</mat-icon>
|
||||
<span>Fill DD Details</span>
|
||||
<mat-icon style="font-size: 18px; width: 18px; height: 18px">{{
|
||||
row.ddDetails || row.ddLines?.length ? 'edit_note' : 'post_add'
|
||||
}}</mat-icon>
|
||||
<!-- Names what has been captured, so the clerk can see at a glance which
|
||||
rows are ready before pressing Save. A slip names its count instead:
|
||||
its numbers are not allocated until it is submitted. -->
|
||||
<span>{{
|
||||
row.ddLines?.length
|
||||
? row.ddLines?.length + ' Drafts Captured · Edit Slip'
|
||||
: row.ddDetails
|
||||
? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details'
|
||||
: isMultiDdRow(row)
|
||||
? 'Fill ' + ddCountFor(row) + ' DD Details'
|
||||
: 'Fill DD Details'
|
||||
}}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user