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

app/controllers/application_controller.rb

@@ -30,8 +30,10 @@ class ApplicationController < ActionController::Base
   end
 
   def current_login_employee
+    if (!session[:session_token].nil?)
       @employee = Employee.find_by_token_session(session[:session_token])
     end
+  end
 
   private
   def check_installation

app/controllers/home_controller.rb

@@ -1,10 +1,30 @@
 class HomeController < ApplicationController
-  skip_before_action :authenticate, only: [:index, :create, :destroy]
+  skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]
 
   def index
+    @employees = Employee.all.order("name asc")
     @login_form = LoginForm.new()
   end
 
+  def show
+    @login_form = LoginForm.new()
+    @login_form.emp_id = params[:emp_id]
+  end
+
+  def update
+    @login_form = LoginForm.new()
+    @login_form.emp_id = params[:emp_id]
+    @login_form.password = params[:login_form][:password]
+    @employee = Employee.login(@login_form.emp_id, @login_form.password)
+
+    if @employee != nil
+      session[:session_token] = @employee.token_session
+      redirect_to origami_root_path
+    else
+      render :show, flash[:notice] => "Invalid PIN for Employee. Please try again!"
+    end
+  end
+
   def create
     @login_form = LoginForm.new()
     @login_form.emp_id = params[:login_form][:emp_id]

app/helpers/application_helper.rb

@@ -1,2 +1,11 @@
 module ApplicationHelper
+
+  def flash_class(level)
+    case level
+    when :notice then "alert alert-info fade-in"
+    when :success then "alert alert-success fade-in"
+    when :error then "alert alert-error fade-in"
+    when :alert then "alert alert-error fade-in"
+    end
+end
 end

app/models/employee.rb

@@ -13,9 +13,9 @@ class Employee < ApplicationRecord
   def self.login(emp_id, password)
     user = Employee.find_by_emp_id(emp_id)
     if (user)
-      user.authenticate(password)
+      #user.authenticate(password)
 
-      if (user)
+      if (user.authenticate(password))
         user.generate_token
         user.session_expiry = DateTime.now.utc + 30.minutes
         user.session_last_login = DateTime.now.utc

app/views/home/index.html.erb

@@ -1,4 +1,4 @@
-
+<!--
 <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| %>
@@ -22,4 +22,40 @@
 
       <% end %>
     </div>
+</div> -->
+<div class="row">
+  <div class="col-md-12 col-lg-12">
+    <div class="card-deck">
+
+      <% @employees.each do |employee| %>
+
+        <div data-formid="#form_<%= employee.emp_id %>" class="empBtn card card-inverse card-primary mb-3 text-center" style="width: 15rem;height:15rem;">
+            <form id="form_<%=employee.emp_id%>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH"></form>
+            <div class="card-block">
+              <h4 class="card-title">
+                <%= employee.name %>
+              </h4>
+              <div class="card-content">
+                (<%= employee.emp_id%>)
               </div>
+              <div class="card-footer">
+                    <small><%= employee.role %></small>
+              </div>
+            </div>
+        </div>
+        <% end %>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+$(document).on('turbolinks:load', function() {
+  $(".empBtn").click(function(event){
+    event.preventDefault();
+    console.log($(this).data("formid"));
+    var item = $(this).data("formid");
+    $(item).submit();
+
+  });
+});
+</script>

app/views/home/show.html.erb

@@ -0,0 +1,68 @@
+<style>
+  .pin_pad {
+    width:10rem;
+    height:10rem;
+    text-align: center;
+    vertical-align: middle;
+    line-height: 10rem;
+    margin:2px;
+    margin-top:4px;
+    margin-bottom:4px;
+    font-size:3rem;
+  }
+</style>
+
+<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: emp_login_update_path, method: "PATCH") do |f| %>
+          <div class="card">
+                <div class="content" style="margin:10px">
+                    <div class="form-group">
+                      <%= f.input :emp_id,as: :hidden, label: "Access PIN", required: false, class: "form-control" %>
+
+                        <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
+                    </div>
+                </div>
+                <div class="content" style="margin:10px; margin-top:0px; text-align:center">
+                  <button class="pin_pad" data-value="1">1</button>
+                  <button class="pin_pad" data-value="2">2</button>
+                  <button class="pin_pad" data-value="3">3</button>
+                  <button class="pin_pad" data-value="4">4</button>
+                  <button class="pin_pad" data-value="5">5</button>
+                  <button class="pin_pad" data-value="6">6</button>
+                  <button class="pin_pad" data-value="7">7</button>
+                  <button class="pin_pad" data-value="8">8</button>
+                  <button class="pin_pad" data-value="9">9</button>
+                  <button class="pin_pad" data-value="CLR">CLR</button>
+                  <button class="pin_pad" data-value="8">0</button>
+                  <button class="pin_pad btn-warning" data-value="ENT">ENT</button>
+
+                </div>
+                <div class="footer text-center" style="margin:10px">
+
+                </div>
+
+            </div>
+
+      <% end %>
+    </div>
+</div>
+
+<script type="text/javascript">
+$(document).on('turbolinks:load', function() {
+  $(".pin_pad").click(function(event){
+    event.preventDefault();
+    console.log($(this).data("value"));
+    var value = $(this).data("value");
+
+    if (value == "CLR") {
+      $("#login_form_password").val("");
+    } else if(value == "ENT") {
+      $("#new_login_form").submit();
+    } else {
+      var old_value = $("#login_form_password").val();
+      $("#login_form_password").val(old_value + value);
+    }
+  });
+});
+</script>

config/routes.rb

@@ -2,9 +2,6 @@ require 'sidekiq/web'
 
 Rails.application.routes.draw do
 
-  namespace :settings do
-    resources :membership_actions
-  end
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
@@ -16,6 +13,9 @@ Rails.application.routes.draw do
   post 'install' =>  'install#create'
 
   #--------- Login/Authentication ------------#
+  get 'auth/:emp_id' => 'home#show' , as: :emp_login
+  patch "auth/:emp_id" => 'home#update', as: :emp_login_update
+
   post 'login' => 'home#create'
   delete 'logout' => 'home#destroy'
   get 'dashboard' => 'home#dashboard'
@@ -215,6 +215,8 @@ Rails.application.routes.draw do
     resources :payment_method_settings
     #membership_settings
     resources :membership_settings
+    resources :membership_actions
+
     #zones
     resources :zones do
       #tables
@@ -224,6 +226,7 @@ Rails.application.routes.draw do
     end
 
   end
+
   #--------- Transactions Sections ------------#
   namespace :transactions do
     resources :sales