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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2018-01-10 18:14:51 +06:30
parent 3e4d63f664 410cacf279
commit 5027ff3975
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/api/authenticate_controller.rb
View File

@@ -7,8 +7,7 @@ class Api::AuthenticateController < Api::ApiController
if emp_id && password if emp_id && password
@employee = Employee.login(emp_id, password) @employee = Employee.login(emp_id, password)
if @employee && @employee.role == "waiter"
if @employee
render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role}) render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role})
else else
render json: JSON.generate({:status => false, :error_message => "Bad Emp_ID or Password."}) render json: JSON.generate({:status => false, :error_message => "Bad Emp_ID or Password."})

6
app/models/menu_category.rb
View File

@@ -41,9 +41,9 @@ class MenuCategory < ApplicationRecord
menu_category = MenuCategory.find(self.id) menu_category = MenuCategory.find(self.id)
menu = Menu.find(menu_category.menu_id) menu = Menu.find(menu_category.menu_id)
from = menu.valid_time_from.strftime("%H:%m:%S") from = menu.valid_time_from.strftime("%H:%M:%S")
to = menu.valid_time_to.strftime("%H:%m:%S") to = menu.valid_time_to.strftime("%H:%M:%S")
current = Time.now.utc.getlocal.strftime("%H:%m:%S") current = Time.now.utc.getlocal.strftime("%H:%M:%S")
from = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} from = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}
to = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} to = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b}