activemerchant 1.79.2 → 1.129.0

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

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'rexml/document'
 
 module ActiveMerchant #:nodoc:
@@ -119,25 +120,23 @@ module ActiveMerchant #:nodoc:
                       'KO' => 'N',
                       'NO' => 'R' }
 
-      SUCCESS_MESSAGE = "The transaction was successful"
+      SUCCESS_MESSAGE = 'The transaction was successful'
+
+      THREE_D_SECURE_DISPLAY_WAYS = { main_window: 'MAINW', # display the identification page in the main window (default value).
 
-      THREE_D_SECURE_DISPLAY_WAYS = { :main_window => 'MAINW',  # display the identification page in the main window
-                                                                # (default value).
-                                      :pop_up      => 'POPUP',  # display the identification page in a pop-up window
-                                                                # and return to the main window at the end.
-                                      :pop_ix      => 'POPIX' } # display the identification page in a pop-up window
-                                                                # and remain in the pop-up window.
+                                      pop_up: 'POPUP',  # display the identification page in a pop-up window and return to the main window at the end.
+                                      pop_ix: 'POPIX' } # display the identification page in a pop-up window and remain in the pop-up window.
 
-      OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE   = "Signature usage will be the default for a future release of ActiveMerchant. You should either begin using it, or update your configuration to explicitly disable it (signature_encryptor: none)"
+      OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE   = 'Signature usage will be the default for a future release of ActiveMerchant. You should either begin using it, or update your configuration to explicitly disable it (signature_encryptor: none)'
       OGONE_STORE_OPTION_DEPRECATION_MESSAGE   = "The 'store' option has been renamed to 'billing_id', and its usage is deprecated."
 
-      self.test_url = "https://secure.ogone.com/ncol/test/"
-      self.live_url = "https://secure.ogone.com/ncol/prod/"
+      self.test_url = 'https://secure.ogone.com/ncol/test/'
+      self.live_url = 'https://secure.ogone.com/ncol/prod/'
 
-      self.supported_countries = ['BE', 'DE', 'FR', 'NL', 'AT', 'CH']
+      self.supported_countries = %w[BE DE FR NL AT CH]
       # also supports Airplus and UATP
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :jcb, :maestro]
-      self.homepage_url = 'http://www.ogone.com/'
+      self.supported_cardtypes = %i[visa master american_express diners_club discover jcb maestro]
+      self.homepage_url = 'https://www.ingenico.com/login/ogone/'
       self.display_name = 'Ogone'
       self.default_currency = 'EUR'
       self.money_format = :cents
@@ -150,7 +149,7 @@ module ActiveMerchant #:nodoc:
       # Verify and reserve the specified amount on the account, without actually doing the transaction.
       def authorize(money, payment_source, options = {})
         post = {}
-        action = (payment_source.brand == "mastercard") ? "PAU" : "RES"
+        action = payment_source.brand == 'mastercard' ? 'PAU' : 'RES'
         add_invoice(post, options)
         add_payment_source(post, payment_source, options)
         add_address(post, payment_source, options)
@@ -205,7 +204,7 @@ module ActiveMerchant #:nodoc:
         perform_reference_credit(money, reference, options)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(100, credit_card, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
@@ -214,7 +213,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))
+        options[:alias_operation] = 'BYPSP' unless options.has_key?(:billing_id) || options.has_key?(:store)
         response = authorize(@options[:store_amount] || 1, payment_source, options)
         void(response.authorization) if response.success?
         response
@@ -226,21 +225,22 @@ module ActiveMerchant #:nodoc:
 
       def scrub(transcript)
         transcript.
-        gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
-        gsub(%r((&?cardno=)[^&]*)i, '\1[FILTERED]').
-        gsub(%r((&?cvc=)[^&]*)i, '\1[FILTERED]').
-        gsub(%r((&?pswd=)[^&]*)i, '\1[FILTERED]')
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((&?cardno=)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((&?cvc=)[^&]*)i, '\1[FILTERED]').
+          gsub(%r((&?pswd=)[^&]*)i, '\1[FILTERED]')
       end
 
       private
 
       def reference_from(authorization)
-        authorization.split(";").first
+        authorization.split(';').first
       end
 
       def reference_transaction?(identifier)
         return false unless identifier.is_a?(String)
-        _, action = identifier.split(";")
+
+        _, action = identifier.split(';')
         !action.nil?
       end
 
@@ -264,7 +264,6 @@ module ActiveMerchant #:nodoc:
 
       def add_payment_source(post, payment_source, options)
         add_d3d(post, options) if options[:d3d]
-
         if payment_source.is_a?(String)
           add_alias(post, payment_source, options[:alias_operation])
           add_eci(post, options[:eci] || '9')
@@ -285,25 +284,54 @@ module ActiveMerchant #:nodoc:
           THREE_D_SECURE_DISPLAY_WAYS[options[:win_3ds]] :
           THREE_D_SECURE_DISPLAY_WAYS[:main_window]
         add_pair post, 'WIN3DS', win_3ds
-
-        add_pair post, 'HTTP_ACCEPT',     options[:http_accept] || "*/*"
         add_pair post, 'HTTP_USER_AGENT', options[:http_user_agent] if options[:http_user_agent]
         add_pair post, 'ACCEPTURL',       options[:accept_url]      if options[:accept_url]
         add_pair post, 'DECLINEURL',      options[:decline_url]     if options[:decline_url]
         add_pair post, 'EXCEPTIONURL',    options[:exception_url]   if options[:exception_url]
         add_pair post, 'CANCELURL',       options[:cancel_url]      if options[:cancel_url]
-        add_pair post, 'PARAMVAR',        options[:paramvar]       if options[:paramvar]
+        add_pair post, 'PARAMVAR',        options[:paramvar]        if options[:paramvar]
         add_pair post, 'PARAMPLUS',       options[:paramplus]       if options[:paramplus]
         add_pair post, 'COMPLUS',         options[:complus]         if options[:complus]
         add_pair post, 'LANGUAGE',        options[:language]        if options[:language]
+        if  options[:three_ds_2]
+          browser_info = options[:three_ds_2][:browser_info]
+          ecom_postal = options[:billing_address]
+          if browser_info
+            add_pair post, 'BROWSERACCEPTHEADER', browser_info[:accept_header]
+            add_pair post, 'BROWSERCOLORDEPTH', browser_info[:depth]
+
+            # for 3ds v2.1 to v2.2 add BROWSERJAVASCRIPTENABLED: This boolean indicates whether your customers have enabled JavaScript in their browsers when making a purchase.
+            # the following BROWSER<tag> parameters will remain mandatory unless browser_info[:javascript] = false
+            # her documentation https://epayments-support.ingenico.com/en/integration-solutions/integrations/directlink#directlink_integration_guides_secure_payment_with_3_d_secure
+            add_pair post, 'BROWSERJAVASCRIPTENABLED', browser_info[:javascript]
+            add_pair post, 'BROWSERJAVAENABLED', browser_info[:java]
+            add_pair post, 'BROWSERLANGUAGE', browser_info[:language]
+            add_pair post, 'BROWSERSCREENHEIGHT', browser_info[:height]
+            add_pair post, 'BROWSERSCREENWIDTH', browser_info[:width]
+            add_pair post, 'BROWSERTIMEZONE', browser_info[:timezone]
+            add_pair post, 'BROWSERUSERAGENT', browser_info[:user_agent]
+          end
+          # recommended
+          if ecom_postal
+            add_pair post, 'ECOM_BILLTO_POSTAL_CITY', ecom_postal[:city]
+            add_pair post, 'ECOM_BILLTO_POSTAL_COUNTRYCODE', ecom_postal[:country]
+            add_pair post, 'ECOM_BILLTO_POSTAL_STREET_LINE1', ecom_postal[:address1]
+            add_pair post, 'ECOM_BILLTO_POSTAL_STREET_LINE2', ecom_postal[:address2]
+            add_pair post, 'ECOM_BILLTO_POSTAL_POSTALCODE', ecom_postal[:zip]
+          end
+          # optional
+          add_pair post, 'Mpi.threeDSRequestorChallengeIndicator', options[:three_ds_reqchallengeind]
+        else
+          add_pair post, 'HTTP_ACCEPT', options[:http_accept] || '*/*'
+        end
       end
 
       def add_eci(post, eci)
         add_pair post, 'ECI', eci.to_s
       end
 
-      def add_alias(post, _alias, alias_operation = nil)
-        add_pair post, 'ALIAS', _alias
+      def add_alias(post, alias_name, alias_operation = nil)
+        add_pair post, 'ALIAS', alias_name
         add_pair post, 'ALIASOPERATION', alias_operation unless alias_operation.nil?
       end
 
@@ -323,6 +351,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(post, creditcard, options)
         return unless options[:billing_address]
+
         add_pair post, 'Owneraddress', options[:billing_address][:address1]
         add_pair post, 'OwnerZip',     options[:billing_address][:zip]
         add_pair post, 'ownertown',    options[:billing_address][:city]
@@ -339,7 +368,7 @@ module ActiveMerchant #:nodoc:
       def add_creditcard(post, creditcard)
         add_pair post, 'CN',     creditcard.name
         add_pair post, 'CARDNO', creditcard.number
-        add_pair post, 'ED',     "%02d%02s" % [creditcard.month, creditcard.year.to_s[-2..-1]]
+        add_pair post, 'ED',     '%02d%02s' % [creditcard.month, creditcard.year.to_s[-2..-1]]
         add_pair post, 'CVC',    creditcard.verification_value
       end
 
@@ -349,8 +378,8 @@ module ActiveMerchant #:nodoc:
 
         # Add HTML_ANSWER element (3-D Secure specific to the response's params)
         # Note: HTML_ANSWER is not an attribute so we add it "by hand" to the response
-        if html_answer = REXML::XPath.first(xml_root, "//HTML_ANSWER")
-          response["HTML_ANSWER"] = html_answer.text
+        if html_answer = REXML::XPath.first(xml_root, '//HTML_ANSWER')
+          response['HTML_ANSWER'] = html_answer.text
         end
 
         response
@@ -365,27 +394,27 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(url(parameters['PAYID']), post_data(action, parameters)))
 
         options = {
-          :authorization => [response["PAYID"], action].join(";"),
-          :test          => test?,
-          :avs_result    => { :code => AVS_MAPPING[response["AAVCheck"]] },
-          :cvv_result    => CVV_MAPPING[response["CVCCheck"]]
+          authorization: [response['PAYID'], action].join(';'),
+          test: test?,
+          avs_result: { code: AVS_MAPPING[response['AAVCheck']] },
+          cvv_result: CVV_MAPPING[response['CVCCheck']]
         }
         OgoneResponse.new(successful?(response), message_from(response), response, options)
       end
 
       def url(payid)
-        (test? ? test_url : live_url) + (payid ? "maintenancedirect.asp" : "orderdirect.asp")
+        (test? ? test_url : live_url) + (payid ? 'maintenancedirect.asp' : 'orderdirect.asp')
       end
 
       def successful?(response)
-        response["NCERROR"] == "0"
+        response['NCERROR'] == '0'
       end
 
       def message_from(response)
         if successful?(response)
           SUCCESS_MESSAGE
         else
-          format_error_message(response["NCERRORPLUS"])
+          format_error_message(response['NCERRORPLUS'])
         end
       end
 
@@ -393,9 +422,9 @@ module ActiveMerchant #:nodoc:
         raw_message = message.to_s.strip
         case raw_message
         when /\|/
-          raw_message.split("|").join(", ").capitalize
+          raw_message.split('|').join(', ').capitalize
         when /\//
-          raw_message.split("/").first.to_s.capitalize
+          raw_message.split('/').first.to_s.capitalize
         else
           raw_message.to_s.capitalize
         end
@@ -409,30 +438,31 @@ module ActiveMerchant #:nodoc:
 
       def add_signature(parameters)
         if @options[:signature].blank?
-           ActiveMerchant.deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless(@options[:signature_encryptor] == "none")
-           return
+          ActiveMerchant.deprecated(OGONE_NO_SIGNATURE_DEPRECATION_MESSAGE) unless @options[:signature_encryptor] == 'none'
+          return
         end
 
-        add_pair parameters, 'SHASign', calculate_signature(parameters, @options[:signature_encryptor], @options[:signature])
+        add_pair parameters, 'SHASIGN', calculate_signature(parameters, @options[:signature_encryptor], @options[:signature])
       end
 
       def calculate_signature(signed_parameters, algorithm, secret)
         return legacy_calculate_signature(signed_parameters, secret) unless algorithm
 
-        sha_encryptor = case algorithm
-        when 'sha256'
-          Digest::SHA256
-        when 'sha512'
-          Digest::SHA512
-        when 'sha1'
-          Digest::SHA1
-        else
-          raise "Unknown signature algorithm #{algorithm}"
-        end
+        sha_encryptor =
+          case algorithm
+          when 'sha256'
+            Digest::SHA256
+          when 'sha512'
+            Digest::SHA512
+          when 'sha1'
+            Digest::SHA1
+          else
+            raise "Unknown signature algorithm #{algorithm}"
+          end
 
-        filtered_params = signed_parameters.select{|k,v| !v.blank?}
+        filtered_params = signed_parameters.compact
         sha_encryptor.hexdigest(
-          filtered_params.sort_by{|k,v| k.upcase}.map{|k, v| "#{k.upcase}=#{v}#{secret}"}.join("")
+          filtered_params.sort_by { |k, _v| k.upcase }.map { |k, v| "#{k.upcase}=#{v}#{secret}" }.join('')
         ).upcase
       end
 
@@ -447,14 +477,14 @@ module ActiveMerchant #:nodoc:
               PSPID
               Operation
               ALIAS
-            ).map{|key| parameters[key]} +
+            ).map { |key| parameters[key] } +
             [secret]
-          ).join("")
+          ).join('')
         ).upcase
       end
 
       def add_pair(post, key, value)
-        post[key] = value if !value.blank?
+        post[key] = value unless value.nil?
       end
 
       def convert_attributes_to_hash(rexml_attributes)

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

@@ -19,15 +19,15 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'THB'
       self.money_format     = :cents
 
-      #Country supported by Omise
+      # Country supported by Omise
       # * Thailand
-      self.supported_countries = %w( TH JP )
+      self.supported_countries = %w(TH JP)
 
       # Credit cards supported by Omise
       # * VISA
       # * MasterCard
       # * JCB
-      self.supported_cardtypes = [:visa, :master, :jcb]
+      self.supported_cardtypes = %i[visa master jcb]
 
       # Omise main page
       self.homepage_url = 'https://www.omise.co/'
@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>:api_version</tt> -- Omise's API Version (OPTIONAL), default version is '2014-07-27'
       #                            See version at page https://dashboard.omise.co/api-version/edit
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :public_key, :secret_key)
         @public_key  = options[:public_key]
         @secret_key  = options[:secret_key]
@@ -79,7 +79,7 @@ module ActiveMerchant #:nodoc:
       #
       #   purchase(money, nil, { :customer_id => customer_id })
 
-      def purchase(money, payment_method, options={})
+      def purchase(money, payment_method, options = {})
         create_charge(money, payment_method, options)
       end
 
@@ -91,7 +91,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>payment_method</tt> -- The CreditCard object
       # * <tt>options</tt>        -- An optional parameters, such as token or capture
 
-      def authorize(money, payment_method, options={})
+      def authorize(money, payment_method, options = {})
         options[:capture] = 'false'
         create_charge(money, payment_method, options)
       end
@@ -104,7 +104,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>charge_id</tt> -- The CreditCard object
       # * <tt>options</tt>   -- An optional parameters, such as token or capture
 
-      def capture(money, charge_id, options={})
+      def capture(money, charge_id, options = {})
         post = {}
         add_amount(post, money, options)
         commit(:post, "charges/#{CGI.escape(charge_id)}/capture", post, options)
@@ -118,7 +118,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>charge_id</tt> -- The CreditCard object
       # * <tt>options</tt>   -- An optional parameters, such as token or capture
 
-      def refund(money, charge_id, options={})
+      def refund(money, charge_id, options = {})
         options[:amount] = money if money
         commit(:post, "charges/#{CGI.escape(charge_id)}/refunds", options)
       end
@@ -132,7 +132,7 @@ module ActiveMerchant #:nodoc:
       #     'email'       (A customer email)
       #     'description' (A customer description)
 
-      def store(payment_method, options={})
+      def store(payment_method, options = {})
         post, card_params = {}, {}
         add_customer_data(post, options)
         add_token(card_params, payment_method, options)
@@ -145,7 +145,7 @@ module ActiveMerchant #:nodoc:
       #
       # * <tt>customer_id</tt> -- The Customer identifier (REQUIRED).
 
-      def unstore(customer_id, options={})
+      def unstore(customer_id, options = {})
         commit(:delete, "customers/#{CGI.escape(customer_id)}")
       end
 
@@ -164,7 +164,7 @@ module ActiveMerchant #:nodoc:
         transcript.
           gsub(/(Authorization: Basic )\w+/i, '\1[FILTERED]').
           gsub(/(\\"number\\":)\\"\d+\\"/, '\1[FILTERED]').
-          gsub(/(\\"security_code\\":)\\"\d+\\"/,'\1[FILTERED]')
+          gsub(/(\\"security_code\\":)\\"\d+\\"/, '\1[FILTERED]')
       end
 
       private
@@ -178,11 +178,11 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'charges', post, options)
       end
 
-      def headers(options={})
+      def headers(options = {})
         key = options[:key] || @secret_key
         {
           'Content-Type'    => 'application/json;utf-8',
-          'Omise-Version'   => @api_version || "2014-07-27",
+          'Omise-Version'   => @api_version || '2014-07-27',
           'User-Agent'      => "ActiveMerchantBindings/#{ActiveMerchant::VERSION} Ruby/#{RUBY_VERSION}",
           'Authorization'   => 'Basic ' + Base64.encode64(key.to_s + ':').strip,
           'Accept-Encoding' => 'utf-8'
@@ -197,7 +197,7 @@ module ActiveMerchant #:nodoc:
         parameters.present? ? parameters.to_json : nil
       end
 
-      def https_request(method, endpoint, parameters=nil, options={})
+      def https_request(method, endpoint, parameters = nil, options = {})
         raw_response = response = nil
         begin
           raw_response = ssl_request(method, url_for(endpoint), post_data(parameters), headers(options))
@@ -216,12 +216,12 @@ module ActiveMerchant #:nodoc:
       end
 
       def json_error(raw_response)
-        msg  = "Invalid response received from Omise API. Please contact support@omise.co if you continue to receive this message."
+        msg  = 'Invalid response received from Omise API. Please contact support@omise.co if you continue to receive this message.'
         msg += "The raw response returned by the API was #{raw_response.inspect})"
         { message: msg }
       end
 
-      def commit(method, endpoint, params=nil, options={})
+      def commit(method, endpoint, params = nil, options = {})
         response = https_request(method, endpoint, params, options)
         Response.new(
           successful?(response),
@@ -246,16 +246,16 @@ module ActiveMerchant #:nodoc:
       def message_to_standard_error_code_from(response)
         message = response['message'] if response['code'] == 'invalid_card'
         case message
-          when /brand not supported/
-            STANDARD_ERROR_CODE[:invalid_number]
-          when /number is invalid/
-            STANDARD_ERROR_CODE[:incorrect_number]
-          when /expiration date cannot be in the past/
-            STANDARD_ERROR_CODE[:expired_card]
-          when /expiration \w+ is invalid/
-            STANDARD_ERROR_CODE[:invalid_expiry_date]
-          else
-            STANDARD_ERROR_CODE[:processing_error]
+        when /brand not supported/
+          STANDARD_ERROR_CODE[:invalid_number]
+        when /number is invalid/
+          STANDARD_ERROR_CODE[:incorrect_number]
+        when /expiration date cannot be in the past/
+          STANDARD_ERROR_CODE[:expired_card]
+        when /expiration \w+ is invalid/
+          STANDARD_ERROR_CODE[:invalid_expiry_date]
+        else
+          STANDARD_ERROR_CODE[:processing_error]
         end
       end
 
@@ -263,7 +263,7 @@ module ActiveMerchant #:nodoc:
         if successful?(response)
           'Success'
         else
-          (response['message'] ? response['message'] : response['failure_message'])
+          response['message'] || response['failure_message']
         end
       end
 
@@ -284,7 +284,7 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'tokens', post, { key: @public_key })
       end
 
-      def add_token(post, credit_card, options={})
+      def add_token(post, credit_card, options = {})
         if options[:token_id].present?
           post[:card] = options[:token_id]
         else
@@ -304,11 +304,11 @@ module ActiveMerchant #:nodoc:
         post[:card] = card
       end
 
-      def add_customer(post, options={})
+      def add_customer(post, options = {})
         post[:customer] = options[:customer_id] if options[:customer_id]
       end
 
-      def add_customer_data(post, options={})
+      def add_customer_data(post, options = {})
         post[:description] = options[:description] if options[:description]
         post[:email]       = options[:email] if options[:email]
       end
@@ -318,7 +318,6 @@ module ActiveMerchant #:nodoc:
         post[:currency]    = (options[:currency] || currency(money))
         post[:description] = options[:description] if options.key?(:description)
       end
-
     end
   end
 end

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

@@ -1,11 +1,18 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class OpenpayGateway < Gateway
-      self.live_url = 'https://api.openpay.mx/v1/'
-      self.test_url = 'https://sandbox-api.openpay.mx/v1/'
-
-      self.supported_countries = ['MX']
-      self.supported_cardtypes = [:visa, :master, :american_express]
+      class_attribute :mx_live_url, :mx_test_url
+      class_attribute :co_live_url, :co_test_url
+
+      self.co_live_url = 'https://api.openpay.co/v1/'
+      self.co_test_url = 'https://sandbox-api.openpay.co/v1/'
+      self.mx_live_url = 'https://api.openpay.mx/v1/'
+      self.mx_test_url = 'https://sandbox-api.openpay.mx/v1/'
+      self.live_url = self.co_live_url
+      self.test_url = self.co_test_url
+
+      self.supported_countries = %w(CO MX)
+      self.supported_cardtypes = %i[visa master american_express carnet]
       self.homepage_url = 'http://www.openpay.mx/'
       self.display_name = 'Openpay'
       self.default_currency = 'MXN'
@@ -24,6 +31,16 @@ module ActiveMerchant #:nodoc:
         super
       end
 
+      def gateway_url(options = {})
+        country = options[:merchant_country] || @options[:merchant_country]
+
+        if country == 'MX'
+          test? ? mx_test_url : mx_live_url
+        else
+          test? ? co_test_url : co_live_url
+        end
+      end
+
       def purchase(money, creditcard, options = {})
         post = create_post_for_auth_or_purchase(money, creditcard, options)
         commit(:post, 'charges', post, options)
@@ -38,6 +55,7 @@ module ActiveMerchant #:nodoc:
       def capture(money, authorization, options = {})
         post = {}
         post[:amount] = amount(money) if money
+        post[:payments] = options[:payments] if options[:payments]
         commit(:post, "charges/#{CGI.escape(authorization)}/capture", post, options)
       end
 
@@ -74,7 +92,7 @@ module ActiveMerchant #:nodoc:
           MultiResponse.run(:first) do |r|
             r.process { commit(:post, 'customers', post, options) }
 
-            if(r.success? && !r.params['id'].blank?)
+            if r.success? && !r.params['id'].blank?
               customer_id = r.params['id']
               r.process { commit(:post, "customers/#{customer_id}/cards", card, options) }
             end
@@ -103,6 +121,7 @@ module ActiveMerchant #:nodoc:
           gsub(%r((cvv2\\?":\\?")\\?"), '\1[BLANK]"').
           gsub(%r((cvv2\\?":\\?")\s+), '\1[BLANK]')
       end
+
       private
 
       def create_post_for_auth_or_purchase(money, creditcard, options)
@@ -114,6 +133,7 @@ module ActiveMerchant #:nodoc:
         post[:device_session_id] = options[:device_session_id]
         post[:currency] = (options[:currency] || currency(money)).upcase
         post[:use_card_points] = options[:use_card_points] if options[:use_card_points]
+        post[:payment_plan] = { payments: options[:payments] } if options[:payments]
         add_creditcard(post, creditcard, options)
         post
       end
@@ -124,8 +144,8 @@ module ActiveMerchant #:nodoc:
         elsif creditcard.respond_to?(:number)
           card = {
             card_number: creditcard.number,
-            expiration_month: "#{sprintf("%02d", creditcard.month)}",
-            expiration_year: "#{"#{creditcard.year}"[-2, 2]}",
+            expiration_month: sprintf('%02d', creditcard.month),
+            expiration_year: creditcard.year.to_s[-2, 2],
             cvv2: creditcard.verification_value,
             holder_name: creditcard.name
           }
@@ -148,6 +168,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(card, options)
         return unless card.kind_of?(Hash)
+
         if address = (options[:billing_address] || options[:address])
           card[:address] = {
             line1: address[:address1],
@@ -163,15 +184,16 @@ module ActiveMerchant #:nodoc:
 
       def headers(options = {})
         {
-          "Content-Type" => "application/json",
-          "Authorization" => "Basic " + Base64.strict_encode64(@api_key.to_s + ":").strip,
-          "User-Agent" => "Openpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
-          "X-Openpay-Client-User-Agent" => user_agent
+          'Content-Type' => 'application/json',
+          'Authorization' => 'Basic ' + Base64.strict_encode64(@api_key.to_s + ':').strip,
+          'User-Agent' => "Openpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          'X-Openpay-Client-User-Agent' => user_agent
         }
       end
 
       def parse(body)
         return {} unless body
+
         JSON.parse(body)
       end
 
@@ -182,13 +204,12 @@ module ActiveMerchant #:nodoc:
         Response.new(success,
           (success ? response['error_code'] : response['description']),
           response,
-          :test => test?,
-          :authorization => response['id']
-        )
+          test: test?,
+          authorization: response['id'])
       end
 
-      def http_request(method, resource, parameters={}, options={})
-        url = (test? ? self.test_url : self.live_url) + @merchant_id + '/' + resource
+      def http_request(method, resource, parameters = {}, options = {})
+        url = gateway_url(options) + @merchant_id + '/' + resource
         raw_response = nil
         begin
           raw_response = ssl_request(method, url, (parameters ? parameters.to_json : nil), headers(options))
@@ -202,24 +223,22 @@ module ActiveMerchant #:nodoc:
       end
 
       def error?(response)
-        response.key?('error_code')
+        response['error_code'] && !response['error_code'].blank?
       end
 
       def response_error(raw_response)
-        begin
-          parse(raw_response)
-        rescue JSON::ParserError
-          json_error(raw_response)
-        end
+        parse(raw_response)
+      rescue JSON::ParserError
+        json_error(raw_response)
       end
 
       def json_error(raw_response)
         msg = 'Invalid response received from the Openpay API.  Please contact soporte@openpay.mx if you continue to receive this message.'
         msg += "  (The raw response returned by the API was #{raw_response.inspect})"
         {
-            'category' => 'request',
-            'error_code' => '9999',
-            'description' => msg
+          'category' => 'request',
+          'error_code' => '9999',
+          'description' => msg
         }
       end
     end