git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display message when calling to cloud

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-08-30 17:30:59 +06:30
parent 78af4188d1
commit aed51eba69
3 changed files with 70 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/controllers/crm/customers_controller.rb
View File

@@ -5,6 +5,7 @@ class Crm::CustomersController < BaseCrmController
# GET /crm/customers # GET /crm/customers
# GET /crm/customers.json # GET /crm/customers.json
def index def index
@no_need_validation =false
filter = params[:filter] filter = params[:filter]
filter_card_no = params[:filter_card_no] filter_card_no = params[:filter_card_no]
type = params[:type] type = params[:type]
@@ -39,24 +40,37 @@ class Crm::CustomersController < BaseCrmController
@crm_customers.tax_profiles = ["1", "2"] @crm_customers.tax_profiles = ["1", "2"]
@crm_customers.save @crm_customers.save
@crm_customers = Customer.search(filter) @crm_customers = Customer.search(filter)
flash[:notice]='Customer was successfully created.' flash[:member_notice]='Customer was successfully created.'
else else
flash[:error]=response["message"] flash[:member_error]=response["message"]
end end
else else
@crm_customers.each do |customer| if response["status"] ==true
if customer.contact_no != response["customer_data"]["phone"] @crm_customers.each do |customer|
@customer_update_phone_email_membertype =true if !response["customer_data"].nil?
if customer.contact_no != response["customer_data"]["phone"]
@customer_update_phone_email_membertype =true
end
if customer.email != response["customer_data"]["email"]
@customer_update_phone_email_membertype =true
end
if customer.name != response["customer_data"]["name"]
@customer_update_phone_email_membertype =true
end
if customer.membership_type.to_i != response["customer_data"]["member_group_id"]
@customer_update_phone_email_membertype =true
end
else
flash[:member_error]=response["message"]
end
end end
if customer.email != response["customer_data"]["email"] else
@customer_update_phone_email_membertype =true if response["message"] =='No internet connection '
end flash[:member_error]=response["message"]
if customer.name != response["customer_data"]["name"] else
@customer_update_phone_email_membertype =true flash[:member_error]="Need to press sync button "
end
if customer.membership_type.to_i != response["customer_data"]["member_group_id"]
@customer_update_phone_email_membertype =true
end end
end end
end end
end end
@@ -190,14 +204,18 @@ class Crm::CustomersController < BaseCrmController
}, },
:timeout => 10 :timeout => 10
) )
rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { status: false } response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError rescue OpenURI::HTTPError
response = { status: false} response = {"status" => false, "message" => "No internet connection "}
rescue SocketError rescue SocketError
response = { status: false} response = {"status" => false, "message" => "No internet connection "}
end end
customer = Customer.find(@crm_customer.customer_id) customer = Customer.find(@crm_customer.customer_id)
Rails.logger.debug "--------Sync Member response -------" Rails.logger.debug "--------Sync Member response -------"
@@ -222,6 +240,9 @@ class Crm::CustomersController < BaseCrmController
customer.destroy customer.destroy
format.html { redirect_to crm_customers_path } format.html { redirect_to crm_customers_path }
flash[:member_error] ='Member cannot created.Invalid Account.' flash[:member_error] ='Member cannot created.Invalid Account.'
else
format.html { redirect_to crm_customers_path }
flash[:member_error] =response["message"]
end end
format.html { redirect_to crm_customers_path } format.html { redirect_to crm_customers_path }
flash[:member_error] =response["message"] flash[:member_error] =response["message"]
@@ -286,16 +307,16 @@ class Crm::CustomersController < BaseCrmController
) )
rescue HTTParty::Error rescue HTTParty::Error
response = {"status" => false, "message" => "Can't open membership server "} response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = {"status" => false, "message" => "Can't open membership server "} response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError rescue OpenURI::HTTPError
response = {"status" => false, "message" => "Can't open membership server "} response = {"status" => false, "message" => "No internet connection "}
rescue SocketError rescue SocketError
response = {"status" => false, "message" => "Can't open membership server "} response = {"status" => false, "message" => "No internet connection "}
end end
Rails.logger.debug "--------------Create Member---------" Rails.logger.debug "--------------Create Member---------"
Rails.logger.debug response.to_json Rails.logger.debug response.to_json
@@ -332,6 +353,9 @@ class Crm::CustomersController < BaseCrmController
format.html { redirect_to crm_customers_path } format.html { redirect_to crm_customers_path }
flash[:member_error]='Member cannot created.Invalid Account.' flash[:member_error]='Member cannot created.Invalid Account.'
end end
else
format.html { redirect_to crm_customers_path }
flash[:member_error]=response["message"]
end end
if params[:sale_id] if params[:sale_id]
format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page] } format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page] }
@@ -431,14 +455,17 @@ class Crm::CustomersController < BaseCrmController
}, },
:timeout => 10 :timeout => 10
) )
rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { status: false } response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError rescue OpenURI::HTTPError
response = { status: false} response = {"status" => false, "message" => "No internet connection "}
rescue SocketError rescue SocketError
response = { status: false} response = {"status" => false, "message" => "No internet connection "}
end end
customer = Customer.find(@crm_customer.customer_id) customer = Customer.find(@crm_customer.customer_id)
Rails.logger.debug "--------Update Member response -------" Rails.logger.debug "--------Update Member response -------"
@@ -493,14 +520,17 @@ class Crm::CustomersController < BaseCrmController
}, },
:timeout => 10 :timeout => 10
) )
rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { status: false } response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError rescue OpenURI::HTTPError
response = { status: false} response = {"status" => false, "message" => "No internet connection "}
rescue SocketError rescue SocketError
response = { status: false} response = {"status" => false, "message" => "No internet connection "}
end end
Rails.logger.debug "--------Update Member response -------" Rails.logger.debug "--------Update Member response -------"
Rails.logger.debug response.to_json Rails.logger.debug response.to_json

8
app/models/customer.rb
View File

@@ -325,16 +325,16 @@ class Customer < ApplicationRecord
:timeout => 10 :timeout => 10
) )
rescue HTTParty::Error rescue HTTParty::Error
response = {status: false, message: "Server Error"} response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { status: false , message: "Server Time out"} response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError rescue OpenURI::HTTPError
response = { status: false, message: "Can't connect server"} response = {"status" => false, "message" => "No internet connection "}
rescue SocketError rescue SocketError
response = { status: false, message: "Can't connect server"} response = {"status" => false, "message" => "No internet connection "}
end end
Rails.logger.debug "--------Search Paypar Account No response -------" Rails.logger.debug "--------Search Paypar Account No response -------"
Rails.logger.debug response.to_json Rails.logger.debug response.to_json

12
app/views/crm/customers/index.html.erb
View File

@@ -29,7 +29,9 @@
</div> </div>
</div> </div>
<div class="row p-l-20 p-t-20"> <div class="row p-l-20 p-t-20">
<div id="oqs_loading_wrapper" style="display:none;">
<div id="oqs_loading"></div>
</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-8"> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-8">
<%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %> <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
<div class="row clearfix"> <div class="row clearfix">
@@ -123,7 +125,7 @@
</td> </td>
<td><%= crm_customer.card_no rescue '-' %></td> <td><%= crm_customer.card_no rescue '-' %></td>
<td> <td>
<% if crm_customer.membership_id.nil? && !crm_customer.membership_type.nil? && !crm_customer.membership_type =="" && !crm_customer.paypar_account_no =="" && !crm_customer.paypar_account_no.nil? %> <% if crm_customer.membership_id.nil? && !crm_customer.membership_type.nil? && !crm_customer.membership_type.blank? && !crm_customer.paypar_account_no.blank? && !crm_customer.paypar_account_no.nil? %>
<%= link_to t("views.btn.sync"), crm_customer_sync_path(crm_customer), :class => "btn btn-md bg-green waves-effect" %> <%= link_to t("views.btn.sync"), crm_customer_sync_path(crm_customer), :class => "btn btn-md bg-green waves-effect" %>
<% end %> <% end %>
<% if @customer_update_phone_email_membertype %> <% if @customer_update_phone_email_membertype %>
@@ -156,6 +158,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$("#oqs_loading_wrapper").show();
localStorage.setItem("member_card",false); localStorage.setItem("member_card",false);
/*$('.datepicker').datepicker({ /*$('.datepicker').datepicker({
format : 'dd-mm-yyyy', format : 'dd-mm-yyyy',
@@ -176,6 +179,7 @@
},100); },100);
}); });
// QR Code Reader // QR Code Reader
$("#qr_code").on('click', function(e){ $("#qr_code").on('click', function(e){
var code = ""; var code = "";
@@ -358,4 +362,8 @@
$("#sxModal .btn_cancel").on('click',function(){ $("#sxModal .btn_cancel").on('click',function(){
$("#sxModal").hide(); $("#sxModal").hide();
}); });
$('#filter_form').submit(function() {
$("#oqs_loading_wrapper").show();
return true
});
</script> </script>