This commit is contained in:
phyusin
2018-04-05 17:30:44 +06:30
parent 686a980a9e
commit 7c15dac2aa
8 changed files with 55 additions and 4 deletions

View File

@@ -387,3 +387,15 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
function setHeaderBreadCrumb(params){
$("#others_payment").html(params);
}
//show hide nav bar for webview
function showHideNavbar(webview,page){
// if(webview){
$("nav.navbar").hide();
// if(page=="index"){
// $(".btn-lists").hide();
// }
// }else{
// $("nav.navbar").show();
// }
}

View File

@@ -1,5 +1,5 @@
class Api::SurveyController < Api::ApiController
skip_before_action :authenticate
# before_action :authenticate
def index
dining_facility = DiningFacility.find(params[:id])

View File

@@ -33,5 +33,34 @@ class BaseOrigamiController < ActionController::Base
def shop_detail
@shop = Shop.first
end
#check webview
def check_mobile
status = false
if request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
status = true
end
return status
end
# protected
# # Authenticate the user with token based authentication
# def authenticate
# authenticate_token || render_unauthorized
# end
# def authenticate_token
# authenticate_with_http_token do |token, options|
# Rails.logger.debug "token - " + token.to_s
# @user = Employee.authenticate_by_token(token)
# if @user
# return true
# end
# end
# end
# def render_unauthorized(realm = "Application")
# request.headers["WWW-Authenticate"] = %(Token realm="#{realm.gsub(/"/, "")}")
# render json: 'Bad credentials', status: :unauthorized
# end
end

View File

@@ -3,6 +3,13 @@ class Origami::HomeController < BaseOrigamiController
before_action :set_dining, only: [:show]
def index
@webview = false
if check_mobile
puts "request data"
@webview = true
end
puts @webview == false
@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'))

View File

@@ -31,7 +31,7 @@
<div class="icon" >
<i class="material-icons">arrow_forward</i>
</div>
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_order %></div>
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
</div>
</div>
</div>

View File

@@ -139,6 +139,9 @@
<!-- Column One -->
<script>
$(document).ready(function(){
var webview = <%= @webview %>;
showHideNavbar(webview,"index");
$(".tables").on('click', function(){
var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/' + dining_id;

View File

@@ -72,7 +72,7 @@ en:
payment: "Payment"
backend: "Backend"
date_time: "DateTime"
dine_in_order: "Dine In Order"
dine_in_cashier: "Dine-in Cashier"
quick_service: "Quick Service"
views:

View File

@@ -67,7 +67,7 @@ mm:
payment: "ငွေပေးချေမှု"
backend: "နောက်ကွယ်"
date_time: "ရက်စွဲအချိန်"
dine_in_order: "Dine In Order"
dine_in_cashier: "Dine-in Cashier"
quick_service: "Quick Service"
views: