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

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

@@ -42,6 +42,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                         })
                     }
                     connectWebSocket();
+                    if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) {
+                        $scope.getAgStatus();
+                    }
                 }, function (resp) {
                     if (resp.status == 403) {
                         location.href = 'login.html?f=' + encodeURIComponent(location.href);
@@ -131,7 +134,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
 
                 });
             };
-            // $scope.getAgStatus();
+
             $scope.refundNotice = {counts: 0};
             $scope.openRefundNotice = false;
             $scope.showRefundNotice = function () {

src/main/ui/static/templates/payment/success.js

@@ -55,10 +55,10 @@ $(function () {
                 method: 'GET',
                 dataType: 'text',
                 success: function (data) {
-                    if (data > 0) {
-                        $('.points-dialog .points-value').html('+ ' + data);
-                        $('.points-dialog').removeClass('hide');
-                    }
+                    // if (data > 0) {
+                    //     $('.points-dialog .points-value').html('+ ' + data);
+                    //     $('.points-dialog').removeClass('hide');
+                    // }
 
                 }, error: function () {
                 }