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

src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java

@@ -61,14 +61,14 @@ public class ManagerInfo {
         if (admin) {
             role |= ManagerRole.ADMIN.getMask();
             bd = false;
-            servant = false;
+            //servant = false;
             accountmanager = false;
             orgId = null;
         }
         if (operator) {
             role |= ManagerRole.OPERATOR.getMask();
             bd = false;
-            servant = false;
+            //servant = false;
             accountmanager = false;
             orgId = null;
         }

src/main/ui/static/analysis/templates/trans_analysis.html

@@ -180,10 +180,10 @@
                             </div>
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/wechatpay_sign.png"/>JD Pay</div>
+                                    <div class="description-header text-bold"><img src="/static/images/jd_sign.png"/>JD Pay</div>
                                     <div class="description-text text-red">
                                         <label class="description-text"
-                                               ng-bind="totalChannelAmount.wechatPayAmount|currency: ' $ '"></label>
+                                               ng-bind="totalChannelAmount.jdPayAmount|currency: ' $ '"></label>
                                     </div>
 
                                 </div>

src/main/ui/static/analysis/templates/trans_analysis_monthly.html

@@ -140,10 +140,10 @@
                             </div>
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/wechatpay_sign.png"/>JD Pay</div>
+                                    <div class="description-header text-bold"><img src="/static/images/jd_sign.png"/>JD Pay</div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.wechatPayAmount|currency: ' $ '"></label>
+                                               ng-bind="totalChannelAmount.jdPayAmount|currency: ' $ '"></label>
                                     </div>
 
                                 </div>

src/main/ui/static/config/managers/templates/modify.html

@@ -60,7 +60,7 @@
                         <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.finacial" name="finacial">Accountant
                         </label>
-                        <label ng-if="('00001'|withRole) && !manager.admin && !manager.operator">
+                        <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.servant" name="servant">Service
                         </label>
                         <label ng-if="!manager.admin && !manager.operator">