diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 687c872f..7fa51da4 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -5,7 +5,7 @@ class Origami::RequestBillsController < BaseOrigamiController @sale = Sale.new sale_order=SaleOrder.new - if ShiftSale.current_open_shift(current_user.id) + if shift = ShiftSale.current_open_shift(current_user.id) order_id = params[:id] # order_id bk_order = BookingOrder.find_by_order_id(order_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id) @@ -20,6 +20,10 @@ class Origami::RequestBillsController < BaseOrigamiController @sale_data = Sale.find_by_sale_id(check_booking.sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) end + + # Bind shift sale id to sale + @sale_data.shift_sale_id = shift.id + @sale_data.save else @status = false @error_message = "No Current Open Shift for This Employee"