webview
This commit is contained in:
@@ -387,3 +387,15 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
|
|||||||
function setHeaderBreadCrumb(params){
|
function setHeaderBreadCrumb(params){
|
||||||
$("#others_payment").html(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();
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
class Api::SurveyController < Api::ApiController
|
class Api::SurveyController < Api::ApiController
|
||||||
skip_before_action :authenticate
|
# before_action :authenticate
|
||||||
|
|
||||||
def index
|
def index
|
||||||
dining_facility = DiningFacility.find(params[:id])
|
dining_facility = DiningFacility.find(params[:id])
|
||||||
|
|||||||
@@ -33,5 +33,34 @@ class BaseOrigamiController < ActionController::Base
|
|||||||
def shop_detail
|
def shop_detail
|
||||||
@shop = Shop.first
|
@shop = Shop.first
|
||||||
end
|
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
|
end
|
||||||
|
|||||||
@@ -3,6 +3,13 @@ class Origami::HomeController < BaseOrigamiController
|
|||||||
before_action :set_dining, only: [:show]
|
before_action :set_dining, only: [:show]
|
||||||
|
|
||||||
def index
|
def index
|
||||||
|
@webview = false
|
||||||
|
if check_mobile
|
||||||
|
puts "request data"
|
||||||
|
@webview = true
|
||||||
|
end
|
||||||
|
puts @webview == false
|
||||||
|
|
||||||
@tables = Table.all.active.order('status desc')
|
@tables = Table.all.active.order('status desc')
|
||||||
@rooms = Room.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'))
|
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
<div class="icon" >
|
<div class="icon" >
|
||||||
<i class="material-icons">arrow_forward</i>
|
<i class="material-icons">arrow_forward</i>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -139,6 +139,9 @@
|
|||||||
<!-- Column One -->
|
<!-- Column One -->
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
|
var webview = <%= @webview %>;
|
||||||
|
showHideNavbar(webview,"index");
|
||||||
|
|
||||||
$(".tables").on('click', function(){
|
$(".tables").on('click', function(){
|
||||||
var dining_id = $(this).attr("data-id");
|
var dining_id = $(this).attr("data-id");
|
||||||
window.location.href = '/origami/table/' + dining_id;
|
window.location.href = '/origami/table/' + dining_id;
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ en:
|
|||||||
payment: "Payment"
|
payment: "Payment"
|
||||||
backend: "Backend"
|
backend: "Backend"
|
||||||
date_time: "DateTime"
|
date_time: "DateTime"
|
||||||
dine_in_order: "Dine In Order"
|
dine_in_cashier: "Dine-in Cashier"
|
||||||
quick_service: "Quick Service"
|
quick_service: "Quick Service"
|
||||||
|
|
||||||
views:
|
views:
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ mm:
|
|||||||
payment: "ငွေပေးချေမှု"
|
payment: "ငွေပေးချေမှု"
|
||||||
backend: "နောက်ကွယ်"
|
backend: "နောက်ကွယ်"
|
||||||
date_time: "ရက်စွဲအချိန်"
|
date_time: "ရက်စွဲအချိန်"
|
||||||
dine_in_order: "Dine In Order"
|
dine_in_cashier: "Dine-in Cashier"
|
||||||
quick_service: "Quick Service"
|
quick_service: "Quick Service"
|
||||||
|
|
||||||
views:
|
views:
|
||||||
|
|||||||
Reference in New Issue
Block a user