check mobile
This commit is contained in:
@@ -25,11 +25,7 @@ class BaseOrigamiController < ActionController::Base
|
||||
end
|
||||
end
|
||||
|
||||
if token_status
|
||||
if current_user.nil?
|
||||
redirect_to root_path
|
||||
end
|
||||
else
|
||||
if !token_status
|
||||
if current_user.nil?
|
||||
redirect_to root_path
|
||||
end
|
||||
|
||||
@@ -3,10 +3,7 @@ class Origami::HomeController < BaseOrigamiController
|
||||
before_action :set_dining, only: [:show]
|
||||
|
||||
def index
|
||||
@webview = false
|
||||
if check_mobile
|
||||
@webview = true
|
||||
end
|
||||
@webview = check_mobile
|
||||
@tables = Table.all.active.order('status desc')
|
||||
@rooms = Room.all.active.order('status desc')
|
||||
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
||||
@@ -18,10 +15,7 @@ class Origami::HomeController < BaseOrigamiController
|
||||
|
||||
# origami table detail
|
||||
def show
|
||||
@webview = false
|
||||
if check_mobile
|
||||
@webview = true
|
||||
end
|
||||
@webview = check_mobile
|
||||
|
||||
@tables = Table.all.active.order('status desc')
|
||||
@rooms = Room.all.active.order('status desc')
|
||||
|
||||
@@ -140,7 +140,11 @@
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
var webview = <%= @webview %>;
|
||||
if(webview){
|
||||
code2lab.checkMobile(webview); //js func: for mobile login
|
||||
}
|
||||
showHideNavbar(webview,"index");
|
||||
|
||||
$(".tables").on('click', function(){
|
||||
var dining_id = $(this).attr("data-id");
|
||||
window.location.href = '/origami/table/' + dining_id;
|
||||
|
||||
Reference in New Issue
Block a user