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

update applicaton contro and request bill

Browse Source
This commit is contained in:
Aung Myo
2018-02-20 09:37:30 +06:30
parent a15025c8a0
commit a2d0aee1ab
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

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

3
app/controllers/origami/request_bills_controller.rb
View File

@@ -6,6 +6,7 @@ class Origami::RequestBillsController < ApplicationController
sale_order=SaleOrder.new sale_order=SaleOrder.new
if shift = ShiftSale.current_open_shift(current_user.id) if shift = ShiftSale.current_open_shift(current_user.id)
# if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
order_id = params[:id] # order_id order_id = params[:id] # order_id
bk_order = BookingOrder.find_by_order_id(order_id) bk_order = BookingOrder.find_by_order_id(order_id)
check_booking = Booking.find_by_booking_id(bk_order.booking_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id)
@@ -14,7 +15,7 @@ class Origami::RequestBillsController < ApplicationController
# Create Sale if it doesn't exist # Create Sale if it doesn't exist
# puts "current_login_employee" # puts "current_login_employee"
# puts current_login_employee.name # puts current_login_employee.name
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil) @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user)
@sale_data = Sale.find_by_sale_id(@sale_id) @sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id)
else else