diff --git a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee index ad5bfff97d..fe85d427fd 100644 --- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee @@ -8,6 +8,8 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, {id: 50, name: t('js.admin.orders.index.per_page', results: 50)}, {id: 100, name: t('js.admin.orders.index.per_page', results: 100)} ] + $scope.selected = {} + $scope.select_all = false $scope.initialise = -> $scope.per_page = 15 @@ -36,6 +38,11 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, RequestMonitor, page: page }) + $scope.toggleAll = -> + $scope.select_all = !$scope.select_all + $scope.orders.forEach (order) -> + $scope.selected[order.id] = $scope.select_all + $scope.$watch 'sortOptions', (sort) -> if sort && sort.predicate != "" $scope.sorting = sort.predicate + ' desc' if sort.reverse diff --git a/app/views/spree/admin/orders/index.html.haml b/app/views/spree/admin/orders/index.html.haml index 3c0efc3793..47635c4a86 100644 --- a/app/views/spree/admin/orders/index.html.haml +++ b/app/views/spree/admin/orders/index.html.haml @@ -24,6 +24,9 @@ %col{style: "width: 10%"} %thead %tr + %th + = t('.select_all') + %input{type: 'checkbox', 'ng-click' => 'toggleAll()'} %th = t(:products_distributor) %th @@ -39,6 +42,8 @@ %th.actions %tbody %tr{ng: {repeat: 'order in orders track by $index', class: {even: "'even'", odd: "'odd'"}}, 'ng-class' => "'state-{{order.state}}'"} + %td.align-center + %input{type: 'checkbox', 'ng-model' => 'selected[order.id]'} %td.align-center {{order.distributor_name}} %td.align-center diff --git a/config/locales/en.yml b/config/locales/en.yml index b226b15044..6f13fd6291 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2695,6 +2695,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using no_orders_found: "No Orders Found" results_found: "%{number} Results found." viewing: "Viewing %{start} to %{end}." + select_all: "Select All" invoice: issued_on: Issued on tax_invoice: TAX INVOICE