Merge branch 'master' into adminbsb_material_ui_test

app/controllers/crm/dining_queues_controller.rb

@@ -6,7 +6,7 @@ class Crm::DiningQueuesController < BaseCrmController
   # GET /crm/dining_queues.json
   def index
     today = DateTime.now.strftime('%Y-%m-%d')
-     @dining_queues = DiningQueue.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? ", today).order("queue_no asc")
+     @dining_queues = DiningQueue.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and status is NULL ", today).order("queue_no asc")
   end
 
   # GET /crm/dining_queues/1

app/controllers/origami/addorders_controller.rb

@@ -9,7 +9,7 @@ class Origami::AddordersController < BaseOrigamiController
   end
 
   def detail
-  	@menu = MenuCategory.all
+  	@menu = MenuCategory.all.active
     @table_id = params[:id]
     @table = DiningFacility.find(@table_id)
     @booking = @table.get_booking
@@ -36,6 +36,7 @@ class Origami::AddordersController < BaseOrigamiController
     if (params[:id])
       #Pull this menu
       @menu = MenuCategory.find_by_id(params[:id])
+      puts @menu.menu_items[1].item_attributes.to_json
       return @menu
     else
       MenuCategory.current_menu

app/controllers/origami/home_controller.rb

@@ -4,7 +4,7 @@ class Origami::HomeController < BaseOrigamiController
   def index
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
-    @complete = Sale.where("sale_status != 'new'")
+    @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders   = Order.all.order('date desc')
     @shop     = Shop.find_by_id(1)
 
@@ -15,7 +15,7 @@ class Origami::HomeController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.where("sale_status != 'new'")
+    @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders = Order.all.order('date desc')
     
     @status_order = ""

app/controllers/origami/orders_controller.rb

@@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.where("sale_status != 'new'")
+    @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders = Order.all.order('status desc')
     @order = Order.find(params[:order_id])
     sale_order = SaleOrder.find_by_order_id(@order.order_id)

app/controllers/origami/rooms_controller.rb

@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
   def index
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.where("sale_status != 'new'")
+    @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders = Order.all.order('date desc')
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
@@ -11,7 +11,7 @@ class Origami::RoomsController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.where("sale_status != 'new'")
+    @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders = Order.all.order('date desc')
 
     @room = DiningFacility.find(params[:room_id])

app/controllers/origami/sales_controller.rb

@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.where("sale_status != 'new'")
+    @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders = Order.all.order('date desc')
     @sale = Sale.find(params[:sale_id])
   end

app/controllers/settings/set_menu_items_controller.rb

@@ -125,7 +125,8 @@ class Settings::SetMenuItemsController < ApplicationController
     end
 
     def set_settings_item_attribute
-      @item_attributes = MenuItemAttribute.all.order("id asc").map{|a| [a.name, a.value]}     
+      @item_attributes = MenuItemAttribute.all.order("id asc")#.map{|a| [a.name, a.value]}     
+
     end
 
     def set_settings_item_option