activemerchant 1.38.1 → 1.39.0

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

@@ -35,7 +35,7 @@ module ActiveMerchant #:nodoc:
 
       # visa, master, american_express, discover
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
-      self.supported_countries = ['US']
+      self.supported_countries = %w(US BR CA CN DK FI FR DE JP MX NO SE GB SG)
       self.default_currency = 'USD'
       self.homepage_url = 'http://www.cybersource.com'
       self.display_name = 'CyberSource'
@@ -401,8 +401,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(xml, payment_method, address, options, shipTo = false)
-        requires!(options, :email)
-
         xml.tag! shipTo ? 'shipTo' : 'billTo' do
           xml.tag! 'firstName',             payment_method.first_name             if payment_method
           xml.tag! 'lastName',              payment_method.last_name              if payment_method
@@ -414,7 +412,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'country',               address[:country]
           xml.tag! 'company',               address[:company]                 unless address[:company].blank?
           xml.tag! 'companyTaxID',          address[:companyTaxID]            unless address[:company_tax_id].blank?
-          xml.tag! 'phoneNumber',           address[:phone_number]            unless address[:phone_number].blank?
+          xml.tag! 'phoneNumber',           address[:phone]                   unless address[:phone].blank?
           xml.tag! 'email',                 options[:email]
           xml.tag! 'driversLicenseNumber',  options[:drivers_license_number]  unless options[:drivers_license_number].blank?
           xml.tag! 'driversLicenseState',   options[:drivers_license_state]   unless options[:drivers_license_state].blank?

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

@@ -271,11 +271,11 @@ module ActiveMerchant #:nodoc:
 
       def message_from(succeeded, response)
         if response[:errors]
-          response[:errors]
+          (MESSAGES[response[:errors]] || response[:errors])
         elsif response[:responsecode]
           ActiveMerchant::Billing::EwayGateway::MESSAGES[response[:responsecode]]
         elsif response[:responsemessage]
-          response[:responsemessage]
+          (MESSAGES[response[:responsemessage]] || response[:responsemessage])
         elsif succeeded
           "Succeeded"
         else
@@ -315,6 +315,79 @@ module ActiveMerchant #:nodoc:
           params["formactionurl"]
         end
       end
+
+      MESSAGES = {
+        'V6000' => 'Validation error',
+        'V6001' => 'Invalid CustomerIP',
+        'V6002' => 'Invalid DeviceID',
+        'V6011' => 'Invalid Payment TotalAmount',
+        'V6012' => 'Invalid Payment InvoiceDescription',
+        'V6013' => 'Invalid Payment InvoiceNumber',
+        'V6014' => 'Invalid Payment InvoiceReference',
+        'V6015' => 'Invalid Payment CurrencyCode',
+        'V6016' => 'Payment Required',
+        'V6017' => 'Payment CurrencyCode Required',
+        'V6018' => 'Unknown Payment CurrencyCode',
+        'V6021' => 'EWAY_CARDHOLDERNAME Required',
+        'V6022' => 'EWAY_CARDNUMBER Required',
+        'V6023' => 'EWAY_CARDCVN Required',
+        'V6033' => 'Invalid Expiry Date',
+        'V6034' => 'Invalid Issue Number',
+        'V6035' => 'Invalid Valid From Date',
+        'V6040' => 'Invalid TokenCustomerID',
+        'V6041' => 'Customer Required',
+        'V6042' => 'Customer FirstName Required',
+        'V6043' => 'Customer LastName Required',
+        'V6044' => 'Customer CountryCode Required',
+        'V6045' => 'Customer Title Required',
+        'V6046' => 'TokenCustomerID Required',
+        'V6047' => 'RedirectURL Required',
+        'V6051' => 'Invalid Customer FirstName',
+        'V6052' => 'Invalid Customer LastName',
+        'V6053' => 'Invalid Customer CountryCode',
+        'V6058' => 'Invalid Customer Title',
+        'V6059' => 'Invalid RedirectURL',
+        'V6060' => 'Invalid TokenCustomerID',
+        'V6061' => 'Invalid Customer Reference',
+        'V6062' => 'Invalid Customer CompanyName',
+        'V6063' => 'Invalid Customer JobDescription',
+        'V6064' => 'Invalid Customer Street1',
+        'V6065' => 'Invalid Customer Street2',
+        'V6066' => 'Invalid Customer City',
+        'V6067' => 'Invalid Customer State',
+        'V6068' => 'Invalid Customer PostalCode',
+        'V6069' => 'Invalid Customer Email',
+        'V6070' => 'Invalid Customer Phone',
+        'V6071' => 'Invalid Customer Mobile',
+        'V6072' => 'Invalid Customer Comments',
+        'V6073' => 'Invalid Customer Fax',
+        'V6074' => 'Invalid Customer URL',
+        'V6075' => 'Invalid ShippingAddress FirstName',
+        'V6076' => 'Invalid ShippingAddress LastName',
+        'V6077' => 'Invalid ShippingAddress Street1',
+        'V6078' => 'Invalid ShippingAddress Street2',
+        'V6079' => 'Invalid ShippingAddress City',
+        'V6080' => 'Invalid ShippingAddress State',
+        'V6081' => 'Invalid ShippingAddress PostalCode',
+        'V6082' => 'Invalid ShippingAddress Email',
+        'V6083' => 'Invalid ShippingAddress Phone',
+        'V6084' => 'Invalid ShippingAddress Country',
+        'V6085' => 'Invalid ShippingAddress ShippingMethod',
+        'V6086' => 'Invalid ShippingAddress Fax ',
+        'V6091' => 'Unknown Customer CountryCode',
+        'V6092' => 'Unknown ShippingAddress CountryCode',
+        'V6100' => 'Invalid EWAY_CARDNAME',
+        'V6101' => 'Invalid EWAY_CARDEXPIRYMONTH',
+        'V6102' => 'Invalid EWAY_CARDEXPIRYYEAR',
+        'V6103' => 'Invalid EWAY_CARDSTARTMONTH',
+        'V6104' => 'Invalid EWAY_CARDSTARTYEAR',
+        'V6105' => 'Invalid EWAY_CARDISSUENUMBER',
+        'V6106' => 'Invalid EWAY_CARDCVN',
+        'V6107' => 'Invalid EWAY_ACCESSCODE',
+        'V6108' => 'Invalid CustomerHostAddress',
+        'V6109' => 'Invalid UserAgent',
+        'V6110' => 'Invalid EWAY_CARDNUMBER'
+      }
     end
   end
 end

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

@@ -18,10 +18,21 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://www.moneris.com/'
       self.display_name = 'Moneris'
 
-      # login is your Store ID
-      # password is your API Token
+      # Initialize the Gateway
+      #
+      # The gateway requires that a valid login and password be passed
+      # in the +options+ hash.
+      #
+      # ==== Options
+      #
+      # * <tt>:login</tt> -- Your Store ID
+      # * <tt>:password</tt> -- Your API Token
+      # * <tt>:cvv_enabled</tt> -- Specify that you would like the CVV passed to the gateway.
+      #                            Only particular account types at Moneris will allow this.
+      #                            Defaults to false.  (optional)
       def initialize(options = {})
         requires!(options, :login, :password)
+        @cvv_enabled = options[:cvv_enabled]
         options = { :crypt_type => 7 }.merge(options)
         super
       end
@@ -70,13 +81,28 @@ module ActiveMerchant #:nodoc:
         commit 'completion', crediting_params(authorization, :comp_amount => amount(money))
       end
 
-      # Voiding cancels an open authorization.
+      # Voiding requires the original transaction ID and order ID of some open
+      # transaction. Closed transactions must be refunded.
+      #
+      # Moneris supports the voiding of an unsettled capture or purchase via
+      # its <tt>purchasecorrection</tt> command. This action can only occur
+      # on the same day as the capture/purchase prior to 22:00-23:00 EST. If
+      # you want to do this, pass <tt>:purchasecorrection => true</tt> as
+      # an option.
+      #
+      # Fun, Historical Trivia:
+      # Voiding an authorization in Moneris is a relatively new feature
+      # (September, 2011). It is actually done by doing a $0 capture.
       #
       # Concatenate your transaction number and order_id by using a semicolon
       # (';'). This is to keep the Moneris interface consistent with other
       # gateways. (See +capture+ for details.)
       def void(authorization, options = {})
-        capture(0, authorization, options)
+        if options[:purchasecorrection]
+          commit 'purchasecorrection', crediting_params(authorization)
+        else
+          capture(0, authorization, options)
+        end
       end
 
       # Performs a refund. This method requires that the original transaction
@@ -128,6 +154,7 @@ module ActiveMerchant #:nodoc:
         else
           post[:pan]        = source.number
           post[:expdate]    = expdate(source)
+          post[:cvd_value]  = source.verification_value if source.verification_value?
         end
       end
 
@@ -151,10 +178,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters = {})
-        response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(action, parameters)))
+        data = post_data(action, parameters)
+        url = test? ? self.test_url : self.live_url
+        raw = ssl_post(url, data)
+        response = parse(raw)
 
         Response.new(successful?(response), message_from(response[:message]), response,
           :test          => test?,
+          :cvv_result    => response[:cvd_result_code].try(:last),
           :authorization => authorization_from(response)
         )
       end
@@ -192,14 +223,35 @@ module ActiveMerchant #:nodoc:
         root  = xml.add_element("request")
         root.add_element("store_id").text  = options[:login]
         root.add_element("api_token").text = options[:password]
-        transaction = root.add_element(action)
+        root.add_element(transaction_element(action, parameters))
+
+        xml.to_s
+      end
+
+      def transaction_element(action, parameters)
+        transaction = REXML::Element.new(action)
 
         # Must add the elements in the correct order
         actions[action].each do |key|
-          transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
+          if((key == :cvd_info) && @cvv_enabled)
+            transaction.add_element(cvd_element(parameters[:cvd_value]))
+          else
+            transaction.add_element(key.to_s).text = parameters[key] unless parameters[key].blank?
+          end
         end
 
-        xml.to_s
+        transaction
+      end
+
+      def cvd_element(cvd_value)
+        element = REXML::Element.new('cvd_info')
+        if cvd_value
+          element.add_element('cvd_indicator').text = "1"
+          element.add_element('cvd_value').text = cvd_value
+        else
+          element.add_element('cvd_indicator').text = "0"
+        end
+        element
       end
 
       def message_from(message)
@@ -219,8 +271,8 @@ module ActiveMerchant #:nodoc:
 
       def actions
         {
-          "purchase"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-          "preauth"            => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
+          "purchase"           => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :cvd_info],
+          "preauth"            => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :cvd_info],
           "command"            => [:order_id],
           "refund"             => [:order_id, :amount, :txn_number, :crypt_type],
           "indrefund"          => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],

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

@@ -0,0 +1,160 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class MoneyMoversGateway < Gateway
+      self.live_url = self.test_url = 'https://secure.mmoagateway.com/api/transact.php'
+
+      APPROVED, DECLINED, ERROR = 1, 2, 3
+
+      self.homepage_url = 'http://mmoa.us/'
+      self.display_name = 'MoneyMovers'
+      self.supported_countries = ['US']
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.ssl_version = :SSLv3
+
+      def initialize(options = {})
+        requires!(options, :login, :password)
+        @options = options
+        super
+      end
+
+      def purchase(money, creditcard, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, options)
+        add_customer_data(post, options)
+        commit('sale', money, post)
+      end
+
+      def authorize(money, creditcard, options = {})
+        post = {}
+        add_invoice(post, options)
+        add_creditcard(post, creditcard)
+        add_address(post, options)
+        add_customer_data(post, options)
+        commit('auth', money, post)
+      end
+
+      def capture(money, authorization, options = {})
+        options[:transactionid] = authorization
+        commit('capture', money, options)
+      end
+
+      def void(authorization, options = {})
+        options[:transactionid] = authorization
+        commit('void', nil, options)
+      end
+
+      def refund(money, authorization, options = {})
+        commit('refund', money, options.merge(:transactionid => authorization))
+      end
+
+      def credit(money, authorization, options = {})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, authorization, options)
+      end
+
+      private
+
+      def add_customer_data(post, options)
+        post[:firstname] = options[:first_name]
+        post[:lastname] = options[:last_name]
+
+        post[:email] = options[:email]
+      end
+
+      def add_address(post, options)
+        if address = (options[:billing_address] || options[:address])
+          post[:company] = address[:company]
+          post[:address1] = address[:address1]
+          post[:address2] = address[:address2]
+          post[:city]    = address[:city]
+          post[:state]   = address[:state]
+          post[:zip]     = address[:zip]
+          post[:country] = address[:country]
+          post[:phone] = address[:phone]
+        end
+        if address = options[:shipping_address]
+          post[:shipping_firstname] = address[:first_name]
+          post[:shipping_lastname] = address[:last_name]
+          post[:shipping_company] = address[:company]
+          post[:shipping_address1] = address[:address1]
+          post[:shipping_address2] = address[:address2]
+          post[:shipping_city]    = address[:city]
+          post[:shipping_state]   = address[:state]
+          post[:shipping_zip]     = address[:zip]
+          post[:shipping_country] = address[:country]
+          post[:shipping_email]   = address[:email]
+        end
+      end
+
+      def add_invoice(post, options)
+        post[:orderid] = options[:order_id]
+        post[:orderdescription] = options[:description]
+      end
+
+      def add_creditcard(post, creditcard)
+        post[:ccnumber] = creditcard.number
+        post[:ccexp] = expdate(creditcard)
+        post[:cvv] = creditcard.verification_value
+      end
+
+      def expdate(creditcard)
+        year  = sprintf("%.4i", creditcard.year)
+        month = sprintf("%.2i", creditcard.month)
+        "#{month}#{year[-2..-1]}"
+      end
+
+      def parse(body)
+        body.split('&').inject({}) do |memo, x|
+          k, v = x.split('=')
+          memo[k] = v
+          memo
+        end
+      end
+
+      def commit(action, money, parameters)
+        parameters[:amount] = amount(money)
+
+        data = ssl_post(self.live_url, post_data(action, parameters))
+        response = parse(data)
+        message = message_from(response)
+        test_mode = test?
+
+        Response.new(success?(response), message, response,
+          :test => test?,
+          :authorization => response['transactionid'],
+          :avs_result => {:code =>  response['avsresponse']},
+          :cvv_result => response['cvvresponse']
+        )
+      end
+
+      def success?(response)
+        response['response'] == '1'
+      end
+
+      def test?
+        (@options[:login].eql?('demo')) && (@options[:password].eql?('password'))
+      end
+
+      def message_from(response)
+        case response['response'].to_i
+        when APPROVED
+          "Transaction Approved"
+        when DECLINED
+          "Transaction Declined"
+        else
+          "Error in transaction data or system error"
+        end
+      end
+
+      def post_data(action, parameters = {})
+        parameters[:type] = action
+        parameters[:username] = @options[:login]
+        parameters[:password] = @options[:password]
+        parameters.map{|k, v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
+      end
+    end
+  end
+end
+

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

@@ -32,13 +32,13 @@ module ActiveMerchant #:nodoc:
     # == Usage
     #
     #   gateway = ActiveMerchant::Billing::OgoneGateway.new(
-    #               :login                     => "my_ogone_psp_id",
-    #               :user                      => "my_ogone_user_id",
-    #               :password                  => "my_ogone_pswd",
-    #               :signature                 => "my_ogone_sha_signature", # Only if you configured your Ogone environment so.
-    #               :signature_encryptor       => "sha512", # Can be "none" (default), "sha1", "sha256" or "sha512".
+    #     :login               => "my_ogone_psp_id",
+    #     :user                => "my_ogone_user_id",
+    #     :password            => "my_ogone_pswd",
+    #     :signature           => "my_ogone_sha_signature", # Only if you configured your Ogone environment so.
+    #     :signature_encryptor => "sha512"                  # Can be "none" (default), "sha1", "sha256" or "sha512".
     #                                                       # Must be the same as the one configured in your Ogone account.
-    #            )
+    #   )
     #
     #   # set up credit card object as in main ActiveMerchant example
     #   creditcard = ActiveMerchant::Billing::CreditCard.new(
@@ -75,7 +75,19 @@ module ActiveMerchant #:nodoc:
     #
     #   # When using store, you can also let Ogone generate the alias for you
     #   response = gateway.store(creditcard)
-    #   puts response.billing_id  # Retrieve the generated alias
+    #   puts response.billing_id # Retrieve the generated alias
+    #
+    #   # By default, Ogone tries to authorize 0.01 EUR but you can change this
+    #   # amount using the :store_amount option when creating the gateway object:
+    #   gateway = ActiveMerchant::Billing::OgoneGateway.new(
+    #     :login               => "my_ogone_psp_id",
+    #     :user                => "my_ogone_user_id",
+    #     :password            => "my_ogone_pswd",
+    #     :signature           => "my_ogone_sha_signature",
+    #     :signature_encryptor => "sha512",
+    #     :store_amount        => 100 # The store method will try to authorize 1 EUR instead of 0.01 EUR
+    #   )
+    #   response = gateway.store(creditcard) # authorize 1 EUR and void the authorization right away
     #
     # == 3-D Secure feature
     #
@@ -129,6 +141,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Ogone'
       self.default_currency = 'EUR'
       self.money_format = :cents
+      self.ssl_version = :TLSv1
 
       def initialize(options = {})
         requires!(options, :login, :user, :password)
@@ -195,7 +208,7 @@ module ActiveMerchant #:nodoc:
       # Store a credit card by creating an Ogone Alias
       def store(payment_source, options = {})
         options.merge!(:alias_operation => 'BYPSP') unless(options.has_key?(:billing_id) || options.has_key?(:store))
-        response = authorize(1, payment_source, options)
+        response = authorize(@options[:store_amount] || 1, payment_source, options)
         void(response.authorization) if response.success?
         response
       end

data/lib/active_merchant/billing/gateways/orbital/avs_result.rb

@@ -32,12 +32,12 @@ module ActiveMerchant #:nodoc:
             'JB' => 'International street address match. Postal code not verified',
             'JC' => 'International street address and postal code not verified',
             'JD' => 'International postal code match. Street address not verified',
-            'M1' => 'Merchant Override Decline',
+            'M1' => 'Cardholder name matches',
             'M2' => 'Cardholder name, billing address, and postal code matches',
             'M3' => 'Cardholder name and billing code matches',
-            'M4' => 'Cardholder name and billing address matches',
+            'M4' => 'Cardholder name and billing address match',
             'M5' => 'Cardholder name incorrect, billing address and postal code match',
-            'M6' => 'Cardholder name incorrect, billing address matches',
+            'M6' => 'Cardholder name incorrect, billing postal code matches',
             'M7' => 'Cardholder name incorrect, billing address matches',
             'M8' => 'Cardholder name, billing address and postal code are all incorrect',
             'N3' => 'Address matches, ZIP not verified',
@@ -48,7 +48,7 @@ module ActiveMerchant #:nodoc:
             'N8' => 'Address and ZIP code match (International only)',
             'N9' => 'Address and ZIP code match (UK only)',
             'R'  => 'Issuer does not participate in AVS',
-            'UX' => 'Unknown',
+            'UK' => 'Unknown',
             'X'  => 'Zip Match/Zip 4 Match/Address Match',
             'Z'  => 'Zip Match/Locale no match',
         }
@@ -58,7 +58,7 @@ module ActiveMerchant #:nodoc:
             'Y' => %w( 9 A B C H JA JD M2 M3 M5 N5 N8 N9 X Z ),
             'N' => %w( D E F G M8 ),
             'X' => %w( 4 J R ),
-            nil => %w( 1 2 3 5 6 7 8 JB JC M1 M4 M6 M7 N3 N4 N6 N7 UX )
+            nil => %w( 1 2 3 5 6 7 8 JB JC M1 M4 M6 M7 N3 N4 N6 N7 UK )
         }.inject({}) do |map, (type, codes)|
           codes.each { |code| map[code] = type }
           map
@@ -69,7 +69,7 @@ module ActiveMerchant #:nodoc:
             'Y' => %w( 9 B D F H JA JB M2 M4 M5 M6 M7 N3 N5 N7 N8 N9 X ),
             'N' => %w( A C E G M8 Z ),
             'X' => %w( 4 J R ),
-            nil => %w( 1 2 3 5 6 7 8 JC JD M1 M3 N4 N6 UX )
+            nil => %w( 1 2 3 5 6 7 8 JC JD M1 M3 N4 N6 UK )
         }.inject({}) do |map, (type, codes)|
           codes.each { |code| map[code] = type }
           map

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

@@ -13,8 +13,8 @@ module ActiveMerchant #:nodoc:
       
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :solo, :switch]
       self.supported_countries = ['GB']
-      self.homepage_url = 'https://www.paypal.com/uk/cgi-bin/webscr?cmd=_wp-pro-overview-outside'
-      self.display_name = 'PayPal Website Payments Pro (UK)'
+      self.homepage_url = 'https://www.paypal.com/uk/webapps/mpp/pro'
+      self.display_name = 'PayPal Payments Pro (UK)'
     end
   end
 end

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

@@ -57,6 +57,10 @@ module ActiveMerchant #:nodoc:
         commit(:post, "refunds/#{transaction_id(authorization)}", post)
       end
 
+      def void(authorization, options={})
+        commit(:delete, "preauthorizations/#{preauth(authorization)}")
+      end
+
       def store(credit_card, options={})
         save_card(credit_card)
       end
@@ -97,9 +101,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorization_from(parsed_response)
+        parsed_data = parsed_response['data']
+        return '' unless parsed_data.kind_of?(Hash)
+
         [
-          parsed_response['data']['id'],
-          parsed_response['data']['preauthorization'].try(:[], 'id')
+          parsed_data['id'],
+          parsed_data['preauthorization'].try(:[], 'id')
         ].join(";")
       end
 
@@ -109,6 +116,7 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         post[:token] = card_token
         post[:description] = options[:description]
+        post[:client] = options[:customer]
         commit(:post, 'transactions', post)
       end
 
@@ -158,6 +166,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(params)
+        return nil unless params
+
         no_blanks = params.reject { |key, value| value.blank? }
         no_blanks.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end

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

@@ -10,8 +10,8 @@ module ActiveMerchant #:nodoc:
       
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.supported_countries = ['US']
-      self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=_wp-pro-overview-outside'
-      self.display_name = 'PayPal Website Payments Pro (US)'
+      self.homepage_url = 'https://www.paypal.com/us/webapps/mpp/paypal-payments-pro'
+      self.display_name = 'PayPal Payments Pro (US)'
       
       def authorize(money, credit_card_or_referenced_id, options = {})
         requires!(options, :ip)

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

@@ -119,7 +119,36 @@ module ActiveMerchant #:nodoc:
           :status    => %w(protocol msgtype merchant transaction apikey),
 
           :chstatus  => %w(protocol msgtype merchant apikey)
-        }
+        },
+        
+        7 => {
+          :authorize => %w(protocol msgtype merchant ordernumber amount
+                           currency autocapture cardnumber expirationdate cvd
+                           acquirer cardtypelock testmode fraud_remote_addr
+                           fraud_http_accept fraud_http_accept_language
+                           fraud_http_accept_encoding fraud_http_accept_charset
+                           fraud_http_referer fraud_http_user_agent apikey),
+
+          :capture   => %w(protocol msgtype merchant amount transaction
+                           apikey),
+
+          :cancel    => %w(protocol msgtype merchant transaction apikey),
+
+          :refund    => %w(protocol msgtype merchant amount transaction apikey),
+
+          :subscribe => %w(protocol msgtype merchant ordernumber cardnumber
+                           expirationdate cvd acquirer cardtypelock description testmode
+                           fraud_remote_addr fraud_http_accept fraud_http_accept_language
+                           fraud_http_accept_encoding fraud_http_accept_charset
+                           fraud_http_referer fraud_http_user_agent apikey),
+
+          :recurring => %w(protocol msgtype merchant ordernumber amount currency
+                           autocapture transaction apikey),
+
+          :status    => %w(protocol msgtype merchant transaction apikey),
+
+          :chstatus  => %w(protocol msgtype merchant apikey)
+        }        
       }
 
       APPROVED = '000'
@@ -127,7 +156,7 @@ module ActiveMerchant #:nodoc:
       # The login is the QuickpayId
       # The password is the md5checkword from the Quickpay manager
       # To use the API-key from the Quickpay manager, specify :api-key
-      # Using the API-key, requires that you use version 4+. Specify :version => 4/5/6 in options.
+      # Using the API-key, requires that you use version 4+. Specify :version => 4/5/6/7 in options.
       def initialize(options = {})
         requires!(options, :login, :password)
         @protocol = options.delete(:version) || 3 # default to protocol version 3
@@ -225,6 +254,7 @@ module ActiveMerchant #:nodoc:
         post[:cvd]            = credit_card.verification_value
         post[:expirationdate] = expdate(credit_card)
         post[:cardtypelock]   = options[:cardtypelock] unless options[:cardtypelock].blank?
+        post[:acquirer]       = options[:acquirer] unless options[:acquirer].blank?
       end
 
       def add_reference(post, identification)