zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 17:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

107279984-balance_fix

Browse source
This commit is contained in:
Stas 2016-01-05 17:57:56 +02:00
parent 6909f3d0ef
commit cbe0193cbf
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/admin/account_activities_controller.rb
View file

@ -12,9 +12,15 @@ class Admin::AccountActivitiesController < AdminController
logger.warn('Invalid date')
end
balance_params = params[:q].deep_dup
if balance_params[:created_at_gteq]
balance_params.delete('created_at_gteq')
end
@q = AccountActivity.includes(:invoice, account: :registrar).search(params[:q])
@q.sorts = 'id desc' if @q.sorts.empty?
@b = AccountActivity.where.not(id: @q.result.map(&:id))
@b = AccountActivity.search(balance_params).result.where.not(id: @q.result.map(&:id))
respond_to do |format|
format.html { @account_activities = @q.result.page(params[:page]) }