git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consolidate receipt data

Browse Source
This commit is contained in:
phyusin
2018-11-16 16:30:18 +06:30
parent b678d156f3
commit 01473bffbd
2 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/sale.rb
View File

@@ -2962,7 +2962,7 @@ def self.all_receipt_details
.joins("join sale_payments on sale_payments.sale_id = sale_items.sale_id") .joins("join sale_payments on sale_payments.sale_id = sale_items.sale_id")
.joins("join sales on sales.sale_id = sale_items.sale_id") .joins("join sales on sales.sale_id = sale_items.sale_id")
.group("sale_items.sale_item_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') 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 return query
end end

13
lib/tasks/receipt.rake
View File

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