git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update add order

Browse Source
This commit is contained in:
Aung Myo
2017-07-26 15:04:35 +06:30
parent c93b50d46a
commit 83b8d72632
6 changed files with 111 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/controllers/api/restaurant/menu_categories.rb
View File

@@ -1,37 +0,0 @@
class Api::Restaurant::MenuController < Api::ApiController
#Description
# Pull the default menu details and also other available (active) menus
# Input Params - order_id
def index
@menus = Menu.all
@current_menu = Menu.current_menu
end
#Description
# This API show current order details
# Input Params - menu_id
def show
@menu = menu_detail(params[:id])
end
private
def menu_detail (menu_id)
if (menu_id)
#Pull this menu
menu = Menu.find_by_id(menu_id)
return menu
else
Menu.current_menu
end
end
def menu_params()
params.permit(:id)
end
end

2
app/controllers/api/restaurant/menu_controller.rb
View File

@@ -1,5 +1,5 @@
class Api::Restaurant::MenuController < Api::ApiController class Api::Restaurant::MenuController < Api::ApiController
skip_before_action :authenticate
#Description #Description
# Pull the default menu details and also other available (active) menus # Pull the default menu details and also other available (active) menus
# Input Params - order_id # Input Params - order_id

1
app/controllers/origami/addorders_controller.rb
View File

@@ -10,6 +10,7 @@ class Origami::AddordersController < BaseOrigamiController
def show def show
@menu = MenuCategory.all @menu = MenuCategory.all
@table_id = params[:id]
end end
private private

161
app/views/origami/addorders/show.html.erb
View File

@@ -1,65 +1,42 @@
<div class="row"> <div class="row">
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<div class="ta" style="max-height:550px; overflow:auto"> <div class="ta" style="max-height:550px; overflow:auto">
<ul class="nav nav-tabs md-pills pills-primary flex-column" role="tablist"> <ul class="nav nav-tabs flex-column" role="tablist" >
<% @menu.each do |menu| %>
<li class="nav-item"> <% @menu.each do |menu| %>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a> <li class="nav-item menu_category" data-ref="<%= api_restaurant_menu_category_path menu.id%>">
</li> <p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
</li>
<% end %> <% end %>
</ul> </ul>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6" style="margin-left:-30px !important"> <div class="col-md-6 col-lg-6">
<div class="card-columns menu_items_list" style="column-gap: 10px;">
<ul class="menu-list"> <!-- <div class="card">
<div class="card-header">
<div class="box col-md-3"> <small>Menu Name</small>
<div class="card"> </div>
<div class="card-block"> <div class="card-block">
<p class=""> Menu Name</p> <%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>
<p class="Card subtitle">Price : 3000 ks</p> </div>
</div> <div class="card-footer">
</div> <small>Price : 3000</small>
</div> </div>
<div class="box col-md-3"> </div> -->
<div class="card"> </div>
<div class="card-block">
<p class=""> Menu Name</p>
<p class="Card subtitle">Price : 3000 ks</p>
</div>
</div>
</div>
<div class="box col-md-3">
<div class="card">
<div class="card-block">
<p class=""> Menu Name</p>
<p class="Card subtitle">Price : 3000 ks</p>
</div>
</div>
</div>
<div class="box col-md-3">
<div class="card">
<div class="card-block">
<p class=""> Menu Name</p>
<p class="Card subtitle">Price : 3000 ks</p>
</div>
</div>
</div>
</ul>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-md-3 col-lg-3 col-sm-3">
<div class="card-header"> <div class="card-header">
<div><strong id="order-title">ORDER DETAILS </strong> | Table 21</div> <div><strong id="order-title">ORDER DETAILS </strong> | Table <%=@table_id%></div>
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-text" style="min-height:500px; max-height:500px; overflow:auto">
<div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll">
<table class="table table-striped" id="order-items-table"> <table class="table table-striped" id="order-items-table">
<thead> <thead>
<tr> <tr>
@@ -90,21 +67,95 @@
</div> </div>
</div> </div>
</div> </div>
<script> <script type="text/javascript">
$(function(){
$(".menu_category").on("click", function(){
var menu_id = $(this).find(".menu-id").text();
var url = $(this).attr('data-ref');
show_details(url);
}); //End Booking Click
function show_details(url_item){
//Start Ajax
$.ajax({
type: "GET",
url: url_item,
data: {},
dataType: "json",
success: function(data) {
menu_items = data.menu_items;
for(var field in menu_items) {
if (menu_items[field].item_instances){
var price = parseFloat(menu_items[field].item_instances[0].price).toFixed(2);
}else{
var price = parseFloat(menu_items[field].price).toFixed(2);
}
row = '<div class="card">'
+'<div class="card-header">'
+'<small>'+ menu_items[field].name +'</small>'
+'</div>'
+'<div class="card-block">'
+'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>'
+'</div>'
+'<div class="card-footer">'
+'<small>'+ price +'</small>'
+'</div>';
}
$(".menu_items_list").html(row);
}
});
//end Ajax
}
});
</script> </script>
<style type="text/css"> <style type="text/css">
li{ .card-block {
padding: 0.3rem !important;
} }
.box{ @media (min-width: 34em) {
padding:1px !important; .card-columns {
-webkit-column-count: 2;
-moz-column-count: 2;
column-count: 2;
}
} }
..card-block{
padding:1rem !important;
@media (min-width: 48em) {
.card-columns {
-webkit-column-count: 3;
-moz-column-count: 3;
column-count: 3;
}
}
@media (min-width: 62em) {
.card-columns {
-webkit-column-count: 4;
-moz-column-count: 4;
column-count: 4;
}
}
@media (min-width: 75em) {
.card-columns {
-webkit-column-count: 4;
-moz-column-count: 4;
column-count: 4;
}
} }
</style> </style>

2
app/views/origami/home/show.html.erb
View File

@@ -579,6 +579,6 @@ function show_customer_details(customer_id){
$('#add_order').on('click',function(){ $('#add_order').on('click',function(){
var dining_id = "<%= @dining.id %>" var dining_id = "<%= @dining.id %>"
window.location.href = '/origami/addorders/'+dining_id; window.location.href = '/origami/addorders/'+ dining_id;
}); });
</script> </script>

2
config/routes.rb
View File

@@ -30,7 +30,7 @@ Rails.application.routes.draw do
namespace :restaurant do namespace :restaurant do
get 'zones' => "zones#index" get 'zones' => "zones#index"
resources :menu, only:[:index, :show] resources :menu, only:[:index, :show]
resources :menu_categories, only: [:index] resources :menu_categories, only: [:index, :show]
resources :menu_items, only: [:index, :show] resources :menu_items, only: [:index, :show]
resources :menu_item_attributes, only: [:index] resources :menu_item_attributes, only: [:index]
resources :menu_item_options, only: [:index] resources :menu_item_options, only: [:index]