Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

app/controllers/settings/menus_controller.rb

@@ -95,8 +95,8 @@ class Settings::MenusController < ApplicationController
                                               :header_text => true}
       
       # Menu Sheet
-      wb.add_worksheet(name: menu.name) do |sheet|
-        sheet.add_row ["Name",menu.name], :style=>title                
+      wb.add_worksheet(name: menu.name,is_ordering: menu.is_ordering) do |sheet|
+        sheet.add_row ["Name",menu.name,"is_ordering",menu.is_ordering], :style=>title                
         sheet.add_row
 
         sheet.add_row ["Category Code", "Category Name", "Item Code", "Item Name", "Account", "Item AltName", "Taxable", "Attributes", "Options", "Instance Code", "Instance Name", "Instance Attribute", "Price", "Is Default", "Image Path"], :style=>header_text  

app/models/menu.rb

@@ -91,9 +91,9 @@ class Menu < ApplicationRecord
           elsif sheet_name == "Menu"
             menu = Menu.find_by_id(row["id"])
             if menu
-              Menu.create(name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+              Menu.create(name: row["name"], is_active: row["is_active"], is_ordering: row["is_ordering"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
             else
-              Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
+              Menu.create(id:row["id"], name: row["name"], is_active: row["is_active"], is_ordering: row["is_ordering"], valid_days: row["valid_days"],valid_time_from: row["valid_time_from"], valid_time_to: row["valid_time_to"], created_by: row["created_by"])
             end
           elsif sheet_name == "Menu Category"
              # MenuCategory.create(id:row["id"], menu_id: row["menu_id"], code: row["code"], name: row["name"], alt_name: row["alt_name"], order_by: row["order_by"], created_by: row["created_by"], menu_category_id: row["menu_category_id"], is_available: row["is_available"])
@@ -150,7 +150,9 @@ class Menu < ApplicationRecord
 
       sheet = spreadsheet.sheet(0) 
       menu = sheet.row(1)[1]
-      imported_menu = Menu.create({name: menu, is_active: true, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by}) 
+      is_ordering = sheet.row(1)[3]?sheet.row(1)[3]:0
+
+      imported_menu = Menu.create({name: menu, is_active: true, is_ordering: is_ordering, valid_days: "1,2,3,4,5,6,7",valid_time_from: "00:00:00", valid_time_to: "23:59:59", created_by: created_by}) 
 
       (4..sheet.last_row).each do |ii|             
           row = Hash[[sheet.row(3),sheet.row(ii)].transpose]   

app/views/api/restaurant/menu/_menu.json.jbuilder

@@ -1,6 +1,7 @@
 json.id menu.id
 json.name menu.name
 json.is_active menu.is_active
+json.is_ordering menu.is_ordering
 json.valid_time_from menu.valid_time_from.strftime("%H:%M")
 json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 

app/views/api/restaurant/menu/index.json.jbuilder

@@ -1,6 +1,8 @@
 menu_json = json.array! @menus do |menu|
   json.id menu.id
   json.name menu.name
+  json.is_active menu.is_active
+  json.is_ordering menu.is_ordering
   json.valid_days menu.valid_days
   json.valid_time_from menu.valid_time_from.strftime("%H:%M")
   json.valid_time_to menu.valid_time_to.strftime("%H:%M")

app/views/origami/dashboard/_menu.json.jbuilder

@@ -1,5 +1,6 @@
 json.id menu.id
 json.name menu.name
+json.is_ordering menu.is_ordering
 json.is_active menu.is_active
 json.valid_time_from menu.valid_time_from.strftime("%H:%M")
 json.valid_time_to menu.valid_time_to.strftime("%H:%M")

app/views/origami/dashboard/get_all_menu.json.jbuilder

@@ -1,15 +1,19 @@
 menu_json = json.array! @menus do |menu|
-  json.id menu.id
-  json.name menu.name
-  json.valid_days menu.valid_days
-  json.valid_time_from menu.valid_time_from.strftime("%H:%M")
-  json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 
-  json.partial! 'origami/dashboard/menu', menu: menu
-  # if (@current_menu)
-  #   json.current_menu do
-  #     json.partial! 'api/restaurant/menu/menu', menu: @current_menu
-  #   end
-  # end
+  if menu.is_ordering
+    json.id menu.id
+    json.name menu.name
+    json.valid_days menu.valid_days
+    json.valid_time_from menu.valid_time_from.strftime("%H:%M")
+    json.valid_time_to menu.valid_time_to.strftime("%H:%M")
+
+    json.partial! 'origami/dashboard/menu', menu: menu
+    # if (@current_menu)
+    #   json.current_menu do
+    #     json.partial! 'api/restaurant/menu/menu', menu: @current_menu
+    #   end
+    # end
+  end
+  
 end
 

db/migrate/20170325111608_create_menus.rb

@@ -3,6 +3,7 @@ class CreateMenus < ActiveRecord::Migration[5.1]
     create_table :menus do |t|
       t.string :name
       t.boolean :is_active, :null => false, :deafult => true
+      t.boolean :is_ordering, :default => false
       t.boolean :is_checksum, :default => false
       t.string :valid_days, :null => false, :default => "1,2,3,4,5,6,7"
       t.time :valid_time_from, :null => false, :default => "00:00:00"