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

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

@@ -121,7 +121,18 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     $scope.loadPartnerNotice();
                 })
             };
-            //$scope.showAG();
+
+            $scope.getAgStatus = function () {
+                $http.get('/sys/partners/check').then(function (resp) {
+                    // $scope.rate_expire = resp.data.rate_expire;
+                    $scope.rate_waring = resp.data.rate_waring;
+                    // $scope.file_url = resp.data.file_url;
+                    if($scope.rate_waring){
+                        $scope.showAG(resp.data);
+                    }
+                });
+            };
+            $scope.getAgStatus();
             $scope.refundNotice = {counts: 0};
             $scope.openRefundNotice = false;
             $scope.showRefundNotice = function () {
@@ -292,9 +303,13 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     }]);
 
     app.controller('agreementDetailCtrl', ['$scope', '$http', '$sce', 'ag', function ($scope, $http, $sce, ag) {
+        $scope.ag = angular.copy(ag);
         $scope.agreeCheck = false;
         $scope.agree = function () {
-            $scope.$close();
+            $http.post('/sys/partners/agree/confirm').then(function () {
+            }, function (resp) {
+                $scope.$close();
+            })
         };
         $scope.notAgree = function () {
             window.location.href = "https://mpay.royalpay.com.au";

src/main/ui/static/commons/templates/ag_detail.html

@@ -4,7 +4,7 @@
 <div class="modal-body">
     <div class="row">
         <div class="col-xs-12">
-            <embed src="https://file.royalpay.com.au/open/2017/08/23/1503492220481_7PDsaYCYR9aKrOf1IrwouX0clmGW6e.pdf" type="application/pdf" width="100%" height="500px">
+            <embed ng-src="{{ag.file_url}}" type="application/pdf" width="100%" height="500px">
         </div>
     </div>
 </div>
@@ -14,6 +14,7 @@
         <input type="checkbox" ng-model="agreeCheck"> 我已阅读完合同内容，并同意相关条款
     </label>
     <button class="btn btn-success" type="button" ng-if="agreeCheck" ng-click="agree()">我同意 | I Agree</button>
-    <button class="btn btn-danger" type="button" ng-click="notAgree()">不同意，退出</button>
+    <button ng-if="ag.rate_expire" class="btn btn-danger" type="button" ng-click="notAgree()">不同意，退出 | Login Out</button>
+    <button ng-if="!ag.rate_expire && ag.rate_waring" class="btn btn-danger" type="button" ng-click="$dismiss()">取消 | Cancel</button>
     </div>
 </div>