diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 73495c70..9cca8f1c 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -72,7 +72,14 @@ class HomeController < ApplicationController # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p') # .sum(:grand_total) @employee_sales = Sale.employee_sales(today).sum(:grand_total) - @inventories = StockJournal.inventory_balances(today).sum(:balance) + @inventories = StockJournal.inventory_balances(today).sum(:balance) + + @total_sale = Sale.total_sale(today) + @total_count = Sale.total_count(today) + + puts @grand_total.to_json + puts @total_count + puts "ssssssssssss" end def destroy diff --git a/app/models/sale.rb b/app/models/sale.rb index d0004954..306592c2 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -867,6 +867,15 @@ end .order('e.name ASC') end + def self.total_sale(today) + total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).sum("grand_total") + + end + + def self.total_count(today) + total = Sale.where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today).count + end + private def generate_custom_id diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 0bffc868..7dda39a4 100755 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -8,11 +8,11 @@