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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Zin Lin Phyo
2017-06-27 14:04:41 +06:30
parent 1c65a38b70 c6f482da83
commit bce4380d70
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ class Api::BillController < Api::ApiController
@sale_id = booking.sale_id
end
end
elsif (params[:order_id])
@sale = Sale.new
@status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee)
@@ -29,12 +29,7 @@ class Api::BillController < Api::ApiController
@sale_items = SaleItem.where("sale_id=?",@sale_id)
unique_code = "ReceiptBillPdf"
#shop detail
shop_details = Shop.find(1)
customer= Customer.where('customer_id=' + @sale_data.customer_id)
# get member information
member_info = Customer.get_member_account(customer)
customer= Customer.find(@sale_data.customer_id)
# get printer info
print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -43,7 +38,7 @@ class Api::BillController < Api::ApiController
item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
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)
end