update order & reservation
This commit is contained in:
12
app/controllers/origami/order_reservation_controller.rb
Normal file
12
app/controllers/origami/order_reservation_controller.rb
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
class Origami::OrderReservationController < BaseOrigamiController
|
||||||
|
|
||||||
|
def index
|
||||||
|
@webview = check_mobile
|
||||||
|
@shop = Shop::ShopDetail
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
end
|
||||||
@@ -34,6 +34,14 @@
|
|||||||
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
|
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 order_reservation">
|
||||||
|
<div class="info-box bg-blue">
|
||||||
|
<div class="icon" >
|
||||||
|
<i class="material-icons">arrow_forward</i>
|
||||||
|
</div>
|
||||||
|
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :order_reservation %></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- #END# Widgets -->
|
<!-- #END# Widgets -->
|
||||||
<% if !@current_user.nil? && @current_user.role != 'waiter' %>
|
<% if !@current_user.nil? && @current_user.role != 'waiter' %>
|
||||||
@@ -200,7 +208,10 @@
|
|||||||
$(".qs_view").on('click', function() {
|
$(".qs_view").on('click', function() {
|
||||||
document.getElementById('second_view').click();
|
document.getElementById('second_view').click();
|
||||||
window.location.href = '/origami/quick_service';
|
window.location.href = '/origami/quick_service';
|
||||||
|
});
|
||||||
|
|
||||||
|
$(".order_reservation").on('click', function() {
|
||||||
|
window.location.href = '/origami/order_reservation';
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#second_view").on('click', function () {
|
$("#second_view").on('click', function () {
|
||||||
|
|||||||
61
app/views/origami/order_reservation/index.html.erb
Normal file
61
app/views/origami/order_reservation/index.html.erb
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<div class="container-fluid">
|
||||||
|
<div class="row">
|
||||||
|
<div class="<%= @webview==true ? 'col-lg-12 col-md-12 col-sm-12' : 'col-lg-10 col-md-10 col-sm-10'%>">
|
||||||
|
<ul class="nav nav-tabs tab-col-teal" role="tablist">
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#complete" role="tab"><%= t :competed %></a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link active" data-toggle="tab" href="#tables" role="tab"><%= t :tables %></a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><%= t :rooms %></a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div class="tab-content m-t-10" id="custom-slimscroll">
|
||||||
|
<div class="tab-pane dining" id="complete" role="tabpanel">
|
||||||
|
<div class="card-columns">
|
||||||
|
<% @complete.each do |sale| %>
|
||||||
|
<div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<%= sale.receipt_no %>
|
||||||
|
<span class="pull-right"><%= sale.sale_status %></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!--- Panel 3 - Orders -->
|
||||||
|
<div class="tab-pane dining" id="orders" role="tabpanel">
|
||||||
|
<div class="card-columns">
|
||||||
|
<% @orders.each do |order| %>
|
||||||
|
<div class="card orders red text-white" data-id = "<%= order.order_id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<%= order.order_id %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<!-- tabs - End -->
|
||||||
|
</div>
|
||||||
|
<div class="<%= @webview==true ? 'hidden' : 'col-lg-2 col-md-2 col-sm-2' %>">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- Column One -->
|
||||||
|
<script>
|
||||||
|
$(document).ready(function(){
|
||||||
|
var webview = <%= @webview %>;
|
||||||
|
if(webview){
|
||||||
|
code2lab.checkMobile(webview); //js func: for mobile login
|
||||||
|
}
|
||||||
|
showHideNavbar(webview,"index");
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -74,6 +74,7 @@ en:
|
|||||||
date_time: "DateTime"
|
date_time: "DateTime"
|
||||||
dine_in_cashier: "Dine-in Cashier"
|
dine_in_cashier: "Dine-in Cashier"
|
||||||
quick_service: "Quick Service"
|
quick_service: "Quick Service"
|
||||||
|
order_reservation: "Order & Reservation"
|
||||||
|
|
||||||
views:
|
views:
|
||||||
btn:
|
btn:
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ mm:
|
|||||||
date_time: "ရက်စွဲအချိန်"
|
date_time: "ရက်စွဲအချိန်"
|
||||||
dine_in_cashier: "Dine-in Cashier"
|
dine_in_cashier: "Dine-in Cashier"
|
||||||
quick_service: "Quick Service"
|
quick_service: "Quick Service"
|
||||||
|
order_reservation: "Order & Reservation"
|
||||||
|
|
||||||
views:
|
views:
|
||||||
btn:
|
btn:
|
||||||
|
|||||||
@@ -257,6 +257,8 @@ scope "(:locale)", locale: /en|mm/ do
|
|||||||
|
|
||||||
post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
|
post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
|
||||||
|
|
||||||
|
#order and reservation
|
||||||
|
resources :order_reservation
|
||||||
end
|
end
|
||||||
|
|
||||||
#--------- Waiter/Ordering Station ------------#
|
#--------- Waiter/Ordering Station ------------#
|
||||||
|
|||||||
Reference in New Issue
Block a user