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

src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java

@@ -91,14 +91,13 @@ public class ClientContractServiceImpl implements ClientContractService {
             record.put("sign_channel", channel);
             record.put("confirm_time", now);
             record.put("expiry_date", DateUtils.addYears(now, 1));
-            record.put("sign_channel", channel);
             record.put("signatory", account.getString("display_name"));
             contract = record;
             clientsContractMapper.save(record);
         }
 
         getOrGenerateSourceAgreement(client_id, channel);
-        logger.info("confirmSourceAgreement+account_id"+account_id);
+        logger.info("confirmSourceAgreement+client_id+client_id"+client_id+","+account_id);
         contract.put("has_sign", 1);
         contract.put("sign_account_id", account_id);
         contract.put("sign_channel", channel);

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

@@ -45,6 +45,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     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);