Merge branch 'hotfix_custom' into develop

src/main/ui/static/activity/encourage/templates/encourage_detail.html

@@ -9,7 +9,7 @@
     </section>
     <section class="content">
         <div class="box box-primary">
-            <div class="box-header">Parameters <a role="button" title="Edit" ng-click="modifyEvent()"><i class="fa fa-edit"></i></a></div>
+            <div class="box-header">Parameters <a role="button" ng-if="('1'|withRole)" title="Edit" ng-click="modifyEvent()"><i class="fa fa-edit"></i></a></div>
             <div class="box-body">
                 <div class="row">
                     <div class="col-xs-4 col-sm-3">From:{{event.parameters.from_date|limitTo:10}}</div>

src/main/ui/static/payment/custom/templates/custom_detail.html

@@ -27,24 +27,6 @@
                     </div>
                 </div>
 
-
-
-
-                <div class="form-group">
-                    <label class="control-label col-sm-4" for="mch_ext_custom_id">Merchant Custom Record Name</label>
-                    <div class="col-sm-6">
-                        <input class="form-control" ng-model="custom.mch_ext_custom_id"  id="mch_ext_custom_id" type="text">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label class="control-label col-sm-4" for="mch_ext_custom_name">Merchant Custom Record Name</label>
-                    <div class="col-sm-6">
-                        <input class="form-control" ng-model="custom.mch_ext_custom_name"  id="mch_ext_custom_name" type="text">
-                    </div>
-                </div>
-
-
                 <div class="form-group">
                     <label class="control-label col-sm-4" for="has_sub">Split</label>
                     <div class="col-sm-6">