activemerchant 1.38.1 → 1.39.0

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

@@ -34,7 +34,7 @@ module ActiveMerchant
       self.money_format = :cents
       self.default_currency = 'EUR'
       self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :switch, :solo, :laser ]
-      self.supported_countries = [ 'IE', 'GB' ]
+      self.supported_countries = %w(IE GB FR BE NL LU IT)
       self.homepage_url = 'http://www.realexpayments.com/'
       self.display_name = 'Realex'
 
@@ -86,8 +86,11 @@ module ActiveMerchant
       def commit(request)
         response = parse(ssl_post(self.live_url, request))
 
-        Response.new(response[:result] == "00", message_from(response), response,
-          :test => response[:message] =~ /\[ test system \]/,
+        Response.new(
+          (response[:result] == "00"),
+          message_from(response),
+          response,
+          :test => (response[:message] =~ %r{\[ test system \]}),
           :authorization => authorization_from(response),
           :cvv_result => response[:cvnresult],
           :avs_result => {
@@ -187,14 +190,14 @@ module ActiveMerchant
 
           if billing_address
             xml.tag! 'address', 'type' => 'billing' do
-              xml.tag! 'code', format_shipping_zip_code(billing_address[:zip])
+              xml.tag! 'code', format_address_code(billing_address)
               xml.tag! 'country', billing_address[:country]
             end
           end
 
           if shipping_address
             xml.tag! 'address', 'type' => 'shipping' do
-              xml.tag! 'code', format_shipping_zip_code(shipping_address[:zip])
+              xml.tag! 'code', format_address_code(shipping_address)
               xml.tag! 'country', shipping_address[:country]
             end
           end
@@ -240,8 +243,9 @@ module ActiveMerchant
         end
       end
 
-      def format_shipping_zip_code(zip)
-        zip.to_s.gsub(/\W/, '')
+      def format_address_code(address)
+        code = [address[:zip].to_s, address[:address1].to_s + address[:address2].to_s]
+        code.collect{|e| e.gsub(/\D/, "")}.reject{|e| e.empty?}.join("|")
       end
 
       def new_timestamp

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

@@ -44,7 +44,7 @@ module ActiveMerchant #:nodoc:
       }
 
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :switch, :solo, :maestro, :diners_club]
-      self.supported_countries = ['GB']
+      self.supported_countries = ['GB', 'IE']
       self.default_currency = 'GBP'
 
       self.homepage_url = 'http://www.sagepay.com'

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

@@ -93,9 +93,8 @@ module ActiveMerchant #:nodoc:
 
         xml.tag! 'AMOUNT', amount(money)
         add_credit_card(xml, creditcard)
-        add_required_params(xml, action, options)
+        add_params_in_required_order(xml, action, options)
         add_address(xml, creditcard, options)
-        add_invoice(xml, options)
         add_more_required_params(xml, options)
 
         xml.target!
@@ -111,7 +110,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'CARDNUMBER', last_four
         end
 
-        add_required_params(xml, action, options)
+        add_params_in_required_order(xml, action, options)
         xml.tag! 'REF_TRANSID', transaction_id
         add_more_required_params(xml, options)
 
@@ -181,12 +180,6 @@ module ActiveMerchant #:nodoc:
 
       end
 
-      def add_invoice(xml, options)
-        xml.tag! 'NOTE', options[:description] if options[:description]
-        xml.tag! 'INVOICEDESC', options[:invoice_description] if options[:invoice_description]
-        xml.tag! 'INVOICENUM', options[:invoice_number] if options[:invoice_number]
-      end
-
       def add_merchant_key(xml, options)
         xml.tag!("MERCHANT_KEY") do
           xml.tag! 'GROUPID', 0
@@ -195,13 +188,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_required_params(xml, action, options)
+      # SecureNet requires some of the xml params to be in a certain order.  http://cl.ly/image/3K260E0p0a0n/content.png
+      def add_params_in_required_order(xml, action, options)
         xml.tag! 'CODE', TRANSACTIONS[action]
         add_customer_data(xml, options)
         xml.tag! 'DCI', 0 # No duplicate checking will be done, except for ORDERID
         xml.tag! 'INSTALLMENT_SEQUENCENUM', 1
+        xml.tag! 'INVOICEDESC', options[:invoice_description] if options[:invoice_description]
+        xml.tag! 'INVOICENUM', options[:invoice_number] if options[:invoice_number]
         add_merchant_key(xml, options)
         xml.tag! 'METHOD', 'CC'
+        xml.tag! 'NOTE', options[:description] if options[:description]
         xml.tag! 'ORDERID', options[:order_id]
         xml.tag! 'OVERRIDE_FROM', 0 # Docs say not required, but doesn't work without it
       end

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

@@ -36,7 +36,9 @@ module ActiveMerchant #:nodoc:
       #
       # money          - The monetary amount of the transaction in cents.
       # payment_method - The CreditCard or the Spreedly payment method token.
-      # options        - A standard ActiveMerchant options hash
+      # options        - A hash of options:
+      #                  :store - Retain the payment method if the purchase
+      #                           succeeds.  Defaults to false.  (optional)
       def purchase(money, payment_method, options = {})
         if payment_method.is_a?(String)
           purchase_with_token(money, payment_method, options)
@@ -52,7 +54,9 @@ module ActiveMerchant #:nodoc:
       #
       # money          - The monetary amount of the transaction in cents.
       # payment_method - The CreditCard or the Spreedly payment method token.
-      # options        - A standard ActiveMerchant options hash
+      # options        - A hash of options:
+      #                  :store - Retain the payment method if the authorize
+      #                           succeeds.  Defaults to false.  (optional)
       def authorize(money, payment_method, options = {})
         if payment_method.is_a?(String)
           authorize_with_token(money, payment_method, options)
@@ -126,6 +130,7 @@ module ActiveMerchant #:nodoc:
         build_xml_request('transaction') do |doc|
           add_invoice(doc, money, options)
           doc.payment_method_token(payment_method_token)
+          doc.retain_on_success(true) if options[:store]
         end
       end
 
@@ -137,6 +142,7 @@ module ActiveMerchant #:nodoc:
       def add_credit_card(doc, credit_card, options)
         doc.credit_card do
           doc.number(credit_card.number)
+          doc.verification_value(credit_card.verification_value)
           doc.first_name(credit_card.first_name)
           doc.last_name(credit_card.last_name)
           doc.month(credit_card.month)
@@ -147,6 +153,7 @@ module ActiveMerchant #:nodoc:
           doc.city(options[:billing_address].try(:[], :city))
           doc.state(options[:billing_address].try(:[], :state))
           doc.zip(options[:billing_address].try(:[], :zip))
+          doc.country(options[:billing_address].try(:[], :country))
         end
       end
 

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

@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
         'unchecked' => 'P'
       }
 
-      self.supported_countries = ['US', 'CA', 'GB']
+      self.supported_countries = %w(US CA GB AU IE FR NL BE DE ES)
       self.default_currency = 'USD'
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]

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

@@ -2,7 +2,8 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
 
     class UsaEpayTransactionGateway < Gateway
-      self.test_url = self.live_url = 'https://www.usaepay.com/gate.php'
+      self.test_url = 'https://sandbox.usaepay.com/gate.php'
+      self.live_url = 'https://www.usaepay.com/gate.php'
 
       self.supported_cardtypes = [:visa, :master, :american_express]
       self.supported_countries = ['US']
@@ -168,7 +169,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-        response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
+        url = (self.test? ? self.test_url : self.live_url)
+        response = parse( ssl_post(url, post_data(action, parameters)) )
 
         Response.new(response[:status] == 'Approved', message_from(response), response,
           :test => test?,

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

@@ -30,7 +30,7 @@ module ActiveMerchant #:nodoc:
       VALID_PHONE_FORMAT = /\+\d{1,3}(\(?\d{3}\)?)?\d{3}-\d{4}-\d{3}/
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['DE']
+      self.supported_countries = %w(AD CY GI IM MT RO CH AT DK GR IT MC SM TR BE EE HU LV NL SK GB BG FI IS LI NO SI VA FR IL LT PL ES CZ DE IE LU PT SE)
 
       # Wirecard supports all major credit and debit cards:
       # Visa, Mastercard, American Express, Diners Club,

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
 
       self.default_currency = 'GBP'
       self.money_format = :cents
-      self.supported_countries = ['HK', 'US', 'GB', 'AU']
+      self.supported_countries = %w(HK US GB AU AD BE CH CY CZ DE DK ES FI FR GI GR HU IE IL IT LI LU MC MT NL NO NZ PL PT SE SG SI SM TR UM VA)
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro, :laser]
       self.homepage_url = 'http://www.worldpay.com/'
       self.display_name = 'WorldPay'
@@ -59,7 +59,7 @@ module ActiveMerchant #:nodoc:
 
       def refund(money, authorization, options = {})
         MultiResponse.run do |r|
-          r.process{inquire_request(authorization, options, "CAPTURED", "SETTLED")}
+          r.process{inquire_request(authorization, options, "CAPTURED", "SETTLED", "SETTLED_BY_MERCHANT")}
           r.process{refund_request(money, authorization, options)}
         end
       end

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

@@ -154,7 +154,7 @@ module ActiveMerchant #:nodoc:
             @notification_type == :additional
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             security_key == signature
           end
 

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

@@ -49,7 +49,8 @@ module ActiveMerchant #:nodoc:
           service = service_class.new(order, account, options)
           form_options[:method] = service.form_method
           result = []
-          result << form_tag(integration_module.service_url, form_options)
+          service_url = integration_module.respond_to?(:credential_based_url) ? integration_module.credential_based_url(options) : integration_module.service_url
+          result << form_tag(service_url, form_options)
 
           result << capture(service, &proc)
 

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

@@ -0,0 +1,41 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module BitPay
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          def initialize(order_id, account, options)
+            super
+            add_field('account', account)
+            add_field('orderID', order_id)
+            add_field('posData', options[:authcode])
+            add_field('currency', options[:currency])
+            add_field('fullNotifications', 'true')
+            add_field('transactionSpeed', options[:transactionSpeed] || "high")
+            add_field('address1', options[:address1])
+          end
+
+          # Replace with the real mapping
+          mapping :account, 'key'
+          mapping :amount, 'price'
+
+          mapping :order, 'orderID'        
+          mapping :currency, 'currency'
+
+          mapping :customer, :first_name => 'buyerName',
+                             :email      => 'buyerEmail',
+                             :phone      => 'buyerPhone'
+
+          mapping :billing_address, :city     => 'buyerCity',
+                                    :address1 => 'buyerAddress1',
+                                    :address2 => 'buyerAddress2',
+                                    :state    => 'buyerState',
+                                    :zip      => 'buyerZip',
+                                    :country  => 'buyerCountry'
+
+          mapping :notify_url, 'notificationURL'
+          mapping :return_url, 'returnURL'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+require 'net/http'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module BitPay
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+          def complete?
+            status == "complete"
+          end
+
+          def transaction_id
+            params['id']
+          end
+
+          # When was this payment received by the client.
+          def received_at
+            params['invoiceTime'].to_i
+          end
+
+          def currency
+            params['currency']
+          end
+
+          def amount
+            params['price']
+          end
+
+          # the money amount we received in X.2 decimal.
+          def btcPrice 
+            params['btcPrice'].to_f
+          end
+
+          def status
+            params['status'].downcase
+          end
+
+          def acknowledge(authcode = nil)
+            authcode == params['posData']
+          end
+
+          private
+
+          # Take the posted data and move the relevant data into a hash
+          def parse(post)
+            @raw = post.to_s
+            for line in @raw.split('&')
+              key, value = *line.scan( %r{^([A-Za-z0-9_.]+)\=(.*)$} ).flatten
+              params[key] = CGI.unescape(value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/bit_pay/helper.rb'
+require File.dirname(__FILE__) + '/bit_pay/notification.rb'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module BitPay
+
+        mattr_accessor :service_url
+        self.service_url = 'https://www.bitpay.com/api/invoice'
+
+        def self.notification(post)
+          Notification.new(post)
+        end
+      end
+    end
+  end
+end

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

@@ -148,7 +148,7 @@ module ActiveMerchant #:nodoc:
             date.blank? && time.blank? && transaction_id.blank?
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             true
           end
         end

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

@@ -0,0 +1,40 @@
+module ActiveMerchant
+  module Billing
+    module Integrations
+      module Citrus
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+
+          mapping :order, 'merchantTxnId'
+          mapping :amount, 'orderAmount'
+          mapping :account, 'merchantAccessKey'
+          mapping :credential2, 'secret_key'
+          mapping :credential3, 'pmt_url'
+          mapping :currency, 'currency'
+
+          mapping :customer, :first_name => 'firstName',:last_name => 'lastName', :email => 'email', :phone => 'mobileNo'
+
+          mapping :billing_address, :city => 'addressCity', :address1 => 'addressStreet1', :address2 => 'addressStreet2',:state => 'addressState',:zip => 'addressZip', :country => 'addressCountry'
+
+          mapping :checksum, 'secSignature'
+          mapping :return_url, 'returnUrl'
+
+
+          def initialize(order, account, options = {})
+            super
+            add_field 'paymentMode', 'NET_BANKING'
+            add_field 'reqtime', (Time.now.to_i * 1000).to_s
+          end
+
+          def form_fields
+            @fields.merge(mappings[:checksum] => generate_checksum)
+          end
+
+          def generate_checksum
+            checksum_fields = @fields["pmt_url"] + @fields["orderAmount"].to_s + @fields["merchantTxnId"] + @fields["currency"]
+            Citrus.checksum(@fields["secret_key"],  checksum_fields )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,133 @@
+module ActiveMerchant
+  module Billing
+    module Integrations
+      module Citrus
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+
+      	  def initialize(post, options = {})
+            super(post, options)
+            @secret_key = options[:credential2]
+          end
+
+          def complete?
+            status == "Completed" || status == 'Canceled'
+          end
+
+          def status
+            @status ||= if checksum_ok?
+              if transaction_id.blank?
+                'Invalid'
+              else
+                case transaction_status.downcase
+                when 'success' then 'Completed'
+                when 'canceled' then 'Canceled'
+                end
+              end
+            else
+              'Tampered'
+            end
+          end
+
+          def invoice_ok?( order_id )
+            order_id.to_s == invoice.to_s
+          end
+
+          def amount_ok?( order_amount )
+            BigDecimal.new( amount ) == order_amount
+          end
+
+          def item_id
+            params['TxId']
+          end
+
+          def invoice
+            item_id
+          end
+
+          # Status of transaction return from the Citrus. List of possible values:
+          # <tt>SUCCESS</tt>::
+          # <tt>CANCELED</tt>::
+          def transaction_status
+            params['TxStatus']
+          end
+
+          def gross
+            params['amount']
+          end
+
+          def amount
+            gross
+          end
+
+          def transaction_id
+            params['pgTxnNo']
+          end
+
+          def issuerrefno
+            params['issuerRefNo']
+          end
+
+          def authidcode
+            params['authIdCode']
+          end
+
+          def pgrespcode
+            params['pgRespCode']
+          end
+
+          def checksum
+            params['signature']
+          end
+
+          def paymentmode
+            params['paymentMode']
+          end
+
+          def currency
+            params['currency']
+          end
+
+          def customer_email
+            params['email']
+          end
+
+          def customer_phone
+            params['mobileNo']
+          end
+
+          def customer_first_name
+            params['firstName']
+          end
+
+          def customer_last_name
+            params['lastName']
+          end
+
+          def customer_address
+            { :address1 => params['addressStreet1'], :address2 => params['addressStreet2'],
+              :city => params['addressCity'], :state => params['addressState'],
+              :country => params['addressCountry'], :zip => params['addressZip'] }
+          end
+
+          def message
+            @message || params['TxMsg']
+          end
+
+          def acknowledge(authcode = nil)
+            checksum_ok?
+          end
+
+          def checksum_ok?
+            fields = [invoice, transaction_status, amount.to_s, transaction_id, issuerrefno, authidcode, customer_first_name, customer_last_name, pgrespcode, customer_address[:zip]].join
+
+            unless Citrus.checksum(@secret_key, fields ) == checksum
+              @message = 'checksum mismatch...'
+              return false
+            end
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/citrus/return.rb

@@ -0,0 +1,40 @@
+module ActiveMerchant
+  module Billing
+    module Integrations
+      module Citrus
+        class Return < ActiveMerchant::Billing::Integrations::Return
+
+          def initialize(query_string, options = {})
+            super
+            @notification = Notification.new(query_string, options)
+          end
+
+          def transaction_id
+            @notification.transaction_id
+          end
+
+          def status( order_id, order_amount )
+            if @notification.invoice_ok?( order_id ) && @notification.amount_ok?( BigDecimal.new(order_amount) )
+              @notification.status
+            else
+              'Mismatch'
+            end
+          end
+
+          def success?
+            status( @params['TxId'], @params['amount'] ) == 'Completed'
+          end
+
+          def message
+            @notification.message
+          end
+
+          def cancelled?
+            @notification.status == 'Cancelled'
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module ActiveMerchant
+  module Billing
+    module Integrations
+      module Citrus
+        autoload :Helper, File.dirname(__FILE__) + '/citrus/helper.rb'
+        autoload :Notification, File.dirname(__FILE__) + '/citrus/notification.rb'
+        autoload :Return, File.dirname(__FILE__) + '/citrus/return.rb'
+
+        mattr_accessor :sandbox_url
+        mattr_accessor :staging_url
+        mattr_accessor :production_url
+
+        self.sandbox_url = 'https://sandbox.citruspay.com/'
+        self.staging_url = 'https://stg.citruspay.com/'
+        self.production_url = 'https://www.citruspay.com/'
+
+        def self.credential_based_url(options)
+          pmt_url = options[:credential3]
+
+          case ActiveMerchant::Billing::Base.integration_mode
+          when :production
+            self.production_url + pmt_url
+          when :test
+            self.sandbox_url    + pmt_url
+          when :staging
+          	self.staging_url    + pmt_url
+          else
+            raise StandardError, "Integration mode set to an invalid value: #{mode}"
+          end
+        end
+
+        def self.helper(order, account, options = {})
+          Helper.new(order, account, options)
+        end
+
+        def self.notification(post, options = {})
+          Notification.new(post, options)
+        end
+
+        def self.return(query_string, options = {})
+          Return.new(query_string, options)
+        end
+
+        def self.checksum(secret_key, payload_items )
+          digest = OpenSSL::Digest::Digest.new('sha1')
+		      OpenSSL::HMAC.hexdigest(digest, secret_key, payload_items)
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
         class Notification < ActiveMerchant::Billing::Integrations::Notification
           RESPONSE_PARAMS = ['DirecPay Reference ID', 'Flag', 'Country', 'Currency', 'Other Details', 'Merchant Order No', 'Amount']
           
-          def acknowledge
+          def acknowledge(authcode = nil)
             true
           end
 

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

@@ -108,7 +108,7 @@ module ActiveMerchant #:nodoc:
             Digest::SHA1.hexdigest(generate_signature_string)
           end
           
-          def acknowledge
+          def acknowledge(authcode = nil)
             # signature_is_valid?
             generate_signature.to_s == params['hash'].to_s
           end

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

@@ -76,7 +76,7 @@ module ActiveMerchant #:nodoc:
             Digest::MD5.hexdigest(generate_signature_string)
           end
 
-          def acknowledge      
+          def acknowledge(authcode = nil)      
             generate_signature.to_s == md5.to_s
           end
         end