activemerchant 1.28.0 → 1.29.1

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

@@ -4,12 +4,14 @@ rescue LoadError
   raise "Could not load the vindicia-api gem.  Use `gem install vindicia-api` to install it."
 end
 
+require 'i18n/core_ext/string/interpolate'
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
 
     # For more information on the Vindicia Gateway please visit their {website}[http://vindicia.com/]
     #
-    # The login and password are not the username and password you use to 
+    # The login and password are not the username and password you use to
     # login to the Vindicia Merchant Portal.
     #
     # ==== Recurring Billing
@@ -25,8 +27,8 @@ module ActiveMerchant #:nodoc:
 
       class_attribute :test_url, :live_url
 
-      self.test_url = "https://soap.prodtest.sj.vindicia.com/soap.pl" 
-      self.live_url = "http://soap.vindicia.com/soap.pl" 
+      self.test_url = "https://soap.prodtest.sj.vindicia.com/soap.pl"
+      self.live_url = "http://soap.vindicia.com/soap.pl"
 
       # Creates a new VindiciaGateway
       #
@@ -40,24 +42,25 @@ module ActiveMerchant #:nodoc:
       # * <tt>:api_version</tt> -- Vindicia API Version - defaults to 3.6 (OPTIONAL)
       # * <tt>:account_id</tt> -- Account Id which all transactions will be run against. (REQUIRED)
       # * <tt>:transaction_prefix</tt> -- Prefix to order id for one-time transactions - defaults to 'X' (OPTIONAL
-      # * <tt>:min_chargeback_probability</tt> -- Minimum score for chargebacks - defaults to 65 (OPTIONAL) 
+      # * <tt>:min_chargeback_probability</tt> -- Minimum score for chargebacks - defaults to 65 (OPTIONAL)
       # * <tt>:cvn_success</tt> -- Array of valid CVN Check return values - defaults to [M, P] (OPTIONAL)
       # * <tt>:avs_success</tt> -- Array of valid AVS Check return values - defaults to [X, Y, A, W, Z] (OPTIONAL)
       def initialize(options = {})
         requires!(options, :login, :password)
+        super
 
         config = lambda do |config|
-          config.login = options[:login] 
-          config.password = options[:password] 
+          config.login = options[:login]
+          config.password = options[:password]
           config.api_version = options[:api_version] || "3.6"
-          config.endpoint = test? ? self.test_url : self.live_url 
+          config.endpoint = test? ? self.test_url : self.live_url
           config.namespace = "http://soap.vindicia.com"
         end
 
-        if Vindicia.config.is_configured? 
+        if Vindicia.config.is_configured?
           config.call(Vindicia.config)
         else
-          Vindicia.configure(&config) 
+          Vindicia.configure(&config)
         end
 
         requires!(options, :account_id)
@@ -66,10 +69,9 @@ module ActiveMerchant #:nodoc:
         @transaction_prefix = options[:transaction_prefix] || "X"
 
         @min_chargeback_probability = options[:min_chargeback_probability] || 65
-        @cvn_success = options[:cvn_success] || %w{M P} 
+        @cvn_success = options[:cvn_success] || %w{M P}
         @avs_success = options[:avs_success] || %w{X Y A W Z}
 
-        @options = options
         @allowed_authorization_statuses = %w{Authorized}
       end
 
@@ -103,7 +105,7 @@ module ActiveMerchant #:nodoc:
         if !response.success? && response.fraud_review? && !response.authorization.blank?
           void_response = void([vindicia_transaction[:transaction][:merchantTransactionId]], options)
           if void_response.success?
-            return response 
+            return response
           else
             return void_response
           end
@@ -142,10 +144,10 @@ module ActiveMerchant #:nodoc:
             :account => { :merchantAccountId => @account_id },
             :merchantTransactionId => identification,
             :sourceIp => options[:ip]
-          }] 
+          }]
         }))
 
-        if response[:return][:returnCode] == '200' && response[:qtyFail].to_i == 0          
+        if response[:return][:returnCode] == '200' && response[:qtyFail].to_i == 0
           success(response, identification)
         else
           fail(response)
@@ -204,22 +206,22 @@ module ActiveMerchant #:nodoc:
 
       def check_transaction(vindicia_transaction)
         if vindicia_transaction[:return][:returnCode] == '200'
-          status_log = vindicia_transaction[:transaction][:statusLog].first 
+          status_log = vindicia_transaction[:transaction][:statusLog].first
           if status_log[:creditCardStatus]
             avs = status_log[:creditCardStatus][:avsCode]
             cvn = status_log[:creditCardStatus][:cvnCode]
           end
 
-          if @allowed_authorization_statuses.include?(status_log[:status]) && 
+          if @allowed_authorization_statuses.include?(status_log[:status]) &&
             check_cvn(cvn) && check_avs(avs)
 
-            success(vindicia_transaction, 
-                    vindicia_transaction[:transaction][:merchantTransactionId], 
+            success(vindicia_transaction,
+                    vindicia_transaction[:transaction][:merchantTransactionId],
                     avs, cvn)
           else
             # If the transaction is authorized, but it didn't pass our AVS/CVV checks send the authorization along so
             # that is gets voided. Otherwise, send no authorization.
-            fail(vindicia_transaction, avs, cvn, false, 
+            fail(vindicia_transaction, avs, cvn, false,
                  @allowed_authorization_statuses.include?(status_log[:status]) ? vindicia_transaction[:transaction][:merchantTransactionId] : "")
           end
         else
@@ -238,9 +240,9 @@ module ActiveMerchant #:nodoc:
         add_customer_data(parameters, options)
         add_payment_source(parameters, creditcard, options)
 
-        post(Vindicia::Transaction.auth({ 
-          :transaction => parameters, 
-          :minChargebackProbability => @min_chargeback_probability 
+        post(Vindicia::Transaction.auth({
+          :transaction => parameters,
+          :minChargebackProbability => @min_chargeback_probability
         }))
       end
 
@@ -281,8 +283,8 @@ module ActiveMerchant #:nodoc:
         add_subscription_information(parameters, options)
 
         post(Vindicia::AutoBill.update({
-          :autobill => parameters, 
-          :validatePaymentMethod => false, 
+          :autobill => parameters,
+          :validatePaymentMethod => false,
           :minChargebackProbability => 100
         }))
       end
@@ -290,8 +292,8 @@ module ActiveMerchant #:nodoc:
       def check_subscription(vindicia_transaction)
         if vindicia_transaction[:return][:returnCode] == '200'
           if vindicia_transaction[:autobill] && vindicia_transaction[:autobill][:status] == "Active"
-            success(vindicia_transaction, 
-                    vindicia_transaction[:autobill][:merchantAutoBillId]) 
+            success(vindicia_transaction,
+                    vindicia_transaction[:autobill][:merchantAutoBillId])
           else
             fail(vindicia_transaction)
           end
@@ -326,8 +328,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def fail(response, avs_code = nil, cvn_code = nil, fraud_review = false, authorization = "")
-        ActiveMerchant::Billing::Response.new(false, response[:return][:returnString], response, 
-                                              { :fraud_review => fraud_review || !authorization.blank?, 
+        ActiveMerchant::Billing::Response.new(false, response[:return][:returnString], response,
+                                              { :fraud_review => fraud_review || !authorization.blank?,
                                                 :authorization => authorization, :test => test?,
                                                 :avs_result => { :code => avs_code }, :cvv_result => cvn_code })
 

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

@@ -0,0 +1,45 @@
+require 'json'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class WebpayGateway < StripeGateway
+      self.live_url = 'https://api.webpay.jp/v1/'
+
+      self.supported_countries = ['JP']
+      self.default_currency = 'JPY'
+      self.money_format = :cents
+      self.supported_cardtypes = [:visa, :master, :american_express, :jcb, :diners_club]
+
+      self.homepage_url = 'https://webpay.jp/'
+      self.display_name = 'WebPay'
+
+      def json_error(raw_response)
+        msg = 'Invalid response received from the WebPay API.  Please contact support@webpay.jp if you continue to receive this message.'
+        msg += "  (The raw response returned by the API was #{raw_response.inspect})"
+        {
+          "error" => {
+            "message" => msg
+          }
+        }
+      end
+
+      def headers(meta={})
+        @@ua ||= JSON.dump({
+          :bindings_version => ActiveMerchant::VERSION,
+          :lang => 'ruby',
+          :lang_version => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
+          :platform => RUBY_PLATFORM,
+          :publisher => 'active_merchant',
+          :uname => (RUBY_PLATFORM =~ /linux|darwin/i ? `uname -a 2>/dev/null`.strip : nil)
+        })
+
+        {
+          "Authorization" => "Basic " + Base64.encode64(@api_key.to_s + ":").strip,
+          "User-Agent" => "Webpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          "X-Webpay-Client-User-Agent" => @@ua,
+          "X-Webpay-Client-User-Metadata" => meta.to_json
+        }
+      end
+    end
+  end
+end

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

@@ -57,15 +57,9 @@ module ActiveMerchant #:nodoc:
         requires!(options, :login, :password)
         # unfortunately Wirecard also requires a BusinessCaseSignature in the XML request
         requires!(options, :signature)
-        @options = options
         super
       end
 
-      # Should run against the test servers or not?
-      def test?
-        @options[:test] || super
-      end
-
       # Authorization
       def authorize(money, creditcard, options = {})
         options[:credit_card] = creditcard

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

@@ -20,12 +20,11 @@ module ActiveMerchant #:nodoc:
 
       def initialize(options = {})
         requires!(options, :login, :password)
-        @options = options
         super
       end
 
       def purchase(money, payment_method, options = {})
-        MultiResponse.new.tap do |r|
+        MultiResponse.run do |r|
           r.process{authorize(money, payment_method, options)}
           r.process{capture(money, r.authorization, options.merge(:authorization_validated => true))}
         end
@@ -37,30 +36,26 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, authorization, options = {})
-        MultiResponse.new.tap do |r|
+        MultiResponse.run do |r|
           r.process{inquire_request(authorization, options, "AUTHORISED")} unless options[:authorization_validated]
           r.process{capture_request(money, authorization, options)}
         end
       end
 
       def void(authorization, options = {})
-        MultiResponse.new.tap do |r|
+        MultiResponse.run do |r|
           r.process{inquire_request(authorization, options, "AUTHORISED")}
           r.process{cancel_request(authorization, options)}
         end
       end
 
       def refund(money, authorization, options = {})
-        MultiResponse.new.tap do |r|
+        MultiResponse.run do |r|
           r.process{inquire_request(authorization, options, "CAPTURED")}
           r.process{refund_request(money, authorization, options)}
         end
       end
 
-      def test?
-        @options[:test] || super  
-      end
-
       private
 
       def authorize_request(money, payment_method, options)

data/lib/active_merchant/billing/gateways.rb

@@ -1,18 +1,17 @@
 module ActiveMerchant
   module Billing
     autoload :Gateway, 'active_merchant/billing/gateway'
-        
-    Dir[File.dirname(__FILE__) + '/gateways/**/*.rb'].each do |f|      
-      
-      # Get camelized class name 
+
+    Dir[File.dirname(__FILE__) + '/gateways/**/*.rb'].each do |f|
+      # Get camelized class name
       filename = File.basename(f, '.rb')
       # Add _gateway suffix
       gateway_name = filename + '_gateway'
       # Camelize the string to get the class name
-      gateway_class = gateway_name.camelize      
-      
+      gateway_class = gateway_name.camelize
+
       # Register for autoloading
-      autoload gateway_class, f      
+      autoload gateway_class, f
     end
   end
 end

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

@@ -0,0 +1,31 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module A1agregator
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+
+          # public key
+          mapping :account, 'key'
+
+          mapping :amount, 'cost'
+
+          mapping :order, 'order_id'
+
+          mapping :customer, :email => 'email',
+                             :phone => 'phone_number'
+
+           # payment description
+          mapping :credential2, 'name'
+
+          mapping :credential3, 'comment'
+
+          # on error
+          # 1 - raise error
+          # 0 - redirect
+          mapping :credential4, 'verbose'
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,186 @@
+require 'net/http'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module A1agregator
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+
+          self.production_ips = [
+            '78.108.178.206',
+            '79.137.235.129',
+            '95.163.96.79',
+            '212.24.38.100'
+          ]
+
+          def initialize(*args)
+            super
+            guess_notification_type
+          end
+
+          # Simple notification request params:
+          # tid
+          # name
+          # comment
+          # partner_id
+          # service_id
+          # order_id
+          # type
+          # partner_income
+          # system_income
+
+          def complete?
+            true
+          end
+
+          def transaction_id
+            params['tid']
+          end
+
+          def title
+            params['name']
+          end
+
+          def comment
+            params['comment']
+          end
+
+          def partner_id
+            params['partner_id']
+          end
+
+          def service_id
+            params['service_id']
+          end
+
+          def item_id
+            params['order_id']
+          end
+
+          def type
+            params['type']
+          end
+
+          def partner_income
+            params['partner_income']
+          end
+
+          def system_income
+            params['system_income']
+          end
+
+          # Additional notification request params:
+          # tid
+          # name
+          # comment
+          # partner_id
+          # service_id
+          # order_id
+          # type
+          # cost
+          # income_total
+          # income
+          # partner_income
+          # system_income
+          # command
+          # phone_number
+          # email
+          # resultStr
+          # date_created
+          # version
+          # check
+
+          def inclome_total
+            params['income_total']
+          end
+
+          def income
+            params['income']
+          end
+
+          def partner_income
+            params['partner_income']
+          end
+
+          def system_income
+            params['system_income']
+          end
+
+          def command
+            params['command']
+          end
+
+          def phone_number
+            params['phone_number']
+          end
+
+          def payer_email
+            params['email']
+          end
+
+          def result_string
+            params['resultStr']
+          end
+
+          def received_at
+            params['date_created']
+          end
+
+          def version
+            params['version']
+          end
+
+          def security_key
+            params[A1agregator.signature_parameter_name].to_s.downcase
+          end
+
+          # the money amount we received in X.2 decimal.
+          alias_method :gross, :system_income
+
+          def currency
+            'RUB'
+          end
+
+          # Was this a test transaction?
+          def test?
+            params['test'] == '1'
+          end
+
+          def simple_notification?
+            @notification_type == :simple
+          end
+
+          def additional_notification?
+            @notification_type == :additional
+          end
+
+          def acknowledge
+            security_key == signature
+          end
+
+        private
+
+          def signature
+            data = "#{params['tid']}\
+#{params['name']}\
+#{params['comment']}\
+#{params['partner_id']}\
+#{params['service_id']}\
+#{params['order_id']}\
+#{params['type']}\
+#{params['partner_income']}\
+#{params['system_income']}\
+#{params['test']}\
+#{@options[:secret]}"
+            Digest::MD5.hexdigest(data)
+          end
+
+          def guess_notification_type
+            @notification_type = params['version'] ? :additional : :simple
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module A1agregator
+
+        class Status
+          include PostsData
+
+          STATUS_TEST_URL = 'https://partner.a1pay.ru/a1lite/info/'
+
+          attr_accessor :login, :password
+
+          def initialize(login, password)
+            @login, @password = login, password
+          end
+
+          # agregator provides two methods:
+          # by tid - transaction id
+          # by order_id & service_id
+          def update(options = {})
+            data = PostData.new
+            data[:user] = @login
+            data[:pass] = @password
+            if options[:tid]
+              data[:tid] = options[:tid]
+            else
+              data[:ord_id] = options[:ord_id]
+              data[:service_id] = options[:service_id]
+            end
+
+            ssl_post(STATUS_TEST_URL, data.to_post_data)
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/a1agregator/helper.rb'
+require File.dirname(__FILE__) + '/a1agregator/notification.rb'
+require File.dirname(__FILE__) + '/a1agregator/status.rb'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module A1agregator
+
+        mattr_accessor :service_url
+        self.service_url = 'https://partner.a1agregator.ru/a1lite/input/'
+
+        mattr_accessor :signature_parameter_name
+        self.signature_parameter_name = 'check'
+
+        def self.notification(*args)
+          Notification.new(*args)
+        end
+
+        def self.status(login, password)
+          Status.new(login, password)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Liqpay
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          def initialize(order, account, options = {})
+            @secret = options.delete(:secret)
+            super
+
+            add_field 'version', '1.2'
+          end
+
+          def form_fields
+            xml = "<request>
+              <version>1.2</version>
+              <result_url>#{@fields["result_url"]}</result_url>
+              <server_url>#{@fields["server_url"]}</server_url>
+              <merchant_id>#{@fields["merchant_id"]}</merchant_id>
+              <order_id>#{@fields["order_id"]}</order_id>
+              <amount>#{@fields["amount"]}</amount>
+              <currency>#{@fields["currency"]}</currency>
+              <description>#{@fields["description"]}</description>
+              <default_phone>#{@fields["default_phone"]}</default_phone>
+              <pay_way>card</pay_way>
+              </request>".strip
+            sign = Base64.encode64(Digest::SHA1.digest("#{@secret}#{xml}#{@secret}")).strip
+            {"operation_xml" => Base64.encode64(xml), "signature" => sign}
+          end
+
+          mapping :account, 'merchant_id'
+          mapping :amount, 'amount'
+          mapping :currency, 'currency'
+          mapping :order, 'order_id'
+          mapping :description, 'description'
+          mapping :phone, 'default_phone'
+
+          mapping :notify_url, 'server_url'
+          mapping :return_url, 'result_url'
+        end
+      end
+    end
+  end
+end