fix with merge

Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0'
 gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
-gem 'pg'
+#gem 'pg'
 
 # redis server for cable
 # gem 'redis', '~> 3.0'

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 }

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