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

update rake receipt

Browse Source
This commit is contained in:
Aung Myo
2018-04-22 10:45:29 +06:30
parent 276c776cfb
commit cc89a35ece
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/sale.rb
View File

@@ -2603,7 +2603,7 @@ end
end end
def self.all_receipts def self.all_receipts
query = Sale.select("sale_payments.created_at as receipt_close_time, query = Sale.select("sales.*,sale_payments.created_at as receipt_close_time,
case when (sale_audits.action='SALEPAYMENT') then sale_audits.remark else 0 end as remark, case when (sale_audits.action='SALEPAYMENT') then sale_audits.remark else 0 end as remark,
case when (sale_taxes.tax_name='Service Charges') then sale_taxes.tax_payable_amount else 0 end as service_charges, case when (sale_taxes.tax_name='Service Charges') then sale_taxes.tax_payable_amount else 0 end as service_charges,
SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount, SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,

14
lib/tasks/receipt.rake
View File

@@ -6,7 +6,7 @@ namespace :consolidate do
shop = Shop.find(1) shop = Shop.find(1)
sales.each do |sale| sales.each do |sale|
if !sale.shift_sale_id.nil? if sale.shift_sale_id.present?
shift = ShiftSale.find(sale.shift_sale_id) shift = ShiftSale.find(sale.shift_sale_id)
receipt = Receipt.new receipt = Receipt.new
receipt.client_code = shop.client_code receipt.client_code = shop.client_code
@@ -69,10 +69,10 @@ namespace :consolidate do
@item_sequence = 1 @item_sequence = 1
sale_count = sales.to_a.count sale_count = sales.to_a.count
sales.each do |sale| sales.each do |sale|
if sale.qty > 0 if sale.qty > 0
if sale.item_instance_code !=nil if sale.item_instance_code !=nil
byebug
menu_category = MenuCategory.find(MenuItem.find_by_item_code(sale.product_code).menu_category_id) menu_category = MenuCategory.find(MenuItem.find_by_item_code(sale.product_code).menu_category_id)
name = menu_category.name name = menu_category.name
code = menu_category.code code = menu_category.code
@@ -91,7 +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'
byebug
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
@@ -116,7 +118,7 @@ namespace :consolidate do
receipt.sub_category_name = 0 receipt.sub_category_name = 0
receipt.report_group_code = 0 receipt.report_group_code = 0
receipt.report_group_name = 0 receipt.report_group_name = 0
receipt.item_code = sale.product_code receipt.item_code = (sale.product_code.to_s=="NULL") ? "0" : sale.product_code
receipt.item_name = sale.product_name receipt.item_name = sale.product_name
receipt.qty = @total_qty receipt.qty = @total_qty
receipt.transaction_type = "Tender" receipt.transaction_type = "Tender"
@@ -165,7 +167,7 @@ namespace :consolidate do
receipt.sub_category_name = 0 receipt.sub_category_name = 0
receipt.report_group_code = 0 receipt.report_group_code = 0
receipt.report_group_name = 0 receipt.report_group_name = 0
receipt.item_code = menu_code receipt.item_code = (menu_code.to_s=="NULL") ? "0" : sale.product_code
receipt.item_name = menu_name receipt.item_name = menu_name
receipt.qty = sale.qty receipt.qty = sale.qty
receipt.transaction_type = (sale.status==nil) ? "Sales" : sale.status receipt.transaction_type = (sale.status==nil) ? "Sales" : sale.status
@@ -215,7 +217,7 @@ namespace :consolidate do
receipt.sub_category_name = 0 receipt.sub_category_name = 0
receipt.report_group_code = 0 receipt.report_group_code = 0
receipt.report_group_name = 0 receipt.report_group_name = 0
receipt.item_code = menu_code receipt.item_code = (menu_code.to_s=="NULL") ? "0" : sale.product_code
receipt.item_name = menu_name receipt.item_name = menu_name
receipt.qty = @total_qty receipt.qty = @total_qty
receipt.transaction_type = "Tender" receipt.transaction_type = "Tender"