3541

Gruntfile.js

@@ -349,24 +349,19 @@ module.exports = function(grunt) {
       }
     },
 
-    devcode: {
-      options: {
-        html: true,        // html files parsing?
-        js: true,          // javascript files parsing?
-        css: false,         // css files parsing?
-        clean: true,       // removes devcode comments even if code was not removed
-        block: {
-          open: 'devcode', // with this string we open a block of code
-          close: 'endcode' // with this string we close a block of code
-        },
-        dest: 'dist'       // default destination which overwrittes environment variable
-      },
-      dist : {             // settings for task used with 'devcode:dist'
+    preprocess: {
+
+      dist: {
+        src: ['dist/**/*.js','dist/**/*.html','dist/*.js','dist/*.html'],
+        dst: ['dist/'],
         options: {
-            source: 'dist/',
-            dest: 'dist/',
-            env: 'production'
+            inline: true,
+            context: {
+              DEBUG: false,
+              NODE_ENV: 'production'
+            }
         }
+
       }
     },
 
@@ -425,7 +420,7 @@ module.exports = function(grunt) {
 
   // Default task(s).
   grunt.registerTask('default', ['clean', 'jshint', 'copy:dev']);
-  grunt.registerTask('prod', ['clean:dist', 'clean:server', 'compass:dist', 'copy:prod', 'copy:tests', 'concat', 'uglify:prod', 'devcode:dist', 'hashres','replace']);
+  grunt.registerTask('prod', ['clean:dist', 'clean:server', 'compass:dist', 'copy:prod', 'copy:tests', 'concat', 'uglify:prod', 'preprocess:dist', 'hashres', 'replace']);
   grunt.registerTask('dev', ['clean', 'compass:dev', 'copy:dev']);
   grunt.registerTask('test', ['karma']);
   grunt.registerTask('deploy', ['prod', 'gh-pages']);

app/scripts/controllers/client/ViewClientController.js

@@ -282,7 +282,7 @@
 
 
             scope.entitySubTypeFilter = function (datatable) {
-                if (datatable.entitySubType === scope.entitySubType) {
+                if (datatable.entitySubType.toLowerCase() === scope.entitySubType.toLowerCase()) {
                     return true;
                 }
             }

app/scripts/controllers/product/CreateLoanProductController.js

@@ -64,7 +64,7 @@
                 scope.formData.amortizationType = scope.product.amortizationType.id;
                 scope.formData.interestType = scope.product.interestType.id;
                 scope.formData.interestCalculationPeriodType = scope.product.interestCalculationPeriodType.id;
-                scope.formData.transactionProcessingStrategyId = scope.product.transactionProcessingStrategyOptions[0].id;
+                scope.formData.transactionProcessingStrategyCode = scope.product.transactionProcessingStrategyOptions[0].code;
                 scope.formData.principalVariationsForBorrowerCycle = scope.product.principalVariationsForBorrowerCycle;
                 scope.formData.interestRateVariationsForBorrowerCycle = scope.product.interestRateVariationsForBorrowerCycle;
                 scope.formData.numberOfRepaymentVariationsForBorrowerCycle = scope.product.numberOfRepaymentVariationsForBorrowerCycle;
@@ -360,7 +360,7 @@
                 scope.selectedConfigurableAttributes =
                 {amortizationType:scope.amortization,
                     interestType:scope.interestMethod,
-                    transactionProcessingStrategyId:scope.transactionProcessingStrategy,
+                    transactionProcessingStrategyCode:scope.transactionProcessingStrategy,
                     interestCalculationPeriodType:scope.interestCalcPeriod,
                     inArrearsTolerance:scope.arrearsTolerance,
                     repaymentEvery:scope.repaymentFrequency,
@@ -377,6 +377,7 @@
                 this.formData.startDate = reqFirstDate;
                 this.formData.closeDate = reqSecondDate;
                 this.formData.rates = scope.rates;
+                this.formData.transactionProcessingStrategyCode = scope.formData.transactionProcessingStrategyCode;
 
                 //Interest recalculation data
                 if (this.formData.isInterestRecalculationEnabled) {

app/scripts/controllers/product/EditLoanProductController.js

@@ -77,7 +77,7 @@
                     interestCalculationPeriodType: scope.product.interestCalculationPeriodType.id,
                     allowPartialPeriodInterestCalcualtion:scope.product.allowPartialPeriodInterestCalcualtion,
                     inArrearsTolerance: scope.product.inArrearsTolerance,
-                    transactionProcessingStrategyId: scope.product.transactionProcessingStrategyId,
+                    transactionProcessingStrategyCode: scope.product.transactionProcessingStrategyCode,
                     graceOnPrincipalPayment: scope.product.graceOnPrincipalPayment,
                     graceOnInterestPayment: scope.product.graceOnInterestPayment,
                     graceOnInterestCharged: scope.product.graceOnInterestCharged,
@@ -143,7 +143,7 @@
                     scope.interestMethod = scope.product.allowAttributeOverrides.interestType;
                     scope.graceOnPrincipalAndInterest = scope.product.allowAttributeOverrides.graceOnPrincipalAndInterestPayment;
                     scope.repaymentFrequency = scope.product.allowAttributeOverrides.repaymentEvery;
-                    scope.transactionProcessingStrategy = scope.product.allowAttributeOverrides.transactionProcessingStrategyId;
+                    scope.transactionProcessingStrategy = scope.product.allowAttributeOverrides.transactionProcessingStrategyCode;
                 }
                 if(scope.amortization || scope.arrearsTolerance || scope.graceOnArrearsAgeing ||
                 scope.interestCalcPeriod || scope.interestMethod || scope.graceOnPrincipalAndInterest ||
@@ -512,7 +512,7 @@
                 scope.selectedConfigurableAttributes = 
 		{amortizationType:scope.amortization,
                     interestType:scope.interestMethod,
-                    transactionProcessingStrategyId:scope.transactionProcessingStrategy,
+                    transactionProcessingStrategyCode:scope.transactionProcessingStrategy,
                     interestCalculationPeriodType:scope.interestCalcPeriod,
                     inArrearsTolerance:scope.arrearsTolerance,
                     repaymentEvery:scope.repaymentFrequency,

app/views/products/createloanproduct.html

@@ -698,11 +698,11 @@
                 </label>
 
                 <div class="col-sm-2">
-                    <select id="transactionProcessingStrategyId" ng-model="formData.transactionProcessingStrategyId"
+                    <select id="transactionProcessingStrategyCode" ng-model="formData.transactionProcessingStrategyCode"
                             class="form-control"
-                            ng-options="transactionProcessingStrategy.id as transactionProcessingStrategy.name for transactionProcessingStrategy in product.transactionProcessingStrategyOptions"
-                            ng-change = "loanproduct.transactionProcessingStrategy.name = formValue(product.transactionProcessingStrategyOptions,formData.transactionProcessingStrategyId,'id','name')"
-                            value="{{transactionProcessingStrategy.id}}"></select>
+                            ng-options="transactionProcessingStrategy.code as transactionProcessingStrategy.name for transactionProcessingStrategy in product.transactionProcessingStrategyOptions"
+                            ng-change = "loanproduct.transactionProcessingStrategy.name = formValue(product.transactionProcessingStrategyOptions,formData.transactionProcessingStrategyCode,'code','name')"
+                            value="{{transactionProcessingStrategy.code}}"></select>
                 </div>
             </div>
             <div class="form-group">

app/views/products/editloanproduct.html

@@ -549,10 +549,10 @@ <h3>{{ 'label.heading.settings' | translate }}</h3>
             class="required">*</span></label>
 
     <div class="col-sm-2">
-        <select id="transactionProcessingStrategyId" ng-model="formData.transactionProcessingStrategyId"
+        <select id="transactionProcessingStrategyCode" ng-model="formData.transactionProcessingStrategyCode"
                 class="form-control"
-                ng-options="transactionProcessingStrategy.id as transactionProcessingStrategy.name for transactionProcessingStrategy in product.transactionProcessingStrategyOptions"
-                value="{{transactionProcessingStrategy.id}}"/>
+				ng-options="transactionProcessingStrategy.code as transactionProcessingStrategy.name for transactionProcessingStrategy in product.transactionProcessingStrategyOptions"
+				value="{{transactionProcessingStrategy.code}}"/>
     </div>
 </div>
     <div class="form-group">

package.json

@@ -21,7 +21,7 @@
     "grunt-contrib-requirejs": "1.0.0",
     "grunt-contrib-uglify": "5.0.0",
     "grunt-contrib-watch": "1.1.0",
-    "grunt-devcode": "0.0.4",
+    "grunt-preprocess": "5.1.0",
     "grunt-gh-pages": "4.0.0",
     "grunt-hashres": "0.4.1",
     "grunt-html-validation": "0.1.18",