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

customer sales report tax fixed

Browse Source
This commit is contained in:
yarzar_code
2020-09-11 14:14:56 +06:30
parent fcadb14ec6
commit 7bbfacca00
7 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/payments_controller.rb
View File

@@ -207,7 +207,7 @@ class Origami::PaymentsController < BaseOrigamiController
end
printer = Printer::ReceiptPrinter.new(print_settings)
filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, printed_status,current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil)
filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,Shop.current_shop, printed_status,current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil)
# if !saleObj.nil?
# InventoryJob.perform_now(self.id)
# InventoryDefinition.calculate_product_count(saleObj)

2
app/controllers/reports/customer_controller.rb
View File

@@ -34,7 +34,7 @@ class Reports::CustomerController < BaseReportController
membership_type = params[:membership_type]
end
@sale_data = Sale.get_shift_sales_by_customer(@shift_sale_range, @shift, from, to, membership_type, customer_filter)
@sale_taxes = Sale.get_separate_tax(@shift_sale_range, @shift, from, to, nil)
@sale_taxes = Sale.get_separate_tax_by_customer(@shift_sale_range, @shift, from, to, nil, customer_filter, membership_type)
@tax_profiles = TaxProfile.group('name').order('order_by asc') #.limit(2)
@from = from

2
app/controllers/reports/receipt_no_controller.rb
View File

@@ -32,7 +32,7 @@ authorize_resource :class => false
payment_type = params[:payment_type]
@sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range, @shift, from, to, payment_type, customer_filter)
@sale_taxes = Sale.get_separate_tax(@shift_sale_range, @shift, from, to, payment_type)
@sale_taxes = Sale.get_separate_tax_by_customer(@shift_sale_range, @shift, from, to, payment_type, customer_filter)
@tax_profiles = TaxProfile.group('name').order('order_by asc') #.limit(2)
@from = from