Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java

@@ -375,7 +375,7 @@ public class PartnerViewController {
         return clientManager.getCheckClientInfo(account.getIntValue("client_id"),account.getString("account_id"),"PC");
     }
 
-    @PartnerMapping(value = "/agree/confirm", method = RequestMethod.POST,roles = PartnerRole.ADMIN)
+    @PartnerMapping(value = "/agree/confirm", method = RequestMethod.POST,roles = {PartnerRole.ADMIN, PartnerRole.MANAGER})
     @ResponseBody
     public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) {
         clientContractService.confirmSourceAgreement(account.getIntValue("client_id"),account.getString("account_id"),"PC");

src/main/ui/static/boot/indexMainApp.js

@@ -131,7 +131,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
 
                 });
             };
-            // $scope.getAgStatus();
+            if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) {
+                $scope.getAgStatus();
+            }
             $scope.refundNotice = {counts: 0};
             $scope.openRefundNotice = false;
             $scope.showRefundNotice = function () {