fix with merge

2017-06-23 19:20:00 +06:30
parent e01ecc6e0f
commit 1f6a0eb1f6
3 changed files with 3 additions and 2 deletions
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -30,6 +30,7 @@ class Origami::HomeController < BaseOrigamiController
                order.order_items.each do |item|
                  @order_items.push(item)
                end
+              end
           end
           @status_order = 'order'
         else