Merge branch 'hotfix_custom' into develop

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

@@ -14,9 +14,9 @@
                 </div>
 
                 <div class="form-group">
-                    <label class="control-label col-sm-4" for="mch_custom_no">Customs No</label>
+                    <label class="control-label col-sm-4" for="mch_custom_id">Customs No</label>
                     <div class="col-sm-6">
-                        <input class="form-control" ng-model="custom.mch_custom_no"  id="mch_custom_no" type="text">
+                        <input class="form-control" ng-model="custom.mch_custom_id"  id="mch_custom_id" type="text">
                     </div>
                 </div>
 
@@ -27,6 +27,21 @@
                     </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">