Merge pull request #1821 from internetee/1819-improve-credit-account-balance-overview

Registrar / REPP: Preserve balance after billable action

app/controllers/repp/v1/accounts_controller.rb

@@ -4,8 +4,28 @@ module Repp
       def balance
         resp = { balance: current_user.registrar.cash_account.balance,
                  currency: current_user.registrar.cash_account.currency }
+        resp[:transactions] = activities if params[:detailed] == 'true'
         render_success(data: resp)
       end
+
+      def activities
+        arr = []
+        registrar_activities.each do |a|
+          arr << { created_at: a.created_at, description: a.description,
+                   type: a.activity_type == 'add_credit' ? 'credit' : 'debit',
+                   sum: a.sum, balance: a.new_balance }
+        end
+
+        arr
+      end
+
+      def registrar_activities
+        activities = current_user.registrar.cash_account.activities.order(created_at: :desc)
+        activities = activities.where('created_at >= ?', params[:from]) if params[:from]
+        activities = activities.where('created_at <= ?', params[:until]) if params[:until]
+
+        activities
+      end
     end
   end
 end