update request bill

This commit is contained in:
Aung Myo
2018-02-20 11:59:57 +06:30
parent 31adc0e993
commit a5640877a3
3 changed files with 13 additions and 5 deletions

View File

@@ -92,6 +92,11 @@ class ApplicationController < ActionController::Base
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
end
# Get current Cashier
def get_cashier
@cashier = Employee.where("role = 'cashier' AND token_session <> ''")
end
def current_company
begin
return Company.first

View File

@@ -6,7 +6,9 @@ class Origami::RequestBillsController < ApplicationController
sale_order=SaleOrder.new
# if shift = ShiftSale.current_open_shift(current_user.id)
if get_cashier.count>0
puts ShiftSale.current_shift
puts "sssssssssss"
if !ShiftSale.current_shift.nil?
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)