Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/models/employee.rb

@@ -33,8 +33,6 @@ class Employee < ApplicationRecord
         return user
       end
     end
-
-
     return nil
 
   end
@@ -43,6 +41,7 @@ class Employee < ApplicationRecord
     if (session_token)
       user = Employee.find_by_token_session(session_token)
       expiry_time = login_expiry_time
+
       if user && user.session_expiry.utc > DateTime.now.utc
         #Extend the login time each time authenticatation take place
         user.session_expiry = user.session_expiry.utc + expiry_time.minutes

app/models/sale.rb

@@ -2878,7 +2878,7 @@ end
     query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id")
                  .joins("join orders as orders on orders.order_id = sale_orders.order_id")
     query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' AND orders.source =? ","#{type}")
-    query = query.where("DATE_FORMAT(sales.created_at,'%Y-%m-%d') = ? ",DateTime.now.strftime('%Y-%m-%d'))
+    query = query.where("DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ? ",DateTime.now.strftime('%Y-%m-%d'))
                   .group("sales.sale_id")
   end