From ede876ea27fd27779a7fee9e8c46384d1357cacd Mon Sep 17 00:00:00 2001 From: Nweni Date: Wed, 27 Dec 2017 16:42:37 +0630 Subject: [PATCH] index / home --- app/controllers/origami/home_controller.rb | 6 +++--- app/views/origami/home/index.html.erb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 8e5b33c2..12c7fb76 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -7,7 +7,7 @@ class Origami::HomeController < BaseOrigamiController @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) - + # @shift = ShiftSale.current_open_shift(current_user.id) end @@ -17,7 +17,7 @@ class Origami::HomeController < BaseOrigamiController @rooms = Room.all.active.order('status desc') @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 = "" @status_sale = "" @sale_array = Array.new @@ -70,7 +70,7 @@ class Origami::HomeController < BaseOrigamiController end end end - + end private diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 4e3d27c1..ad7c8b58 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -42,7 +42,7 @@ <% if table.status == 'occupied' %> <% if table.get_booking.nil? %>
-
+
Zone <%= table.zone_id %>
Table <%= table.name %> ( <%= table.seater %> Seat )
@@ -53,7 +53,7 @@ <% else %>
<% end %> -
+
Zone <%= table.zone_id %>
Table <%= table.name %> ( <%= table.seater %> Seat )
@@ -104,7 +104,7 @@ <% end %>
- +