Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill

2018-02-26 09:21:46 +06:30
parent 3bb6649d39 f4f5915532
commit d287ab267d
12 changed files with 259 additions and 160 deletions
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -276,11 +276,11 @@
                              </tr>

                          <%
-                            # end
                            end
                            end

                            if @status_order == 'order' && @status_sale != 'sale'
+                              puts
                              unless @order_items.nil? || @order_items.empty?
                                count = 0
                                @order_items.each do |order_item|