diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java b/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java index 6854edebb..752a8aedc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java +++ b/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; } diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 89732d77f..134046425 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -180,10 +180,10 @@
-
JD Pay
+
JD Pay
+ ng-bind="totalChannelAmount.jdPayAmount|currency: ' $ '">
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html index a9f28f395..86fdf9740 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html +++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html @@ -140,10 +140,10 @@
-
JD Pay
+
JD Pay
+ ng-bind="totalChannelAmount.jdPayAmount|currency: ' $ '">
diff --git a/src/main/ui/static/config/managers/templates/modify.html b/src/main/ui/static/config/managers/templates/modify.html index c77c3e1a5..d2d86acb7 100644 --- a/src/main/ui/static/config/managers/templates/modify.html +++ b/src/main/ui/static/config/managers/templates/modify.html @@ -60,7 +60,7 @@ -