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

src/main/ui/static/analysis/client_rates.js

@@ -69,9 +69,11 @@ define(['angular', 'echarts', 'jquery', 'uiRouter','./monitoring/analysis-monito
         } else {
             $scope.chooseLastDays(30);
             if($filter('withRole')('1000000000000') && $scope.currentUser.org_id){
+                $scope.org2 = "ALL Organizations"
                 $scope.loadOrgChild();
             }
             if (!$scope.currentUser.org_id) {
+                $scope.org2 = "ALL"
                 $scope.loadOrgs();
             }
             if(!($filter('withRole')('1000000000000') && $scope.currentUser.org_id) || $scope.currentUser.org_id){

src/main/ui/static/analysis/templates/client_rates.html

@@ -16,12 +16,12 @@
                 </div>
                 <div class="input-group" ng-if="('analysis_monitoring.client_rates'|isState) && !currentUser.org_id">
                     <select ng-model="params.org_id" ng-change="params.org_id2 = '';loadBDUsers();loadOrgChild()" class="form-control" ng-options="org.org_id as org.name for org in orgs">
-                        <option value="">All</option>
+                        <option value="">ALL Organizations</option>
                     </select>
                 </div>
                 <div class="input-group" ng-if="(('1000000000000'|withRole) && (orgs_child.length>1)) || (params.org_id && (orgs_child.length>1))">
                     <select ng-model="params.org_id2" ng-change="loadBDUsers()" class="form-control" ng-options="org.org_id as org.name for org in orgs_child">
-                        <option value="">All</option>
+                        <option value="">{{org2}}</option>
                     </select>
                 </div>
                 <div class="input-group">

src/main/ui/static/payment/tradelog/templates/trade_logs.html

@@ -62,7 +62,7 @@
                                                 <select id="org-clild" class="form-control" ng-model="params.org_id"
                                                         ng-options="org.org_id as org.name group by org.type for org in orgs"
                                                         ng-change="params.org_id2 = '';loadOrgs();loadTradeLogs(1)">
-                                                    <option value="">All</option>
+                                                    <option value="">ALL Organizations</option>
                                                 </select>
                                             </div>
 
@@ -70,7 +70,7 @@
                                                 <select id="org-select" class="form-control" ng-model="params.org_id2"
                                                         ng-options="org.org_id as org.name group by org.org_type for org in orgs_child"
                                                         ng-change="loadTradeLogs(1)">
-                                                    <option value="">All</option>
+                                                    <option value="">{{org2}}</option>
                                                 </select>
                                             </div>
 

src/main/ui/static/payment/tradelog/tradelog-manage.js

@@ -77,7 +77,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 $scope.loadTradeLogs(1);
             };
             if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) {
-                /* $scope.showOrg = 'Organization';*/
+                $scope.org2 = "ALL"
                 $http.get('/sys/orgs', {params: {}}).then(function (resp) {
                     $scope.orgs = resp.data;
                 });
@@ -90,6 +90,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 })
             };
             if(($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && ($scope.currentUser.org_id != null)){
+                $scope.org2 = "ALL Organizations"
                 $scope.loadOrgs();
             }