Merge branch 'adminbsb_material_ui'

app/assets/javascripts/addorder.js

@@ -101,6 +101,13 @@ $(function() {
     var menu_id = $(this).attr("data-id");
     var url = "get_menu_category/"+menu_id;
     show_menu_item_list(url); 
+
+    var sub_id  = $(this).attr("data-sub-id");
+    if (sub_id) {
+      var sub_url = "get_menu_sub_category/"+menu_id;
+      sub_category = $(this).find('.sub_category_list');
+      show_sub_category_list(sub_url,sub_category);
+    }
   }); 
   //End menu category Click
 
@@ -1232,7 +1239,7 @@ console.log(d_option)
 
    //click menu sidebar menu category
 
-   $(document).on('click', '.sub_click', function(event){ 
+   $(document).on('click', '.sub_clickssss', function(event){ 
      event.preventDefault();
     var menu_id = $(this).attr("data-id");
     var url = "get_menu_sub_category/"+menu_id;
@@ -1267,11 +1274,11 @@ console.log(d_option)
         data = data.sub_category;
 
         if (data.length>0) {
-          if ((sub_category.hasClass('hidden'))) {
+          // if ((sub_category.hasClass('hidden'))) {
             $(sub_category).removeClass('hidden');
-          }else{
-            $(sub_category).addClass('hidden');
-          }
+          // }else{
+            // $(sub_category).addClass('hidden');
+          // }
           
         for(var i in data) { 
 

app/controllers/origami/addorders_controller.rb

@@ -23,6 +23,8 @@ class Origami::AddordersController < BaseOrigamiController
     day = Date.today.wday
     @menus    = Menu.all
     @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+    puts "ssssssssssssssssssssssss"
+    puts @menu.to_json
     @table_id = params[:id]
     @table = DiningFacility.find(@table_id)
     @booking = @table.get_booking

app/models/menu_category.rb

@@ -78,6 +78,14 @@ class MenuCategory < ApplicationRecord
     end
   end
 
+  def get_sub_category
+    menu_category = MenuCategory.find_by_menu_category_id(self.id)
+    if menu_category
+      return true
+    end
+    return false
+  end
+
   private
 
   # def generate_menu_category_code        

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

@@ -46,7 +46,7 @@
                 <!--if type quick_service or cashier for table -->
                   <% if type %>
                     <% if !menu.code.include? "SPL" %>
-                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
                           <p class="hidden menu-id"><%= menu.id  %></p> 
                           <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
                              <ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
@@ -58,7 +58,7 @@
                   <% else %>
                     <% if @table.get_current_checkout_booking.nil? %>
                       <% if !menu.code.include? "SPL" %>
-                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                        <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%> " data-sub-id="<%=menu.get_sub_category%>">
                           <p class="hidden menu-id"><%= menu.id  %></p> 
                           <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
                              <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
@@ -67,7 +67,7 @@
                         </li>
                       <% end%>
                     <% else %>
-                      <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
+                      <li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
                            <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">

config/secrets.yml

@@ -12,8 +12,8 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  sx_provision_url: connect.pos-myanmar.com/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 
@@ -24,7 +24,7 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api
+  sx_provision_url: connect.pos-myanmar.com/api #192.168.1.147:3002/api
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L