fixed conflict

2019-11-18 13:14:01 +06:30
parent 54ab9e0ca5 5702819b8b
commit 5dc93ef2f8
29 changed files with 1699 additions and 1183 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -113,6 +113,7 @@ class HomeController < ApplicationController
    @top_products = Sale.top_bottom_products(today,current_user,@from,@to,@from_time,@to_time,"top").sum('i.qty')
    @bottom_products = Sale.top_bottom_products(today,current_user,@from,@to,@from_time,@to_time,"bottom").sum('i.qty')
    @hourly_sales = Sale.hourly_sales(today,current_user,@from,@to,@from_time,@to_time).sum(:grand_total)
+
    employee_sales = Sale.employee_sales(today,current_user,@from,@to,@from_time,@to_time)
    @employee_sales = []
    if !employee_sales.nil?