activemerchant 1.108.0 → 1.109.0

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

@@ -3,8 +3,8 @@ module ActiveMerchant #:nodoc:
     class MercadoPagoGateway < Gateway
       self.live_url = self.test_url = 'https://api.mercadopago.com/v1'
 
-      self.supported_countries = ['AR', 'BR', 'CL', 'CO', 'MX', 'PE', 'UY']
-      self.supported_cardtypes = [:visa, :master, :american_express, :elo, :cabal, :naranja]
+      self.supported_countries = %w[AR BR CL CO MX PE UY]
+      self.supported_cardtypes = %i[visa master american_express elo cabal naranja]
 
       self.homepage_url = 'https://www.mercadopago.com/'
       self.display_name = 'Mercado Pago'
@@ -33,7 +33,7 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options={})
         post = {}
-        authorization, _ = authorization.split('|')
+        authorization, = authorization.split('|')
         post[:capture] = true
         post[:transaction_amount] = amount(money).to_f
         commit('capture', "payments/#{authorization}", post)
@@ -47,7 +47,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def void(authorization, options={})
-        authorization, _ = authorization.split('|')
+        authorization, = authorization.split('|')
         post = { status: 'cancelled' }
         commit('void', "payments/#{authorization}", post)
       end
@@ -98,6 +98,7 @@ module ActiveMerchant #:nodoc:
         add_processing_mode(post, options)
         add_net_amount(post, options)
         add_taxes(post, options)
+        add_notification_url(post, options)
         post[:binary_mode] = (options[:binary_mode].nil? ? true : options[:binary_mode])
         post
       end
@@ -203,6 +204,10 @@ module ActiveMerchant #:nodoc:
         post[:net_amount] = Float(options[:net_amount]) if options[:net_amount]
       end
 
+      def add_notification_url(post, options)
+        post[:notification_url] = options[:notification_url] if options[:notification_url]
+      end
+
       def add_taxes(post, options)
         return unless (tax_object = options[:taxes])
 
@@ -251,7 +256,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, path, parameters)
-        if ['capture', 'void'].include?(action)
+        if %w[capture void].include?(action)
           response = parse(ssl_request(:put, url(path), post_data(parameters), headers))
         else
           response = parse(ssl_post(url(path), post_data(parameters), headers(parameters)))
@@ -271,7 +276,7 @@ module ActiveMerchant #:nodoc:
         if action == 'refund'
           response['status'] != 404 && response['error'].nil?
         else
-          ['active', 'approved', 'authorized', 'cancelled', 'in_process'].include?(response['status'])
+          %w[active approved authorized cancelled in_process].include?(response['status'])
         end
       end
 

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover jcb]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.merchante-solutions.com/'

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

@@ -13,7 +13,7 @@ module ActiveMerchant #:nodoc:
       BASE_URL = 'https://secure.merchantonegateway.com/api/transact.php'
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://merchantone.com/'
       self.display_name = 'Merchant One Gateway'
       self.money_format = :dollars
@@ -76,7 +76,7 @@ module ActiveMerchant #:nodoc:
       def add_creditcard(post, creditcard)
         post['cvv'] = creditcard.verification_value
         post['ccnumber'] = creditcard.number
-        post['ccexp'] = "#{sprintf("%02d", creditcard.month)}#{creditcard.year.to_s[-2, 2]}"
+        post['ccexp'] = "#{sprintf('%02d', creditcard.month)}#{creditcard.year.to_s[-2, 2]}"
       end
 
       def commit(action, money, parameters={})

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

@@ -11,7 +11,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
       self.default_currency = 'USD'
       self.money_format = :dollars
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
 
       def initialize(options={})
         requires!(options, :account_id, :merchant_pin)

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.v4_live_url = 'https://ps1.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://merchantwarehouse.com/merchantware'
       self.display_name = 'MerchantWARE'
 

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://ps1.merchantware.net/Merchantware/ws/RetailTransaction/v4/Credit.asmx'
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://merchantwarehouse.com/merchantware'
       self.display_name = 'MerchantWARE'
 

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

@@ -11,8 +11,8 @@ module ActiveMerchant #:nodoc:
       POST_LIVE_URL = 'https://api.merchantwarrior.com/post/'
 
       self.supported_countries = ['AU']
-      self.supported_cardtypes = [:visa, :master, :american_express,
-                                  :diners_club, :discover, :jcb]
+      self.supported_cardtypes = %i[visa master american_express
+                                    diners_club discover jcb]
       self.homepage_url = 'https://www.merchantwarrior.com/'
       self.display_name = 'Merchant Warrior'
 

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

@@ -18,8 +18,8 @@ module ActiveMerchant #:nodoc:
 
       self.homepage_url = 'http://www.mercurypay.com'
       self.display_name = 'Mercury'
-      self.supported_countries = ['US', 'CA']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_countries = %w[US CA]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
       self.default_currency = 'USD'
 
       STANDARD_ERROR_CODE_MAPPING = {
@@ -103,7 +103,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'Transaction' do
             xml.tag! 'TranType', 'Credit'
             xml.tag! 'TranCode', action
-            xml.tag! 'PartialAuth', 'Allow' if options[:allow_partial_auth] && ['PreAuth', 'Sale'].include?(action)
+            xml.tag! 'PartialAuth', 'Allow' if options[:allow_partial_auth] && %w[PreAuth Sale].include?(action)
             add_invoice(xml, options[:order_id], nil, options)
             add_reference(xml, 'RecordNumberRequested')
             add_customer_data(xml, options)
@@ -294,7 +294,7 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      SUCCESS_CODES = ['Approved', 'Success']
+      SUCCESS_CODES = %w[Approved Success]
 
       def commit(action, request)
         response = parse(action, ssl_post(endpoint_url, build_soap_request(request), build_header))

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

@@ -31,7 +31,7 @@ module ActiveMerchant #:nodoc:
       AVS_RESULT_CODE, TRANSACTION_ID, CARD_CODE_RESPONSE_CODE  = 5, 6, 38
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express discover diners_club jcb]
       self.homepage_url = 'http://www.metricsglobal.com'
       self.display_name = 'Metrics Global'
 

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

@@ -9,7 +9,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = %w(DE)
       self.default_currency = 'EUR'
       self.money_format = :cents
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_cardtypes = %i[visa master american_express]
 
       def initialize(options={})
         requires!(options, :access_key)
@@ -175,7 +175,7 @@ module ActiveMerchant #:nodoc:
 
       def authorization_from(response, request_params)
         session_id = response['sessionId'] || request_params[:sessionId]
-        "#{session_id}|#{response["transactionId"]}"
+        "#{session_id}|#{response['transactionId']}"
       end
     end
   end

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

@@ -20,7 +20,7 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = %w(AU AE BD BN EG HK ID JO KW LB LK MU MV MY NZ OM PH QA SA SG TT VN)
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express diners_club jcb]
 
       self.money_format = :cents
       self.currencies_without_fractions = %w(IDR)

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       TEST_XMLNS = 'https://secure.modpay.com/netservices/test/'
 
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
       self.homepage_url = 'http://www.modpay.com'
       self.display_name = 'Modern Payments'
 

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

@@ -14,9 +14,9 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://test.monei-api.net/payment/ctpe'
       self.live_url = 'https://monei-api.net/payment/ctpe'
 
-      self.supported_countries = ['AD', 'AT', 'BE', 'BG', 'CA', 'CH', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FO', 'FR', 'GB', 'GI', 'GR', 'HU', 'IE', 'IL', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK', 'TR', 'US', 'VA']
+      self.supported_countries = %w[AD AT BE BG CA CH CY CZ DE DK EE ES FI FO FR GB GI GR HU IE IL IS IT LI LT LU LV MT NL NO PL PT RO SE SI SK TR US VA]
       self.default_currency = 'EUR'
-      self.supported_cardtypes = [:visa, :master, :maestro, :jcb, :american_express]
+      self.supported_cardtypes = %i[visa master maestro jcb american_express]
 
       self.homepage_url = 'http://www.monei.net/'
       self.display_name = 'Monei'

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

@@ -13,7 +13,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://www3.moneris.com/gateway2/servlet/MpgRequest'
 
       self.supported_countries = ['CA']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover]
+      self.supported_cardtypes = %i[visa master american_express diners_club discover]
       self.homepage_url = 'http://www.moneris.com/'
       self.display_name = 'Moneris'
 
@@ -417,27 +417,27 @@ module ActiveMerchant #:nodoc:
 
       def actions
         {
-          'purchase' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :track2, :pos_code, :cof_info],
-          'preauth' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :track2, :pos_code, :cof_info],
+          'purchase' => %i[order_id cust_id amount pan expdate crypt_type avs_info cvd_info track2 pos_code cof_info],
+          'preauth' => %i[order_id cust_id amount pan expdate crypt_type avs_info cvd_info track2 pos_code cof_info],
           'command' => [:order_id],
-          'refund' => [:order_id, :amount, :txn_number, :crypt_type],
-          'indrefund' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
-          'completion' => [:order_id, :comp_amount, :txn_number, :crypt_type],
-          'purchasecorrection' => [:order_id, :txn_number, :crypt_type],
-          'cavv_preauth' => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv, :crypt_type, :wallet_indicator],
-          'cavv_purchase' => [:order_id, :cust_id, :amount, :pan, :expdate, :cavv, :crypt_type, :wallet_indicator],
-          'card_verification' => [:order_id, :cust_id, :pan, :expdate, :crypt_type, :avs_info, :cvd_info, :cof_info],
-          'transact' => [:order_id, :cust_id, :amount, :pan, :expdate, :crypt_type],
+          'refund' => %i[order_id amount txn_number crypt_type],
+          'indrefund' => %i[order_id cust_id amount pan expdate crypt_type],
+          'completion' => %i[order_id comp_amount txn_number crypt_type],
+          'purchasecorrection' => %i[order_id txn_number crypt_type],
+          'cavv_preauth' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator],
+          'cavv_purchase' => %i[order_id cust_id amount pan expdate cavv crypt_type wallet_indicator],
+          'card_verification' => %i[order_id cust_id pan expdate crypt_type avs_info cvd_info cof_info],
+          'transact' => %i[order_id cust_id amount pan expdate crypt_type],
           'Batchcloseall' => [],
           'opentotals' => [:ecr_number],
           'batchclose' => [:ecr_number],
-          'res_add_cc' => [:pan, :expdate, :crypt_type, :avs_info, :cof_info],
-          'res_temp_add' => [:pan, :expdate, :crypt_type, :duration],
+          'res_add_cc' => %i[pan expdate crypt_type avs_info cof_info],
+          'res_temp_add' => %i[pan expdate crypt_type duration],
           'res_delete' => [:data_key],
-          'res_update_cc' => [:data_key, :pan, :expdate, :crypt_type, :avs_info, :cof_info],
-          'res_purchase_cc' => [:data_key, :order_id, :cust_id, :amount, :crypt_type, :cof_info],
-          'res_preauth_cc' => [:data_key, :order_id, :cust_id, :amount, :crypt_type, :cof_info],
-          'res_card_verification_cc' => [:order_id, :data_key, :expdate, :crypt_type, :cof_info]
+          'res_update_cc' => %i[data_key pan expdate crypt_type avs_info cof_info],
+          'res_purchase_cc' => %i[data_key order_id cust_id amount crypt_type cof_info],
+          'res_preauth_cc' => %i[data_key order_id cust_id amount crypt_type cof_info],
+          'res_card_verification_cc' => %i[order_id data_key expdate crypt_type cof_info]
         }
       end
     end

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://mmoa.us/'
       self.display_name = 'MoneyMovers'
       self.supported_countries = ['US']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       def initialize(options = {})
         requires!(options, :login, :password)

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :alelo]
+      self.supported_cardtypes = %i[visa master american_express discover alelo]
 
       self.homepage_url = 'https://www.mundipagg.com/'
       self.display_name = 'Mundipagg'

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

@@ -16,7 +16,7 @@ module ActiveMerchant #:nodoc:
       self.live_periodic_url = 'https://transact.nab.com.au/xmlapi/periodic'
 
       self.supported_countries = ['AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
+      self.supported_cardtypes = %i[visa master american_express diners_club jcb]
 
       self.homepage_url = 'http://transact.nab.com.au'
       self.display_name = 'NAB Transact'
@@ -39,7 +39,7 @@ module ActiveMerchant #:nodoc:
         trigger: 8
       }
 
-      SUCCESS_CODES = ['00', '08', '11', '16', '77']
+      SUCCESS_CODES = %w[00 08 11 16 77]
 
       def initialize(options = {})
         requires!(options, :login, :password)

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       self.homepage_url = 'http://www.ncrretailonline.com'
       self.display_name = 'NCR Secure Pay'

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

@@ -24,7 +24,7 @@ module ActiveMerchant
     class NetRegistryGateway < Gateway
       self.live_url = self.test_url = 'https://paygate.ssllock.net/external2.pl'
 
-      FILTERED_PARAMS = ['card_no', 'card_expiry', 'receipt_array']
+      FILTERED_PARAMS = %w[card_no card_expiry receipt_array]
 
       self.supported_countries = ['AU']
 
@@ -32,7 +32,7 @@ module ActiveMerchant
       # steps in setting up your account, as detailed in
       # "Programming for NetRegistry's E-commerce Gateway."
       # [http://rubyurl.com/hNG]
-      self.supported_cardtypes = [:visa, :master, :diners_club, :american_express, :jcb]
+      self.supported_cardtypes = %i[visa master diners_club american_express jcb]
       self.display_name = 'NetRegistry'
       self.homepage_url = 'http://www.netregistry.com.au'
 

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

@@ -7,10 +7,10 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://epayment.bbs.no/'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['NO', 'DK', 'SE', 'FI']
+      self.supported_countries = %w[NO DK SE FI]
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      self.supported_cardtypes = %i[visa master american_express]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.betalingsterminal.no/Netthandel-forside/'

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

@@ -7,14 +7,14 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w(AF AX AL DZ AS AD AO AI AQ AG AR AM AW AU AT AZ BS BH BD BB BY BE BZ BJ BM BT BO BQ BA BW BV BR IO BN BG BF BI KH CM CA CV KY CF TD CL CN CX CC CO KM CG CD CK CR CI HR CU CW CY CZ DK DJ DM DO EC EG SV GQ ER EE ET FK FO FJ FI FR GF PF TF GA GM GE DE GH GI GR GL GD GP GU GT GG GN GW GY HT HM HN HK HU IS IN ID IR IQ IE IM IL IT JM JP JE JO KZ KE KI KP KR KW KG LA LV LB LS LR LY LI LT LU MO MK MG MW MY MV ML MT MH MQ MR MU YT MX FM MD MC MN ME MS MA MZ MM NA NR NP NC NZ NI NE NG NU NF MP NO OM PK PW PS PA PG PY PE PH PN PL PT PR QA RE RO RU RW BL SH KN LC MF VC WS SM ST SA SN RS SC SL SG SX SK SI SB SO ZA GS SS ES LK PM SD SR SJ SZ SE CH SY TW TJ TZ TH NL TL TG TK TO TT TN TR TM TC TV UG UA AE GB US UM UY UZ VU VA VE VN VG VI WF EH YE ZM ZW)
       self.default_currency = 'CAD'
-      self.supported_cardtypes = [
-        :american_express,
-        :diners_club,
-        :discover,
-        :jcb,
-        :master,
-        :maestro,
-        :visa
+      self.supported_cardtypes = %i[
+        american_express
+        diners_club
+        discover
+        jcb
+        master
+        maestro
+        visa
       ]
 
       self.money_format = :cents
@@ -37,6 +37,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorize(money, payment, options={})
+        # Do a Verification with AVS prior to Auth + Settle
+        verification_response = verify(payment, options)
+        return verification_response if verification_response.message != 'OK'
+
         post = {}
         add_invoice(post, money, options)
         add_payment(post, payment, options)
@@ -52,14 +56,28 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, authorization, options={})
+        # If the transactions that are pending, API call needs to be Cancellation
+        settlement_data = get_settlement(authorization)
+        return settlement_data if settlement_data.message != 'OK'
+
         post = {}
-        add_invoice(post, money, options)
+        if settlement_data.params['status'] == 'PENDING'
+          post[:status] = 'CANCELLED'
+          commit(:put, "settlements/#{authorization}", post)
+        else
+          add_invoice(post, money, options)
 
-        # Setting merchantRefNumber to a unique id for each refund
-        # This is to support multiple partial refunds for the same order
-        post[:merchantRefNum] = SecureRandom.uuid
+          # Setting merchantRefNumber to a unique id for each refund
+          # This is to support multiple partial refunds for the same order
+          post[:merchantRefNum] = SecureRandom.uuid
 
-        commit(:post, "settlements/#{authorization}/refunds", post)
+          commit(:post, "settlements/#{authorization}/refunds", post)
+        end
+      end
+
+      def get_settlement(authorization)
+        post = {}
+        commit(:get, "settlements/#{authorization}", post)
       end
 
       def void(authorization, options={})
@@ -71,7 +89,7 @@ module ActiveMerchant #:nodoc:
 
       def verify(credit_card, options={})
         post = {}
-        add_payment(post, credit_card)
+        add_payment(post, credit_card, options)
         add_order_id(post, options)
 
         commit(:post, 'verifications', post)
@@ -139,14 +157,14 @@ module ActiveMerchant #:nodoc:
         add_order_id(post, options)
       end
 
-      def add_payment(post, credit_card_or_reference, options = {})
+      def add_payment(post, credit_card_reference, options = {})
         post[:card] ||= {}
-        if credit_card_or_reference.is_a?(String)
-          post[:card][:paymentToken] = credit_card_or_reference
+        if credit_card_reference.is_a?(String)
+          post[:card][:paymentToken] = credit_card_reference
         else
-          post[:card][:cardNum]    = credit_card_or_reference.number
-          post[:card][:cvv]        = credit_card_or_reference.verification_value
-          post[:card][:cardExpiry] = expdate(credit_card_or_reference)
+          post[:card][:cardNum]    = credit_card_reference.number
+          post[:card][:cvv]        = credit_card_reference.verification_value
+          post[:card][:cardExpiry] = expdate(credit_card_reference)
         end
 
         post[:currencyCode] = options[:currency] if options[:currency]
@@ -202,7 +220,11 @@ module ActiveMerchant #:nodoc:
         params = parameters.to_json unless parameters.nil?
         response =
           begin
-            parse(ssl_request(method, get_url(uri), params, headers))
+            if method == :get
+              parse(ssl_request(method, get_url(uri), nil, headers))
+            else
+              parse(ssl_request(method, get_url(uri), params, headers))
+            end
           rescue ResponseError => e
             return Response.new(false, 'Invalid Login') if e.response.code == '401'
 
@@ -216,7 +238,9 @@ module ActiveMerchant #:nodoc:
           response,
           test: test?,
           error_code: error_code_from(response),
-          authorization: authorization_from(success, get_url(uri), method, response)
+          authorization: authorization_from(success, get_url(uri), method, response),
+          avs_result: AVSResult.new(code: response['avsResponse']),
+          cvv_result: CVVResult.new(response['cvvVerification'])
         )
       end