From 6e13aa73a33e5c62592925ed9677bae52bb76855 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 6 Aug 2018 10:56:33 +0630 Subject: [PATCH] update for bill api with order source --- app/controllers/api/bill_controller.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index d5eb77b1..0d16414c 100755 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -14,10 +14,13 @@ class Api::BillController < Api::ApiController # for Multiple Cashier by Zone table = DiningFacility.find(booking.dining_facility_id) + bk_order = BookingOrder.find_by_booking_id(booking.booking_id) + order = Order.find(bk_order.order_id) + if booking if booking.sale_id.nil? @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, current_login_employee, "cashier") + @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, current_login_employee, order.source) @sale_data = Sale.find_by_sale_id(@sale_id) else @status = true @@ -41,8 +44,9 @@ class Api::BillController < Api::ApiController end elsif (params[:order_id]) + order = Order.find(params[:order_id]) @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier, "cashier") + @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier, order.source) # for Job booking = Booking.find_by_sale_id(@sale_id)