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

update change version v3 for api paymal

Browse Source
This commit is contained in:
Aung Myo
2018-03-13 14:23:23 +06:30
parent df781395c8
commit 9f0bef732e
6 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ class Crm::CustomersController < BaseCrmController
:body => member_params, :body => member_params,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, },
:timeout => 10 :timeout => 10
) )
@@ -269,7 +269,7 @@ end
:body => member_params, :body => member_params,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, },
:timeout => 10 :timeout => 10
) )
@@ -328,7 +328,7 @@ end
:body => member_params, :body => member_params,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, },
:timeout => 10 :timeout => 10
) )

2
app/controllers/origami/discounts_controller.rb
View File

@@ -273,7 +273,7 @@ class Origami::DiscountsController < BaseOrigamiController
auth_token:auth_token}.to_json, auth_token:auth_token}.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, :timeout => 10) }, :timeout => 10)
rescue HTTParty::Error rescue HTTParty::Error
response = {"status": false, "message": "Can't open membership server " } response = {"status": false, "message": "Can't open membership server " }

6
app/controllers/origami/payments_controller.rb
View File

@@ -63,9 +63,9 @@ class Origami::PaymentsController < BaseOrigamiController
# get member information # get member information
rebate = MembershipSetting.find_by_rebate(1) rebate = MembershipSetting.find_by_rebate(1)
if customer.membership_id != nil && rebate if customer.membership_id != nil && rebate
member_info = Customer.get_member_account(customer) # member_info = Customer.get_member_account(customer)
current_balance = SaleAudit.paymal_search(sale_id) # current_balance = SaleAudit.paymal_search(sale_id)
# current_balance = 0 current_balance = 0
end end
# get printer info # get printer info
print_settings=PrintSetting.find_by_unique_code(unique_code) print_settings=PrintSetting.find_by_unique_code(unique_code)

2
app/controllers/origami/voucher_controller.rb
View File

@@ -54,7 +54,7 @@ class Origami::VoucherController < BaseOrigamiController
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, :timeout => 10 }, :timeout => 10
) )
rescue Net::OpenTimeout rescue Net::OpenTimeout

12
app/models/customer.rb
View File

@@ -31,7 +31,7 @@ class Customer < ApplicationRecord
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, },
:timeout => 10) :timeout => 10)
rescue HTTParty::Error rescue HTTParty::Error
@@ -68,7 +68,7 @@ class Customer < ApplicationRecord
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, },
:timeout => 10 :timeout => 10
) )
@@ -121,7 +121,7 @@ class Customer < ApplicationRecord
:body => member_params, :body => member_params,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}) })
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { status: false, message: "Server Time out" } response = { status: false, message: "Server Time out" }
@@ -198,7 +198,7 @@ class Customer < ApplicationRecord
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, :timeout => 10) }, :timeout => 10)
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { "status": false , "message": "Connect To" } response = { "status": false , "message": "Connect To" }
@@ -274,7 +274,7 @@ class Customer < ApplicationRecord
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, :timeout => 10) }, :timeout => 10)
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { "status": false , "message": "Connect To" } response = { "status": false , "message": "Connect To" }
@@ -309,7 +309,7 @@ class Customer < ApplicationRecord
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, },
:timeout => 10 :timeout => 10
) )

11
app/models/sale_payment.rb
View File

@@ -85,7 +85,7 @@ class SalePayment < ApplicationRecord
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, :timeout => 10 }, :timeout => 10
) )
rescue Net::OpenTimeout rescue Net::OpenTimeout
@@ -133,7 +133,7 @@ class SalePayment < ApplicationRecord
auth_token:auth_token}.to_json, auth_token:auth_token}.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, },
:timeout => 10 :timeout => 10
) )
@@ -455,7 +455,7 @@ class SalePayment < ApplicationRecord
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, :timeout => 10) }, :timeout => 10)
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { "status": false , "message": " Connection timeout" } response = { "status": false , "message": " Connection timeout" }
@@ -500,7 +500,8 @@ class SalePayment < ApplicationRecord
end end
rebate_arr.push(data) rebate_arr.push(data)
end end
Rails.logger.debug "Rebage Response"
Rails.logger.debug rebate_arr.to_json
total_amount = rebate_prices - payparcost - overall_dis total_amount = rebate_prices - payparcost - overall_dis
if credit == 1 if credit == 1
@@ -531,7 +532,7 @@ class SalePayment < ApplicationRecord
}.to_json, }.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=2' 'Accept' => 'application/json; version=3'
}, :timeout => 10) }, :timeout => 10)
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { "status": false , "message": "Connect To" } response = { "status": false , "message": "Connect To" }