From 91fc8696af531d843a46ce600bbb04f52f8c2ef7 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 17 Jul 2018 14:45:14 +0630
Subject: [PATCH] check order items arr

---
 app/controllers/origami/home_controller.rb  | 1 +
 app/controllers/origami/rooms_controller.rb | 2 +-
 app/views/origami/home/show.html.erb        | 4 ++--
 app/views/origami/rooms/show.html.erb       | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 69b20576..3f5c310c 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -33,6 +33,7 @@ class Origami::HomeController < BaseOrigamiController
     @payment_methods = PaymentMethodSetting.all
     @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
     #@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'")
+    @order_items = Array.new
     @dining_booking.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index b2319691..0a44ede7 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -33,6 +33,7 @@ class Origami::RoomsController < BaseOrigamiController
     @payment_methods = PaymentMethodSetting.all
     
     @dining_room = @room.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
+    @order_items = Array.new
     @dining_room.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new
@@ -100,7 +101,6 @@ class Origami::RoomsController < BaseOrigamiController
            end
          end
      end
-
     # @room.bookings.each do |booking|
     #      if booking.sale_id.nil?
     #        @order_items = Array.new
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f15475a1..10bd36cd 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -484,7 +484,7 @@
                   <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
                   <button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button>
                   <% if !@split_bill.nil? %>
-                    <% if @split_bill == '1' && (!@order_items.empty?) %>
+                    <% if @split_bill == '1' && (!(@order_items.nil?) || !(@order_items.empty?)) %>
                       <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
                     <% end %>
                   <% end %>
@@ -515,7 +515,7 @@
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
                 
                   <% if !@split_bill.nil? %>
-                    <% if @split_bill == '1' && (!@order_items.empty?) %>
+                    <% if @split_bill == '1' && (!(@order_items.nil?) || !(@order_items.empty?)) %>
                       <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
                     <% end %>
                   <% end %>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 83e75023..54cbd97f 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -513,7 +513,7 @@
        <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
        <button type="button" id="request_bills" class="btn bg-blue btn-block">Req.Bill</button>
         <% if !@split_bill.nil? %>
-          <% if @split_bill == '1' && (!@order_items.empty?) %>
+          <% if @split_bill == '1' && (!(@order_items.nil?) || !(@order_items.empty?)) %>
             <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
           <% end %>
         <% end %>
@@ -540,7 +540,7 @@
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
         
         <% if !@split_bill.nil? %>
-          <% if @split_bill == '1' && (!@order_items.empty?) %>
+          <% if @split_bill == '1' && (!(@order_items.nil?) || !(@order_items.empty?)) %>
             <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
           <% end %>
         <% end %>