Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

src/main/ui/static/payment/partner/templates/partner_new_rate.html

@@ -160,6 +160,30 @@
                     </div>
                 </div>
 
+                <div class="form-group"
+                     ng-class="{'has-error':rate_form.hf_rate_value.$invalid && rate_form.hf_rate_value.$dirty}">
+                    <label class="control-label col-sm-4" for="Rpay_rate_value_input">Rpay+ Rate Value</label>
+                    <div class="col-sm-6">
+                        <div class="input-group">
+                            <input type="number" name="jd_rate_value" stringToNumber2 class="form-control" ng-model="rate.Rpay_rate_value"
+                                   min="0.6" max="2.2" step="0.1" id="Rpay_rate_value_input" required>
+                            <div class="input-group-addon">%</div>
+                        </div>
+                        <div ng-messages="rate_form.hf_rate_value.$error" ng-if="rate_form.hf_rate_value.$dirty">
+                            <div class="small text-danger" ng-message="max">
+                                <i class="glyphicon glyphicon-alert"></i> No more than 2.2%
+                            </div>
+                            <div class="small text-danger" ng-message="min">
+                                <i class="glyphicon glyphicon-alert"></i> No less than 0.6%
+                            </div>
+                            <div class="small text-danger" ng-message="required">
+                                <i class="glyphicon glyphicon-alert"></i> Required Field
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label class="control-label col-sm-4" for="active_time_input">Active Date</label>
                     <div class="col-sm-6">

src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html

@@ -95,7 +95,7 @@
             <div class="box-solid">
                 <div class="box box-warning">
                     <div class="box-header">
-                        <h3 class="box-title pull-left" ng-if="partner.rpay_enterprise_id">
+                        <h3 class="box-title pull-left">
                             Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}}
                             <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
                         </h3>