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

2017-06-23 21:45:34 +06:30
parent 4dbc9b6134 1f6a0eb1f6
commit 7263a65da9
3 changed files with 3 additions and 2 deletions
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -168,7 +168,7 @@ end
                                                          'Content-Type' => 'application/json',
                                                          'Accept'       => 'application/json'
                                                  },
-                                                  :timeout 10
+                                                  :timeout => 10
                                            )
            rescue Net::OpenTimeout
              response = { status: false }
--- 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