From 3959f16d6532abc77a95e6d714a7c3c3357a0fc3 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Fri, 29 Nov 2019 12:22:50 +0000 Subject: [PATCH] Switch some more references from Permissions to Permissions::Order --- app/controllers/admin/bulk_line_items_controller.rb | 5 +++-- app/services/search_orders.rb | 2 +- lib/open_food_network/order_and_distributor_report.rb | 2 +- lib/open_food_network/sales_tax_report.rb | 2 +- lib/open_food_network/xero_invoices_report.rb | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/bulk_line_items_controller.rb b/app/controllers/admin/bulk_line_items_controller.rb index e7b4237652..86a2f539e2 100644 --- a/app/controllers/admin/bulk_line_items_controller.rb +++ b/app/controllers/admin/bulk_line_items_controller.rb @@ -5,10 +5,11 @@ module Admin def index order_params = params[:q].andand.delete :order - orders = OpenFoodNetwork::Permissions.new(spree_current_user). + order_permissions = ::Permissions::Order.new(spree_current_user) + orders = order_permissions. editable_orders.ransack(order_params).result - line_items = OpenFoodNetwork::Permissions.new(spree_current_user). + line_items = order_permissions. editable_line_items.where(order_id: orders). includes(variant: { option_values: :option_type }). ransack(params[:q]).result. diff --git a/app/services/search_orders.rb b/app/services/search_orders.rb index 5d4f834cc0..4ff0f717da 100644 --- a/app/services/search_orders.rb +++ b/app/services/search_orders.rb @@ -24,7 +24,7 @@ class SearchOrders attr_reader :params, :current_user def fetch_orders - @search = OpenFoodNetwork::Permissions.new(current_user).editable_orders.ransack(params[:q]) + @search = ::Permissions::Order.new(current_user).editable_orders.ransack(params[:q]) return paginated_results if using_pagination? diff --git a/lib/open_food_network/order_and_distributor_report.rb b/lib/open_food_network/order_and_distributor_report.rb index d0b00d08b0..529cf7a6f9 100644 --- a/lib/open_food_network/order_and_distributor_report.rb +++ b/lib/open_food_network/order_and_distributor_report.rb @@ -5,7 +5,7 @@ module OpenFoodNetwork @user = user @render_table = render_table - @permissions = OpenFoodNetwork::Permissions.new(user) + @permissions = ::Permissions::Order.new(user) end def header diff --git a/lib/open_food_network/sales_tax_report.rb b/lib/open_food_network/sales_tax_report.rb index af6ef44bf7..1ce3f860dd 100644 --- a/lib/open_food_network/sales_tax_report.rb +++ b/lib/open_food_network/sales_tax_report.rb @@ -34,7 +34,7 @@ module OpenFoodNetwork end def search - permissions = OpenFoodNetwork::Permissions.new(user) + permissions = ::Permissions::Order.new(user) permissions.editable_orders.complete.not_state(:canceled).search(params[:q]) end diff --git a/lib/open_food_network/xero_invoices_report.rb b/lib/open_food_network/xero_invoices_report.rb index 36bbdf9fe8..6a05c3e296 100644 --- a/lib/open_food_network/xero_invoices_report.rb +++ b/lib/open_food_network/xero_invoices_report.rb @@ -19,7 +19,7 @@ module OpenFoodNetwork end def search - permissions = OpenFoodNetwork::Permissions.new(@user) + permissions = ::Permissions::Order.new(@user) permissions.editable_orders.complete.not_state(:canceled).search(@opts[:q]) end