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

update

Browse Source
This commit is contained in:
Aung Myo
2017-07-03 13:22:02 +06:30
parent 92712787e1
commit e3477fd268
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,10 +55,6 @@ class Origami::PaymentsController < BaseOrigamiController
shop_details = Shop.find(1) shop_details = Shop.find(1)
# get member information # get member information
member_info = Customer.get_member_account(customer) member_info = Customer.get_member_account(customer)
puts "transaction"
puts rebate_amount.to_json
puts "member_info"
puts member_info.to_json
# 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/models/sale_payment.rb
View File

@@ -337,7 +337,7 @@ class SalePayment < ApplicationRecord
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json' 'Accept' => 'application/json'
}, :timeout => 100) }, :timeout => 10)
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { status: false , message: "Server Time out"} response = { status: false , message: "Server Time out"}