add cashier in sale and origami ui updated

This commit is contained in:
Yan
2017-06-14 16:51:25 +06:30
parent 7d6414cce6
commit 41e9aec389
6 changed files with 45 additions and 45 deletions

View File

@@ -11,8 +11,7 @@ class Origami::HomeController < BaseOrigamiController
@selected_item = Order.find(params[:booking_id])
@selected_item_type="Order"
end
end
puts params[:booking_id]
end
@completed_orders = Order.get_completed_order()
@booking_orders = Order.get_booking_order_table()

View File

@@ -9,7 +9,7 @@ class Origami::RequestBillsController < BaseOrigamiController
check_booking = Booking.find_by_booking_id(booking_id)
if check_booking.sale_id.nil?
# Create Sale if it doesn't exist
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee.name)
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee)
@sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id)
else