diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index 50a45ae3d7..8ae1a76896 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -183,6 +183,14 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $scope.page = 1 $scope.refreshData() + $scope.resetSelectedUnitsVariant = -> + $scope.selectedUnitsProduct = { } + $scope.selectedUnitsVariant = { } + $scope.filterByVariantId = null + $scope.sharedResource = false + $scope.page = 1 + $scope.refreshData() + $scope.getLineItemScale = (lineItem) -> if lineItem.units_product && lineItem.units_variant && (lineItem.units_product.variant_unit == "weight" || lineItem.units_product.variant_unit == "volume") lineItem.units_product.variant_unit_scale diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index e722459903..447737cf5a 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -70,7 +70,7 @@ %h6.text-center{ 'ng-hide' => 'sharedResource' } {{ selectedUnitsVariant.full_name }} .three.columns %h6.text-right - %a{ :href => '#', 'ng-click' => 'selectedUnitsVariant = {};selectedUnitsProduct = {};sharedResource=false;' }= t('admin.clear') + %a{ :href => '#', 'ng-click' => 'resetSelectedUnitsVariant()' }= t('admin.clear') %hr .row .one.columns.alpha