activemerchant 1.29.1 → 1.31.0

data/lib/active_merchant/billing/integrations/quickpay/notification.rb

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
         class Notification < ActiveMerchant::Billing::Integrations::Notification
           def complete?
             status == '000'
-          end 
+          end
 
           def item_id
             params['ordernumber']
@@ -18,7 +18,10 @@ module ActiveMerchant #:nodoc:
           end
 
           def received_at
-            Time.parse("20#{params['time']}")
+            time = params['time']
+            # If time only contains 12 integers then it's pre v5 format
+            time = "20#{params['time']}" if /[0-9]{12}/.match(params['time'])
+            Time.parse(time)
           end
 
           def gross
@@ -29,10 +32,6 @@ module ActiveMerchant #:nodoc:
             params['amount'].to_i
           end
 
-          def test?
-            params['testmode'] == 'Yes'
-          end
-
           def status
             params['qpstat']
           end
@@ -40,9 +39,9 @@ module ActiveMerchant #:nodoc:
           def currency
             params['currency']
           end
-          
+
           # Provide access to raw fields from quickpay
-          %w(msgtype ordernumber state chstat chstatmsg qpstat qpstatmsg merchant merchantemail cardtype cardnumber).each do |attr|
+          %w(msgtype ordernumber state chstat chstatmsg qpstat qpstatmsg merchant merchantemail cardtype cardnumber splitpayment fraudprobability fraudremarks fraudreport fee).each do |attr|
             define_method(attr) do
               params[attr]
             end
@@ -50,21 +49,22 @@ module ActiveMerchant #:nodoc:
 
           MD5_CHECK_FIELDS = [
             :msgtype, :ordernumber, :amount, :currency, :time, :state,
-            :chstat, :chstatmsg, :qpstat, :qpstatmsg, :merchant, :merchantemail,
-            :transaction, :cardtype, :cardnumber, :testmode
+            :qpstat, :qpstatmsg, :chstat, :chstatmsg, :merchant, :merchantemail,
+            :transaction, :cardtype, :cardnumber, :splitpayment, :fraudprobability,
+            :fraudremarks, :fraudreport, :fee
           ]
 
           def generate_md5string
-            MD5_CHECK_FIELDS.map { |key| params[key.to_s] } * "" + @options[:credential2]
+            MD5_CHECK_FIELDS.map { |key| params[key.to_s] } * "" + @options[:credential2].to_s
           end
-          
+
           def generate_md5check
             Digest::MD5.hexdigest(generate_md5string)
           end
-          
+
           # Quickpay doesn't do acknowledgements of callback notifications
           # Instead it uses and MD5 hash of all parameters
-          def acknowledge      
+          def acknowledge
             generate_md5check == params['md5check']
           end
         end

data/lib/active_merchant/billing/integrations/sage_pay_form/helper.rb

@@ -64,8 +64,8 @@ module ActiveMerchant #:nodoc:
 
             fields['FailureURL'] ||= fields['SuccessURL']
 
-            fields['BillingPostCode'] ||= "0000" if fields['BillingCountry'] == "IE"
-            fields['DeliveryPostCode'] ||= "0000" if fields['DeliveryCountry'] == "IE"
+            fields['BillingPostCode'] ||= "0000"
+            fields['DeliveryPostCode'] ||= "0000"
 
             crypt_skip = ['Vendor', 'EncryptKey', 'SendEmail']
             crypt_skip << 'BillingState'  unless fields['BillingCountry']  == 'US'

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.29.1"
+  VERSION = "1.31.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.29.1
+  version: 1.31.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,11 +37,11 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70335632813660 !ruby/object:Gem::Requirement
+  requirement: &70206840641520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,10 +49,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70335632813660
+  version_requirements: *70206840641520
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70335632813220 !ruby/object:Gem::Requirement
+  requirement: &70206840641100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -60,10 +60,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335632813220
+  version_requirements: *70206840641100
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70335632812700 !ruby/object:Gem::Requirement
+  requirement: &70206840640640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,10 +71,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335632812700
+  version_requirements: *70206840640640
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70335632812180 !ruby/object:Gem::Requirement
+  requirement: &70206840640080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,10 +82,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70335632812180
+  version_requirements: *70206840640080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70335632811640 !ruby/object:Gem::Requirement
+  requirement: &70206840639440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -93,10 +93,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70335632811640
+  version_requirements: *70206840639440
 - !ruby/object:Gem::Dependency
   name: active_utils
-  requirement: &70335632811140 !ruby/object:Gem::Requirement
+  requirement: &70206840638860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70335632811140
+  version_requirements: *70206840638860
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70335632810740 !ruby/object:Gem::Requirement
+  requirement: &70206840638080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -115,10 +115,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335632810740
+  version_requirements: *70206840638080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335632810240 !ruby/object:Gem::Requirement
+  requirement: &70206840637200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335632810240
+  version_requirements: *70206840637200
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70335632809700 !ruby/object:Gem::Requirement
+  requirement: &70206840636380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 0.11.3
   type: :development
   prerelease: false
-  version_requirements: *70335632809700
+  version_requirements: *70206840636380
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70335632809180 !ruby/object:Gem::Requirement
+  requirement: &70206840635740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 2.3.14
   type: :development
   prerelease: false
-  version_requirements: *70335632809180
+  version_requirements: *70206840635740
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70335632808760 !ruby/object:Gem::Requirement
+  requirement: &70206840684480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,7 +159,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335632808760
+  version_requirements: *70206840684480
 description: Active Merchant is a simple payment abstraction library used in and sponsored
   by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim
   of the project is to feel natural to Ruby users and to abstract as many parts as
@@ -206,6 +206,7 @@ files:
 - lib/active_merchant/billing/gateways/efsnet.rb
 - lib/active_merchant/billing/gateways/elavon.rb
 - lib/active_merchant/billing/gateways/epay.rb
+- lib/active_merchant/billing/gateways/evo_ca.rb
 - lib/active_merchant/billing/gateways/eway.rb
 - lib/active_merchant/billing/gateways/eway_managed.rb
 - lib/active_merchant/billing/gateways/eway_rapid.rb
@@ -213,6 +214,7 @@ files:
 - lib/active_merchant/billing/gateways/fat_zebra.rb
 - lib/active_merchant/billing/gateways/federated_canada.rb
 - lib/active_merchant/billing/gateways/first_pay.rb
+- lib/active_merchant/billing/gateways/firstdata_e4.rb
 - lib/active_merchant/billing/gateways/garanti.rb
 - lib/active_merchant/billing/gateways/hdfc.rb
 - lib/active_merchant/billing/gateways/ideal/ideal_base.rb
@@ -228,6 +230,7 @@ files:
 - lib/active_merchant/billing/gateways/litle.rb
 - lib/active_merchant/billing/gateways/merchant_e_solutions.rb
 - lib/active_merchant/billing/gateways/merchant_ware.rb
+- lib/active_merchant/billing/gateways/merchant_warrior.rb
 - lib/active_merchant/billing/gateways/mercury.rb
 - lib/active_merchant/billing/gateways/metrics_global.rb
 - lib/active_merchant/billing/gateways/migs/migs_codes.rb
@@ -240,6 +243,7 @@ files:
 - lib/active_merchant/billing/gateways/net_registry.rb
 - lib/active_merchant/billing/gateways/netaxept.rb
 - lib/active_merchant/billing/gateways/netbilling.rb
+- lib/active_merchant/billing/gateways/netpay.rb
 - lib/active_merchant/billing/gateways/nmi.rb
 - lib/active_merchant/billing/gateways/ogone.rb
 - lib/active_merchant/billing/gateways/optimal_payment.rb
@@ -258,6 +262,7 @@ files:
 - lib/active_merchant/billing/gateways/payflow_express_uk.rb
 - lib/active_merchant/billing/gateways/payflow_uk.rb
 - lib/active_merchant/billing/gateways/payment_express.rb
+- lib/active_merchant/billing/gateways/paymill.rb
 - lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb
 - lib/active_merchant/billing/gateways/paypal/paypal_express_response.rb
 - lib/active_merchant/billing/gateways/paypal/paypal_recurring_api.rb
@@ -268,6 +273,7 @@ files:
 - lib/active_merchant/billing/gateways/paypal_express_common.rb
 - lib/active_merchant/billing/gateways/paystation.rb
 - lib/active_merchant/billing/gateways/payway.rb
+- lib/active_merchant/billing/gateways/pin.rb
 - lib/active_merchant/billing/gateways/plugnpay.rb
 - lib/active_merchant/billing/gateways/psigate.rb
 - lib/active_merchant/billing/gateways/psl_card.rb
@@ -289,6 +295,7 @@ files:
 - lib/active_merchant/billing/gateways/secure_pay_tech.rb
 - lib/active_merchant/billing/gateways/skip_jack.rb
 - lib/active_merchant/billing/gateways/smart_ps.rb
+- lib/active_merchant/billing/gateways/spreedly_core.rb
 - lib/active_merchant/billing/gateways/stripe.rb
 - lib/active_merchant/billing/gateways/trans_first.rb
 - lib/active_merchant/billing/gateways/transax.rb
@@ -470,3 +477,4 @@ signing_key:
 specification_version: 3
 summary: Framework and tools for dealing with credit card transactions.
 test_files: []
+has_rdoc: