Pull from master
This commit is contained in:
@@ -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.present?
|
||||
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
|
||||
|
||||
@@ -68,10 +69,10 @@ puts sales.to_json
|
||||
@item_sequence = 1
|
||||
sale_count = sales.to_a.count
|
||||
sales.each do |sale|
|
||||
|
||||
if sale.qty > 0
|
||||
|
||||
if sale.item_instance_code !=nil
|
||||
byebug
|
||||
menu_category = MenuCategory.find(MenuItem.find_by_item_code(sale.product_code).menu_category_id)
|
||||
name = menu_category.name
|
||||
code = menu_category.code
|
||||
@@ -90,7 +91,9 @@ puts sales.to_json
|
||||
|
||||
@receipt_no = sale.receipt_no
|
||||
@requested_at = sale.requested_at
|
||||
|
||||
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
|
||||
@@ -109,14 +112,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.to_s=="NULL") ? "0" : 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 +161,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.to_s=="NULL") ? "0" : sale.product_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 +211,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.to_s=="NULL") ? "0" : sale.product_code
|
||||
receipt.item_name = menu_name
|
||||
receipt.qty = @total_qty
|
||||
receipt.transaction_type = "Tender"
|
||||
receipt.gross_sales = @total_gross_sales
|
||||
|
||||
Reference in New Issue
Block a user