git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove def total_account from sale

Browse Source
This commit is contained in:
Thein Lin Kyaw
2019-11-18 14:00:52 +06:30
parent 5702819b8b
commit 74e29f7c39
4 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/origami/dashboard_controller.rb
View File

@@ -27,7 +27,7 @@ class Origami::DashboardController < BaseOrigamiController
# @total_other_customer = Sale.total_other_customer(today,current_user)
@total_order = Sale.total_order(today,current_user)
@total_accounts = Sale.total_account(today,current_user)
@total_accounts = Account.select("accounts.id as account_id, accounts.title as title")
@account_data = Array.new
if !@total_accounts.nil?
@total_accounts.each do |account|
@@ -36,6 +36,7 @@ class Origami::DashboardController < BaseOrigamiController
@account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
end
end
@total_accounts = @total_accounts.reject.with_index { |x, i| @account_data[i].nil? }
else
@account_data = nil
end