From f23bbd69364de1372517f0243ef3bc84d4165a69 Mon Sep 17 00:00:00 2001 From: superuser Date: Fri, 30 Jun 2017 19:33:04 +0630 Subject: [PATCH] merge with origin master --- app/controllers/api/bill_controller.rb | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index cc9e2f26..a51ce93e 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -24,11 +24,9 @@ class Api::BillController < Api::ApiController @sale = Sale.new @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier) end -<<<<<<< HEAD - - @sale_data = Sale.find_by_sale_id(@sale_id) - @sale_items = SaleItem.where("sale_id=?",@sale_id) -======= + + #@sale_data = Sale.find_by_sale_id(@sale_id) + #@sale_items = SaleItem.where("sale_id=?",@sale_id) # Not Use for these printed bill cannot give customer # @sale_data = Sale.find_by_sale_id(@sale_id) @@ -45,22 +43,16 @@ class Api::BillController < Api::ApiController # # get printer info # print_settings=PrintSetting.find_by_unique_code(unique_code) ->>>>>>> 18094f5a71174d84305cfefd3a39db8123b65cff # # Calculate Price by accounts # 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 - member_info = Customer.get_member_account(customer) -======= ->>>>>>> 18094f5a71174d84305cfefd3a39db8123b65cff + #member_info = Customer.get_member_account(customer) # 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) - - end