activemerchant 1.14.0 → 1.15.0

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

@@ -17,7 +17,7 @@ module ActiveMerchant #:nodoc:
       # The name of the gateway
       self.display_name = 'SecurePay'
       
-      class_inheritable_accessor :request_timeout
+      class_attribute :request_timeout
       self.request_timeout = 60
       
       self.money_format = :cents
@@ -58,20 +58,20 @@ module ActiveMerchant #:nodoc:
         commit :authorization, build_purchase_request(money, credit_card, options)
       end
       
-      def capture(money, reference)
+      def capture(money, reference, options = {})
         commit :capture, build_reference_request(money, reference)
       end
       
-      def refund(money, reference)
+      def refund(money, reference, options = {})
         commit :refund, build_reference_request(money, reference)
       end
 
-      def credit(money, reference)
+      def credit(money, reference, options = {})
         deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, reference)
       end
 
-      def void(reference)
+      def void(reference, options = {})
         commit :void, build_reference_request(nil, reference)
       end
       

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

@@ -1,7 +1,7 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class ViaklixGateway < Gateway
-      class_inheritable_accessor :test_url, :live_url, :delimiter, :actions
+      class_attribute :test_url, :live_url, :delimiter, :actions
 
       self.test_url = 'https://demo.viaklix.com/process.asp'
       self.live_url = 'https://www.viaklix.com/process.asp'

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

@@ -64,8 +64,7 @@ module ActiveMerchant #:nodoc:
           
 
           def customer(params = {})
-            full_name = "#{params[:first_name]} #{params[:last_name]}"
-            add_field(mappings[:customer][:name], full_name)
+            add_field(mappings[:customer][:name], full_name(params))
             add_field(mappings[:customer][:email], params[:email])
           end
           
@@ -79,13 +78,11 @@ module ActiveMerchant #:nodoc:
           end
           
           def shipping_address(params = {})
-            update_address(:shipping_address, params)
-            super(params.dup)
+            super(update_address(:shipping_address, params))
           end
           
           def billing_address(params = {})
-            update_address(:billing_address, params)
-            super(params.dup)
+            super(update_address(:billing_address, params))
           end
           
           def form_fields
@@ -121,15 +118,20 @@ module ActiveMerchant #:nodoc:
           end
           
           def update_address(address_type, params)
+            params = params.dup
             address = params[:address1]
-            address << " #{params[:address2]}" if params[:address2]
-            params[:address1] = address
+            address = "#{address} #{params[:address2]}" if params[:address2].present?
+            address = "#{params[:company]} #{address}" if params[:company].present?
+            params[:address1] = address            
+            
             params[:phone] = normalize_phone_number(params[:phone])
             add_land_line_phone_for(address_type, params)
             
-            if address_type == :shipping_address && params[:name].blank?
-              add_field(mappings[:shipping_address][:name], fields[mappings[:customer][:name]])
+            if address_type == :shipping_address
+              shipping_name = full_name(params) || fields[mappings[:customer][:name]]
+              add_field(mappings[:shipping_address][:name], shipping_name)
             end
+            params
           end
           
           # Split a single phone number into the country code, area code and local number as best as possible
@@ -185,6 +187,12 @@ module ActiveMerchant #:nodoc:
           def phone_code_for_country(country)
             PHONE_CODES[country]
           end
+          
+          def full_name(params)
+            return if params[:name].blank? && params[:first_name].blank? && params[:last_name].blank?
+            
+            params[:name] || "#{params[:first_name]} #{params[:last_name]}"
+          end
         end
       end
     end

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

@@ -0,0 +1,47 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Directebanking 
+        autoload :Return,       File.dirname(__FILE__) + '/directebanking/return.rb'
+        autoload :Helper,       File.dirname(__FILE__) + '/directebanking/helper.rb'
+        autoload :Notification, File.dirname(__FILE__) + '/directebanking/notification.rb'
+        
+        # Supported countries:
+        # Germany - DE
+        # Austria - AT
+        # Belgium - BE
+        # Netherlands - NL
+        # Switzerland - CH
+        # Great Britain - GB
+        
+        # Overwrite this if you want to change the directebanking test url
+        mattr_accessor :test_url
+        self.test_url = 'https://www.directebanking.com/payment/start'
+        
+        # Overwrite this if you want to change the directebanking production url
+        mattr_accessor :production_url 
+        self.production_url = 'https://www.directebanking.com/payment/start'
+        
+        def self.service_url
+          mode = ActiveMerchant::Billing::Base.integration_mode
+          case mode
+          when :production
+            self.production_url    
+          when :test
+            self.test_url
+          else
+            raise StandardError, "Integration mode set to an invalid value: #{mode}"
+          end
+        end
+
+        def self.notification(post, options = {})
+          Notification.new(post, options)
+        end  
+
+        def self.return(post, options = {})
+          Return.new(post, options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Directebanking
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+
+          # All credentials are mandatory and need to be set
+          #
+          # credential1: User ID
+          # credential2: Project ID
+          # credential3: Project Password (Algorithm: SH1)
+          # credential4: Notification Password (Algorithm: SH1)
+          def initialize(order, account, options = {})
+            super
+            add_field('user_variable_0', order)
+            add_field('project_id', options[:credential2])
+            @project_password = options[:credential3]
+          end
+
+          SIGNATURE_FIELDS = [
+            :user_id,
+            :project_id,
+            :sender_holder,
+            :sender_account_number,
+            :sender_bank_code,
+            :sender_country_id,
+            :amount,
+            :currency_id,
+            :reason_1,
+            :reason_2,
+            :user_variable_0,
+            :user_variable_1,
+            :user_variable_2,
+            :user_variable_3,
+            :user_variable_4,
+            :user_variable_5
+          ]
+          
+          SIGNATURE_IGNORE_AT_METHOD_CREATION_FIELDS = [
+            :user_id,
+            :amount,
+            :project_id,
+            :currency_id,
+            :user_variable_0,
+            :user_variable_1,
+            :user_variable_2,
+            :user_variable_3
+          ]
+          
+          SIGNATURE_FIELDS.each do |key|
+            if !SIGNATURE_IGNORE_AT_METHOD_CREATION_FIELDS.include?(key) 
+              mapping "#{key}".to_sym, "#{key.to_s}"
+            end
+          end
+
+          # Need to format the amount to have 2 decimal places
+          def amount=(money)
+            cents = money.respond_to?(:cents) ? money.cents : money
+            if money.is_a?(String) or cents.to_i <= 0
+              raise ArgumentError, 'money amount must be either a Money object or a positive integer in cents.'
+            end
+            add_field mappings[:amount], sprintf("%.2f", cents.to_f/100)
+          end
+
+          def generate_signature_string
+            # format of signature: user_id|project_id|sender_holder|sender_account_number|sender_bank_code| sender_country_id|amount|currency_id|reason_1|reason_2|user_variable_0|user_variable_1|user_variable_2|user_variable_3|user_variable_4|user_variable_5|project_password
+            SIGNATURE_FIELDS.map {|key| @fields[key.to_s]} * "|" + "|#{@project_password}"
+          end
+
+          def generate_signature
+            Digest::SHA1.hexdigest(generate_signature_string)
+          end
+          
+          def form_fields
+            @fields.merge('hash' => generate_signature)
+          end
+            
+          mapping :account, 'user_id'
+          mapping :amount, 'amount'
+          mapping :currency, 'currency_id'
+          mapping :description, 'reason_1'
+          
+          mapping :return_url, 'user_variable_1'
+          mapping :cancel_return_url, 'user_variable_2'
+          mapping :notify_url, 'user_variable_3'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,120 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Directebanking
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+          
+          def initialize(data, options)
+            if options[:credential4].nil?
+              raise ArgumentError, "You need to provide the notification password (SH1) as the option :credential4 to verify that the notification originated from Directebanking (Payment Networks AG)"
+            end
+            super
+          end
+          
+          def complete?
+            status == 'Completed'
+          end
+          
+          def item_id
+            params['user_variable_0']
+          end
+          
+          def transaction_id
+            params['transaction']
+          end
+          
+          # When was this payment received by the client. 
+          def received_at
+            Time.parse(params['created']) if params['created']
+          end
+          
+          # the money amount we received in X.2 decimal.
+          def gross
+            "%.2f" % params['amount'].to_f
+          end
+
+          def status
+            'Completed'
+          end
+
+          def currency
+            params['currency_id']
+          end
+          
+          def test?
+            params['sender_bank_name'] == 'Testbank'
+          end
+          
+          # for verifying the signature of the URL parameters
+          PAYMENT_HOOK_SIGNATURE_FIELDS = [
+            :transaction,
+            :user_id,
+            :project_id,
+            :sender_holder,
+            :sender_account_number,
+            :sender_bank_code,
+            :sender_bank_name,
+            :sender_bank_bic,
+            :sender_iban,
+            :sender_country_id,
+            :recipient_holder,
+            :recipient_account_number,
+            :recipient_bank_code,
+            :recipient_bank_name,
+            :recipient_bank_bic,
+            :recipient_iban,
+            :recipient_country_id,
+            :international_transaction,
+            :amount,
+            :currency_id,
+            :reason_1,
+            :reason_2,
+            :security_criteria,
+            :user_variable_0,
+            :user_variable_1,
+            :user_variable_2,
+            :user_variable_3,
+            :user_variable_4,
+            :user_variable_5,
+            :created
+          ]
+          
+          PAYMENT_HOOK_IGNORE_AT_METHOD_CREATION_FIELDS = [
+            :transaction,
+            :amount,
+            :currency_id,
+            :user_variable_0,
+            :user_variable_1,
+            :user_variable_2,
+            :user_variable_3,
+            :created
+          ]
+          
+          # Provide access to raw fields
+          PAYMENT_HOOK_SIGNATURE_FIELDS.each do |key|
+            if !PAYMENT_HOOK_IGNORE_AT_METHOD_CREATION_FIELDS.include?(key) 
+              define_method(key.to_s) do
+                 params[key.to_s]
+              end
+            end
+          end
+          
+          def generate_signature_string
+            #format is: transaction|user_id|project_id|sender_holder|sender_account_number|sender_bank_code|sender_bank_name|sender_bank_bic|sender_iban|sender_country_id|recipient_holder|recipient_account_number|recipient_bank_code|recipient_bank_name|recipient_bank_bic|recipient_iban|recipient_country_id|international_transaction|amount|currency_id|reason_1|reason_2|security_criteria|user_variable_0|user_variable_1|user_variable_2|user_variable_3|user_variable_4|user_variable_5|created|notification_password
+            PAYMENT_HOOK_SIGNATURE_FIELDS.map {|key| params[key.to_s]} * "|" + "|#{@options[:credential4]}"
+          end
+
+          def generate_signature
+            Digest::SHA1.hexdigest(generate_signature_string)
+          end
+          
+          def acknowledge
+            # signature_is_valid?
+            generate_signature.to_s == params['hash'].to_s
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Directebanking
+        class Return < ActiveMerchant::Billing::Integrations::Return
+        end
+      end
+    end
+  end
+end
+

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

@@ -3,14 +3,14 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       class Helper #:nodoc:
         attr_reader :fields
-        class_inheritable_accessor :service_url
-        class_inheritable_hash :mappings
-        class_inheritable_accessor :country_format
+        class_attribute :service_url
+        class_attribute :mappings
+        class_attribute :country_format
         self.country_format = :alpha2
         
         # The application making the calls to the gateway
         # Useful for things like the PayPal build notation (BN) id fields
-        class_inheritable_accessor :application_id
+        class_attribute :application_id
         self.application_id = 'ActiveMerchant'
 
         def initialize(order, account, options = {})

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
         attr_accessor :raw
         
         # set this to an array in the subclass, to specify which IPs are allowed to send requests
-        class_inheritable_accessor :production_ips
+        class_attribute :production_ips
 
         def initialize(post, options = {})
           @options = options

data/lib/active_merchant/common/post_data.rb

@@ -2,7 +2,7 @@ require 'cgi'
 
 module ActiveMerchant
   class PostData < Hash
-    class_inheritable_accessor :required_fields, :instance_writer => false
+    class_attribute :required_fields, :instance_writer => false
     self.required_fields = []
   
     def []=(key, value)

data/lib/active_merchant/common/posts_data.rb

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
       base.superclass_delegating_accessor :ssl_strict
       base.ssl_strict = true
       
-      base.class_inheritable_accessor :retry_safe
+      base.class_attribute :retry_safe
       base.retry_safe = false
 
       base.superclass_delegating_accessor :open_timeout

data/lib/active_merchant/common/validateable.rb

@@ -1,4 +1,4 @@
-module ActiveMerchant #:nodoc:  
+module ActiveMerchant #:nodoc:
   module Validateable #:nodoc:
     def valid?
       errors.clear
@@ -7,13 +7,13 @@ module ActiveMerchant #:nodoc:
       validate if respond_to?(:validate, true)
 
       errors.empty?
-    end  
+    end
 
     def initialize(attributes = {})
       self.attributes = attributes
     end
 
-    def errors    
+    def errors
       @errors ||= Errors.new(self)
     end
 
@@ -22,46 +22,51 @@ module ActiveMerchant #:nodoc:
     def attributes=(attributes)
       unless attributes.nil?
         for key, value in attributes
-          send("#{key}=", value )            
+          send("#{key}=", value )
         end
       end
-    end  
+    end
 
     # This hash keeps the errors of the object
     class Errors < HashWithIndifferentAccess
 
       def initialize(base)
+        super() { |h, k|  h[k] = [] ; h[k] }
         @base = base
       end
-      
+
       def count
         size
       end
 
-      # returns a specific fields error message. 
-      # if more than one error is available we will only return the first. If no error is available 
+      def empty?
+        all? { |k, v| v && v.empty? }
+      end
+
+      # returns a specific fields error message.
+      # if more than one error is available we will only return the first. If no error is available
       # we return an empty string
       def on(field)
         self[field].to_a.first
       end
 
       def add(field, error)
-        self[field] ||= []
         self[field] << error
-      end    
-      
+      end
+
       def add_to_base(error)
         add(:base, error)
       end
 
       def each_full
-        full_messages.each { |msg| yield msg }      
+        full_messages.each { |msg| yield msg }
       end
 
       def full_messages
         result = []
 
-        self.each do |key, messages| 
+        self.each do |key, messages|
+          next if messages.blank?
           if key == 'base'
             result << "#{messages.first}"
           else
@@ -70,7 +75,7 @@ module ActiveMerchant #:nodoc:
         end
 
         result
-      end   
-    end  
+      end
+    end
   end
 end