Fix CC issues

This commit is contained in:
Karl Erik Õunapuu 2021-02-18 11:22:59 +02:00
parent 7b4214def1
commit 47cd7cc4f7
No known key found for this signature in database
GPG key ID: C9DD647298A34764
2 changed files with 26 additions and 28 deletions

View file

@ -4,34 +4,28 @@ module Repp
def balance
resp = { balance: current_user.registrar.cash_account.balance,
currency: current_user.registrar.cash_account.currency }
resp[:activities] = activities if params[:detailed] == 'true'
render_success(data: resp)
end
def activity
resp = { balance: current_user.registrar.cash_account.balance,
currency: current_user.registrar.cash_account.currency }
resp[:activities] = activities
resp[:transactions] = activities if params[:detailed] == 'true'
render_success(data: resp)
end
def 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]
arr = []
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,
}
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