diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 3d5b9722..209ec4c0 100644
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -88,8 +88,8 @@ class Origami::SaleEditController < BaseOrigamiController
    # remove all void items
    def cancel_all_void
      sale_id = params[:sale_id]
-     saleobj = Sale.find(sale_id)
-     saleobj.sale_items.each do |item|
+     saleObj = Sale.find(sale_id)
+     saleObj.sale_items.each do |item|
        if item.qty.to_i < 0
           item.destroy
        else
diff --git a/app/models/sale.rb b/app/models/sale.rb
index fc2a761b..f89f2695 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -517,10 +517,11 @@ def self.get_by_shiftsales(from,to,shift)
 end
 
 def self.get_by_shift_sale(from,to,status)
-  query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,shift_closed_at As closing_date," +
-    " grand_total AS grand_total, cash_sales AS cash," +
-     "total_taxes AS total_tax,total_discounts As total_discount")    
-     .order("shift_sales.id DESC")
+  query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,
+                          shift_closed_at As closing_date," +
+                          " grand_total AS grand_total, cash_sales AS cash," +
+                          "total_taxes AS total_tax,total_discounts As total_discount")    
+                          .order("shift_sales.id DESC")
   return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to)
 end
 
@@ -551,25 +552,7 @@ def self.get_item_query()
     total_foc_amount = 0
     total_grand_total = 0   
 
-    if shift.blank?
-        ### => get all sales range in shift_sales
-        query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
-        discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
-        change_amount = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
-        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
-                                      SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
-                                      SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
-                                      SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
-                                     .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                     .where("sales.shift_sale_id in (?) and sale_status = 'completed'  ", shift_sale_range.to_a) 
-        sale_cash.each do |s_c|
-          total_cash_amount += s_c.cash_amount.to_f
-          total_card_amount += s_c.card_amount.to_f
-          total_credit_amount += s_c.credit_amount.to_f
-          total_foc_amount += s_c.foc_amount.to_f
-        end
-        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-    else
+    if shift.present?
         query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
         discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount)   
         change_amount = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)   
@@ -586,7 +569,44 @@ def self.get_item_query()
           total_foc_amount += s_c.foc_amount.to_f
         end
         total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f 
-   
+    
+        ### => get all sales range in shift_sales
+    elsif shift_sale_range.present?
+        query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
+        discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
+        change_amount = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
+        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+                                      SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
+                                      SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
+                                      SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
+                                     .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+                                     .where("sales.shift_sale_id in (?) and sale_status = 'completed'  ", shift_sale_range.to_a) 
+        sale_cash.each do |s_c|
+          total_cash_amount += s_c.cash_amount.to_f
+          total_card_amount += s_c.card_amount.to_f
+          total_credit_amount += s_c.credit_amount.to_f
+          total_foc_amount += s_c.foc_amount.to_f
+        end
+        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
+    
+    else
+        query          = query.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to)
+        discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount)
+        change_amount = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed)
+        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+                                      SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
+                                      SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
+                                      SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
+                                     .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+                                     .where("sales.receipt_date between ? and ? and sale_status = 'completed'  ", from,to) 
+        sale_cash.each do |s_c|
+          total_cash_amount += s_c.cash_amount.to_f
+          total_card_amount += s_c.card_amount.to_f
+          total_credit_amount += s_c.credit_amount.to_f
+          total_foc_amount += s_c.foc_amount.to_f
+        end
+        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
+    
     end
 
     return query, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
@@ -606,13 +626,22 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
     
     query = Sale.all
     if shift.present?
+
       query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-             .group("sales.sale_id")
-    else
+              .group("sales.sale_id")
+
+    elsif shift_sale_range.present?
+
       query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
+
+    else
+
+      query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to)
+              .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+              .group("sales.sale_id")
     end 
                                      
 end  
@@ -636,13 +665,20 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
            .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) 
            .group("sale_taxes.tax_name")
            .order("sale_taxes.sale_tax_id asc")           
-  else
+  elsif shift_sale_range.present?
     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
            .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
            .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift_sale_range.to_a)
            .group("sale_taxes.tax_name")
            .order("sale_taxes.sale_tax_id asc")
+  else
+    query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
+           .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
+           .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+           .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", from,to)
+           .group("sale_taxes.tax_name")
+           .order("sale_taxes.sale_tax_id asc")
   end 
   
   # query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")