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

2017-12-12 10:45:02 +06:30
parent 8298b1aebe e727b8b22e
commit 196746bd4f
2 changed files with 6 additions and 2 deletions
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -237,7 +237,7 @@
                            end

                            if @status_order == 'order' && @status_sale != 'sale'
-                              unless @order_items.nil?
+                              unless @order_items.nil? || @order_items.empty?
                                count = 0
                                @order_items.each do |order_item|
                                  count += 1
@@ -306,7 +306,7 @@

              <%
                if @status_sale == 'sale'
-                  unless @order_items.nil?
+                  unless @order_items.nil? || @order_items.empty?
              %>
                      Pending New Order
                      <table class="table table-striped">