diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index f24206cc..852b6398 100755 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -1552,6 +1552,7 @@ "label.heading.prematureclosefixeddepositaccount":"Premature Closure of Fixed Deposit Account", "label.heading.closefixeddepositaccount":"Fixed Deposit Closure on Maturity", "label.heading.closerecurringdepositaccount":"Recurring Deposit Closure on Maturity", + "label.heading.closeopenrecurringdepositaccount":"Recurring Deposit Closure", "label.heading.editrecurringdepositaccounttransaction":"Edit Recurring Account Transaction", "label.heading.editfixeddepositaccounttransaction":"Edit Fixed Deposit Account Transaction", "label.heading.enforceMinRequiredBalance":"Enforce minimum balance", diff --git a/app/scripts/controllers/deposits/recurring/RecurringDepositAccountActionsController.js b/app/scripts/controllers/deposits/recurring/RecurringDepositAccountActionsController.js index b848470b..6423953e 100755 --- a/app/scripts/controllers/deposits/recurring/RecurringDepositAccountActionsController.js +++ b/app/scripts/controllers/deposits/recurring/RecurringDepositAccountActionsController.js @@ -108,8 +108,13 @@ scope.savingsAccounts = data.savingsAccounts; scope.paymentTypes = data.paymentTypeOptions; scope.currency = data.currency; + if(data.maturityAmount){ + scope.title = 'label.heading.closerecurringdepositaccount'; + } else{ + scope.title = 'label.heading.closeopenrecurringdepositaccount'; + } }); - scope.title = 'label.heading.closerecurringdepositaccount'; + scope.labelName = 'label.input.closedon'; scope.modelName = 'closedOnDate'; scope.showDateField = true; diff --git a/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js b/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js index d2e697fe..e049f73d 100755 --- a/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js +++ b/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js @@ -85,6 +85,7 @@ scope.savingaccountdetails.accountChart.chartSlabs = _.sortBy(scope.chartSlabs, function (obj) { return obj.fromPeriod }); + scope.isprematureAllowed = data.maturityDate != null; scope.status = data.status.value; if (scope.status == "Submitted and pending approval" || scope.status == "Active" || scope.status == "Approved") { scope.choice = true; @@ -179,6 +180,13 @@ } } } + + if(!scope.isprematureAllowed){ + scope.buttons.singlebuttons[1] = { + name: "button.close", + icon: "icon-arrow-right" + }; + } } if (data.status.value == "Matured") { diff --git a/app/views/deposits/recurring/recurring_deposit_account_actions.html b/app/views/deposits/recurring/recurring_deposit_account_actions.html index ac151852..2619da9a 100644 --- a/app/views/deposits/recurring/recurring_deposit_account_actions.html +++ b/app/views/deposits/recurring/recurring_deposit_account_actions.html @@ -26,7 +26,7 @@
-
+
diff --git a/app/views/deposits/recurring/viewaccountdetails.html b/app/views/deposits/recurring/viewaccountdetails.html index 6d996a2d..38d7c51f 100755 --- a/app/views/deposits/recurring/viewaccountdetails.html +++ b/app/views/deposits/recurring/viewaccountdetails.html @@ -53,7 +53,8 @@ {{'label.account.deposit.principal.amount' | translate}} - {{savingaccountdetails.currency.displaySymbol}} {{savingaccountdetails.depositAmount | number}} + {{savingaccountdetails.currency.displaySymbol}} {{savingaccountdetails.depositAmount | number}} + {{savingaccountdetails.currency.displaySymbol}} 0 @@ -66,7 +67,7 @@ {{savingaccountdetails.nominalAnnualInterestRate}} - + {{'label.account.maturity.date' | translate}} {{savingaccountdetails.maturityDate | DateFormat}} @@ -79,11 +80,13 @@ {{'label.account.total.deposit' | translate}} - {{savingaccountdetails.currency.displaySymbol}} {{savingaccountdetails.summary.totalDeposits | number}} + {{savingaccountdetails.currency.displaySymbol}} {{savingaccountdetails.summary.totalDeposits | number}} + {{savingaccountdetails.currency.displaySymbol}} 0 {{'label.account..total.withdrawals' | translate}} - {{savingaccountdetails.currency.displaySymbol}} {{savingaccountdetails.summary.totalWithdrawals | number}} + {{savingaccountdetails.currency.displaySymbol}} {{savingaccountdetails.summary.totalWithdrawals | number}} + {{savingaccountdetails.currency.displaySymbol}} 0 @@ -115,7 +118,8 @@ {{'label.totalinterestposted' | translate}} - {{savingaccountdetails.currency.displaySymbol}} {{savingaccountdetails.summary.totalInterestPosted | number}} + {{savingaccountdetails.currency.displaySymbol}} {{savingaccountdetails.summary.totalInterestPosted | number}} + {{savingaccountdetails.currency.displaySymbol}} 0