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

10729984-starting_balance

Browse source
This commit is contained in:
Stas 2015-12-18 13:30:51 +02:00
parent 0fd682c6b9
commit 6909f3d0ef
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,7 @@ class Admin::AccountActivitiesController < AdminController
@q = AccountActivity.includes(:invoice, account: :registrar).search(params[:q]) @q = AccountActivity.includes(:invoice, account: :registrar).search(params[:q])
@q.sorts = 'id desc' if @q.sorts.empty? @q.sorts = 'id desc' if @q.sorts.empty?
@b = AccountActivity.where.not(id: @q.result.map(&:id))
respond_to do |format| respond_to do |format|
format.html { @account_activities = @q.result.page(params[:page]) } format.html { @account_activities = @q.result.page(params[:page]) }

7
app/views/admin/account_activities/index.haml
View file

@ -36,6 +36,13 @@
&nbsp; &nbsp;
%button.btn.btn-default.js-reset-form %button.btn.btn-default.js-reset-form
= t(:clear_fields) = 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 %hr
.row .row

1
config/locales/en.yml
View file

@ -352,6 +352,7 @@ en:
eedirekt: 'EEDirekt' eedirekt: 'EEDirekt'
contact: 'Contact' contact: 'Contact'
credit_balance: 'Credit balance' credit_balance: 'Credit balance'
starting_balance: 'Starting balance'
domain_transfer_requested: 'Domain transfer requested!' domain_transfer_requested: 'Domain transfer requested!'
domain_transfer_approved: 'Domain transfer approved!' domain_transfer_approved: 'Domain transfer approved!'