update route conflict for addorder

app/assets/javascripts/addorder.js

@@ -1,6 +1,6 @@
 $(function() { 
   var role = $('#role').val();
-  localStorage.removeItem("menus")
+
   type = window.location.href.indexOf("quick_service");
   modify_order = window.location.href.indexOf("modify_order");
   

app/controllers/origami/addorders_controller.rb

@@ -18,17 +18,14 @@ class Origami::AddordersController < BaseOrigamiController
     if check_mobile
       @webview = true  
     end
-puts params[:menu]
-puts "sssssssssssssssssssssssssss"
-    if params[:menus].present?
-      @menus    = JSON.parse(params[:menus], object_class: OpenStruct) 
-      @menu     = JSON.parse(params[:category], object_class: OpenStruct) 
-      puts @menus.to_json
-      puts @menu.to_json
-    else
-       @menus    = Menu.all   
-       @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
-    end
+
+   # if params[:menu] == "true"
+     @menus    = []
+     @menu     = []
+   # else
+   #    @menus    = Menu.all   
+   #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+   # end
 
     @table_id = params[:id]
     @table = DiningFacility.find(@table_id)

app/controllers/origami/home_controller.rb

@@ -30,9 +30,9 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    bookings = Booking.all
-    if !bookings.today.nil?
-      @order_items_count = Hash.new
+    # bookings = Booking.all
+    # if !bookings.today.nil?
+    #   @order_items_count = Hash.new
       # bookings.each do |booking|
       #   if booking.sale_id.nil? && booking.booking_status != 'moved'
       #     if !booking.booking_orders.empty?
@@ -60,7 +60,7 @@ class Origami::HomeController < BaseOrigamiController
       #     end
       #   end
       # end
-    end
+    # end
 
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'

app/controllers/origami/quick_service_controller.rb

@@ -10,24 +10,30 @@ class Origami::QuickServiceController < ApplicationController
   def index
     today = DateTime.now
     day = Date.today.wday
-    @menus    = Menu.all
-    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+     # if params[:menu] == "true"
+     @menus    = []
+     @menu     = []
+   # else
+   #    @menus    = Menu.all   
+   #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+   # end
     @zone     = Zone.all
     @customer = Customer.all
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
-      # @tables = Table.all.active.order('zone_id asc').group("zone_id")
-      # @rooms = Room.all.active.order('zone_id asc').group("zone_id")
-      # @all_table = Table.all.active.order('status desc')
-      # @all_room = Room.all.active.order('status desc')
-       render "origami/addorders/detail"
+    render "origami/addorders/detail"
   end
 
   def modify_order
     today = DateTime.now
     day = Date.today.wday
-    @menus    = Menu.all
-    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+     # if params[:menu] == "true"
+     @menus    = []
+     @menu     = []
+   # else
+   #    @menus    = Menu.all   
+   #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+   # end
     if(params[:id][0,3] == "BKI")
       @table_id = nil
       @table = nil

app/views/origami/addorders/detail.html.erb

@@ -11,10 +11,15 @@
   </div>
   <input type="hidden" name="type" id="role" value="<%= current_user.role%>">
   <div class="row m-t--20">
-    <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data">
+    <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> 
         <li class="list-menu">
           <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
-            <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
+
+            <span class="main_menu" id="main_menu menu_name" >
+              <%if @menu.present? %>
+                  <%=menu[0].name%>
+              <% end%>
+            </span>
           </a>
           <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
             <% @menus.each do |menu| %>
@@ -179,12 +184,14 @@
 
                 <% if modify_order %>
                    <% if @table.nil? %>
-                     <div class="col-md-5 col-lg-5 col-sm-5">Table : </div>
+                     
+                     <div class="col-md-3 col-lg-3 col-sm-3">Table : </div>
                      <p class="hidden" id="table_id"><%=@table_id%></p>
                      <p class="hidden" id="table_type"></p>
                      <p class="hidden" id="table_get_current"></p>
                    <% else%>
-                     <div class="col-md-5 col-lg-5 col-sm-5">Table : <%=@table.name%></div>
+                     
+                     <div class="col-md-3 col-lg-3 col-sm-3">Table : <%=@table.name%></div>
                      <p class="hidden" id="table_id"><%=@table_id%></p>
                      <p class="hidden" id="table_type"><%=@table.type%></p>
                        <p class="hidden" id="table_get_current"><%=@table.get_current_checkout_booking%></p>
@@ -539,13 +546,51 @@
 <script>
 
     jQuery(function(){
-      id = "<%=@menu[0].id%>";
+      var menus = JSON.parse(localStorage.getItem("menus"));
+      if (menus != null) {
+        console.log("menu")
+        id = menus[0]["id"];
+      }else{
+        id = 1;
+      }
+      
       jQuery('.first_'+id).click();
     });
 
     $(document).ready(function () {
       var menus = JSON.parse(localStorage.getItem("menus"));
       if (menus != null) {
+        console.log("menu")
+        menu_cache_append(menus);
+      }else{
+        $("#menu_data").removeClass("hidden");
+      }
+
+      function category_list_template(menu) {
+        row = '<li class="nav-item">'
+                +'<p class="hidden menu-id">'+menu.id+'</p> '
+                +'<a class="nav-link menu_category sub_click first_'+menu.id+'" '
+                +'data-toggle="tab" href="" role="tab" data-id="'+menu.id+'" '
+                +'data-sub-id="'+menu.sub_category+'">'+menu.name+''
+                +'</a>'
+                  +'<ul class="sub_category_list hidden fadeInTop animated" '
+                  +'id="sub_category_list">'
+                  +'</ul>'
+                
+             +' </li>';
+        $(".category_cache_list").append(row);           
+      }
+
+      function menu_list_template(menu) {
+        row = '<li class="nav-item menu_click" data-name="'+menu.name+'" '
+                +' data-id="'+menu.id+'" style="">'
+            +' <a class="nav-link" data-toggle="tab" href="" role="tab"'
+            +' style="text-transform: lowercase;">'+menu.name+'</a>'
+           +'</li>';
+        $(".menu_cache_list").append(row);           
+      } 
+
+      function menu_cache_append(menus){
         $("#menu_cache").removeClass("hidden");
         $(".menu_cache_name").text(menus[0]["name"])       
         for(var i in menus) {
@@ -575,34 +620,8 @@
                 }
               }
           }
-      }else{
-        $("#menu_data").removeClass("hidden");
       }
 
-      function category_list_template(menu) {
-        row = '<li class="nav-item">'
-                +'<p class="hidden menu-id">'+menu.id+'</p> '
-                +'<a class="nav-link menu_category sub_click first_'+menu.id+'" '
-                +'data-toggle="tab" href="" role="tab" data-id="'+menu.id+'" '
-                +'data-sub-id="'+menu.sub_category+'">'+menu.name+''
-                +'</a>'
-                  +'<ul class="sub_category_list hidden fadeInTop animated" '
-                  +'id="sub_category_list">'
-                  +'</ul>'
-                
-             +' </li>';
-        $(".category_cache_list").append(row);           
-      }
-
-      function menu_list_template(menu) {
-        row = '<li class="nav-item menu_click" data-name="'+menu.name+'" '
-                +' data-id="'+menu.id+'" style="">'
-            +' <a class="nav-link" data-toggle="tab" href="" role="tab"'
-            +' style="text-transform: lowercase;">'+menu.name+'</a>'
-           +'</li>';
-        $(".menu_cache_list").append(row);           
-      } 
-
       $(".tables").on('click', function () {
         $('.tables').css('background-color','');
         $('.tables').removeClass('purple')
@@ -684,7 +703,6 @@
                 +'</li>';
                 $('.category_list').append(list);
               }
-              
             }
           }
         });
@@ -694,6 +712,8 @@
 
       $(document).on('click', '#clear_all', function(event){
         $(".summary-items tbody").empty(); 
+        $('#sub_total').text(0.00);
+        $(".create").attr("disabled","disabled");
       }); 
 
       $(document).on('click', '.cashier_number', function(event){
@@ -707,7 +727,6 @@
             case 'num':
               var input_value = $(this).attr("data-value");
               if (original_value == "0"){
-                console.log("hi")
                 $('#modal-qty').val(input_value);
                 $('#modal-qty').attr('data-value',input_value);
                 // update_total_amount();

app/views/origami/dashboard/index.html.erb

@@ -208,6 +208,7 @@
  <input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
 <script>
 $(function() {
+console.log(localStorage.getItem("menus"))
   $.ajax({
     type: "GET",
     url: 'get_all_menu',

app/views/origami/home/show.html.erb

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

config/routes.rb

@@ -239,7 +239,7 @@ scope "(:locale)", locale: /en|mm/ do
     get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }
     get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
 
-    get '/:addorders/:id', to: "addorders#detail"
+    get '/:addorders/:id' => "addorders#detail"
     post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }