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

app/models/card_sale_tran.rb

@@ -46,19 +46,16 @@ class CardSaleTran < ApplicationRecord
 
 	    if from.present? && to.present?
 
-	        # cardSale = CardSaleTran.where("DATE_FORMAT(req_date,'%Y-%m-%d') >= ?" + " AND DATE_FORMAT(req_date,'%Y-%m-%d') <= ? and status IS NULL ", from,to)
-	        from_date = from.strftime("%Y-%m-%d")
-	        to_date = to.strftime("%Y-%m-%d")
 	        query  = CardSaleTran.joins("Join sales s ON s.sale_id = card_sale_trans.sale_id"+
 	        								" JOIN customers c ON c.customer_id = s.customer_id")
-	        cardSale = query.where("req_date >= ? and req_date <= ? and status = 'Approved'",from_date,to_date)
+	        cardSale = query.where("DATE_FORMAT(req_date,'%Y-%m-%d') >= ? and DATE_FORMAT(req_date,'%Y-%m-%d') <= ? and status = 'Approved'",from,to)
-	        
+
 	        if shift.present?
 	        	query1 = cardSale.where("s.shift_sale_id in (?)", shift.to_a)
 	        elsif shift_sale_range.present?	
 	        	query1 = cardSale.where("s.shift_sale_id in (?)",shift_sale_range.to_a)
 	        else
-	        	query1 = cardSale.where("s.receipt_date between ? and ?",from,to)
+	        	query1 = cardSale.where("DATE_FORMAT(s.receipt_date,'%Y-%m-%d') between ? and ?",from,to)
 	        end
 	        query2 = query1.where(payment)
 

app/models/card_settle_tran.rb

@@ -23,11 +23,9 @@ class CardSettleTran < ApplicationRecord
 
 	    if from.present? && to.present?
 
-			from_date = from.strftime("%Y-%m-%d")
-	        to_date = to.strftime("%Y-%m-%d")
 	        query  = CardSettleTran.joins("Join shift_sales ss ON ss.id = card_settle_trans.shift_sale_id"+
 	        								" JOIN employees e ON e.id = ss.employee_id")
-	        cardSettle = query.where("req_date >= ? and req_date <= ?",from_date,to_date)
+	        cardSettle = query.where("DATE_FORMAT(req_date,'%Y-%m-%d') >= ? and DATE_FORMAT(req_date,'%Y-%m-%d') <= ?",from,to)
 	        query1 = cardSettle.where(keyword)
 	        query2 = query1.where(payment)
 	        query3 = query2.where(status)
@@ -45,18 +43,16 @@ class CardSettleTran < ApplicationRecord
 
 	    if from.present? && to.present?
 
-			from_date = from.strftime("%Y-%m-%d")
-	        to_date = to.strftime("%Y-%m-%d")
 	        query  = CardSettleTran.joins("Join shift_sales ss ON ss.id = card_settle_trans.shift_sale_id"+
 	        								" JOIN employees e ON e.id = ss.employee_id")
-	        cardSettle = query.where("req_date >= ? and req_date <= ? and status = 'Approved'",from_date,to_date)
+	        cardSettle = query.where("DATE_FORMAT(req_date,'%Y-%m-%d') >= ? and DATE_FORMAT(req_date,'%Y-%m-%d') <= ? and status = 'Approved'",from,to)
 	        
 	        if shift.present?
 	        	query1 = cardSettle.where("ss.id in (?)", shift.to_a)
 	        elsif shift_sale_range.present?	
 	        	query1 = cardSettle.where("ss.id in (?)",shift_sale_range.to_a)
 	        else
-	        	query1 = cardSettle.where("req_date between ? and ?",from,to)
+	        	query1 = cardSettle.where("DATE_FORMAT(req_date,'%Y-%m-%d') between ? and ?",from,to)
 	        end
 	        query2 = query1.where(payment)