From 83b8d726324be48f32807b36cf9d4371038ff7f1 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 26 Jul 2017 15:04:35 +0630
Subject: [PATCH] update add order

---
 .../api/restaurant/menu_categories.rb         |  37 ----
 .../api/restaurant/menu_controller.rb         |   2 +-
 .../origami/addorders_controller.rb           |   1 +
 app/views/origami/addorders/show.html.erb     | 163 ++++++++++++------
 app/views/origami/home/show.html.erb          |   2 +-
 config/routes.rb                              |   2 +-
 6 files changed, 111 insertions(+), 96 deletions(-)
 delete mode 100644 app/controllers/api/restaurant/menu_categories.rb

diff --git a/app/controllers/api/restaurant/menu_categories.rb b/app/controllers/api/restaurant/menu_categories.rb
deleted file mode 100644
index fe7983ea..00000000
--- a/app/controllers/api/restaurant/menu_categories.rb
+++ /dev/null
@@ -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
diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb
index fe7983ea..169cc1fd 100644
--- a/app/controllers/api/restaurant/menu_controller.rb
+++ b/app/controllers/api/restaurant/menu_controller.rb
@@ -1,5 +1,5 @@
 class Api::Restaurant::MenuController < Api::ApiController
-
+  skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 68a15c71..e65b24b7 100644
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -10,6 +10,7 @@ class Origami::AddordersController < BaseOrigamiController
 
   def show
   	@menu = MenuCategory.all
+    @table_id = params[:id]
   end
   
   private
diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb
index c4f51c1e..049ba371 100644
--- a/app/views/origami/addorders/show.html.erb
+++ b/app/views/origami/addorders/show.html.erb
@@ -1,65 +1,42 @@
 <div class="row">
    <div class="col-lg-3 col-md-3 col-sm-3">
        <div class="ta" style="max-height:550px; overflow:auto">
-          <ul class="nav nav-tabs md-pills pills-primary flex-column" role="tablist">
-             <% @menu.each do |menu| %>
-            <li class="nav-item">
-                <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
-            </li>
+          <ul class="nav nav-tabs flex-column" role="tablist" >
+                 
+            <% @menu.each do |menu| %>
+              <li class="nav-item menu_category" data-ref="<%= api_restaurant_menu_category_path menu.id%>">
+              <p class="hidden menu-id"><%= menu.id  %></p> 
+                  <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
+              </li>
             <% end %>
             
         </ul>
        </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="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>
-               <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 class="card">
+          <div class="card-header">
+             <small>Menu Name</small>
+          </div>
+          <div class="card-block">
+            <%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>
+          </div>
+          <div class="card-footer">
+           <small>Price : 3000</small>
+          </div>
+        </div> -->
+    </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><strong id="order-title">ORDER DETAILS </strong> |  Table 21</div>
+      <div><strong id="order-title">ORDER DETAILS </strong> |  Table <%=@table_id%></div>
 
     </div>
     <div class="card-block">
-
-
-     <div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll">
+     <div class="card-text" style="min-height:500px; max-height:500px; overflow:auto">
        <table class="table table-striped" id="order-items-table">
          <thead>
            <tr>
@@ -90,21 +67,95 @@
      </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>
 
+
 <style type="text/css">
-  li{
-    
+   .card-block {
+    padding: 0.3rem !important;
   }
-  .box{
-    padding:1px !important;
-   
+  @media (min-width: 34em) {
+    .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>
 
+
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 92b37cf9..8281a16e 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -579,6 +579,6 @@ function show_customer_details(customer_id){
 
   $('#add_order').on('click',function(){
     var dining_id = "<%= @dining.id %>"
-    window.location.href = '/origami/addorders/'+dining_id;
+    window.location.href = '/origami/addorders/'+ dining_id;
   });
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index e4723a22..310ae0f0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -30,7 +30,7 @@ Rails.application.routes.draw do
     namespace :restaurant do
       get 'zones' => "zones#index"
       resources :menu, only:[:index, :show]
-      resources :menu_categories, only: [:index]
+      resources :menu_categories, only: [:index, :show]
       resources :menu_items, only: [:index, :show]
       resources :menu_item_attributes, only: [:index]
       resources :menu_item_options, only: [:index]