From 635db2e0110ecfc539777a30057290552cc8d363 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 13:59:50 +0630 Subject: [PATCH] update rake receipt file --- db/migrate/20180306044939_create_receipts.rb | 2 +- lib/tasks/clear_data.rake | 20 ++--------- lib/tasks/receipt.rake | 38 +++++++++++--------- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/db/migrate/20180306044939_create_receipts.rb b/db/migrate/20180306044939_create_receipts.rb index 22f3b0fa..7e1df523 100644 --- a/db/migrate/20180306044939_create_receipts.rb +++ b/db/migrate/20180306044939_create_receipts.rb @@ -5,7 +5,7 @@ class CreateReceipts < ActiveRecord::Migration[5.1] t.string :client_name, :null => false t.string :shop_code, :limit => 16, :null => false t.string :shop_name, :null => false - t.integer :receipt_no, :limit => 8, :null => false + t.integer :receipt_no, :null => false t.datetime :transaction_time, :null => false t.datetime :receipt_open_time, :null => false t.datetime :receipt_close_time, :null => false diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index 247992be..508fcd8c 100755 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -1,23 +1,9 @@ namespace :clear do desc "Clear Data" task :data => :environment do - BookingOrder.delete_all - Booking.delete_all - OrderItem.delete_all - AssignedOrderItem.delete_all - Order.delete_all - SaleOrder.delete_all - SaleItem.delete_all - Sale.delete_all - SaleTax.delete_all - SaleAudit.delete_all - SalePayment.delete_all - ShiftSale.delete_all - PaymentJournal.delete_all - Survey.delete_all - 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..23f57896 100644 --- a/lib/tasks/receipt.rake +++ b/lib/tasks/receipt.rake @@ -3,18 +3,22 @@ namespace :consolidate do task :receipt => :environment do Receipt.delete_all sales = Sale.all_receipts - + shop = Shop.find(1) sales.each do |sale| + 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 +100,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 +149,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 +199,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