Skip to content

Misc changes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sigmike wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Misc changes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b99ef9
check trans_id (between 000000 and 899999)
sigmike Oct 3, 2012
5488949
renamed certificat to certificate
sigmike Oct 3, 2012
3b4c65b
added vads_return_mode
sigmike Oct 3, 2012
2d84a42
correctly merge instance and class values
sigmike Oct 3, 2012
f54afdb
backward compatibility for certificat
sigmike Oct 3, 2012
61d9db2
updated README, valid_signature? is a class method
sigmike Oct 3, 2012
1d71620
added language
sigmike Oct 4, 2012
aff408d
added fields vads_order_id, vads_shop_name and vads_shop_url
sigmike Oct 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Readme.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ or, in your Gemfile

### in development.rb :

# Your test certificat
SystemPay.certificat = '9123456299120752'
# Your test certificate
SystemPay.certificate = '9123456299120752'

### in production.rb :

# Your production certificat
SystemPay.certificat = '7193156219823756'
# Your production certificate
SystemPay.certificate = '7193156219823756'
# Set the production mode
SystemPay.vads_ctx_mode = 'PRODUCTION'

Expand All @@ -51,8 +51,7 @@ or, in your Gemfile
protect_from_forgery :except => [:bank_callback]

def bank_callback
@system_pay = SystemPay.new(params)
if @system_pay.valid_signature?(params[:signature])
if SystemPay.valid_signature?(params)

order_transaction = OrderTransaction.find_by_reference params[:reference], :last
order = order_transaction.order
Expand Down
24 changes: 19 additions & 5 deletions lib/system_pay.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,18 @@ class SystemPay
@@vads_version = 'V2'
cattr_accessor :vads_version

@@certificat = '1122334455667788'
cattr_accessor :certificat
@@certificate = '1122334455667788'
cattr_accessor :certificate

# Backward compatibility
class << self
alias_method :certificat, :certificate
alias_method :certificat=, :certificate=
end

attr_accessor :vads_amount, :vads_available_languages, :vads_capture_delay, :vads_contracts, :vads_currency, :vads_cust_address, :vads_cust_cell_phone,
:vads_cust_email, :vads_cust_id, :vads_cust_name, :vads_redirect_error_message, :vads_redirect_success_message, :vads_trans_date, :vads_trans_id, :vads_url_cancel, :vads_url_error,
:vads_url_referral, :vads_url_refused, :vads_url_success
:vads_url_referral, :vads_url_refused, :vads_url_success, :vads_return_mode, :vads_language, :vads_order_id, :vads_shop_name, :vads_shop_url

# Public: Creation of new instance.
#
Expand Down Expand Up @@ -67,6 +73,8 @@ def initialize args=nil
@vads_trans_date ||= Time.now.utc.strftime("%Y%m%d%H%M%S")
@vads_trans_id = @vads_trans_id.to_s.rjust(6, '0')

raise ArgumentError.new("Invalid trans_id: #{@vads_trans_id.inspect}") unless @vads_trans_id =~ /\A[0-8][0-9]{5}\Z/

end

# Public: Perform the signature of the request based on the parameters
Expand All @@ -90,7 +98,7 @@ def self.valid_signature?(params)
private

def self.sign(values)
Digest::SHA1.hexdigest((values+[certificat]).join("+"))
Digest::SHA1.hexdigest((values+[certificate]).join("+"))
end

def instance_variables_array
Expand All @@ -102,7 +110,13 @@ def self.class_variables_array
end

def sorted_array
(instance_variables_array + self.class.class_variables_array).uniq.sort
class_variables_hash = Hash[*self.class.class_variables_array.flatten(1)]
instance_variables_hash = Hash[*instance_variables_array.flatten(1)]

names = (class_variables_hash.keys + instance_variables_hash.keys).uniq.sort
names.map do |name|
[name, instance_variables_hash[name] || class_variables_hash[name]]
end
end

def sorted_values
Expand Down