activemerchant 1.112.0 → 1.113.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b190bcb3ae62de72a04d6ccf0bdbf8118bf3a7ed933047623376c19462f5300c
-  data.tar.gz: f189cc282450940147eab25223d1046382edb063c5df42205f954931df22bce3
+  metadata.gz: e55d83260a0ec7b9a824a6313782d8c2b086d55aeb33d99554a09a18836f40a5
+  data.tar.gz: 35b24d3dd8e61c096ec4f5ef5d241a5ae3f905f32ba159e4332be36942cd3c56
 SHA512:
-  metadata.gz: 720b7a70402af86c246c1f28cd2d5d310a84edc6528718b15bb3d6183001e1b1d083dfb43e5f8d2e89dddcaa75f385e1154059fd0e1d6ce6f4b168bd469cf119
-  data.tar.gz: c8206af39075a57a3c4d201ef0d80a2cd775509cd62e5f6f5bdcfbf60809a0dd4bfe16e61ed587f42a1f75ebbbe893c1f97947886e9c758e289cd6993f3f7ac5
+  metadata.gz: 337249552ee4b5fd33ff2ca257cfcc90265e9aff657b5c42f42563aae070fd583308f5e6cfe05ed5ba1d23a791bac04edf50d0b8afce796c051d36f0b0dca256
+  data.tar.gz: d21728f2c2448e36842ccf5c38d64bf21ace79bd61ddf37367cf08f62ec98d33e0e277d5c5d21adb32ae7db4b03b15fa8e9f6d18b3acdf2be46ac153141585da

data/CHANGELOG

@@ -2,6 +2,23 @@
 
 == HEAD
 
+== Version 1.113.0
+* Orbital: Add cardIndicators field [meagabeth] #3734
+* Openpay: Add Colombia to supported countries [molbrown] #3740
+* Mercado Pago: Update Device Id Header field [cdmackeyfree] #3741
+* RuboCop: Fix Style/TrailingCommaInHashLiteral [leila-alderman] #3718
+* RuboCop: Fix Naming/PredicateName [leila-alderman] #3724
+* RuboCop: Fix Style/Attr [leila-alderman] #3728
+* Payflow: Use application_id to set buttonsource [britth] #3737
+* HPS: Enable refunds using capture transaction [britth] #3738
+* Quickbooks: Omit empty strings in address [leila-alderman] #3743
+* BlueSnap: Add transactionMetaData support #3745
+* Orbital: Fix typo in PC3DtlLineTot field [naashton] #3736
+* Credorax: Send first and last name parameters for CFT transactions [britth] #3748
+* Orbital: Update CardIndicators field to fix bug [meagabeth] #3746
+* CyberSource: Always send default address [leila-alderman] #3747
+* Netbanx: Reject partial refund on pending status [rockyhakjoong] #3735
+
 == Version 1.112.0
 * Cybersource: add `maestro` and `diners_club` eci brand mapping [bbraschi] #3708
 * Cybersource: Ensure Partner Solution Id placement conforms to schema [britth] #3715

data/lib/active_merchant/billing/credit_card.rb

@@ -190,7 +190,7 @@ module ActiveMerchant #:nodoc:
         'contactless' => 'Data was read by a Contactless EMV kernel. Issuer script results are not available.',
         'contactless_magstripe' => 'Contactless data was read with a non-EMV protocol.',
         'contact' => 'Data was read using the EMV protocol. Issuer script results may follow.',
-        'contact_quickchip' => 'Data was read by the Quickchip EMV kernel. Issuer script results are not available.',
+        'contact_quickchip' => 'Data was read by the Quickchip EMV kernel. Issuer script results are not available.'
       }
 
       # Returns the ciphertext of the card's encrypted PIN.

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -329,7 +329,7 @@ module ActiveMerchant #:nodoc:
           54 => 3, # 6 * 2 - 9
           55 => 5, # etc ...
           56 => 7,
-          57 => 9,
+          57 => 9
         }.freeze
 
         # Checks the validity of a card number by use of the Luhn Algorithm.

data/lib/active_merchant/billing/gateway.rb

@@ -95,7 +95,7 @@ module ActiveMerchant #:nodoc:
         pickup_card: 'pick_up_card',
         config_error: 'config_error',
         test_mode_live_card: 'test_mode_live_card',
-        unsupported_feature: 'unsupported_feature',
+        unsupported_feature: 'unsupported_feature'
       }
 
       cattr_reader :implementations

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

@@ -26,7 +26,7 @@ module ActiveMerchant #:nodoc:
         '132' => STANDARD_ERROR_CODE[:incorrect_address],
         '133' => STANDARD_ERROR_CODE[:incorrect_address],
         '134' => STANDARD_ERROR_CODE[:incorrect_address],
-        '135' => STANDARD_ERROR_CODE[:incorrect_address],
+        '135' => STANDARD_ERROR_CODE[:incorrect_address]
       }
 
       def initialize(options={})
@@ -243,7 +243,7 @@ module ActiveMerchant #:nodoc:
         splits = []
         split_data.each do |split|
           amount = {
-            value: split['amount']['value'],
+            value: split['amount']['value']
           }
           amount[:currency] = split['amount']['currency'] if split['amount']['currency']
 

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

@@ -54,7 +54,7 @@ module ActiveMerchant
         '37' => STANDARD_ERROR_CODE[:invalid_expiry_date],
         '378' => STANDARD_ERROR_CODE[:invalid_cvc],
         '38' => STANDARD_ERROR_CODE[:expired_card],
-        '384' => STANDARD_ERROR_CODE[:config_error],
+        '384' => STANDARD_ERROR_CODE[:config_error]
       }
 
       MARKET_TYPE = {
@@ -771,7 +771,7 @@ module ActiveMerchant
       end
 
       def parse(action, raw_response, options = {})
-        if is_cim_action?(action) || action == :verify_credentials
+        if cim_action?(action) || action == :verify_credentials
           parse_cim(raw_response, options)
         else
           parse_normal(action, raw_response)
@@ -802,7 +802,7 @@ module ActiveMerchant
         end
       end
 
-      def is_cim_action?(action)
+      def cim_action?(action)
         action.to_s.start_with?('cim')
       end
 
@@ -824,7 +824,7 @@ module ActiveMerchant
           'deleteCustomerProfileRequest'
         elsif action == :verify_credentials
           'authenticateTestRequest'
-        elsif is_cim_action?(action)
+        elsif cim_action?(action)
           'createCustomerProfileTransactionRequest'
         else
           'createTransactionRequest'
@@ -1006,7 +1006,7 @@ module ActiveMerchant
 
       def auth_was_for_cim?(authorization)
         _, _, action = split_authorization(authorization)
-        action && is_cim_action?(action)
+        action && cim_action?(action)
       end
 
       def parse_direct_response_elements(response, options)
@@ -1059,7 +1059,7 @@ module ActiveMerchant
           card_type: parts[51] || '',
           split_tender_id: parts[52] || '',
           requested_amount: parts[53] || '',
-          balance_on_card: parts[54] || '',
+          balance_on_card: parts[54] || ''
         }
       end
     end

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

@@ -928,7 +928,7 @@ module ActiveMerchant #:nodoc:
             'card_type' => direct_response_fields[51] || '',
             'split_tender_id' => direct_response_fields[52] || '',
             'requested_amount' => direct_response_fields[53] || '',
-            'balance_on_card' => direct_response_fields[54] || '',
+            'balance_on_card' => direct_response_fields[54] || ''
           }
         )
       end

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

@@ -254,7 +254,7 @@ module ActiveMerchant #:nodoc:
           'Authorization' => 'Basic ' + Base64.encode64(@options[:login].to_s + ':').strip,
           'User-Agent' => "Balanced/v1.1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           'Accept' => 'application/vnd.api+json;revision=1.1',
-          'X-Balanced-User-Agent' => @@ua,
+          'X-Balanced-User-Agent' => @@ua
         }
       end
     end

data/lib/active_merchant/billing/gateways/bambora_apac.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={})

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

@@ -24,7 +24,7 @@ module ActiveMerchant #:nodoc:
         'authonly'  => 'CC.PA',
         'capture'   => 'CC.CP',
         'refund'    => 'CC.RF',
-        'void'      => 'CC.RV',
+        'void'      => 'CC.RV'
       }
 
       def initialize(options={})

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

@@ -58,7 +58,7 @@ module ActiveMerchant
         'line1: N, zip: M, name: N' => 'W',
         'line1: N, zip: N, name: U' => 'N',
         'line1: N, zip: N, name: M' => 'K',
-        'line1: N, zip: N, name: N' => 'N',
+        'line1: N, zip: N, name: N' => 'N'
       }
 
       BANK_ACCOUNT_TYPE_MAPPING = {
@@ -212,12 +212,28 @@ module ActiveMerchant
         end
       end
 
-      def add_description(doc, description)
+      def add_metadata(doc, options)
+        transaction_meta_data = options.fetch(:transaction_meta_data, {})
+        return if transaction_meta_data.empty? && !options[:description]
+
         doc.send('transaction-meta-data') do
-          doc.send('meta-data') do
-            doc.send('meta-key', 'description')
-            doc.send('meta-value', truncate(description, 500))
-            doc.send('meta-description', 'Description')
+          # ensure backwards compatibility for calls expecting :description
+          # to become meta-data fields.
+          if options[:description]
+            doc.send('meta-data') do
+              doc.send('meta-key', 'description')
+              doc.send('meta-value', truncate(options[:description], 500))
+              doc.send('meta-description', 'Description')
+            end
+          end
+
+          # https://developers.bluesnap.com/v8976-XML/docs/meta-data
+          transaction_meta_data.each do |entry|
+            doc.send('meta-data') do
+              doc.send('meta-key', truncate(entry[:meta_key], 40))
+              doc.send('meta-value', truncate(entry[:meta_value], 500))
+              doc.send('meta-description', truncate(entry[:meta_description], 40))
+            end
           end
         end
       end
@@ -225,7 +241,7 @@ module ActiveMerchant
       def add_order(doc, options)
         doc.send('merchant-transaction-id', truncate(options[:order_id], 50)) if options[:order_id]
         doc.send('soft-descriptor', options[:soft_descriptor]) if options[:soft_descriptor]
-        add_description(doc, options[:description]) if options[:description]
+        add_metadata(doc, options)
         add_3ds(doc, options[:three_d_secure]) if options[:three_d_secure]
         add_level_3_data(doc, options)
       end
@@ -315,7 +331,7 @@ module ActiveMerchant
         add_echeck_transaction(doc, payment_method_details.payment_method, options, vaulted_shopper_id.present?) if payment_method_details.check?
 
         add_fraud_info(doc, options)
-        add_description(doc, options)
+        add_metadata(doc, options)
       end
 
       def add_echeck_transaction(doc, check, options, vaulted_shopper)
@@ -350,12 +366,21 @@ module ActiveMerchant
         parsed = {}
         doc = Nokogiri::XML(response.body)
         doc.root.xpath('*').each do |node|
+          name = node.name.downcase
+
           if node.elements.empty?
-            parsed[node.name.downcase] = node.text
+            parsed[name] = node.text
+          elsif name == 'transaction-meta-data'
+            metadata = []
+            node.elements.each { |m|
+              metadata.push parse_metadata_entry(m)
+            }
+
+            parsed['transaction-meta-data'] = metadata
           else
-            node.elements.each do |childnode|
+            node.elements.each { |childnode|
               parse_element(parsed, childnode)
-            end
+            }
           end
         end
 
@@ -363,6 +388,18 @@ module ActiveMerchant
         parsed
       end
 
+      def parse_metadata_entry(node)
+        entry = {}
+
+        node.elements.each { |e|
+          entry = entry.merge({
+            e.name => e.text
+          })
+        }
+
+        entry
+      end
+
       def parse_element(parsed, node)
         if !node.elements.empty?
           node.elements.each { |e| parse_element(parsed, e) }
@@ -476,7 +513,7 @@ module ActiveMerchant
       def headers
         {
           'Content-Type' => 'application/xml',
-          'Authorization' => ('Basic ' + Base64.strict_encode64("#{@options[:api_username]}:#{@options[:api_password]}").strip),
+          'Authorization' => ('Basic ' + Base64.strict_encode64("#{@options[:api_username]}:#{@options[:api_password]}").strip)
         }
       end
 

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

@@ -176,7 +176,7 @@ module ActiveMerchant #:nodoc:
 
       def headers
         {
-          'Authorization' => 'Basic ' + Base64.strict_encode64(@options[:username].to_s + ':' + @options[:password].to_s),
+          'Authorization' => 'Basic ' + Base64.strict_encode64(@options[:username].to_s + ':' + @options[:password].to_s)
         }
       end
 

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

@@ -234,7 +234,7 @@ module ActiveMerchant #:nodoc:
             phone: options[:phone] || (options[:billing_address][:phone] if options[:billing_address] &&
               options[:billing_address][:phone]),
             id: options[:customer],
-            device_data: options[:device_data],
+            device_data: options[:device_data]
           }.merge credit_card_params
           result = @braintree_gateway.customer.create(merge_credit_card_options(parameters, options))
           Response.new(result.success?, message_from_result(result),
@@ -258,7 +258,7 @@ module ActiveMerchant #:nodoc:
             cvv: credit_card.verification_value,
             expiration_month: credit_card.month.to_s.rjust(2, '0'),
             expiration_year: credit_card.year.to_s,
-            device_data: options[:device_data],
+            device_data: options[:device_data]
           }
           if options[:billing_address]
             address = map_address(options[:billing_address])
@@ -320,7 +320,7 @@ module ActiveMerchant #:nodoc:
           company: address[:company],
           locality: address[:city],
           region: address[:state],
-          postal_code: scrub_zip(address[:zip]),
+          postal_code: scrub_zip(address[:zip])
         }
 
         mapped[:country_code_alpha2] = (address[:country] || address[:country_code_alpha2]) if address[:country] || address[:country_code_alpha2]
@@ -508,7 +508,7 @@ module ActiveMerchant #:nodoc:
         customer_details = {
           'id' => transaction.customer_details.id,
           'email' => transaction.customer_details.email,
-          'phone' => transaction.customer_details.phone,
+          'phone' => transaction.customer_details.phone
         }
 
         billing_details = {
@@ -518,7 +518,7 @@ module ActiveMerchant #:nodoc:
           'locality'         => transaction.billing_details.locality,
           'region'           => transaction.billing_details.region,
           'postal_code'      => transaction.billing_details.postal_code,
-          'country_name'     => transaction.billing_details.country_name,
+          'country_name'     => transaction.billing_details.country_name
         }
 
         shipping_details = {
@@ -528,7 +528,7 @@ module ActiveMerchant #:nodoc:
           'locality'         => transaction.shipping_details.locality,
           'region'           => transaction.shipping_details.region,
           'postal_code'      => transaction.shipping_details.postal_code,
-          'country_name'     => transaction.shipping_details.country_name,
+          'country_name'     => transaction.shipping_details.country_name
         }
         credit_card_details = {
           'masked_number'       => transaction.credit_card_details.masked_number,
@@ -578,7 +578,7 @@ module ActiveMerchant #:nodoc:
           options: {
             store_in_vault: options[:store] ? true : false,
             submit_for_settlement: options[:submit_for_settlement],
-            hold_in_escrow: options[:hold_in_escrow],
+            hold_in_escrow: options[:hold_in_escrow]
           }
         }
 

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

@@ -312,7 +312,7 @@ module ActiveMerchant #:nodoc:
           Version: '4.5.4',
           SoftwareName: 'Active Merchant',
           SoftwareVersion: ActiveMerchant::VERSION.to_s,
-          Command: command,
+          Command: command
         }
 
         seed = SecureRandom.hex(32).upcase

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

@@ -250,7 +250,7 @@ module ActiveMerchant #:nodoc:
         '257' => STANDARD_ERROR_CODE[:invalid_cvc],
         '333' => STANDARD_ERROR_CODE[:expired_card],
         '1' => STANDARD_ERROR_CODE[:card_declined],
-        '99' => STANDARD_ERROR_CODE[:processing_error],
+        '99' => STANDARD_ERROR_CODE[:processing_error]
       }
 
       def authorization_from(request, response)

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

@@ -194,7 +194,7 @@ module ActiveMerchant #:nodoc:
       def headers
         {
           'Authorization' => @options[:secret_key],
-          'Content-Type' => 'application/json;charset=UTF-8',
+          'Content-Type' => 'application/json;charset=UTF-8'
         }
       end
 

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

@@ -193,6 +193,7 @@ module ActiveMerchant #:nodoc:
         add_email(post, options)
 
         if options[:referral_cft]
+          add_customer_name(post, options)
           commit(:referral_cft, post)
         else
           commit(:refund, post)
@@ -317,6 +318,11 @@ module ActiveMerchant #:nodoc:
         post[:c3] = options[:email] || 'unspecified@example.com'
       end
 
+      def add_customer_name(post, options)
+        post[:j5] = options[:first_name] if options[:first_name]
+        post[:j13] = options[:last_name] if options[:last_name]
+      end
+
       def add_3d_secure(post, options)
         if options[:eci] && options[:xid]
           add_3d_secure_1_data(post, options)

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

@@ -205,7 +205,7 @@ module ActiveMerchant #:nodoc:
         refund: 'SingleCallGenericReverse',
         tokenize: 'SingleCallTokenServlet',
         invalidate: 'SingleCallInvalidateToken',
-        tokenpay: 'SingleCallTokenTransaction',
+        tokenpay: 'SingleCallTokenTransaction'
       }
 
       def commit(action, params)

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

@@ -34,7 +34,7 @@ module ActiveMerchant #:nodoc:
         american_express: 'aesk',
         jcb: 'js',
         discover: 'pb',
-        diners_club: 'pb',
+        diners_club: 'pb'
       }.freeze
       DEFAULT_COLLECTION_INDICATOR = 2
 
@@ -266,7 +266,9 @@ module ActiveMerchant #:nodoc:
           zip: '00000',
           country: 'US'
         }
-        options[:billing_address] = options[:billing_address] || options[:address] || default_address
+
+        submitted_address = options[:billing_address] || options[:address] || default_address
+        options[:billing_address] = default_address.merge(submitted_address) { |_k, default, submitted| submitted.blank? ? default : submitted }
         options[:shipping_address] = options[:shipping_address] || {}
       end
 

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

@@ -39,7 +39,7 @@ module ActiveMerchant #:nodoc:
         76 => STANDARD_ERROR_CODE[:call_issuer],
         91 => STANDARD_ERROR_CODE[:call_issuer],
         96 => STANDARD_ERROR_CODE[:processing_error],
-        97 => STANDARD_ERROR_CODE[:processing_error],
+        97 => STANDARD_ERROR_CODE[:processing_error]
       }
 
       def initialize(options={})