From 6909f3d0ef19be4a05cbd26476a4b0d838536404 Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 18 Dec 2015 13:30:51 +0200 Subject: [PATCH] 10729984-starting_balance --- app/controllers/admin/account_activities_controller.rb | 1 + app/views/admin/account_activities/index.haml | 7 +++++++ config/locales/en.yml | 1 + 3 files changed, 9 insertions(+) diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb index 1c447d8a6..640acf2e7 100644 --- a/app/controllers/admin/account_activities_controller.rb +++ b/app/controllers/admin/account_activities_controller.rb @@ -14,6 +14,7 @@ class Admin::AccountActivitiesController < AdminController @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)) 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 521ebf84c..6efefb814 100644 --- a/app/views/admin/account_activities/index.haml +++ b/app/views/admin/account_activities/index.haml @@ -36,6 +36,13 @@   %button.btn.btn-default.js-reset-form = t(:clear_fields) +.row + .col-md-3 + .col-md-3 + .col-md-2 + .col-md-4{class: 'text-right'} + = t(:starting_balance) + " #{@b.sum('sum').to_f} EUR" + %hr .row diff --git a/config/locales/en.yml b/config/locales/en.yml index 07b8cde24..fbfc09780 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -352,6 +352,7 @@ en: eedirekt: 'EEDirekt' contact: 'Contact' credit_balance: 'Credit balance' + starting_balance: 'Starting balance' domain_transfer_requested: 'Domain transfer requested!' domain_transfer_approved: 'Domain transfer approved!'