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

merge with origin master

Browse Source
This commit is contained in:
superuser
2017-06-30 19:33:04 +06:30
parent 336b76e4b2
commit f23bbd6936
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/api/bill_controller.rb
View File

@@ -24,11 +24,9 @@ class Api::BillController < Api::ApiController
@sale = Sale.new @sale = Sale.new
@status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier) @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
end end
<<<<<<< HEAD
@sale_data = Sale.find_by_sale_id(@sale_id) #@sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id) #@sale_items = SaleItem.where("sale_id=?",@sale_id)
=======
# Not Use for these printed bill cannot give customer # Not Use for these printed bill cannot give customer
# @sale_data = Sale.find_by_sale_id(@sale_id) # @sale_data = Sale.find_by_sale_id(@sale_id)
@@ -45,22 +43,16 @@ class Api::BillController < Api::ApiController
# # get printer info # # get printer info
# print_settings=PrintSetting.find_by_unique_code(unique_code) # print_settings=PrintSetting.find_by_unique_code(unique_code)
>>>>>>> 18094f5a71174d84305cfefd3a39db8123b65cff
# # Calculate Price by accounts # # Calculate Price by accounts
# item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items) # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
<<<<<<< HEAD #customer= Customer.find(@sale_data.customer_id)
customer= Customer.find(@sale_data.customer_id)
# get member information # get member information
member_info = Customer.get_member_account(customer) #member_info = Customer.get_member_account(customer)
=======
>>>>>>> 18094f5a71174d84305cfefd3a39db8123b65cff
# printer = Printer::ReceiptPrinter.new(print_settings) # printer = Printer::ReceiptPrinter.new(print_settings)
# printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
end end