fixed conflict

2019-12-02 17:43:02 +06:30
parent bf337495c1 cac6994ccb
commit de73bf9f7d
118 changed files with 14390 additions and 190 deletions
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -225,14 +225,14 @@ class SalePayment < ApplicationRecord
                        'Accept' => 'application/json; version=3'
              }, :timeout => 10
        )
+    rescue Errno::ECONNREFUSED
+        response = { "status" => false, "message" => "Can't open membership server"}
    rescue Net::OpenTimeout
-        response = { status: false }
-
+        response = { "status" => false, "message" => "No internet connection " }
    rescue OpenURI::HTTPError
-      response = { status: false}
-
+        response = { "status" => false, "message" => "No internet connection "}
    rescue SocketError
-      response = { status: false}
+        response = { "status" => false, "message" => "No internet connection "}
    end
    Rails.logger.debug "Get Paypar Account "
    Rails.logger.debug response.to_json