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

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