CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(investment): show sent-for-approval message on investment actions

Browse Source
This commit is contained in:
anshul
2026-10-27 17:21:33 +05:30
parent d26cb89c5a
commit ad0a1a0b1d
4 changed files with 121 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/investment/bond-investment/bond-investment.component.ts
+63 -18
View File
@@ -75,6 +75,8 @@ import {
InvestmentValuationDto,
NON_SLR_TYPES,
apiErrorMessage,
awaitingApproval,
sentForApproval,
toHolding,
toInterestTxn,
toPurchaseTxn,
@@ -1003,7 +1005,9 @@ export class BondInvestmentComponent implements OnInit {
this.investmentService.createPurchase(body).subscribe({
next: (res) => {
this.toast(
`Deal ${res.resourceIdentifier} saved — pending settlement. Settle it from Holdings on or after the settlement date.`
awaitingApproval(res)
? sentForApproval('Purchase deal')
: `Deal ${res.resourceIdentifier} saved — pending settlement. Settle it from Holdings on or after the settlement date.`
);
this.activeTab = 'holdings';
this.loadPurchases();
@@ -1116,8 +1120,8 @@ export class BondInvestmentComponent implements OnInit {
next: (res) => {
this.settlingDealId = null;
this.toast(
res.rollbackTransaction
? `Settlement of deal ${h.dealNo} sent for approval (Checker Inbox).`
awaitingApproval(res)
? sentForApproval(`Settlement of deal ${h.dealNo}`)
: `Deal ${h.dealNo} settled and posted to GL (transaction ${res.transactionId}).`
);
this.loadPurchases();
@@ -1136,8 +1140,12 @@ export class BondInvestmentComponent implements OnInit {
return;
}
this.investmentService.deletePurchase(h.id).subscribe({
next: () => {
this.toast(`Deal ${h.dealNo} (Cert No ${h.certNo}) dropped.`);
next: (res) => {
this.toast(
awaitingApproval(res)
? sentForApproval(`Drop of deal ${h.dealNo}`)
: `Deal ${h.dealNo} (Cert No ${h.certNo}) dropped.`
);
this.loadPurchases();
},
error: (err) => this.toast(apiErrorMessage(err))
@@ -1211,7 +1219,11 @@ export class BondInvestmentComponent implements OnInit {
.subscribe({
next: (res) => {
this.redeeming = false;
this.toast(`Deal ${q.dealNo} redeemed — voucher ${res.resourceIdentifier ?? ''}.`);
this.toast(
awaitingApproval(res)
? sentForApproval(`Redemption of deal ${q.dealNo}`)
: `Deal ${q.dealNo} redeemed — voucher ${res.resourceIdentifier ?? ''}.`
);
this.redeemPurchaseId = null;
this.redeemQuote = null;
this.redeemRemarks = '';
@@ -1315,8 +1327,11 @@ export class BondInvestmentComponent implements OnInit {
this.investmentService.postInterest(sc.purchaseId, body).subscribe({
next: (res) => {
this.intPosting = false;
const line = `${r.type === 'COUPON' ? 'Coupon' : 'Provision'} of ${r.intDate}`;
this.toast(
`${r.type === 'COUPON' ? 'Coupon' : 'Provision'} of ${r.intDate} posted — voucher ${res.resourceIdentifier ?? ''}.`
awaitingApproval(res)
? sentForApproval(`${line} voucher`)
: `${line} posted — voucher ${res.resourceIdentifier ?? ''}.`
);
this.retrieveInterestSchedule();
this.loadDueInterest();
@@ -1450,9 +1465,13 @@ export class BondInvestmentComponent implements OnInit {
};
this.savingSale = true;
this.investmentService.createSale(body).subscribe({
next: () => {
next: (res) => {
this.savingSale = false;
this.toast(`Sale saved — settle it on ${this.saleQuote?.settlementDate ?? 'the settlement date'} to post it.`);
this.toast(
awaitingApproval(res)
? sentForApproval('Sale')
: `Sale saved — settle it on ${this.saleQuote?.settlementDate ?? 'the settlement date'} to post it.`
);
this.sale = this.blankSale();
this.saleQuote = null;
this.loadInterestLog();
@@ -1475,6 +1494,10 @@ export class BondInvestmentComponent implements OnInit {
this.investmentService.settleSale(s.id).subscribe({
next: (res) => {
this.busySaleId = null;
if (awaitingApproval(res)) {
this.toast(sentForApproval(`Settlement of the sale of deal ${s.dealNo}`));
return;
}
this.sales = this.sales.filter((x) => x.id !== s.id);
this.toast(`Sale of deal ${s.dealNo} settled — voucher ${res.resourceIdentifier ?? ''}.`);
this.loadPurchases();
@@ -1492,8 +1515,12 @@ export class BondInvestmentComponent implements OnInit {
}
this.busySaleId = s.id;
this.investmentService.deleteSale(s.id).subscribe({
next: () => {
next: (res) => {
this.busySaleId = null;
if (awaitingApproval(res)) {
this.toast(sentForApproval(`Drop of the pending sale of deal ${s.dealNo}`));
return;
}
this.sales = this.sales.filter((x) => x.id !== s.id);
this.toast(`Pending sale of deal ${s.dealNo} dropped.`);
this.loadInterestLog();
@@ -1549,7 +1576,11 @@ export class BondInvestmentComponent implements OnInit {
this.investmentService.writeOff(h.id, { amount, remarks: this.writeoffReason.trim(), locale: 'en' }).subscribe({
next: (res) => {
this.writingOff = false;
this.toast(`Deal ${h.dealNo}: ₹${amount} written off — voucher ${res.resourceIdentifier ?? ''}.`);
this.toast(
awaitingApproval(res)
? sentForApproval(`Write-off of ₹${amount} on deal ${h.dealNo}`)
: `Deal ${h.dealNo}: ₹${amount} written off — voucher ${res.resourceIdentifier ?? ''}.`
);
this.writeoffPurchaseId = null;
this.writeoffAmount = null;
this.writeoffReason = '';
@@ -1594,7 +1625,11 @@ export class BondInvestmentComponent implements OnInit {
.subscribe({
next: (res) => {
this.amortizing = false;
this.toast(`Deal ${d.dealNo}: premium amortised for ${fyEnd} — voucher ${res.resourceIdentifier ?? ''}.`);
this.toast(
awaitingApproval(res)
? sentForApproval(`Premium amortisation of deal ${d.dealNo} for ${fyEnd}`)
: `Deal ${d.dealNo}: premium amortised for ${fyEnd} — voucher ${res.resourceIdentifier ?? ''}.`
);
this.onAmortizeDealChange();
this.loadPurchases();
},
@@ -1645,7 +1680,9 @@ export class BondInvestmentComponent implements OnInit {
next: (res) => {
this.amortizing = false;
this.toast(
`Amortisation for ${this.amortizeFyEnd} posted for ${this.amortizeDue.length} holding(s) — vouchers ${res.resourceIdentifier ?? ''}.`
awaitingApproval(res)
? sentForApproval(`Amortisation for ${this.amortizeFyEnd} (${this.amortizeDue.length} holding(s))`)
: `Amortisation for ${this.amortizeFyEnd} posted for ${this.amortizeDue.length} holding(s) — vouchers ${res.resourceIdentifier ?? ''}.`
);
this.loadAmortizeDue();
this.loadPurchases();
@@ -1721,7 +1758,11 @@ export class BondInvestmentComponent implements OnInit {
.subscribe({
next: (res) => {
this.goiSaving = false;
this.toast(`Deal ${h.dealNo} transferred to ${to.scriptCode} — ${res.resourceIdentifier ?? ''}.`);
this.toast(
awaitingApproval(res)
? sentForApproval(`Transfer of deal ${h.dealNo} to ${to.scriptCode}`)
: `Deal ${h.dealNo} transferred to ${to.scriptCode} — ${res.resourceIdentifier ?? ''}.`
);
this.goiPurchaseId = null;
this.goiToScriptCode = '';
this.goiRemarks = '';
@@ -1794,9 +1835,11 @@ export class BondInvestmentComponent implements OnInit {
next: (res) => {
this.valuationPosting = false;
this.toast(
v.delta === 0
? `Valuation of ${v.valuationDate} recorded; the IDR needed is unchanged, so no voucher.`
: `Valuation of ${v.valuationDate} posted — ${res.resourceIdentifier ?? ''}.`
awaitingApproval(res)
? sentForApproval(`${v.category} valuation of ${v.valuationDate}`)
: v.delta === 0
? `Valuation of ${v.valuationDate} recorded; the IDR needed is unchanged, so no voucher.`
: `Valuation of ${v.valuationDate} posted — ${res.resourceIdentifier ?? ''}.`
);
this.valuationPreview = null;
this.loadValuationRuns();
@@ -1956,7 +1999,9 @@ export class BondInvestmentComponent implements OnInit {
next: (res) => {
this.mfSwitchSaving = false;
this.toast(
`Switched ${this.mfSwitchUnits} units of deal ${h.dealNo} into ${to.scriptCode} — new deal ${res.resourceIdentifier ?? ''}.`
awaitingApproval(res)
? sentForApproval(`Switch of ${this.mfSwitchUnits} units of deal ${h.dealNo} into ${to.scriptCode}`)
: `Switched ${this.mfSwitchUnits} units of deal ${h.dealNo} into ${to.scriptCode} — new deal ${res.resourceIdentifier ?? ''}.`
);
this.mfSwitchPurchaseId = null;
this.mfSwitchUnits = null;