From ba1b7a1d9c1b223aa5e8be5045b710ff50e7df76 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 20 Apr 2018 18:11:32 +0630 Subject: [PATCH] update receipt rake --- lib/tasks/receipt.rake | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake index fce410fa..3f8c12c5 100644 --- a/lib/tasks/receipt.rake +++ b/lib/tasks/receipt.rake @@ -3,11 +3,11 @@ namespace :consolidate do task :receipt => :environment do # Receipt.delete_all sales = Sale.all_receipts -puts sales.to_json shop = Shop.find(1) sales.each do |sale| - puts sale.to_json - shift = ShiftSale.find(sale.shift_sale_id) + + if !sale.shift_sale_id.nil? + shift = ShiftSale.find(sale.shift_sale_id) receipt = Receipt.new receipt.client_code = shop.client_code receipt.client_name = shop.client_name @@ -48,6 +48,7 @@ puts sales.to_json receipt.cancle = (sale.payment_status=="void") ? false : true # void is cancel receipt.remarks = sale.remark receipt.save + end end end @@ -109,14 +110,14 @@ puts sales.to_json receipt.receipt_date = @requested_at #requet-at receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char receipt.item_sequence = @item_sequence - receipt.category_code = '' - receipt.category_name = '' + receipt.category_code = sale.product_code + receipt.category_name = sale.product_name receipt.sub_category_code = 0 receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = '' - receipt.item_name = '' + receipt.item_code = sale.product_code + receipt.item_name = sale.product_name receipt.qty = @total_qty receipt.transaction_type = "Tender" receipt.gross_sales = @total_gross_sales @@ -158,14 +159,14 @@ puts sales.to_json receipt.receipt_date = sale.requested_at #requet-at receipt.transaction_date = sale.requested_at #before disco/after tax /after/ser_char receipt.item_sequence = @item_sequence - receipt.category_code = name - receipt.category_name = code + receipt.category_code = sale.product_code + receipt.category_name = sale.product_name receipt.sub_category_code = 0 receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = menu_name - receipt.item_name = menu_code + receipt.item_code = menu_code + receipt.item_name = menu_name receipt.qty = sale.qty receipt.transaction_type = (sale.status==nil) ? "Sales" : sale.status receipt.gross_sales = sale.price @@ -208,14 +209,14 @@ puts sales.to_json receipt.receipt_date = @requested_at #requet-at receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char receipt.item_sequence = @item_sequence - receipt.category_code = '' - receipt.category_name = '' + receipt.category_code = sale.product_code + receipt.category_name = sale.product_name receipt.sub_category_code = 0 receipt.sub_category_name = 0 receipt.report_group_code = 0 receipt.report_group_name = 0 - receipt.item_code = '' - receipt.item_name = '' + receipt.item_code = menu_code + receipt.item_name = menu_name receipt.qty = @total_qty receipt.transaction_type = "Tender" receipt.gross_sales = @total_gross_sales