activemerchant 1.112.0 → 1.113.0

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

@@ -175,7 +175,7 @@ module ActiveMerchant #:nodoc:
         post[:data][:attributes] = {
           tokenType: 'card',
           customerId: options[:customer_id],
-          label: 'Credit Card',
+          label: 'Credit Card'
         }
         add_payment(post, payment, options)
         add_address(post, options)

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

@@ -209,7 +209,7 @@ module ActiveMerchant #:nodoc:
         credit_card_refund: %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
         void_transaction: %w(ReferenceNumber TransactionID),
         credit_card_settle: %w(ReferenceNumber TransactionAmount OriginalTransactionAmount OriginalTransactionID ClientIpAddress),
-        system_check: %w(SystemCheck),
+        system_check: %w(SystemCheck)
       }
     end
   end

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

@@ -204,7 +204,7 @@ module ActiveMerchant #:nodoc:
           'InvoiceReference' => truncate(options[:order_id], 50),
           'InvoiceNumber' => truncate(options[:invoice] || options[:order_id], 12),
           'InvoiceDescription' => truncate(options[:description], 64),
-          'CurrencyCode' => currency_code,
+          'CurrencyCode' => currency_code
         }
       end
 
@@ -558,7 +558,7 @@ module ActiveMerchant #:nodoc:
         'V6150' => 'Invalid Refund Amount',
         'V6151' => 'Refund amount greater than original transaction',
         'V6152' => 'Original transaction already refunded for total amount',
-        'V6153' => 'Card type not support by merchant',
+        'V6153' => 'Card type not support by merchant'
       }
     end
   end

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

@@ -187,7 +187,7 @@ module ActiveMerchant
 
       def headers
         {
-          'User-Agent' => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          'User-Agent' => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}"
         }
       end
     end

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

@@ -204,7 +204,7 @@ module ActiveMerchant #:nodoc:
         'Bank Declined Transaction' => STANDARD_ERROR_CODE[:card_declined],
         'Insufficient Funds' => STANDARD_ERROR_CODE[:card_declined],
         'Transaction Declined - Bank Error' => STANDARD_ERROR_CODE[:processing_error],
-        'No Reply from Bank' => STANDARD_ERROR_CODE[:processing_error],
+        'No Reply from Bank' => STANDARD_ERROR_CODE[:processing_error]
       }
 
       def error_code_from(succeeded, response)

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

@@ -134,7 +134,7 @@ module ActiveMerchant #:nodoc:
         'purchase' => '1',
         'refund' => '2',
         'authorize' => '4',
-        'capture' => '5',
+        'capture' => '5'
       }
 
       def commit(action, post)

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

@@ -43,7 +43,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, transaction_id, options={})
-        commit('CreditAddToBatch') do |xml|
+        commit('CreditAddToBatch', transaction_id) do |xml|
           add_amount(xml, money)
           add_reference(xml, transaction_id)
         end
@@ -126,7 +126,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(xml, transaction_id)
-        xml.hps :GatewayTxnId, transaction_id
+        reference = transaction_id.to_s.include?('|') ? transaction_id.split('|').first : transaction_id
+        xml.hps :GatewayTxnId, reference
       end
 
       def add_amount(xml, money)
@@ -232,7 +233,7 @@ module ActiveMerchant #:nodoc:
             source: card_or_token.source,
             cavv: card_or_token.payment_cryptogram,
             eci: card_or_token.eci,
-            xid: card_or_token.transaction_id,
+            xid: card_or_token.transaction_id
           })
         elsif options[:three_d_secure]
           options[:three_d_secure][:source] ||= card_brand(card_or_token)
@@ -323,7 +324,7 @@ module ActiveMerchant #:nodoc:
         response
       end
 
-      def commit(action, &request)
+      def commit(action, reference = nil, &request)
         data = build_request(action, &request)
 
         response =
@@ -338,7 +339,7 @@ module ActiveMerchant #:nodoc:
           message_from(response),
           response,
           test: test?,
-          authorization: authorization_from(response),
+          authorization: authorization_from(response, reference),
           avs_result: {
             code: response['AVSRsltCode'],
             message: response['AVSRsltText']
@@ -369,7 +370,9 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def authorization_from(response)
+      def authorization_from(response, reference)
+        return [reference, response['GatewayTxnId']].join('|') if reference
+
         response['GatewayTxnId']
       end
 

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

@@ -18,7 +18,7 @@ module ActiveMerchant #:nodoc:
         '05' => STANDARD_ERROR_CODE[:card_declined],
         '06' => STANDARD_ERROR_CODE[:processing_error],
         '14' => STANDARD_ERROR_CODE[:invalid_number],
-        '54' => STANDARD_ERROR_CODE[:expired_card],
+        '54' => STANDARD_ERROR_CODE[:expired_card]
       }
 
       def initialize(options={})
@@ -121,7 +121,7 @@ module ActiveMerchant #:nodoc:
       def commit(action, &block)
         headers = {
           'Content-Type' => 'text/xml; charset=utf-8',
-          'SOAPAction' => "http://www.ippayments.com.au/interface/api/dts/#{action}",
+          'SOAPAction' => "http://www.ippayments.com.au/interface/api/dts/#{action}"
         }
         response = parse(ssl_post(commit_url, new_submit_xml(action, &block), headers))
 

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

@@ -203,7 +203,7 @@ module ActiveMerchant #:nodoc:
         'YER' => '886',
         'ZAR' => '710',
         'ZMK' => '894',
-        'ZWD' => '716',
+        'ZWD' => '716'
       }
 
       AVS_CODE = {
@@ -389,7 +389,7 @@ module ActiveMerchant #:nodoc:
           authorization: authorization,
           avs_result: {
             street_match: AVS_CODE[ response[:transaction_output_data][:address_numeric_check_result] ],
-            postal_match: AVS_CODE[ response[:transaction_output_data][:post_code_check_result] ],
+            postal_match: AVS_CODE[ response[:transaction_output_data][:post_code_check_result] ]
           },
           cvv_result: CVV_CODE[ response[:transaction_output_data][:cv2_check_result] ]
         )

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

@@ -364,7 +364,7 @@ module ActiveMerchant #:nodoc:
             dlstate: options[:telecheck_dlstate],
             void: options[:telecheck_void],
             accounttype: options[:telecheck_accounttype],
-            ssn: options[:telecheck_ssn],
+            ssn: options[:telecheck_ssn]
           }
         }
 

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

@@ -105,7 +105,7 @@ module ActiveMerchant
           billing: {},
           device: {},
           shipping: {},
-          transaction: {},
+          transaction: {}
         }
       end
 
@@ -190,7 +190,7 @@ module ActiveMerchant
       def headers
         {
           'Authorization' => 'Basic ' + Base64.encode64("merchant.#{@options[:userid]}:#{@options[:password]}").strip.delete("\r\n"),
-          'Content-Type' => 'application/json',
+          'Content-Type' => 'application/json'
         }
       end
 

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

@@ -311,7 +311,7 @@ module ActiveMerchant #:nodoc:
         headers = {
           'Content-Type' => 'application/json'
         }
-        headers['X-Device-Session-ID'] = options[:device_id] if options[:device_id]
+        headers['X-meli-session-id'] = options[:device_id] if options[:device_id]
         headers
       end
 

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

@@ -65,9 +65,11 @@ module ActiveMerchant #:nodoc:
         return settlement_data if settlement_data.message != 'OK'
 
         post = {}
-        if settlement_data.params['status'] == 'PENDING'
+        if settlement_data.params['status'] == 'PENDING' && money == settlement_data.params['amount']
           post[:status] = 'CANCELLED'
           commit(:put, "settlements/#{authorization}", post)
+        elsif settlement_data.params['status'] == 'PENDING' && (money < settlement_data.params['amount'] || money > settlement_data.params['amount'])
+          return Response.new(false, 'Transaction not settled. Either do a full refund or try partial refund after settlement.')
         else
           add_invoice(post, money, options)
 
@@ -196,7 +198,7 @@ module ActiveMerchant #:nodoc:
           street: address[:address1],
           city: address[:city],
           zip: address[:zip],
-          state: address[:state],
+          state: address[:state]
         }
         mapped[:country] = country.code(:alpha2).value unless country.blank?
 

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
       self.live_url = 'https://api.openpay.mx/v1/'
       self.test_url = 'https://sandbox-api.openpay.mx/v1/'
 
-      self.supported_countries = ['MX']
+      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'

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

@@ -243,7 +243,7 @@ module ActiveMerchant #:nodoc:
           city: address[:city],
           state: address[:state],
           postcode: address[:zip],
-          country: address[:country],
+          country: address[:country]
         }
       end
 
@@ -260,7 +260,7 @@ module ActiveMerchant #:nodoc:
 
         if options[:registrationId]
           post[:card] = {
-            cvv: payment.verification_value,
+            cvv: payment.verification_value
           }
         else
           post[:paymentBrand] = payment.brand.upcase
@@ -269,7 +269,7 @@ module ActiveMerchant #:nodoc:
             number: payment.number,
             expiryMonth: '%02d' % payment.month,
             expiryYear: payment.year,
-            cvv: payment.verification_value,
+            cvv: payment.verification_value
           }
         end
       end

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

@@ -325,7 +325,7 @@ module ActiveMerchant #:nodoc:
           'master'          => 'MC',
           'american_express' => 'AM',
           'discover'        => 'DI',
-          'diners_club'     => 'DC', }[key]
+          'diners_club'     => 'DC' }[key]
       end
     end
   end

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

@@ -421,6 +421,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_card_indicators(xml, options)
+        xml.tag! :CardIndicators, options[:card_indicators] if options[:card_indicators]
+      end
+
       def add_address(xml, creditcard, options)
         if (address = (options[:billing_address] || options[:address]))
           avs_supported = AVS_SUPPORTED_COUNTRIES.include?(address[:country].to_s) || empty?(address[:country])
@@ -756,6 +760,7 @@ module ActiveMerchant #:nodoc:
             add_level_2_purchase(xml, parameters)
             add_level_3_purchase(xml, parameters)
             add_level_3_tax(xml, parameters)
+            add_card_indicators(xml, parameters)
             add_line_items(xml, parameters) if parameters[:line_items]
             add_stored_credentials(xml, parameters)
             add_pymt_brand_program_code(xml, creditcard, three_d_secure)
@@ -788,6 +793,8 @@ module ActiveMerchant #:nodoc:
             xml.tag! :TxRefNum, tx_ref_num
             add_level_2_purchase(xml, parameters)
             add_level_2_advice_addendum(xml, parameters)
+            add_level_3_purchase(xml, parameters)
+            add_level_3_tax(xml, parameters)
           end
         end
         xml.target!
@@ -979,7 +986,7 @@ module ActiveMerchant #:nodoc:
           'R'  => 'Issuer does not participate in AVS',
           'UK' => 'Unknown',
           'X'  => 'Zip Match/Zip 4 Match/Address Match',
-          'Z'  => 'Zip Match/Locale no match',
+          'Z'  => 'Zip Match/Locale no match'
         }
 
         # Map vendor's AVS result code to a postal match code

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

@@ -13,7 +13,7 @@ module ActiveMerchant #:nodoc:
 
       STANDARD_ERROR_CODE_MAPPING = {
         'refused' => STANDARD_ERROR_CODE[:card_declined],
-        'processing_error' => STANDARD_ERROR_CODE[:processing_error],
+        'processing_error' => STANDARD_ERROR_CODE[:processing_error]
       }
 
       def initialize(options={})

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

@@ -165,7 +165,7 @@ module ActiveMerchant #:nodoc:
       # transaction_id that can be used later to postauthorize (capture) the funds.
       def authorize(money, payment_source, options = {})
         parameters = {
-          transaction_amount: amount(money),
+          transaction_amount: amount(money)
         }
 
         add_payment_source(parameters, payment_source)
@@ -178,7 +178,7 @@ module ActiveMerchant #:nodoc:
       # Execute authorization and capture in a single step.
       def purchase(money, payment_source, options = {})
         parameters = {
-          transaction_amount: amount(money),
+          transaction_amount: amount(money)
         }
 
         add_payment_source(parameters, payment_source)

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

@@ -155,7 +155,7 @@ module ActiveMerchant
         params[:auth] = 'false'
       end
 
-      def is_store_action?(params)
+      def store_action?(params)
         params[:transaction_type] == 'store'
       end
 
@@ -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)
@@ -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'],

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

@@ -25,7 +25,7 @@ module ActiveMerchant #:nodoc:
         authorize:  '3',
         cancel:     '4',
         failure:    '5',
-        capture:    '6',
+        capture:    '6'
       }
 
       SOAP_ACTIONS = {
@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
         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 = {})
@@ -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)

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

@@ -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/paymill.rb

@@ -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)
@@ -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