consolidate receipt data

app/models/sale.rb

@@ -2962,7 +2962,7 @@ def self.all_receipt_details
             .joins("join sale_payments on sale_payments.sale_id = sale_items.sale_id")
             .joins("join sales on sales.sale_id = sale_items.sale_id")
             .group("sale_items.sale_item_id")
-   query = query.where("sale_itemsqty > 0 and sales.sale_status !='new'")
+   query = query.where("sale_items.qty > 0 and sales.sale_status !='new'")
        query = query.where("sale_items.created_at between ? and ?", '2017-11-01 00:00:00 +0630','2018-02-05 13:59:59 +0630')
     return query
 end

lib/tasks/receipt.rake

@@ -3,7 +3,7 @@ namespace :consolidate do
   task :receipt => :environment do
     # Receipt.delete_all
     sales = Sale.all_receipts
-    shop  = current_shop
+    shop  = Shop.first #current_shop
     sales.each do |sale|
       
      if sale.shift_sale_id.present?
@@ -57,7 +57,7 @@ namespace :consolidate do
     ReceiptDetail.delete_all
     sales = Sale.all_receipt_details
 
-    shop  = current_shop
+    shop  = Shop.first #current_shop
 
     sale_id = ''
     count   = 0
@@ -91,9 +91,9 @@ namespace :consolidate do
         
         @receipt_no                = sale.receipt_no
         @requested_at              = sale.requested_at
-        if @receipt_no == '20171130-10464'
-          byebug
-        end
+        # if @receipt_no == '20171130-10464'
+        #   byebug
+        # end
         if sale_id == sale.sale_id || count == 0 || @z ==0
           @total_qty                 += sale.qty
           @total_gross_sales         += sale.price
@@ -199,7 +199,6 @@ namespace :consolidate do
       count += 1
       @item_sequence += 1
       sale_id = sale.sale_id
-    end
     
       if count == sale_count
         receipt = ReceiptDetail.new
@@ -241,6 +240,8 @@ namespace :consolidate do
             receipt.remarks             = ""
             receipt.save
       end
+
+    end
   end
 
 end