diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 247992be..cd4fec49 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -18,6 +18,8 @@ namespace :clear do
     DiningFacility.update_all(status:'available')
     CashierTerminal.update_all(is_currently_login: 0)
     SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
+    Receipt.delete_all
+    ReceiptDetail.delete_all
     puts "Clear Data Done."
   end
 
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index fa24f481..d23efea6 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -3,18 +3,23 @@ namespace :consolidate do
   task :receipt => :environment do
     Receipt.delete_all
     sales = Sale.all_receipts
-   
+
     shop  = Shop.find(1)
     sales.each do |sale|
+      puts sale.to_json
+     shift = ShiftSale.find(sale.shift_sale_id)
       receipt = Receipt.new
-      receipt.client_code         = shop.id
-      receipt.client_name         = shop.id
-      receipt.shop_code           = shop.id
-      receipt.shop_name           = shop.id
+      receipt.client_code         = shop.client_code
+      receipt.client_name         = shop.client_name
+      receipt.shop_code           = shop.shop_code
+      receipt.shop_name           = shop.name
       receipt.receipt_no          = sale.receipt_no
       receipt.transaction_time    = sale.requested_at #requet-at
       receipt.receipt_open_time   = sale.requested_at #before disco/after tax /after/ser_char
       receipt.receipt_close_time  = sale.receipt_close_time
+      receipt.shift_id            = sale.shift_sale_id
+      receipt.shift_open_time     = shift.shift_started_at
+      receipt.shift_close_time    = shift.shift_closed_at
       receipt.gross_sales         = sale.total_amount + sale.total_tax #before disco/after tax /after/ser_char
       receipt.discount_amount     = sale.total_discount + sale.item_discount
       receipt.sales               = sale.grand_total #after disco/after tax /after/ser_char /no roundingadn
@@ -96,10 +101,10 @@ namespace :consolidate do
         if sale_id != sale.sale_id && count !=0 
 
           receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = @receipt_no
           receipt.receipt_date        = @requested_at #requet-at
           receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
@@ -145,10 +150,10 @@ namespace :consolidate do
         
         discount_amount = (sale.status=="Discount") ? sale.price : 0
           receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = sale.receipt_no
           receipt.receipt_date        = sale.requested_at #requet-at
           receipt.transaction_date    = sale.requested_at #before disco/after tax /after/ser_char
@@ -195,10 +200,10 @@ namespace :consolidate do
     
     if count == sale_count
       receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = @receipt_no
           receipt.receipt_date        = @requested_at #requet-at
           receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char