activemerchant 1.18.1 → 1.20.0

data/lib/active_merchant/billing/gateways/usa_epay_transaction.rb

@@ -0,0 +1,194 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+        
+    class UsaEpayTransactionGateway < Gateway
+    	URL = 'https://www.usaepay.com/gate.php'
+      
+      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_countries = ['US']
+      self.homepage_url = 'http://www.usaepay.com/'
+      self.display_name = 'USA ePay'
+
+      TRANSACTIONS = {
+        :authorization => 'authonly',
+        :purchase => 'sale',
+        :capture => 'capture'
+      }
+
+      def initialize(options = {})
+        requires!(options, :login)
+        @options = options
+        super
+      end  
+      
+      def authorize(money, credit_card, options = {})
+        post = {}
+        
+        add_amount(post, money)
+        add_invoice(post, options)
+        add_credit_card(post, credit_card)        
+        add_address(post, credit_card, options)        
+        add_customer_data(post, options)
+        
+        commit(:authorization, post)
+      end
+      
+      def purchase(money, credit_card, options = {})
+        post = {}
+        
+        add_amount(post, money)
+        add_invoice(post, options)
+        add_credit_card(post, credit_card)        
+        add_address(post, credit_card, options)   
+        add_customer_data(post, options)
+             
+        commit(:purchase, post)
+      end                       
+    
+      def capture(money, authorization, options = {})
+        post = {
+          :refNum => authorization
+        }
+        
+        add_amount(post, money)
+        commit(:capture, post)
+      end
+       
+      private                       
+    
+      def add_amount(post, money)
+        post[:amount] = amount(money)
+      end
+      
+      def expdate(credit_card)
+        year  = format(credit_card.year, :two_digits)
+        month = format(credit_card.month, :two_digits)
+
+        "#{month}#{year}"
+      end
+      
+      def add_customer_data(post, options)
+        address = options[:billing_address] || options[:address] || {}
+        post[:street] = address[:address1]
+        post[:zip] = address[:zip]
+
+        if options.has_key? :email
+          post[:custemail] = options[:email]
+          post[:custreceipt] = 'No'
+        end
+        
+        if options.has_key? :customer
+          post[:custid] = options[:customer]
+        end
+        
+        if options.has_key? :ip
+          post[:ip] = options[:ip]
+        end        
+      end
+
+      def add_address(post, credit_card, options)
+        billing_address = options[:billing_address] || options[:address]
+        
+        add_address_for_type(:billing, post, credit_card, billing_address) if billing_address
+        add_address_for_type(:shipping, post, credit_card, options[:shipping_address]) if options[:shipping_address]
+      end
+
+      def add_address_for_type(type, post, credit_card, address)
+        prefix = address_key_prefix(type)
+
+        post[address_key(prefix, 'fname')] = credit_card.first_name
+        post[address_key(prefix, 'lname')] = credit_card.last_name
+        post[address_key(prefix, 'company')] = address[:company] unless address[:company].blank?
+        post[address_key(prefix, 'street')] = address[:address1] unless address[:address1].blank?
+        post[address_key(prefix, 'street2')] = address[:address2] unless address[:address2].blank?
+        post[address_key(prefix, 'city')] = address[:city] unless address[:city].blank?
+        post[address_key(prefix, 'state')] = address[:state] unless address[:state].blank?
+        post[address_key(prefix, 'zip')] = address[:zip] unless address[:zip].blank?
+        post[address_key(prefix, 'country')] = address[:country] unless address[:country].blank?
+        post[address_key(prefix, 'phone')] = address[:phone] unless address[:phone].blank?
+      end
+      
+      def address_key_prefix(type)  
+        case type
+        when :shipping then 'ship'
+        when :billing then 'bill'
+        end
+      end
+
+      def address_key(prefix, key)
+        "#{prefix}#{key}".to_sym
+      end
+      
+      def add_invoice(post, options)
+        post[:invoice] = options[:order_id]
+      end
+      
+      def add_credit_card(post, credit_card)      
+        post[:card]  = credit_card.number
+        post[:cvv2] = credit_card.verification_value if credit_card.verification_value?
+        post[:expir]  = expdate(credit_card)
+        post[:name] = credit_card.name
+      end
+      
+      def parse(body)
+        fields = {}
+        for line in body.split('&')
+          key, value = *line.scan( %r{^(\w+)\=(.*)$} ).flatten
+          fields[key] = CGI.unescape(value.to_s)
+        end
+
+        {
+          :status => fields['UMstatus'],
+          :auth_code => fields['UMauthCode'],
+          :ref_num => fields['UMrefNum'],
+          :batch => fields['UMbatch'],
+          :avs_result => fields['UMavsResult'],
+          :avs_result_code => fields['UMavsResultCode'],
+          :cvv2_result => fields['UMcvv2Result'],
+          :cvv2_result_code => fields['UMcvv2ResultCode'],
+          :vpas_result_code => fields['UMvpasResultCode'],
+          :result => fields['UMresult'],
+          :error => fields['UMerror'],
+          :error_code => fields['UMerrorcode'],
+          :acs_url => fields['UMacsurl'],
+          :payload => fields['UMpayload']
+        }.delete_if{|k, v| v.nil?}         
+      end     
+
+      
+      def commit(action, parameters)
+        response = parse( ssl_post(URL, post_data(action, parameters)) )
+        
+        Response.new(response[:status] == 'Approved', message_from(response), response, 
+          :test => @options[:test] || test?,
+          :authorization => response[:ref_num],
+          :cvv_result => response[:cvv2_result_code],
+          :avs_result => { 
+            :street_match => response[:avs_result_code].to_s[0,1],
+            :postal_match => response[:avs_result_code].to_s[1,1],
+            :code => response[:avs_result_code].to_s[2,1]
+          }
+        )        
+      end
+
+      def message_from(response)
+        if response[:status] == "Approved"
+          return 'Success'
+        else
+          return 'Unspecified error' if response[:error].blank?
+          return response[:error]
+        end
+      end
+      
+      def post_data(action, parameters = {})
+        parameters[:command]  = TRANSACTIONS[action]
+        parameters[:key] = @options[:login]
+        parameters[:software] = 'Active Merchant'
+        parameters[:testmode] = @options[:test] ? 1 : 0
+
+        parameters.collect { |key, value| "UM#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+      end
+    end
+  end
+end
+

data/lib/active_merchant/billing/integrations/dwolla.rb

@@ -17,11 +17,11 @@ module ActiveMerchant #:nodoc:
         mattr_accessor :service_url
         self.service_url = 'https://www.dwolla.com/payment/pay'
 
-        def self.notification(post)
+        def self.notification(post, options={})
           Notification.new(post)
         end
 
-        def self.return(query_string)
+        def self.return(query_string, options={})
           Return.new(query_string)
         end
       end

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

@@ -7,16 +7,19 @@ module ActiveMerchant #:nodoc:
           def initialize(order, account, options = {})
             super
             add_field('name', 'Store Purchase')
+
+            if ActiveMerchant::Billing::Base.integration_mode == :test || options[:test]
+              add_field('test', 'true')
+            end 
           end
           
           # Replace with the real mapping
-          mapping :credential1, 'key'
-          mapping :credential2, 'secret'
+          mapping :account, 'destinationid'
+          mapping :credential2, 'key'
+          mapping :credential3, 'secret'
           mapping :notify_url, 'callback'
           mapping :return_url, 'redirect'
-          mapping :test_mode, 'test'
           mapping :description, 'description'
-          mapping :account, 'destinationid'
           mapping :amount, 'amount'
           mapping :tax, 'tax'
           mapping :shipping, 'shipping'

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

@@ -14,6 +14,10 @@ module ActiveMerchant #:nodoc:
           end
 
           def transaction_id
+            params['TransactionId']
+          end
+
+          def item_id
             params['OrderId']
           end
 
@@ -40,6 +44,7 @@ module ActiveMerchant #:nodoc:
  private
           # Take the posted data and move the relevant data into a hash
           def parse(post)
+            @raw = post.to_s
             json_post = JSON.parse(post)
             params.merge!(json_post)
           end

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

@@ -15,7 +15,8 @@ module ActiveMerchant #:nodoc:
 
         def initialize(order, account, options = {})
           options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name])
-          @fields = {}
+          @fields          = {}
+          @test            = options[:test]
           self.order       = order
           self.account     = account
           self.amount      = options[:amount]
@@ -54,6 +55,10 @@ module ActiveMerchant #:nodoc:
           @fields
         end
 
+        def test?
+          @test_mode ||= ActiveMerchant::Billing::Base.integration_mode == :test || @test
+        end
+
         private
         
         def add_address(key, params)

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

@@ -3,22 +3,27 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module PayflowLink
         class Helper < ActiveMerchant::Billing::Integrations::Helper
+          include PostsData
 
           def initialize(order, account, options = {})
             super
             add_field('login', account)
-            add_field('type', 'S')
             add_field('echodata', 'True')
-            add_field('user2', ActiveMerchant::Billing::Base.integration_mode == :test || options[:test])
+            add_field('user2', self.test?)
             add_field('invoice', order)
+            add_field('vendor', account)
+            add_field('user', options[:credential4] || account)
+            add_field('trxtype', 'S')
           end
 
-          mapping :amount, 'amount'
           mapping :account, 'login'
-          mapping :credential2, 'partner'
+          mapping :credential2, 'pwd'
+          mapping :credential3, 'partner'
           mapping :order, 'user1'
           mapping :description, 'description'
 
+          mapping :amount, 'amt'
+
 
           mapping :billing_address,  :city    => 'city',
                                      :address => 'address',
@@ -51,6 +56,43 @@ module ActiveMerchant #:nodoc:
               add_field(field, v) unless field.nil?
             end
           end
+
+          def form_fields
+            token, token_id = request_secure_token
+
+            {"securetoken" => token, "securetokenid" => token_id, "mode" => test? ? "test" : "live"}
+          end
+
+          private
+
+          def secure_token_id
+            @secure_token_id ||= Utils.generate_unique_id
+          end
+
+          def secure_token_url
+            test? ? "https://pilot-payflowpro.paypal.com" : "https://payflowpro.paypal.com"
+          end
+
+          def request_secure_token
+            @fields["securetokenid"] = secure_token_id
+            @fields["createsecuretoken"] = "Y"
+
+            fields = @fields.collect {|key, value| "#{key}[#{value.length}]=#{value}" }.join("&")
+
+            response = ssl_post(secure_token_url, fields)
+
+            parse_response(response)
+          end
+
+          def parse_response(response)
+            response = response.split("&").inject({}) do |hash, param|
+              key, value = param.split("=")
+              hash[key] = value
+              hash
+            end
+
+            [response['SECURETOKEN'], response['SECURETOKENID']] if response['RESPMSG'] && response['RESPMSG'].downcase == "approved"
+          end
         end
       end
     end

data/lib/active_merchant/billing/integrations/two_checkout.rb

@@ -1,4 +1,3 @@
-
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
@@ -8,7 +7,7 @@ module ActiveMerchant #:nodoc:
         autoload 'Notification', File.dirname(__FILE__) + '/two_checkout/notification'
        
         mattr_accessor :service_url
-        self.service_url = 'https://www.2checkout.com/2co/buyer/purchase'
+        self.service_url = 'https://www.2checkout.com/checkout/purchase'
 
         def self.notification(post, options = {})
           Notification.new(post)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.18.1"
+  VERSION = "1.20.0"
 end

metadata

@@ -1,26 +1,46 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 71
   prerelease: 
   segments: 
   - 1
-  - 18
-  - 1
-  version: 1.18.1
+  - 20
+  - 0
+  version: 1.20.0
 platform: ruby
 authors: 
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: 
-- gem-public_cert.pem
-date: 2011-09-30 00:00:00 -04:00
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApjb2R5
+  ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
+  b20wHhcNMDcwMjIyMTcyMTI3WhcNMDgwMjIyMTcyMTI3WjBBMRMwEQYDVQQDDApj
+  b2R5ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6T4Iqt5iWvAlU
+  iXI6L8UO0URQhIC65X/gJ9hL/x4lwSl/ckVm/R/bPrJGmifT+YooFv824N3y/TIX
+  25o/lZtRj1TUZJK4OCb0aVzosQVxBHSe6rLmxO8cItNTMOM9wn3thaITFrTa1DOQ
+  O3wqEjvW2L6VMozVfK1MfjL9IGgy0rCnl+2g4Gh4jDDpkLfnMG5CWI6cTCf3C1ye
+  ytOpWgi0XpOEy8nQWcFmt/KCQ/kFfzBo4QxqJi54b80842EyvzWT9OB7Oew/CXZG
+  F2yIHtiYxonz6N09vvSzq4CvEuisoUFLKZnktndxMEBKwJU3XeSHAbuS7ix40OKO
+  WKuI54fHAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBR9QQpefI3oDCAxiqJW/3Gg6jI6qjANBgkqhkiG9w0BAQUFAAOCAQEAs0lX26O+
+  HpyMp7WL+SgZuM8k76AjfOHuKajl2GEn3S8pWYGpsa0xu07HtehJhKLiavrfUYeE
+  qlFtyYMUyOh6/1S2vfkH6VqjX7mWjoi7XKHW/99fkMS40B5SbN+ypAUst+6c5R84
+  w390mjtLHpdDE6WQYhS6bFvBN53vK6jG3DLyCJc0K9uMQ7gdHWoxq7RnG92ncQpT
+  ThpRA+fky5Xt2Q63YJDnJpkYAz79QIama1enSnd4jslKzSl89JS2luq/zioPe/Us
+  hbyalWR1+HrhgPoSPq7nk+s2FQUBJ9UZFK1lgMzho/4fZgzJwbu+cO8SNuaLS/bj
+  hPaSTyVU0yCSnw==
+  -----END CERTIFICATE-----
+
+date: 2011-11-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,11 +52,11 @@ dependencies:
         - 11
         version: 2.3.11
   name: activesupport
-  version_requirements: *id001
+  type: :runtime
   prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,25 +66,27 @@ dependencies:
         - 0
         version: "0"
   name: i18n
-  version_requirements: *id002
+  type: :runtime
   prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
+        - 3
+        - 7
+        - 1
+        version: 3.7.1
   name: money
-  version_requirements: *id003
+  type: :runtime
   prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,11 +98,11 @@ dependencies:
         - 0
         version: 2.0.0
   name: builder
-  version_requirements: *id004
+  type: :runtime
   prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,11 +114,11 @@ dependencies:
         - 0
         version: 2.0.0
   name: braintree
-  version_requirements: *id005
+  type: :runtime
   prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,11 +130,11 @@ dependencies:
         - 1
         version: 1.5.1
   name: json
-  version_requirements: *id006
+  type: :runtime
   prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,11 +146,11 @@ dependencies:
         - 1
         version: 1.0.1
   name: active_utils
-  version_requirements: *id007
+  type: :runtime
   prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -138,11 +160,11 @@ dependencies:
         - 0
         version: "0"
   name: rake
-  version_requirements: *id008
+  type: :development
   prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,11 +174,11 @@ dependencies:
         - 0
         version: "0"
   name: mocha
-  version_requirements: *id009
+  type: :development
   prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,8 +190,9 @@ dependencies:
         - 11
         version: 2.3.11
   name: rails
-  version_requirements: *id010
+  type: :development
   prerelease: false
+  requirement: *id010
 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 possible away from the user to offer a consistent interface across all supported gateways.
 email: tobi@leetsoft.com
 executables: []
@@ -270,6 +293,7 @@ files:
 - lib/active_merchant/billing/gateways/sage.rb
 - lib/active_merchant/billing/gateways/sage_pay.rb
 - lib/active_merchant/billing/gateways/sallie_mae.rb
+- lib/active_merchant/billing/gateways/samurai.rb
 - lib/active_merchant/billing/gateways/secure_net.rb
 - lib/active_merchant/billing/gateways/secure_pay.rb
 - lib/active_merchant/billing/gateways/secure_pay_au.rb
@@ -281,6 +305,8 @@ files:
 - lib/active_merchant/billing/gateways/transax.rb
 - lib/active_merchant/billing/gateways/trust_commerce.rb
 - lib/active_merchant/billing/gateways/usa_epay.rb
+- lib/active_merchant/billing/gateways/usa_epay_advanced.rb
+- lib/active_merchant/billing/gateways/usa_epay_transaction.rb
 - lib/active_merchant/billing/gateways/verifi.rb
 - lib/active_merchant/billing/gateways/viaklix.rb
 - lib/active_merchant/billing/gateways/wirecard.rb