From 1f6a0eb1f6813e36c776d0e2ec7018e3394eeac6 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 23 Jun 2017 19:20:00 +0630
Subject: [PATCH] fix with merge

---
 Gemfile                                     | 2 +-
 app/controllers/crm/customers_controller.rb | 2 +-
 app/controllers/origami/home_controller.rb  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 227cfa72..8f16e924 100644
--- a/Gemfile
+++ b/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'
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index ca1aafb2..43b0618e 100644
--- 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 }
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 4a070788..c4edcc0b 100644
--- 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