activemerchant 1.83.0 → 1.84.0

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

@@ -179,8 +179,8 @@ module ActiveMerchant #:nodoc:
           message  = message_from(response)
 
           PaystationResponse.new(success?(response), message, response,
-              :test          => (response[:tm] && response[:tm].downcase == 't'),
-              :authorization => response[:paystation_transaction_id]
+            :test          => (response[:tm] && response[:tm].downcase == 't'),
+            :authorization => response[:paystation_transaction_id]
           )
         end
 

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

@@ -52,6 +52,11 @@ module ActiveMerchant #:nodoc:
         add_transaction_elements(post, 'CAPTURE', options)
         add_reference(post, authorization)
 
+        if !amount.nil? && amount.to_f != 0.0
+          post[:transaction][:additionalValues] ||= {}
+          post[:transaction][:additionalValues][:TX_VALUE] = invoice_for(amount, options)[:TX_VALUE]
+        end
+
         commit('capture', post)
       end
 
@@ -220,6 +225,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_invoice(post, money, options)
+        post[:transaction][:order][:additionalValues] = invoice_for(money, options)
+      end
+
+      def invoice_for(money, options)
         tx_value = {}
         tx_value[:value] = amount(money)
         tx_value[:currency] = options[:currency] || currency(money)
@@ -237,7 +246,7 @@ module ActiveMerchant #:nodoc:
         additional_values[:TX_TAX] = tx_tax if @options[:payment_country] == 'CO'
         additional_values[:TX_TAX_RETURN_BASE] = tx_tax_return_base if @options[:payment_country] == 'CO'
 
-        post[:transaction][:order][:additionalValues] = additional_values
+        additional_values
       end
 
       def add_signature(post)
@@ -310,25 +319,23 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, params)
-        begin
-          raw_response = ssl_post(url, post_data(params), headers)
-          response = parse(raw_response)
-        rescue ResponseError => e
-          raw_response = e.response.body
-          response_error(raw_response)
-        rescue JSON::ParserError
-          unparsable_response(raw_response)
-        else
-          success = success_from(action, response)
-          Response.new(
-            success,
-            message_from(action, success, response),
-            response,
-            authorization: success ? authorization_from(action, response) : nil,
-            error_code: success ? nil : error_from(action, response),
-            test: test?
-          )
-        end
+        raw_response = ssl_post(url, post_data(params), headers)
+        response = parse(raw_response)
+      rescue ResponseError => e
+        raw_response = e.response.body
+        response_error(raw_response)
+      rescue JSON::ParserError
+        unparsable_response(raw_response)
+      else
+        success = success_from(action, response)
+        Response.new(
+          success,
+          message_from(action, success, response),
+          response,
+          authorization: success ? authorization_from(action, response) : nil,
+          error_code: success ? nil : error_from(action, response),
+          test: test?
+        )
       end
 
       def headers
@@ -416,18 +423,16 @@ module ActiveMerchant #:nodoc:
       end
 
       def response_error(raw_response)
-        begin
-          response = parse(raw_response)
-        rescue JSON::ParserError
-          unparsable_response(raw_response)
-        else
-          return Response.new(
-            false,
-            message_from('', false, response),
-            response,
-            :test => test?
-          )
-        end
+        response = parse(raw_response)
+      rescue JSON::ParserError
+        unparsable_response(raw_response)
+      else
+        return Response.new(
+          false,
+          message_from('', false, response),
+          response,
+          :test => test?
+        )
       end
 
       def unparsable_response(raw_response)

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

@@ -84,6 +84,7 @@ module ActiveMerchant #:nodoc:
           gsub(/(number\\?":\\?")(\d*)/, '\1[FILTERED]').
           gsub(/(cvc\\?":\\?")(\d*)/, '\1[FILTERED]')
       end
+
       private
 
       def add_amount(post, money, options)
@@ -120,7 +121,7 @@ module ActiveMerchant #:nodoc:
       def add_capture(post, options)
         capture = options[:capture]
 
-        post[:capture] = capture == false ? false : true
+        post[:capture] = capture != false
       end
 
       def add_creditcard(post, creditcard)
@@ -173,7 +174,6 @@ module ActiveMerchant #:nodoc:
         elsif body['error']
           error_response(body)
         end
-
       rescue JSON::ParserError
         return unparsable_response(raw_response)
       end

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

@@ -172,6 +172,7 @@ module ActiveMerchant
       end
 
       private
+
       def commit(action, post)
         response = parse( ssl_post(self.live_url, post_data(action, post)) )
         success = SUCCESS_CODES.include?(response[:finalstatus])

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

@@ -17,11 +17,11 @@ module ActiveMerchant
       self.default_currency = 'GBP'
 
       self.supported_countries = ['GB']
-      # Visa Credit, Visa Debit, Mastercard, Maestro, Solo, Electron,
+      # Visa Credit, Visa Debit, Mastercard, Maestro, Electron,
       # American Express, Diners Club, JCB, International Maestro,
       # Style, Clydesdale Financial Services, Other
 
-      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb, :switch, :solo, :maestro ]
+      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb, :maestro ]
       self.homepage_url = 'http://www.paymentsolutionsltd.com/'
       self.display_name = 'PSL Payment Solutions'
 
@@ -174,12 +174,6 @@ module ActiveMerchant
         post[:ExpMonth] = credit_card.month
         post[:ExpYear] = credit_card.year
 
-        if requires_start_date_or_issue_number?(credit_card)
-          post[:IssueNumber] = credit_card.issue_number unless credit_card.issue_number.blank?
-          post[:StartMonth] = credit_card.start_month unless credit_card.start_month.blank?
-          post[:StartYear] = credit_card.start_year unless credit_card.start_year.blank?
-        end
-
         # CV2 check
         post[:AVSCV2Check] = credit_card.verification_value? ? 'YES' : 'NO'
         post[:CV2] = credit_card.verification_value if credit_card.verification_value?
@@ -189,7 +183,7 @@ module ActiveMerchant
         address = options[:billing_address] || options[:address]
         return if address.nil?
 
-        post[:QAAddress] = [:address1, :address2, :city, :state].collect{|a| address[a]}.reject{|a| a.blank?}.join(' ')
+        post[:QAAddress] = [:address1, :address2, :city, :state].collect{|a| address[a]}.reject(&:blank?).join(' ')
         post[:QAPostcode] = address[:zip]
       end
 
@@ -246,7 +240,6 @@ module ActiveMerchant
       #   -a hash with all of the values returned in the PSL response
       #
       def parse(body)
-
         fields = {}
         for line in body.split('&')
           key, value = *line.scan( %r{^(\w+)\=(.*)$} ).flatten

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

@@ -216,10 +216,10 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(success, message, response,
-        :test => test?,
-        :authorization => authorization,
-        :avs_result => { :code => response[:AVSResponseCode] },
-        :cvv_result => response[:CVV2ResponseCode]
+          :test => test?,
+          :authorization => authorization,
+          :avs_result => { :code => response[:AVSResponseCode] },
+          :cvv_result => response[:CVV2ResponseCode]
         )
       end
 

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

@@ -1,6 +1,5 @@
 
 module QuickpayCommon
-
   MD5_CHECK_FIELDS = {
     3 => {
       :authorize => %w(protocol msgtype merchant ordernumber amount
@@ -175,7 +174,6 @@ module QuickpayCommon
     base.supported_countries = ['DE', 'DK', 'ES', 'FI', 'FR', 'FO', 'GB', 'IS', 'NO', 'SE']
     base.homepage_url = 'http://quickpay.net/'
     base.display_name = 'QuickPay'
-
   end
     
   def expdate(credit_card)
@@ -184,5 +182,4 @@ module QuickpayCommon
 
     "#{year}#{month}"
   end
-
 end

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

@@ -276,11 +276,9 @@ module ActiveMerchant
         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)
@@ -292,8 +290,6 @@ module ActiveMerchant
         def synchronized_path(path)
           "#{path}?synchronized"
         end
-
     end
-
   end
 end

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

@@ -26,15 +26,12 @@ module ActiveMerchant
         'visa'              => 'VISA',
         'american_express'  => 'AMEX',
         'diners_club'       => 'DINERS',
-        'switch'            => 'SWITCH',
-        'solo'              => 'SWITCH',
-        'laser'             => 'LASER',
         'maestro'           => 'MC'
       }
 
       self.money_format = :cents
       self.default_currency = 'EUR'
-      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :switch, :solo, :laser ]
+      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club ]
       self.supported_countries = %w(IE GB FR BE NL LU IT US CA ES)
       self.homepage_url = 'http://www.realexpayments.com/'
       self.display_name = 'Realex'
@@ -89,11 +86,12 @@ module ActiveMerchant
 
       def scrub(transcript)
         transcript.
-        gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
-        gsub(%r((<number>)\d+(</number>))i, '\1[FILTERED]\2')
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((<number>)\d+(</number>))i, '\1[FILTERED]\2')
       end
 
       private
+
       def commit(request)
         response = parse(ssl_post(self.live_url, request))
 
@@ -245,7 +243,7 @@ module ActiveMerchant
           xml.tag! 'expdate', expiry_date(credit_card)
           xml.tag! 'chname', credit_card.name
           xml.tag! 'type', CARD_MAPPING[card_brand(credit_card).to_s]
-          xml.tag! 'issueno', credit_card.issue_number
+          xml.tag! 'issueno', ''
           xml.tag! 'cvn' do
             xml.tag! 'number', credit_card.verification_value
             xml.tag! 'presind', (options['presind'] || (credit_card.verification_value? ? 1 : nil))
@@ -267,7 +265,7 @@ module ActiveMerchant
 
       def format_address_code(address)
         code = [address[:zip].to_s, address[:address1].to_s + address[:address2].to_s]
-        code.collect{|e| e.gsub(/\D/, '')}.reject{|e| e.empty?}.join('|')
+        code.collect{|e| e.gsub(/\D/, '')}.reject(&:empty?).join('|')
       end
 
       def new_timestamp

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

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'nokogiri'
 
 module ActiveMerchant #:nodoc:

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

@@ -96,7 +96,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-
       def supports_scrubbing?
         true
       end

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

@@ -43,7 +43,7 @@ module ActiveMerchant #:nodoc:
       def capture(money, authorization, options={})
         post = {}
         auth, transaction_id, token, exp_month, exp_year, _, original_currency = authorization.split('|')
-        add_transaction_data('Settle', post, money, (options.merge!({currency: original_currency})))
+        add_transaction_data('Settle', post, money, options.merge!({currency: original_currency}))
         post[:sg_AuthCode] = auth
         post[:sg_TransactionID] = transaction_id
         post[:sg_CCToken] = token
@@ -56,7 +56,7 @@ module ActiveMerchant #:nodoc:
       def refund(money, authorization, options={})
         post = {}
         auth, transaction_id, token, exp_month, exp_year, _, original_currency = authorization.split('|')
-        add_transaction_data('Credit', post, money, (options.merge!({currency: original_currency})))
+        add_transaction_data('Credit', post, money, options.merge!({currency: original_currency}))
         post[:sg_CreditType] = 2
         post[:sg_AuthCode] = auth
         post[:sg_TransactionID] = transaction_id
@@ -79,7 +79,7 @@ module ActiveMerchant #:nodoc:
       def void(authorization, options={})
         post = {}
         auth, transaction_id, token, exp_month, exp_year, original_amount, original_currency = authorization.split('|')
-        add_transaction_data('Void', post, (original_amount.to_f * 100), (options.merge!({currency: original_currency})))
+        add_transaction_data('Void', post, (original_amount.to_f * 100), options.merge!({currency: original_currency}))
         post[:sg_CreditType] = 2
         post[:sg_AuthCode] = auth
         post[:sg_TransactionID] = transaction_id
@@ -181,7 +181,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def element_name_to_symbol(response, childnode)
-        name = "#{childnode.name.downcase}"
+        name = childnode.name.downcase
         response[name.to_sym] = childnode.text
       end
 

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

@@ -98,16 +98,16 @@ module ActiveMerchant #:nodoc:
 
       def scrub(transcript)
          force_utf8(transcript).
-          gsub(%r((M_id=)[^&]*), '\1[FILTERED]').
-          gsub(%r((M_key=)[^&]*), '\1[FILTERED]').
-          gsub(%r((C_cardnumber=)[^&]*), '\1[FILTERED]').
-          gsub(%r((C_cvv=)[^&]*), '\1[FILTERED]').
-          gsub(%r((C_rte=)[^&]*), '\1[FILTERED]').
-          gsub(%r((C_acct=)[^&]*), '\1[FILTERED]').
-          gsub(%r((C_ssn=)[^&]*), '\1[FILTERED]').
-          gsub(%r((<ns1:CARDNUMBER>).+(</ns1:CARDNUMBER>)), '\1[FILTERED]\2').
-          gsub(%r((<ns1:M_ID>).+(</ns1:M_ID>)), '\1[FILTERED]\2').
-          gsub(%r((<ns1:M_KEY>).+(</ns1:M_KEY>)), '\1[FILTERED]\2')
+           gsub(%r((M_id=)[^&]*), '\1[FILTERED]').
+           gsub(%r((M_key=)[^&]*), '\1[FILTERED]').
+           gsub(%r((C_cardnumber=)[^&]*), '\1[FILTERED]').
+           gsub(%r((C_cvv=)[^&]*), '\1[FILTERED]').
+           gsub(%r((C_rte=)[^&]*), '\1[FILTERED]').
+           gsub(%r((C_acct=)[^&]*), '\1[FILTERED]').
+           gsub(%r((C_ssn=)[^&]*), '\1[FILTERED]').
+           gsub(%r((<ns1:CARDNUMBER>).+(</ns1:CARDNUMBER>)), '\1[FILTERED]\2').
+           gsub(%r((<ns1:M_ID>).+(</ns1:M_ID>)), '\1[FILTERED]\2').
+           gsub(%r((<ns1:M_KEY>).+(</ns1:M_KEY>)), '\1[FILTERED]\2')
       end
 
       private
@@ -364,9 +364,12 @@ module ActiveMerchant #:nodoc:
         end
 
         def commit(action, request)
-          response = parse(@gateway.ssl_post(@live_url,
-            build_soap_request(action, request),
-            build_headers(action))
+          response = parse(
+            @gateway.ssl_post(
+              @live_url,
+              build_soap_request(action, request),
+              build_headers(action)
+            )
           )
 
           case action

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

@@ -28,8 +28,6 @@ module ActiveMerchant #:nodoc:
         :visa => 'VISA',
         :master => 'MC',
         :delta => 'DELTA',
-        :solo => 'SOLO',
-        :switch => 'MAESTRO',
         :maestro => 'MAESTRO',
         :american_express => 'AMEX',
         :electron => 'UKE',
@@ -71,7 +69,7 @@ module ActiveMerchant #:nodoc:
         recipient_dob: :FIRecipientDoB
       }
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :switch, :solo, :maestro, :diners_club]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro, :diners_club]
       self.supported_countries = ['GB', 'IE']
       self.default_currency = 'GBP'
 
@@ -183,6 +181,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def truncate(value, max_size)
         return nil unless value
         return value.to_s if CGI.escape(value.to_s).length <= max_size
@@ -291,11 +290,6 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :CardNumber, credit_card.number, :required => true)
 
         add_pair(post, :ExpiryDate, format_date(credit_card.month, credit_card.year), :required => true)
-
-        if requires_start_date_or_issue_number?(credit_card)
-          add_pair(post, :StartDate, format_date(credit_card.start_month, credit_card.start_year))
-          add_pair(post, :IssueNumber, credit_card.issue_number)
-        end
         add_pair(post, :CardType, map_card_type(credit_card))
 
         add_pair(post, :CV2, credit_card.verification_value)
@@ -436,6 +430,5 @@ module ActiveMerchant #:nodoc:
         payment_method.split(';').last == 'purchase'
       end
     end
-
   end
 end

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

@@ -189,7 +189,6 @@ module ActiveMerchant #:nodoc:
           xml.tag!('CUSTOMER_SHIP', NIL_ATTRIBUTE) do
           end
         end
-
       end
 
       def add_merchant_key(xml, options)

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

@@ -4,7 +4,6 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://api.securionpay.com/'
       self.live_url = 'https://api.securionpay.com/'
 
-
       self.supported_countries = %w(AL AD AT BY BE BG HR CY CZ RE DK EE IS FI FR DE GI GR HU IS IE IT IL LV LI LT LU
                                     MK MT MD MC NL NO PL PT RO RU MA RS SK SI ES SE CH UA GB KI CI ME)
 
@@ -205,11 +204,9 @@ module ActiveMerchant #:nodoc:
       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 post_data(params)