activemerchant 1.110.0 → 1.116.0

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

@@ -45,7 +45,7 @@ module ActiveMerchant
       end
 
       def authorize(amount, payment_method, options = {})
-        params = {transaction_type: 'authorize'}
+        params = { transaction_type: 'authorize' }
 
         add_invoice(params, options)
         add_reversal_id(params, options)
@@ -59,7 +59,7 @@ module ActiveMerchant
       end
 
       def capture(amount, authorization, options = {})
-        params = {transaction_type: 'capture'}
+        params = { transaction_type: 'capture' }
 
         add_authorization_info(params, authorization)
         add_amount(params, amount, options)
@@ -69,7 +69,7 @@ module ActiveMerchant
       end
 
       def refund(amount, authorization, options = {})
-        params = {transaction_type: 'refund'}
+        params = { transaction_type: 'refund' }
 
         add_authorization_info(params, authorization)
         add_amount(params, (amount || amount_from_authorization(authorization)), options)
@@ -78,7 +78,7 @@ module ActiveMerchant
       end
 
       def store(payment_method, options = {})
-        params = {transaction_type: 'store'}
+        params = { transaction_type: 'store' }
 
         add_creditcard_for_tokenization(params, payment_method, options)
 
@@ -86,7 +86,7 @@ module ActiveMerchant
       end
 
       def void(authorization, options = {})
-        params = {transaction_type: 'void'}
+        params = { transaction_type: 'void' }
 
         add_authorization_info(params, authorization, options)
         add_amount(params, amount_from_authorization(authorization), options)
@@ -94,7 +94,7 @@ module ActiveMerchant
         commit(params, options)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(0, credit_card, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
@@ -155,7 +155,7 @@ module ActiveMerchant
         params[:auth] = 'false'
       end
 
-      def is_store_action?(params)
+      def store_action?(params)
         params[:transaction_type] == 'store'
       end
 
@@ -278,7 +278,7 @@ module ActiveMerchant
           response,
           test: test?,
           authorization: authorization_from(params, response),
-          avs_result: {code: response['avs']},
+          avs_result: { code: response['avs'] },
           cvv_result: response['cvv2'],
           error_code: error_code(response, success_from(response))
         )
@@ -295,7 +295,7 @@ module ActiveMerchant
       end
 
       def endpoint(params)
-        is_store_action?(params) ? '/transactions/tokens' : '/transactions'
+        store_action?(params) ? '/transactions/tokens' : '/transactions'
       end
 
       def api_request(url, params)
@@ -306,7 +306,7 @@ module ActiveMerchant
       def post_data(params)
         return nil unless params
 
-        params.reject { |k, v| v.blank? }.collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
+        params.reject { |_k, v| v.blank? }.collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
       end
 
       def generate_hmac(nonce, current_timestamp, payload)
@@ -373,7 +373,7 @@ module ActiveMerchant
       end
 
       def authorization_from(params, response)
-        if is_store_action?(params)
+        if store_action?(params)
           if success_from(response)
             [
               response['token']['type'],
@@ -405,7 +405,7 @@ module ActiveMerchant
       end
 
       def json_error(raw_response)
-        {'error' => "Unable to parse response: #{raw_response.inspect}"}
+        { 'error' => "Unable to parse response: #{raw_response.inspect}" }
       end
     end
   end

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

@@ -25,18 +25,18 @@ module ActiveMerchant #:nodoc:
         authorize:  '3',
         cancel:     '4',
         failure:    '5',
-        capture:    '6',
+        capture:    '6'
       }
 
       SOAP_ACTIONS = {
         initialize: { name: 'Initialize8', url: 'pxorder/pxorder.asmx', xmlns: 'http://external.payex.com/PxOrder/' },
-        purchasecc: { name: 'PurchaseCC', url: 'pxconfined/pxorder.asmx', xmlns: 'http://confined.payex.com/PxOrder/', confined: true},
+        purchasecc: { name: 'PurchaseCC', url: 'pxconfined/pxorder.asmx', xmlns: 'http://confined.payex.com/PxOrder/', confined: true },
         cancel: { name: 'Cancel2', url: 'pxorder/pxorder.asmx', xmlns: 'http://external.payex.com/PxOrder/' },
         capture: { name: 'Capture5', url: 'pxorder/pxorder.asmx', xmlns: 'http://external.payex.com/PxOrder/' },
         credit: { name: 'Credit5', url: 'pxorder/pxorder.asmx', xmlns: 'http://external.payex.com/PxOrder/' },
         create_agreement: { name: 'CreateAgreement3', url: 'pxagreement/pxagreement.asmx', xmlns: 'http://external.payex.com/PxAgreement/' },
         delete_agreement: { name: 'DeleteAgreement', url: 'pxagreement/pxagreement.asmx', xmlns: 'http://external.payex.com/PxAgreement/' },
-        autopay: { name: 'AutoPay3', url: 'pxagreement/pxagreement.asmx', xmlns: 'http://external.payex.com/PxAgreement/' },
+        autopay: { name: 'AutoPay3', url: 'pxagreement/pxagreement.asmx', xmlns: 'http://external.payex.com/PxAgreement/' }
       }
 
       def initialize(options = {})
@@ -117,7 +117,7 @@ module ActiveMerchant #:nodoc:
       # options        - A standard ActiveMerchant options hash
       #
       # Returns an ActiveMerchant::Billing::Response object
-      def void(authorization, options={})
+      def void(authorization, options = {})
         send_cancel(authorization)
       end
 
@@ -155,7 +155,7 @@ module ActiveMerchant #:nodoc:
         amount = amount(1) # 1 cent for authorization
         MultiResponse.run(:first) do |r|
           r.process { send_create_agreement(options) }
-          r.process { send_initialize(amount, true, options.merge({agreement_ref: r.authorization})) }
+          r.process { send_initialize(amount, true, options.merge({ agreement_ref: r.authorization })) }
           order_ref = r.params['orderref']
           r.process { send_purchasecc(creditcard, order_ref) }
         end
@@ -231,7 +231,7 @@ module ActiveMerchant #:nodoc:
           description: options[:description] || options[:order_id],
           orderId: options[:order_id],
           purchaseOperation: is_auth ? 'AUTHORIZATION' : 'SALE',
-          currency: (options[:currency] || default_currency),
+          currency: (options[:currency] || default_currency)
         }
         hash_fields = %i[accountNumber agreementRef price productNumber description orderId purchaseOperation currency]
         add_request_hash(properties, hash_fields)
@@ -278,7 +278,7 @@ module ActiveMerchant #:nodoc:
       def send_cancel(transaction_number)
         properties = {
           accountNumber: @options[:account],
-          transactionNumber: transaction_number,
+          transactionNumber: transaction_number
         }
         hash_fields = %i[accountNumber transactionNumber]
         add_request_hash(properties, hash_fields)
@@ -310,7 +310,7 @@ module ActiveMerchant #:nodoc:
       def send_delete_agreement(authorization)
         properties = {
           accountNumber: @options[:account],
-          agreementRef: authorization,
+          agreementRef: authorization
         }
         hash_fields = %i[accountNumber agreementRef]
         add_request_hash(properties, hash_fields)
@@ -341,9 +341,9 @@ module ActiveMerchant #:nodoc:
 
       def build_xml_request(soap_action, properties)
         builder = Nokogiri::XML::Builder.new
-        builder.__send__('soap12:Envelope', {'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+        builder.__send__('soap12:Envelope', { 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
                                              'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-                                             'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope'}) do |root|
+                                             'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope' }) do |root|
           root.__send__('soap12:Body') do |body|
             body.__send__(soap_action[:name], xmlns: soap_action[:xmlns]) do |doc|
               properties.each do |key, val|
@@ -389,8 +389,7 @@ module ActiveMerchant #:nodoc:
           message_from(response),
           response,
           test: test?,
-          authorization: build_authorization(response)
-        )
+          authorization: build_authorization(response))
       end
 
       def build_authorization(response)

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

@@ -45,7 +45,7 @@ module ActiveMerchant #:nodoc:
         commit(build_reference_request(:credit, money, reference, options), options)
       end
 
-      def verify(payment, options={})
+      def verify(payment, options = {})
         if credit_card_type(payment) == 'Amex'
           MultiResponse.run(:use_first_response) do |r|
             r.process { authorize(100, payment, options) }
@@ -154,6 +154,7 @@ module ActiveMerchant #:nodoc:
               end
             end
           end
+          xml.tag! 'ExtData', 'Name' => 'BUTTONSOURCE', 'Value' => application_id unless application_id.blank?
         end
         xml.target!
       end
@@ -187,6 +188,7 @@ module ActiveMerchant #:nodoc:
               add_credit_card(xml, credit_card, options)
             end
           end
+          xml.tag! 'ExtData', 'Name' => 'BUTTONSOURCE', 'Value' => application_id unless application_id.blank?
         end
         add_level_two_three_fields(xml.target!, options)
       end
@@ -250,6 +252,7 @@ module ActiveMerchant #:nodoc:
               end
             end
           end
+          xml.tag! 'ExtData', 'Name' => 'BUTTONSOURCE', 'Value' => application_id unless application_id.blank?
         end
         add_level_two_three_fields(xml.target!, options)
       end

data/lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb

@@ -42,7 +42,7 @@ module ActiveMerchant #:nodoc:
         discover: 'Discover',
         american_express: 'Amex',
         jcb: 'JCB',
-        diners_club: 'DinersClub',
+        diners_club: 'DinersClub'
       }
 
       TRANSACTIONS = {

data/lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb

@@ -35,7 +35,7 @@ module ActiveMerchant #:nodoc:
            'state'      => @params['state'],
            'country'    => @params['country'],
            'zip'        => @params['zip'],
-           'phone'      => phone, }
+           'phone'      => phone }
       end
     end
   end

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

@@ -303,8 +303,7 @@ module ActiveMerchant #:nodoc:
         # Return a response
         PaymentExpressResponse.new(response[:success] == APPROVED, message_from(response), response,
           test: response[:test_mode] == '1',
-          authorization: authorization_from(action, response)
-        )
+          authorization: authorization_from(action, response))
       end
 
       # Response XML documentation: http://www.paymentexpress.com/technical_resources/ecommerce_nonhosted/pxpost.html#XMLTxnOutput

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

@@ -74,14 +74,14 @@ module ActiveMerchant #:nodoc:
         post = {
           transaction: { id: authorization }
         }
-        post[:order] = {amount: amount(money).to_f} if money
+        post[:order] = { amount: amount(money).to_f } if money
 
         commit_transaction('capture', post)
       end
 
       def refund(money, authorization, options = {})
-        post = {transaction: {id: authorization}}
-        post[:order] = {amount: amount(money).to_f} if money
+        post = { transaction: { id: authorization } }
+        post[:order] = { amount: amount(money).to_f } if money
 
         commit_transaction('refund', post)
       end
@@ -113,7 +113,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def unstore(identification, options = {})
-        post = { card: { token: identification }, user: { id: options[:user_id] }}
+        post = { card: { token: identification }, user: { id: options[:user_id] } }
         commit_card('delete', post)
       end
 
@@ -194,7 +194,7 @@ module ActiveMerchant #:nodoc:
         begin
           parse(raw_response)
         rescue JSON::ParserError
-          {'status' => 'Internal server error'}
+          { 'status' => 'Internal server error' }
         end
       end
 

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

@@ -17,7 +17,7 @@ module ActiveMerchant #:nodoc:
         super
       end
 
-      def purchase(money, payment_method, options={})
+      def purchase(money, payment_method, options = {})
         action_with_token(:purchase, money, payment_method, options)
       end
 
@@ -35,7 +35,7 @@ module ActiveMerchant #:nodoc:
         commit(:post, 'transactions', post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
 
         post[:amount] = amount(money)
@@ -43,11 +43,11 @@ module ActiveMerchant #:nodoc:
         commit(:post, "refunds/#{transaction_id(authorization)}", post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         commit(:delete, "preauthorizations/#{preauth(authorization)}")
       end
 
-      def store(credit_card, options={})
+      def store(credit_card, options = {})
         # The store request requires a currency and amount of at least $1 USD.
         # This is used for an authorization that is handled internally by Paymill.
         options[:currency] = 'USD'
@@ -94,7 +94,7 @@ module ActiveMerchant #:nodoc:
         { 'Authorization' => ('Basic ' + Base64.strict_encode64("#{@options[:private_key]}:X").chomp) }
       end
 
-      def commit(method, action, parameters=nil)
+      def commit(method, action, parameters = nil)
         begin
           raw_response = ssl_request(method, live_url + action, post_data(parameters), headers)
         rescue ResponseError => e
@@ -113,7 +113,7 @@ module ActiveMerchant #:nodoc:
         parsed = JSON.parse(raw_response)
         options = {
           authorization: authorization_from(parsed),
-          test: (parsed['mode'] == 'test'),
+          test: (parsed['mode'] == 'test')
         }
 
         succeeded = (parsed['data'] == []) || (parsed['data']['response_code'].to_i == 20000)
@@ -198,7 +198,7 @@ module ActiveMerchant #:nodoc:
       def post_data(params)
         return nil unless params
 
-        no_blanks = params.reject { |key, value| value.blank? }
+        no_blanks = params.reject { |_key, value| value.blank? }
         no_blanks.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join('&')
       end
 
@@ -328,7 +328,7 @@ module ActiveMerchant #:nodoc:
       class ResponseParser
         attr_reader :raw_response, :parsed, :succeeded, :message, :options
 
-        def initialize(raw_response='', options={})
+        def initialize(raw_response = '', options = {})
           @raw_response = raw_response
           @options = options
         end
@@ -357,10 +357,10 @@ module ActiveMerchant #:nodoc:
 
         def handle_response_correct_parsing
           @message = parsed['transaction']['processing']['return']['message']
-          @options[:authorization] = parsed['transaction']['identification']['uniqueId'] if @succeeded = is_ack?
+          @options[:authorization] = parsed['transaction']['identification']['uniqueId'] if @succeeded = ack?
         end
 
-        def is_ack?
+        def ack?
           parsed['transaction']['processing']['result'] == 'ACK'
         end
       end

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

@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def authorize_reference_transaction(money, options = {})
-        requires!(options, :reference_id, :payment_type, :invoice_id, :description, :ip)
+        requires!(options, :reference_id)
 
         commit 'DoReferenceTransaction', build_reference_transaction_request('Authorization', money, options)
       end

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

@@ -17,7 +17,7 @@ module ActiveMerchant
       end
 
       def redirect_url_for(token, options = {})
-        options = {review: true, mobile: false}.update(options)
+        options = { review: true, mobile: false }.update(options)
 
         cmd  = options[:mobile] ? '_express-checkout-mobile' : '_express-checkout'
         url  = "#{redirect_url}?cmd=#{cmd}&token=#{token}"

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

@@ -120,8 +120,7 @@ module ActiveMerchant #:nodoc:
           authorization: response['transactionid'],
           fraud_review: fraud_review?(response),
           avs_result: { code: response['avsresponse'] },
-          cvv_result: response['cvvresponse']
-        )
+          cvv_result: response['cvvresponse'])
       end
 
       def message_from(response)

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

@@ -74,7 +74,7 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = new_request
         add_amount(post, money, options)
         add_invoice(post, options)
@@ -83,7 +83,7 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         authorize(0, credit_card, options)
       end
 
@@ -179,8 +179,7 @@ module ActiveMerchant #:nodoc:
 
         PaystationResponse.new(success?(response), message, response,
           test: (response[:tm]&.casecmp('t')&.zero?),
-          authorization: response[:paystation_transaction_id]
-        )
+          authorization: response[:paystation_transaction_id])
       end
 
       def success?(response)

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

@@ -16,12 +16,12 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'https://www.payu.in/'
       self.display_name = 'PayU India'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :key, :salt)
         super
       end
 
-      def purchase(money, payment, options={})
+      def purchase(money, payment, options = {})
         requires!(options, :order_id)
 
         post = {}
@@ -41,7 +41,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         raise ArgumentError, 'Amount is required' unless money
 
         post = {}

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

@@ -30,24 +30,24 @@ module ActiveMerchant #:nodoc:
         'PEN' => 500
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :merchant_id, :account_id, :api_login, :api_key, :payment_country)
         super
       end
 
-      def purchase(amount, payment_method, options={})
+      def purchase(amount, payment_method, options = {})
         post = {}
         auth_or_sale(post, 'AUTHORIZATION_AND_CAPTURE', amount, payment_method, options)
         commit('purchase', post)
       end
 
-      def authorize(amount, payment_method, options={})
+      def authorize(amount, payment_method, options = {})
         post = {}
         auth_or_sale(post, 'AUTHORIZATION', amount, payment_method, options)
         commit('auth', post)
       end
 
-      def capture(amount, authorization, options={})
+      def capture(amount, authorization, options = {})
         post = {}
 
         add_credentials(post, 'SUBMIT_TRANSACTION', options)
@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
         commit('capture', post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
 
         add_credentials(post, 'SUBMIT_TRANSACTION', options)
@@ -72,17 +72,24 @@ module ActiveMerchant #:nodoc:
         commit('void', post)
       end
 
-      def refund(amount, authorization, options={})
+      def refund(amount, authorization, options = {})
         post = {}
 
         add_credentials(post, 'SUBMIT_TRANSACTION', options)
-        add_transaction_elements(post, 'REFUND', options)
-        add_reference(post, authorization)
 
+        if options[:partial_refund]
+          add_transaction_elements(post, 'PARTIAL_REFUND', options)
+          post[:transaction][:additionalValues] ||= {}
+          post[:transaction][:additionalValues][:TX_VALUE] = invoice_for(amount, options)[:TX_VALUE]
+        else
+          add_transaction_elements(post, 'REFUND', options)
+        end
+
+        add_reference(post, authorization)
         commit('refund', post)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         minimum = MINIMUMS[options[:currency].upcase] if options[:currency]
         amount = options[:verify_amount] || minimum || 100
 
@@ -133,7 +140,7 @@ module ActiveMerchant #:nodoc:
         add_extra_parameters(post, options)
       end
 
-      def add_credentials(post, command, options={})
+      def add_credentials(post, command, options = {})
         post[:test] = test? unless command == 'CREATE_TOKEN'
         post[:language] = options[:language] || 'en'
         post[:command] = command
@@ -391,11 +398,14 @@ module ActiveMerchant #:nodoc:
         else
           if response['transactionResponse']
             response_message = response['transactionResponse']['responseMessage']
+
             response_code = response['transactionResponse']['responseCode'] || response['transactionResponse']['pendingReason']
+
+            response_message = response_code + ' | ' + response['transactionResponse']['paymentNetworkResponseErrorMessage'] unless response['transactionResponse']['paymentNetworkResponseErrorMessage'].nil?
           end
           return response_code if success
 
-          response['error'] || response_message || response_code || 'FAILED'
+          response_message || response['error'] || response_code || 'FAILED'
         end
       end