diff --git a/app/controllers/api/order_cycles_controller.rb b/app/controllers/api/order_cycles_controller.rb index e9d5c996a0..084d54f44b 100644 --- a/app/controllers/api/order_cycles_controller.rb +++ b/app/controllers/api/order_cycles_controller.rb @@ -10,7 +10,7 @@ module Api distributor, order_cycle, customer, - params + params.slice(:q, :page, :per_page) ).products_json render json: products diff --git a/app/services/products_renderer.rb b/app/services/products_renderer.rb index fe0a97df27..2d64ed4471 100644 --- a/app/services/products_renderer.rb +++ b/app/services/products_renderer.rb @@ -5,11 +5,11 @@ class ProductsRenderer DEFAULT_PAGE = 1 DEFAULT_PER_PAGE = 10 - def initialize(distributor, order_cycle, customer, params = {}) + def initialize(distributor, order_cycle, customer, args = {}) @distributor = distributor @order_cycle = order_cycle @customer = customer - @params = params + @args = args end def products_json @@ -26,7 +26,7 @@ class ProductsRenderer private - attr_reader :order_cycle, :distributor, :customer, :params + attr_reader :order_cycle, :distributor, :customer, :args def products return unless order_cycle @@ -49,10 +49,10 @@ class ProductsRenderer def filter_and_paginate(query) query. - ransack(params[:q]). + ransack(args[:q]). result. - page(params[:page] || DEFAULT_PAGE). - per(params[:per_page] || DEFAULT_PER_PAGE) + page(args[:page] || DEFAULT_PAGE). + per(args[:per_page] || DEFAULT_PER_PAGE) end def distributed_products