diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 2f5b25d2..81e7bb71 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -100,18 +100,22 @@ class Crm::CustomersController < BaseCrmController 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, - :timeout => 10 + :timeout => 100 ) - - rescue Net::OpenTimeout - response = { status: false } - rescue OpenURI::HTTPError - response = { status: false} + rescue HTTParty::Error + response = {status: false, message: "Can't open embership server "} - rescue SocketError - response = { status: false} - end + rescue Net::OpenTimeout + + response = { status: false , message: "Can't open embership server "} + + rescue OpenURI::HTTPError + response = { status: false, message: "Can't open embership server "} + + rescue SocketError + response = { status: false, message: "Can't open embership server "} + end if response["status"] == true customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) @@ -125,14 +129,14 @@ class Crm::CustomersController < BaseCrmController else # @crm_customers.destroy if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. '} + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response[:message]} else - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created. ' } + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response[:message] } end end else if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. '} + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. noted'} else format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created. ' } end @@ -231,7 +235,7 @@ end ) rescue Net::OpenTimeout response = { status: false } - + rescue OpenURI::HTTPError response = { status: false} diff --git a/app/models/customer.rb b/app/models/customer.rb index a26d857e..d6ba8bf1 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -27,16 +27,19 @@ class Customer < ApplicationRecord 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, - :timeout => 10 + :timeout => 100 ) + rescue HTTParty::Error + response = {status: false, message: "Server Error"} + rescue Net::OpenTimeout - response = { status: false } + response = { status: false , message: "Server Time out"} rescue OpenURI::HTTPError - response = { status: false} + response = { status: false, message: "Can't connect server"} rescue SocketError - response = { status: false} + response = { status: false, message: "Can't connect server"} end return response; @@ -60,13 +63,13 @@ class Customer < ApplicationRecord :timeout => 10 ) rescue Net::OpenTimeout - response = { status: false } - + response = { status: false , message: "Server Time out"} + rescue OpenURI::HTTPError - response = { status: false} + response = { status: false, message: "Can't connect server"} rescue SocketError - response = { status: false} + response = { status: false, message: "Can't connect server"} end return response; diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 1d8a0e99..6f38d95f 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -331,15 +331,15 @@ class SalePayment < ApplicationRecord :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' - }, :timeout => 10) + }, :timeout => 100) rescue Net::OpenTimeout - response = { status: false } + response = { status: false , message: "Server Time out"} rescue OpenURI::HTTPError - response = { status: false} + response = { status: false, message: "Can't connect server"} rescue SocketError - response = { status: false} + response = { status: false, message: "Can't connect server"} end return response # puts response.to_json diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb index 9fa8020d..225b0036 100644 --- a/app/views/origami/shifts/show.html.erb +++ b/app/views/origami/shifts/show.html.erb @@ -32,7 +32,7 @@