diff --git a/app/scripts/controllers/deposits/fixed/CreateFixedDepositAccountController.js b/app/scripts/controllers/deposits/fixed/CreateFixedDepositAccountController.js index 72e4ed17..6f02bbb5 100755 --- a/app/scripts/controllers/deposits/fixed/CreateFixedDepositAccountController.js +++ b/app/scripts/controllers/deposits/fixed/CreateFixedDepositAccountController.js @@ -356,6 +356,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, data,chartSlab) { $scope.data = data; $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/scripts/controllers/deposits/fixed/EditDepositAccountController.js b/app/scripts/controllers/deposits/fixed/EditDepositAccountController.js index 8adbf08a..fa209d90 100755 --- a/app/scripts/controllers/deposits/fixed/EditDepositAccountController.js +++ b/app/scripts/controllers/deposits/fixed/EditDepositAccountController.js @@ -406,6 +406,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, data,chartSlab) { $scope.data = data; $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/scripts/controllers/deposits/fixed/ViewFixedDepositAccountDetailsController.js b/app/scripts/controllers/deposits/fixed/ViewFixedDepositAccountDetailsController.js index bed774d4..9dd837c6 100755 --- a/app/scripts/controllers/deposits/fixed/ViewFixedDepositAccountDetailsController.js +++ b/app/scripts/controllers/deposits/fixed/ViewFixedDepositAccountDetailsController.js @@ -247,6 +247,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, chartSlab) { $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/scripts/controllers/deposits/recurring/CreateRecurringDepositAccountController.js b/app/scripts/controllers/deposits/recurring/CreateRecurringDepositAccountController.js index ed5af0a1..7157e864 100755 --- a/app/scripts/controllers/deposits/recurring/CreateRecurringDepositAccountController.js +++ b/app/scripts/controllers/deposits/recurring/CreateRecurringDepositAccountController.js @@ -358,6 +358,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, data,chartSlab) { $scope.data = data; $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/scripts/controllers/deposits/recurring/EditRecurringDepositAccountController.js b/app/scripts/controllers/deposits/recurring/EditRecurringDepositAccountController.js index 30dd4a42..287d5992 100755 --- a/app/scripts/controllers/deposits/recurring/EditRecurringDepositAccountController.js +++ b/app/scripts/controllers/deposits/recurring/EditRecurringDepositAccountController.js @@ -407,6 +407,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, data,chartSlab) { $scope.data = data; $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js b/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js index e48affc8..ac3da9b7 100755 --- a/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js +++ b/app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js @@ -281,6 +281,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, chartSlab) { $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/scripts/controllers/product/InterestRateChartController.js b/app/scripts/controllers/product/InterestRateChartController.js index d70efa49..5da8b17a 100755 --- a/app/scripts/controllers/product/InterestRateChartController.js +++ b/app/scripts/controllers/product/InterestRateChartController.js @@ -42,6 +42,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, chartSlab) { $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/scripts/controllers/product/ViewFixedDepositProductController.js b/app/scripts/controllers/product/ViewFixedDepositProductController.js index 1f328394..8240e224 100755 --- a/app/scripts/controllers/product/ViewFixedDepositProductController.js +++ b/app/scripts/controllers/product/ViewFixedDepositProductController.js @@ -30,6 +30,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, chartSlab) { $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/scripts/controllers/product/ViewRecurringDepositProductController.js b/app/scripts/controllers/product/ViewRecurringDepositProductController.js index cd71eb95..6ea355c2 100755 --- a/app/scripts/controllers/product/ViewRecurringDepositProductController.js +++ b/app/scripts/controllers/product/ViewRecurringDepositProductController.js @@ -30,6 +30,11 @@ var IncentiveCtrl = function ($scope, $modalInstance, chartSlab) { $scope.chartSlab = chartSlab; + _.each($scope.chartSlab.incentives, function (incentive) { + if(!incentive.attributeValueDesc){ + incentive.attributeValueDesc = incentive.attributeValue; + } + }); $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; diff --git a/app/views/deposits/fixed/edit_account_application.html b/app/views/deposits/fixed/edit_account_application.html index 5c6eca67..286cfb83 100755 --- a/app/views/deposits/fixed/edit_account_application.html +++ b/app/views/deposits/fixed/edit_account_application.html @@ -311,8 +311,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}} diff --git a/app/views/deposits/fixed/newapplication.html b/app/views/deposits/fixed/newapplication.html index 0333ff0a..1a6d14f5 100755 --- a/app/views/deposits/fixed/newapplication.html +++ b/app/views/deposits/fixed/newapplication.html @@ -313,8 +313,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}} diff --git a/app/views/deposits/fixed/viewaccountdetails.html b/app/views/deposits/fixed/viewaccountdetails.html index ac3036eb..64f12261 100755 --- a/app/views/deposits/fixed/viewaccountdetails.html +++ b/app/views/deposits/fixed/viewaccountdetails.html @@ -330,8 +330,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}} diff --git a/app/views/deposits/recurring/edit_account_application.html b/app/views/deposits/recurring/edit_account_application.html index 991ed2c5..9db9c4a4 100755 --- a/app/views/deposits/recurring/edit_account_application.html +++ b/app/views/deposits/recurring/edit_account_application.html @@ -349,8 +349,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}} diff --git a/app/views/deposits/recurring/newapplication.html b/app/views/deposits/recurring/newapplication.html index 1a0eeed3..622e4dd9 100755 --- a/app/views/deposits/recurring/newapplication.html +++ b/app/views/deposits/recurring/newapplication.html @@ -349,8 +349,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}} diff --git a/app/views/deposits/recurring/viewaccountdetails.html b/app/views/deposits/recurring/viewaccountdetails.html index 191db088..584e90f0 100755 --- a/app/views/deposits/recurring/viewaccountdetails.html +++ b/app/views/deposits/recurring/viewaccountdetails.html @@ -364,8 +364,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}} diff --git a/app/views/products/interestratecharts.html b/app/views/products/interestratecharts.html index 18b897f8..e987e071 100755 --- a/app/views/products/interestratecharts.html +++ b/app/views/products/interestratecharts.html @@ -65,8 +65,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}} diff --git a/app/views/products/viewfixeddepositproduct.html b/app/views/products/viewfixeddepositproduct.html index c4f1d293..96fa2ab0 100755 --- a/app/views/products/viewfixeddepositproduct.html +++ b/app/views/products/viewfixeddepositproduct.html @@ -291,8 +291,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}} diff --git a/app/views/products/viewrecurringdepositproduct.html b/app/views/products/viewrecurringdepositproduct.html index 24ddd01c..0c9aae3c 100755 --- a/app/views/products/viewrecurringdepositproduct.html +++ b/app/views/products/viewrecurringdepositproduct.html @@ -300,8 +300,7 @@ {{incentiveData.attributeName.code | translate}} {{incentiveData.conditionType.code | translate}} - {{incentiveData.attributeValue}} - {{incentiveData.attributeValueDesc}} + {{incentiveData.attributeValueDesc}} {{incentiveData.incentiveType.code | translate}} {{incentiveData.amount}}