From cbe0193cbfb1dbdba5085d8041ac906993be6315 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 5 Jan 2016 17:57:56 +0200 Subject: [PATCH] 107279984-balance_fix --- app/controllers/admin/account_activities_controller.rb | 8 +++++++- app/views/admin/account_activities/index.haml | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb index 640acf2e7..bb5b72df8 100644 --- a/app/controllers/admin/account_activities_controller.rb +++ b/app/controllers/admin/account_activities_controller.rb @@ -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]) } diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml index 6efefb814..4999fd558 100644 --- a/app/views/admin/account_activities/index.haml +++ b/app/views/admin/account_activities/index.haml @@ -62,7 +62,7 @@ %th{class: 'col-xs-2'} = sort_link(@q, 'sum') %tbody - -total = 0 + -total = @b.sum('sum').to_f - @account_activities.each do |x| %tr %td= link_to(x.account.registrar.try(:code), admin_registrar_path(x.account.registrar)) @@ -79,7 +79,7 @@ %td %td %td{class: 'text-right'}= t(:total) - %td{class: 'text-success'}= total > 0 ? "+#{total} EUR" : "#{total} EUR" + %td{class: total > 0 ? 'text-success' : 'text-danger'}= total > 0 ? "+#{total} EUR" : "#{total} EUR" .row .col-md-12 = paginate @account_activities