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:
Phyo
2017-06-15 12:30:33 +06:30
parent 3eb1848fba 4330bf9553
commit 215239ec0f
7 changed files with 86 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/origami.js
View File

@@ -21,9 +21,9 @@
$(document).ready(function(){
// auto refresh every 60 seconds
setTimeout(function(){
window.location.reload(1);
}, 60000);
// setTimeout(function(){
// window.location.reload(1);
// }, 60000);
// For selected order return
var order_status = "";

23
app/controllers/home_controller.rb
View File

@@ -10,15 +10,20 @@ class HomeController < ApplicationController
@login_form.emp_id = params[:login_form][:emp_id]
@login_form.password = params[:login_form][:password]
@employee = Employee.login(@login_form.emp_id, @login_form.password)
if @employee.role == "administrator"
session[:session_token] = @employee.token_session
redirect_to dashboard_path
elsif @employee.role == "cashier"
session[:session_token] = @employee.token_session
redirect_to origami_root_path
else
render :index
end
if @employee != nil
if @employee.role == "administrator"
session[:session_token] = @employee.token_session
redirect_to dashboard_path
elsif @employee.role == "cashier"
session[:session_token] = @employee.token_session
redirect_to origami_root_path
else
render :index
end
else
redirect_to origami_root_path, :notice => "Username and Password dosn't match!"
end
end

36
app/views/home/index.html.erb
View File

@@ -1,25 +1,25 @@
<div class="row">
<div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
<%= simple_form_for(@login_form, url: login_path, method: "POST") do |f| %>
<div class="card">
<h4 class="card-title text-center" style="margin:10px">Login</h4>
<div class="content" style="margin:10px">
<div class="form-group">
<%= f.input :emp_id, required: false, autofocus: true, class: "form-control" %>
</div>
<div class="form-group">
<%= f.input :password, required: false, class: "form-control" %>
</div>
<div class="row">
<div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
<%= simple_form_for(@login_form, url: login_path, method: "POST") do |f| %>
<div class="card">
<h4 class="card-title text-center" style="margin:10px">Login</h4>
<div class="content" style="margin:10px">
<div class="form-group">
<%= f.input :emp_id, required: false, autofocus: true, class: "form-control" %>
</div>
<div class="footer text-center" style="margin:10px">
<%= f.button :submit, "Log in", class: "form-control btn btn-fill btn-warning btn-wd" %>
<div class="form-group">
<%= f.input :password, required: false, class: "form-control" %>
</div>
</div>
<div class="footer text-center" style="margin:10px">
<%= f.button :submit, "Log in", class: "form-control btn btn-fill btn-warning btn-wd" %>
<% end %>
</div>
</div>
</div>
<% end %>
</div>
</div>

2
app/views/layouts/application.html.erb
View File

@@ -18,7 +18,7 @@
<%= render 'layouts/header' %>
<div class="container-fluid">
<% flash.each do |type, message| %>
<div class="alert fade in">
<div class="alert fade-in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<%= message %>
</div>