From 0fd682c6b94f4269939784ecad5281fc8ad1b0cc Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Wed, 9 Dec 2015 14:00:31 +0200
Subject: [PATCH] 107279984-credit_balance_views

---
 app/controllers/admin/registrars_controller.rb | 2 +-
 app/views/admin/account_activities/index.haml  | 9 +++++++++
 app/views/admin/registrars/index.haml          | 7 +++++--
 app/views/admin/registrars/show.haml           | 3 +++
 config/locales/en.yml                          | 1 +
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb
index c0d28908f..cf8c89505 100644
--- a/app/controllers/admin/registrars_controller.rb
+++ b/app/controllers/admin/registrars_controller.rb
@@ -6,7 +6,7 @@ class Admin::RegistrarsController < AdminController
   end
 
   def index
-    @q = Registrar.ordered.search(params[:q])
+    @q = Registrar.joins(:accounts).ordered.search(params[:q])
     @registrars = @q.result.page(params[:page])
   end
 
diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml
index 35e270dce..521ebf84c 100644
--- a/app/views/admin/account_activities/index.haml
+++ b/app/views/admin/account_activities/index.haml
@@ -55,6 +55,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'sum')
         %tbody
+          -total = 0
           - @account_activities.each do |x|
             %tr
               %td= link_to(x.account.registrar.try(:code), admin_registrar_path(x.account.registrar))
@@ -63,7 +64,15 @@
               %td= l(x.created_at)
               - c = x.sum > 0.0 ? 'text-success' : 'text-danger'
               - s = x.sum > 0.0 ? "+#{x.sum} #{x.currency}" : "#{x.sum} #{x.currency}"
+              -total += x.sum
               %td{class: c}= s
+        - if @account_activities.count > 0
+          %tr
+            %td
+            %td
+            %td
+            %td{class: 'text-right'}= t(:total)
+            %td{class: 'text-success'}= total > 0 ? "+#{total} EUR" : "#{total} EUR"
 .row
   .col-md-12
     = paginate @account_activities
diff --git a/app/views/admin/registrars/index.haml b/app/views/admin/registrars/index.haml
index a2604dbec..8ba45d205 100644
--- a/app/views/admin/registrars/index.haml
+++ b/app/views/admin/registrars/index.haml
@@ -8,15 +8,18 @@
       %table.table.table-hover.table-bordered.table-condensed
         %thead
           %tr
-            %th{class: 'col-xs-6'}
+            %th{class: 'col-xs-4'}
               = sort_link(@q, 'name')
-            %th{class: 'col-xs-6'}
+            %th{class: 'col-xs-4'}
               = sort_link(@q, 'reg_no', t(:reg_no))
+            %th{class: 'col-xs-4'}
+              = t(:credit_balance)
         %tbody
           - @registrars.each do |x|
             %tr
               %td= link_to(x, [:admin, x])
               %td= x.reg_no
+              %td= "#{x.balance}"
 .row
   .col-md-12
     = paginate @registrars
diff --git a/app/views/admin/registrars/show.haml b/app/views/admin/registrars/show.haml
index e3966583f..35938c0c6 100644
--- a/app/views/admin/registrars/show.haml
+++ b/app/views/admin/registrars/show.haml
@@ -32,6 +32,9 @@
           %dt= t(:id)
           %dd= @registrar.code
 
+          %dt= t(:credit_balance)
+          %dd= @registrar.balance
+
   .col-md-6
     .panel.panel-default
       .panel-heading
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 07f4ebc0a..07b8cde24 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -351,6 +351,7 @@ en:
   status: 'Status'
   eedirekt: 'EEDirekt'
   contact: 'Contact'
+  credit_balance: 'Credit balance'
 
   domain_transfer_requested: 'Domain transfer requested!'
   domain_transfer_approved: 'Domain transfer approved!'