activemerchant 1.79.2 → 1.80.0

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

@@ -120,7 +120,7 @@ module ActiveMerchant #:nodoc:
           gsub(%r((&?UMkey=)[^&]*)i, '\1[FILTERED]')
       end
 
-    private
+      private
 
       def add_amount(post, money)
         post[:amount] = amount(money)
@@ -269,7 +269,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        if response[:status] == "Approved"
+        if response[:status] == 'Approved'
           return 'Success'
         else
           return 'Unspecified error' if response[:error].blank?
@@ -286,7 +286,7 @@ module ActiveMerchant #:nodoc:
         hash = Digest::SHA1.hexdigest("#{parameters[:command]}:#{@options[:password]}:#{parameters[:amount]}:#{parameters[:invoice]}:#{seed}")
         parameters[:hash] = "s/#{seed}/#{hash}/n"
 
-        parameters.collect { |key, value| "UM#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        parameters.collect { |key, value| "UM#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
     end
   end

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

@@ -23,14 +23,14 @@ module ActiveMerchant
       def purchase(money, payment_method, options={})
         MultiResponse.run do |r|
           r.process { login }
-          r.process { commit(purchase_request(money, payment_method, r.params["response_sessionid"], options), :response_transactionref) }
+          r.process { commit(purchase_request(money, payment_method, r.params['response_sessionid'], options), :response_transactionref) }
         end
       end
 
       def refund(money, authorization, options={})
         MultiResponse.run do |r|
           r.process { login }
-          r.process { commit(refund_request(money, authorization, r.params["response_sessionid"]), :response_creditrequestreceived) }
+          r.process { commit(refund_request(money, authorization, r.params['response_sessionid']), :response_creditrequestreceived) }
         end
       end
 
@@ -66,7 +66,7 @@ module ActiveMerchant
 
       def childnode_to_response(response, node, childnode)
         name = "#{node.name.downcase}_#{childnode.name.downcase}"
-        if name == "response_errors" && !childnode.elements.empty?
+        if name == 'response_errors' && !childnode.elements.empty?
           add_errors_to_response(response, childnode.to_s)
         else
           response[name.downcase.to_sym] = childnode.text
@@ -77,13 +77,13 @@ module ActiveMerchant
         errors_hash = Hash.from_xml(errors_xml).values.first
         response[:response_errors] = errors_hash
 
-        error = errors_hash["Error"]
+        error = errors_hash['Error']
         if error.kind_of?(Hash)
-          response[:error_message] = error["ErrorDescription"]
-          response[:error_codes] = error["ErrorCode"]
+          response[:error_message] = error['ErrorDescription']
+          response[:error_codes] = error['ErrorCode']
         elsif error.kind_of?(Array)
-          error_str = error.map { |e| e["ErrorDescription"]}.join(". ")
-          error_codes = error.map { |e| e["ErrorCode"]}.join(", ")
+          error_str = error.map { |e| e['ErrorDescription']}.join('. ')
+          error_codes = error.map { |e| e['ErrorCode']}.join(', ')
           response[:error_message] = "#{error_str}."
           response[:error_codes] = error_codes
         end
@@ -107,7 +107,7 @@ module ActiveMerchant
       end
 
       def message_from(succeeded, response)
-        return "Success" if succeeded
+        return 'Success' if succeeded
         response[:error_message]
       end
 
@@ -116,7 +116,7 @@ module ActiveMerchant
           response[:response_customerref],
           response[:response_paymentmethodref],
           response[:response_transactionref]
-        ].join("|")
+        ].join('|')
       end
 
       def split_authorization(authorization)
@@ -125,7 +125,7 @@ module ActiveMerchant
 
       def purchase_request(money, payment_method, session_id, options)
         build_xml_request do |doc|
-          add_auth(doc, "EFTAddCompleteTransaction", session_id)
+          add_auth(doc, 'EFTAddCompleteTransaction', session_id)
 
           doc.Request do
             doc.RequestVars do
@@ -141,7 +141,7 @@ module ActiveMerchant
 
       def refund_request(money, authorization, session_id)
         build_xml_request do |doc|
-          add_auth(doc, "EFTAddCredit", session_id)
+          add_auth(doc, 'EFTAddCredit', session_id)
 
           doc.Request do
             doc.RequestVars do
@@ -203,7 +203,7 @@ module ActiveMerchant
         doc.CardExpYear(format(credit_card.year, :two_digits))
         doc.CardCVV2(credit_card.verification_value)
         doc.CardBillingName(credit_card.name)
-        doc.AccountType("CC")
+        doc.AccountType('CC')
         add_billing_address(doc, options)
       end
 
@@ -220,28 +220,28 @@ module ActiveMerchant
       end
 
       def add_echeck(doc, echeck)
-        if echeck.account_type == "savings"
-          doc.AccountType("S")
+        if echeck.account_type == 'savings'
+          doc.AccountType('S')
         else
-          doc.AccountType("C")
+          doc.AccountType('C')
         end
 
         doc.CustomerName("#{echeck.last_name}, #{echeck.first_name}")
         doc.AccountNumber(echeck.account_number)
         doc.RoutingNumber(echeck.routing_number)
-        doc.TransactionTypeCode("WEB")
+        doc.TransactionTypeCode('WEB')
       end
 
       def add_purchase_noise(doc)
-        doc.StartDate("0000-00-00")
-        doc.FrequencyCode("O")
+        doc.StartDate('0000-00-00')
+        doc.FrequencyCode('O')
       end
 
       def add_refund_noise(doc)
-        doc.ContactName("Bilbo Baggins")
-        doc.ContactPhone("1234567890")
-        doc.ContactExtension("None")
-        doc.ReasonForCredit("Refund requested")
+        doc.ContactName('Bilbo Baggins')
+        doc.ContactPhone('1234567890')
+        doc.ContactExtension('None')
+        doc.ReasonForCredit('Refund requested')
       end
 
       def add_options(doc, options)
@@ -259,7 +259,7 @@ module ActiveMerchant
       def login_request
         build_xml_request do |doc|
           doc.Auth do
-            add_request(doc, "Login")
+            add_request(doc, 'Login')
           end
 
           doc.Request do
@@ -273,7 +273,7 @@ module ActiveMerchant
 
       def build_xml_request
         builder = Nokogiri::XML::Builder.new
-        builder.__send__("VancoWS") do |doc|
+        builder.__send__('VancoWS') do |doc|
           yield(doc)
         end
         builder.to_xml

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

@@ -5,46 +5,46 @@ module ActiveMerchant #:nodoc:
     class VerifiGateway < Gateway
       class VerifiPostData < PostData
         # Fields that will be sent even if they are blank
-        self.required_fields = [ :amount, :type, :ccnumber, :ccexp, :firstname, :lastname,
-          :company, :address1, :address2, :city, :state, :zip, :country, :phone ]
+        self.required_fields = [:amount, :type, :ccnumber, :ccexp, :firstname, :lastname,
+                                :company, :address1, :address2, :city, :state, :zip, :country, :phone]
       end
 
       self.live_url = self.test_url = 'https://secure.verifi.com/gw/api/transact.php'
 
       RESPONSE_CODE_MESSAGES = {
-        "100" => "Transaction was Approved",
-        "200" => "Transaction was Declined by Processor",
-        "201" => "Do Not Honor",
-        "202" => "Insufficient Funds",
-        "203" => "Over Limit",
-        "204" => "Transaction not allowed",
-        "220" => "Incorrect payment Data",
-        "221" => "No Such Card Issuer",
-        "222" => "No Card Number on file with Issuer",
-        "223" => "Expired Card",
-        "224" => "Invalid Expiration Date",
-        "225" => "Invalid Card Security Code",
-        "240" => "Call Issuer for Further Information",
-        "250" => "Pick Up Card",
-        "251" => "Lost Card",
-        "252" => "Stolen Card",
-        "253" => "Fraudulent Card",
-        "260" => "Declined With further Instructions Available (see response text)",
-        "261" => "Declined - Stop All Recurring Payments",
-        "262" => "Declined - Stop this Recurring Program",
-        "263" => "Declined - Update Cardholder Data Available",
-        "264" => "Declined - Retry in a few days",
-        "300" => "Transaction was Rejected by Gateway",
-        "400" => "Transaction Error Returned by Processor",
-        "410" => "Invalid Merchant Configuration",
-        "411" => "Merchant Account is Inactive",
-        "420" => "Communication Error",
-        "421" => "Communication Error with Issuer",
-        "430" => "Duplicate Transaction at Processor",
-        "440" => "Processor Format Error",
-        "441" => "Invalid Transaction Information",
-        "460" => "Processor Feature Not Available",
-        "461" => "Unsupported Card Type"
+        '100' => 'Transaction was Approved',
+        '200' => 'Transaction was Declined by Processor',
+        '201' => 'Do Not Honor',
+        '202' => 'Insufficient Funds',
+        '203' => 'Over Limit',
+        '204' => 'Transaction not allowed',
+        '220' => 'Incorrect payment Data',
+        '221' => 'No Such Card Issuer',
+        '222' => 'No Card Number on file with Issuer',
+        '223' => 'Expired Card',
+        '224' => 'Invalid Expiration Date',
+        '225' => 'Invalid Card Security Code',
+        '240' => 'Call Issuer for Further Information',
+        '250' => 'Pick Up Card',
+        '251' => 'Lost Card',
+        '252' => 'Stolen Card',
+        '253' => 'Fraudulent Card',
+        '260' => 'Declined With further Instructions Available (see response text)',
+        '261' => 'Declined - Stop All Recurring Payments',
+        '262' => 'Declined - Stop this Recurring Program',
+        '263' => 'Declined - Update Cardholder Data Available',
+        '264' => 'Declined - Retry in a few days',
+        '300' => 'Transaction was Rejected by Gateway',
+        '400' => 'Transaction Error Returned by Processor',
+        '410' => 'Invalid Merchant Configuration',
+        '411' => 'Merchant Account is Inactive',
+        '420' => 'Communication Error',
+        '421' => 'Communication Error with Issuer',
+        '430' => 'Duplicate Transaction at Processor',
+        '440' => 'Processor Format Error',
+        '441' => 'Invalid Transaction Information',
+        '460' => 'Processor Feature Not Available',
+        '461' => 'Unsupported Card Type'
       }
 
       SUCCESS = 1
@@ -180,10 +180,10 @@ module ActiveMerchant #:nodoc:
         # MD5(username|password|orderid|amount|time)
         now = Time.now.to_i.to_s
         md5 = Digest::MD5.new
-        md5 << @options[:login].to_s + "|"
-        md5 << @options[:password].to_s + "|"
-        md5 << options[:order_id].to_s + "|"
-        md5 << amount(money).to_s + "|"
+        md5 << @options[:login].to_s + '|'
+        md5 << @options[:password].to_s + '|'
+        md5 << options[:order_id].to_s + '|'
+        md5 << amount(money).to_s + '|'
         md5 << now
         post[:key]  = md5.hexdigest
         post[:time] = now
@@ -203,7 +203,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        response[:response_code_message] ? response[:response_code_message] : ""
+        response[:response_code_message] || ''
       end
 
       def parse(body)

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

@@ -50,7 +50,7 @@ module ActiveMerchant #:nodoc:
       # Viaklix does not support credits by reference. You must pass in the credit card
       def credit(money, creditcard, options = {})
         if creditcard.is_a?(String)
-          raise ArgumentError, "Reference credits are not supported. Please supply the original credit card"
+          raise ArgumentError, 'Reference credits are not supported. Please supply the original credit card'
         end
 
         form = {}
@@ -158,16 +158,16 @@ module ActiveMerchant #:nodoc:
       def post_data(parameters)
         result = preamble
         result.merge!(parameters)
-        result.collect { |key, value| "ssl_#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+        result.collect { |key, value| "ssl_#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
       # Parse the response message
       def parse(msg)
         resp = {}
         msg.split(self.delimiter).collect{|li|
-            key, value = li.split("=")
-            resp[key.strip.gsub(/^ssl_/, '')] = value.to_s.strip
-          }
+          key, value = li.split('=')
+          resp[key.strip.gsub(/^ssl_/, '')] = value.to_s.strip
+        }
         resp
       end
     end

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

@@ -2,14 +2,14 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class VisanetPeruGateway < Gateway
       include Empty
-      self.display_name = "VisaNet Peru Gateway"
-      self.homepage_url = "http://www.visanet.com.pe"
+      self.display_name = 'VisaNet Peru Gateway'
+      self.homepage_url = 'http://www.visanet.com.pe'
 
-      self.test_url = "https://devapi.vnforapps.com/api.tokenization/api/v2/merchant"
-      self.live_url = "https://api.vnforapps.com/api.tokenization/api/v2/merchant"
+      self.test_url = 'https://devapi.vnforapps.com/api.tokenization/api/v2/merchant'
+      self.live_url = 'https://api.vnforapps.com/api.tokenization/api/v2/merchant'
 
-      self.supported_countries = ["US", "PE"]
-      self.default_currency = "PEN"
+      self.supported_countries = ['US', 'PE']
+      self.default_currency = 'PEN'
       self.money_format = :dollars
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
 
@@ -34,25 +34,32 @@ module ActiveMerchant #:nodoc:
         params[:email] = options[:email] || 'unknown@email.com'
         params[:createAlias] = false
 
-        commit("authorize", params)
+        commit('authorize', params, options)
       end
 
       def capture(authorization, options={})
         params = {}
+        options[:id_unico] = split_authorization(authorization)[1]
         add_auth_order_id(params, authorization, options)
-        commit("deposit", params)
+        commit('deposit', params, options)
       end
 
       def void(authorization, options={})
         params = {}
         add_auth_order_id(params, authorization, options)
-        commit("void", params)
+        commit('void', params, options)
       end
 
       def refund(amount, authorization, options={})
         params = {}
+        params[:amount] = amount(amount) if amount
         add_auth_order_id(params, authorization, options)
-        commit("cancelDeposit", params)
+        response = commit('cancelDeposit', params, options)
+        return response if response.success? || split_authorization(authorization).length == 1 || !options[:force_full_refund_if_unsettled]
+
+        # Attempt RefundSingleTransaction if unsettled
+        prepare_refund_data(params, authorization, options)
+        commit('refund', params, options)
       end
 
       def verify(credit_card, options={})
@@ -76,8 +83,8 @@ module ActiveMerchant #:nodoc:
       private
 
       CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency: #{k}")}
-      CURRENCY_CODES["USD"] = 840
-      CURRENCY_CODES["PEN"] = 604
+      CURRENCY_CODES['USD'] = 840
+      CURRENCY_CODES['PEN'] = 604
 
       def add_invoice(params, money, options)
         # Visanet Peru expects a 9-digit numeric purchaseNumber
@@ -88,7 +95,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_auth_order_id(params, authorization, options)
-        params[:purchaseNumber] = authorization
+        purchase_number, _ = split_authorization(authorization)
+        params[:purchaseNumber] = purchase_number
         params[:externalTransactionId] = options[:order_id]
       end
 
@@ -118,48 +126,64 @@ module ActiveMerchant #:nodoc:
         params[:antifraud] = antifraud
       end
 
-      def commit(action, params)
+      def prepare_refund_data(params, authorization, options)
+        params.delete(:purchaseNumber)
+        params[:externalReferenceId] = params.delete(:externalTransactionId)
+        _, transaction_id = split_authorization(authorization)
+
+        options.update(transaction_id: transaction_id)
+        params[:ruc] = options[:ruc]
+      end
+
+      def split_authorization(authorization)
+        authorization.split('|')
+      end
+
+      def commit(action, params, options={})
         begin
-          raw_response = ssl_request(method(action), url(action, params), params.to_json, headers)
+          raw_response = ssl_request(method(action), url(action, params, options), params.to_json, headers)
           response = parse(raw_response)
         rescue ResponseError => e
           raw_response = e.response.body
-          response_error(raw_response)
+          response_error(raw_response, options, action)
         rescue JSON::ParserError
           unparsable_response(raw_response)
         else
           Response.new(
             success_from(response),
-            message_from(response),
+            message_from(response, options, action),
             response,
             :test => test?,
-            :authorization => authorization_from(params),
-            :error_code => response["errorCode"]
+            :authorization => authorization_from(params, response, options),
+            :error_code => response['errorCode']
           )
         end
       end
 
       def headers
         {
-          "Authorization" => "Basic " + Base64.strict_encode64("#{@options[:access_key_id]}:#{@options[:secret_access_key]}").strip,
-          "Content-Type"  => "application/json"
+          'Authorization' => 'Basic ' + Base64.strict_encode64("#{@options[:access_key_id]}:#{@options[:secret_access_key]}").strip,
+          'Content-Type'  => 'application/json'
         }
       end
 
-      def url(action, params)
-        if (action == "authorize")
+      def url(action, params, options={})
+        if (action == 'authorize')
           "#{base_url}/#{@options[:merchant_id]}"
+        elsif (action == 'refund')
+          "#{base_url}/#{@options[:merchant_id]}/#{action}/#{options[:transaction_id]}"
         else
           "#{base_url}/#{@options[:merchant_id]}/#{action}/#{params[:purchaseNumber]}"
         end
       end
 
       def method(action)
-        (action == "authorize") ? :post : :put
+        (%w(authorize refund).include? action) ? :post : :put
       end
 
-      def authorization_from(params)
-        params[:purchaseNumber]
+      def authorization_from(params, response, options)
+        id_unico = response['data']['ID_UNICO'] || options[:id_unico]
+        "#{params[:purchaseNumber]}|#{id_unico}"
       end
 
       def base_url
@@ -171,18 +195,22 @@ module ActiveMerchant #:nodoc:
       end
 
       def success_from(response)
-        response["errorCode"] == 0
+        response['errorCode'] == 0
       end
 
-      def message_from(response)
-        if empty?(response["errorMessage"]) || response["errorMessage"] == "[ ]"
-          response["data"]["DSC_COD_ACCION"]
+      def message_from(response, options, action)
+        if empty?(response['errorMessage']) || response['errorMessage'] == '[ ]'
+          action == 'refund' ? "#{response['data']['DSC_COD_ACCION']}, #{options[:error_message]}" : response['data']['DSC_COD_ACCION']
+        elsif action == 'refund'
+          message = "#{response['errorMessage']}, #{options[:error_message]}"
+          options[:error_message] = response['errorMessage']
+          message
         else
-          response["errorMessage"]
+          response['errorMessage']
         end
       end
 
-      def response_error(raw_response)
+      def response_error(raw_response, options, action)
         begin
           response = parse(raw_response)
         rescue JSON::ParserError
@@ -190,17 +218,17 @@ module ActiveMerchant #:nodoc:
         else
           return Response.new(
             false,
-            message_from(response),
+            message_from(response, options, action),
             response,
             :test => test?,
-            :authorization => response["transactionUUID"],
-            :error_code => response["errorCode"]
+            :authorization => response['transactionUUID'],
+            :error_code => response['errorCode']
           )
         end
       end
 
       def unparsable_response(raw_response)
-        message = "Invalid JSON response received from VisanetPeruGateway. Please contact VisanetPeruGateway if you continue to receive this message."
+        message = 'Invalid JSON response received from VisanetPeruGateway. Please contact VisanetPeruGateway if you continue to receive this message.'
         message += " (The raw response returned by the API was #{raw_response.inspect})"
         return Response.new(false, message)
       end