From 82092686c57a7cb14cf0dfa3564d778c72deb003 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 7 Sep 2018 09:41:29 +0630
Subject: [PATCH] update before pull

---
 app/models/employee.rb | 3 +--
 app/models/sale.rb     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/employee.rb b/app/models/employee.rb
index 7bc5c4a4..f27adf29 100755
--- a/app/models/employee.rb
+++ b/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
diff --git a/app/models/sale.rb b/app/models/sale.rb
index cb120fd0..779db759 100644
--- a/app/models/sale.rb
+++ b/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