activemerchant 1.105.0 → 1.107.4

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

@@ -324,7 +324,7 @@ module ActiveMerchant #:nodoc:
 
       def headers
         {
-          'Content-Type'  => 'application/json'
+          'Content-Type' => 'application/json'
         }
       end
 
@@ -398,7 +398,7 @@ module ActiveMerchant #:nodoc:
           false,
           message_from(response),
           response,
-          :test => test?
+          test: test?
         )
       end
 

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

@@ -138,8 +138,8 @@ module ActiveMerchant #:nodoc:
         requires!(options, :login)
 
         @options = {
-          :result => 'LIVE',
-          :pem => LinkpointGateway.pem_file
+          result: 'LIVE',
+          pem: LinkpointGateway.pem_file
         }.update(options)
 
         raise ArgumentError, "You need to pass in your pem file using the :pem parameter or set it globally using ActiveMerchant::Billing::LinkpointGateway.pem_file = File.read( File.dirname(__FILE__) + '/../mycert.pem' ) or similar" if @options[:pem].blank?
@@ -172,13 +172,13 @@ module ActiveMerchant #:nodoc:
         requires!(options, [:periodicity, :bimonthly, :monthly, :biweekly, :weekly, :yearly, :daily], :installments, :order_id)
 
         options.update(
-          :ordertype => 'SALE',
-          :action => options[:action] || 'SUBMIT',
-          :installments => options[:installments] || 12,
-          :startdate => options[:startdate] || 'immediate',
-          :periodicity => options[:periodicity].to_s || 'monthly',
-          :comments => options[:comments] || nil,
-          :threshold => options[:threshold] || 3
+          ordertype: 'SALE',
+          action: options[:action] || 'SUBMIT',
+          installments: options[:installments] || 12,
+          startdate: options[:startdate] || 'immediate',
+          periodicity: options[:periodicity].to_s || 'monthly',
+          comments: options[:comments] || nil,
+          threshold: options[:threshold] || 3
         )
         commit(money, creditcard, options)
       end
@@ -187,7 +187,7 @@ module ActiveMerchant #:nodoc:
       def purchase(money, creditcard, options={})
         requires!(options, :order_id)
         options.update(
-          :ordertype => 'SALE'
+          ordertype: 'SALE'
         )
         commit(money, creditcard, options)
       end
@@ -200,7 +200,7 @@ module ActiveMerchant #:nodoc:
       def authorize(money, creditcard, options = {})
         requires!(options, :order_id)
         options.update(
-          :ordertype => 'PREAUTH'
+          ordertype: 'PREAUTH'
         )
         commit(money, creditcard, options)
       end
@@ -213,8 +213,8 @@ module ActiveMerchant #:nodoc:
       #
       def capture(money, authorization, options = {})
         options.update(
-          :order_id => authorization,
-          :ordertype => 'POSTAUTH'
+          order_id: authorization,
+          ordertype: 'POSTAUTH'
         )
         commit(money, nil, options)
       end
@@ -222,8 +222,8 @@ module ActiveMerchant #:nodoc:
       # Void a previous transaction
       def void(identification, options = {})
         options.update(
-          :order_id => identification,
-          :ordertype => 'VOID'
+          order_id: identification,
+          ordertype: 'VOID'
         )
         commit(nil, nil, options)
       end
@@ -235,8 +235,8 @@ module ActiveMerchant #:nodoc:
       #
       def refund(money, identification, options = {})
         options.update(
-          :ordertype => 'CREDIT',
-          :order_id => identification
+          ordertype: 'CREDIT',
+          order_id: identification
         )
         commit(money, nil, options)
       end
@@ -264,10 +264,10 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(test? ? self.test_url : self.live_url, post_data(money, creditcard, options)))
 
         Response.new(successful?(response), response[:message], response,
-          :test => test?,
-          :authorization => response[:ordernum],
-          :avs_result => { :code => response[:avs].to_s[2, 1] },
-          :cvv_result => response[:avs].to_s[3, 1]
+          test: test?,
+          authorization: response[:ordernum],
+          avs_result: { code: response[:avs].to_s[2, 1] },
+          cvv_result: response[:avs].to_s[3, 1]
         )
       end
 
@@ -325,55 +325,55 @@ module ActiveMerchant #:nodoc:
       # for every action.
       def parameters(money, creditcard, options = {})
         params = {
-          :payment => {
-            :subtotal => amount(options[:subtotal]),
-            :tax => amount(options[:tax]),
-            :vattax => amount(options[:vattax]),
-            :shipping => amount(options[:shipping]),
-            :chargetotal => amount(money)
+          payment: {
+            subtotal: amount(options[:subtotal]),
+            tax: amount(options[:tax]),
+            vattax: amount(options[:vattax]),
+            shipping: amount(options[:shipping]),
+            chargetotal: amount(money)
           },
-          :transactiondetails => {
-            :transactionorigin => options[:transactionorigin] || 'ECI',
-            :oid => options[:order_id],
-            :ponumber => options[:ponumber],
-            :taxexempt => options[:taxexempt],
-            :terminaltype => options[:terminaltype],
-            :ip => options[:ip],
-            :reference_number => options[:reference_number],
-            :recurring => options[:recurring] || 'NO', # DO NOT USE if you are using the periodic billing option.
-            :tdate => options[:tdate]
+          transactiondetails: {
+            transactionorigin: options[:transactionorigin] || 'ECI',
+            oid: options[:order_id],
+            ponumber: options[:ponumber],
+            taxexempt: options[:taxexempt],
+            terminaltype: options[:terminaltype],
+            ip: options[:ip],
+            reference_number: options[:reference_number],
+            recurring: options[:recurring] || 'NO', # DO NOT USE if you are using the periodic billing option.
+            tdate: options[:tdate]
           },
-          :orderoptions => {
-            :ordertype => options[:ordertype],
-            :result => @options[:result]
+          orderoptions: {
+            ordertype: options[:ordertype],
+            result: @options[:result]
           },
-          :periodic => {
-            :action => options[:action],
-            :installments => options[:installments],
-            :threshold => options[:threshold],
-            :startdate => options[:startdate],
-            :periodicity => options[:periodicity],
-            :comments => options[:comments]
+          periodic: {
+            action: options[:action],
+            installments: options[:installments],
+            threshold: options[:threshold],
+            startdate: options[:startdate],
+            periodicity: options[:periodicity],
+            comments: options[:comments]
           },
-          :telecheck => {
-            :routing => options[:telecheck_routing],
-            :account => options[:telecheck_account],
-            :checknumber => options[:telecheck_checknumber],
-            :bankname => options[:telecheck_bankname],
-            :dl => options[:telecheck_dl],
-            :dlstate => options[:telecheck_dlstate],
-            :void => options[:telecheck_void],
-            :accounttype => options[:telecheck_accounttype],
-            :ssn => options[:telecheck_ssn],
+          telecheck: {
+            routing: options[:telecheck_routing],
+            account: options[:telecheck_account],
+            checknumber: options[:telecheck_checknumber],
+            bankname: options[:telecheck_bankname],
+            dl: options[:telecheck_dl],
+            dlstate: options[:telecheck_dlstate],
+            void: options[:telecheck_void],
+            accounttype: options[:telecheck_accounttype],
+            ssn: options[:telecheck_ssn],
           }
         }
 
         if creditcard
           params[:creditcard] = {
-            :cardnumber => creditcard.number,
-            :cardexpmonth => creditcard.month,
-            :cardexpyear => format_creditcard_expiry_year(creditcard.year),
-            :track => nil
+            cardnumber: creditcard.number,
+            cardexpmonth: creditcard.month,
+            cardexpyear: format_creditcard_expiry_year(creditcard.year),
+            track: nil
           }
 
           if creditcard.verification_value?
@@ -431,7 +431,7 @@ module ActiveMerchant #:nodoc:
         # <r_approved>APPROVED</r_approved>
         # <r_avs></r_avs>
 
-        response = {:message => 'Global Error Receipt', :complete => false}
+        response = {message: 'Global Error Receipt', complete: false}
 
         xml = REXML::Document.new("<response>#{xml}</response>")
         xml.root&.elements&.each do |node|

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

@@ -263,6 +263,7 @@ module ActiveMerchant #:nodoc:
         if payment_method.is_a?(String)
           doc.token do
             doc.litleToken(payment_method)
+            doc.expDate(format_exp_date(options[:basis_expiration_month], options[:basis_expiration_year])) if options[:basis_expiration_month] && options[:basis_expiration_year]
           end
         elsif payment_method.respond_to?(:track_data) && payment_method.track_data.present?
           doc.card do
@@ -416,7 +417,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def exp_date(payment_method)
-        "#{format(payment_method.month, :two_digits)}#{format(payment_method.year, :two_digits)}"
+        format_exp_date(payment_method.month, payment_method.year)
+      end
+
+      def format_exp_date(month, year)
+        "#{format(month, :two_digits)}#{format(year, :two_digits)}"
       end
 
       def parse(kind, xml)
@@ -449,8 +454,8 @@ module ActiveMerchant #:nodoc:
         options = {
           authorization: authorization_from(kind, parsed, money),
           test: test?,
-          :avs_result => { :code => AVS_RESPONSE_CODE[parsed[:fraudResult_avsResult]] },
-          :cvv_result => parsed[:fraudResult_cardValidationResult]
+          avs_result: { code: AVS_RESPONSE_CODE[parsed[:fraudResult_avsResult]] },
+          cvv_result: parsed[:fraudResult_cardValidationResult]
         }
 
         Response.new(success_from(kind, parsed), parsed[:message], parsed, options)

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

@@ -207,8 +207,8 @@ module ActiveMerchant
           succeeded,
           message_from(succeeded, raw),
           raw,
-          :authorization => authorization_from(post, raw),
-          :test => test?
+          authorization: authorization_from(post, raw),
+          test: test?
         )
       end
 

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

@@ -113,6 +113,7 @@ module ActiveMerchant #:nodoc:
 
         post[:processing_mode] = options[:processing_mode]
         post[:merchant_account_id] = options[:merchant_account_id] if options[:merchant_account_id]
+        post[:payment_method_option_id] = options[:payment_method_option_id] if options[:payment_method_option_id]
         add_merchant_services(post, options)
       end
 

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

@@ -46,7 +46,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def capture(money, transaction_id, options = {})
-        post ={}
+        post = {}
         post[:transaction_id] = transaction_id
         post[:client_reference_number] = options[:customer] if options.has_key?(:customer)
         add_invoice(post, options)
@@ -166,10 +166,10 @@ module ActiveMerchant #:nodoc:
           end
 
         Response.new(response['error_code'] == '000', message_from(response), response,
-          :authorization => response['transaction_id'],
-          :test => test?,
-          :cvv_result => response['cvv2_result'],
-          :avs_result => { :code => response['avs_result'] }
+          authorization: response['transaction_id'],
+          test: test?,
+          cvv_result: response['cvv2_result'],
+          avs_result: { code: response['avs_result'] }
         )
       end
 

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

@@ -101,8 +101,8 @@ module ActiveMerchant #:nodoc:
           (responses['response'].to_i == 1),
           responses['responsetext'],
           responses,
-          :test => test?,
-          :authorization => responses['transactionid']
+          test: test?,
+          authorization: responses['transactionid']
         )
       end
     end

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

@@ -172,20 +172,20 @@ module ActiveMerchant #:nodoc:
           message_from(succeeded, response_data),
           response_data,
           authorization: authorization_from(post, response_data),
-          :avs_result => AVSResult.new(code: response_data['avs_response']),
-          :cvv_result => CVVResult.new(response_data['cvv2_response']),
+          avs_result: AVSResult.new(code: response_data['avs_response']),
+          cvv_result: CVVResult.new(response_data['cvv2_response']),
           test: test?
         )
       end
 
       def headers
         {
-          'Content-Type'  => 'application/xml'
+          'Content-Type' => 'application/xml'
         }
       end
 
       def build_request(post)
-        Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        Nokogiri::XML::Builder.new(encoding: 'utf-8') do |xml|
           xml.interface_driver {
             xml.trans_catalog {
               xml.transaction(name: 'creditcard') {

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

@@ -22,12 +22,12 @@ module ActiveMerchant #:nodoc:
       TX_NAMESPACE_V4 = 'http://schemas.merchantwarehouse.com/merchantware/40/Credit/'
 
       ACTIONS = {
-        :purchase  => 'IssueKeyedSale',
-        :authorize => 'IssueKeyedPreAuth',
-        :capture   => 'IssuePostAuth',
-        :void      => 'VoidPreAuthorization',
-        :credit    => 'IssueKeyedRefund',
-        :reference_credit => 'IssueRefundByReference'
+        purchase: 'IssueKeyedSale',
+        authorize: 'IssueKeyedPreAuth',
+        capture: 'IssuePostAuth',
+        void: 'VoidPreAuthorization',
+        credit: 'IssueKeyedRefund',
+        reference_credit: 'IssueRefundByReference'
       }
 
       # Creates a new MerchantWareGateway
@@ -117,7 +117,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def soap_request(action)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         xml.tag! 'env:Envelope', ENV_NAMESPACES do
           xml.tag! 'env:Body' do
@@ -131,7 +131,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def v4_soap_request(action)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         xml.tag! 'soap:Envelope', ENV_NAMESPACES_V4 do
           xml.tag! 'soap:Body' do
@@ -300,10 +300,10 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(response[:success], response[:message], response,
-          :test => test?,
-          :authorization => authorization_from(response),
-          :avs_result => { :code => response['AVSResponse'] },
-          :cvv_result => response['CVResponse']
+          test: test?,
+          authorization: authorization_from(response),
+          avs_result: { code: response['AVSResponse'] },
+          cvv_result: response['CVResponse']
         )
       end
 

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

@@ -16,12 +16,12 @@ module ActiveMerchant #:nodoc:
       TX_NAMESPACE = 'http://schemas.merchantwarehouse.com/merchantware/40/Credit/'
 
       ACTIONS = {
-        :purchase  => 'SaleKeyed',
-        :reference_purchase => 'RepeatSale',
-        :authorize => 'PreAuthorizationKeyed',
-        :capture   => 'PostAuthorization',
-        :void      => 'Void',
-        :refund    => 'Refund'
+        purchase: 'SaleKeyed',
+        reference_purchase: 'RepeatSale',
+        authorize: 'PreAuthorizationKeyed',
+        capture: 'PostAuthorization',
+        void: 'Void',
+        refund: 'Refund'
       }
 
       # Creates a new MerchantWareVersionFourGateway
@@ -129,7 +129,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def soap_request(action)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.instruct!
         xml.tag! 'soap:Envelope', ENV_NAMESPACES do
           xml.tag! 'soap:Body' do
@@ -271,10 +271,10 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(response[:success], response[:message], response,
-          :test => test?,
-          :authorization => authorization_from(response),
-          :avs_result => { :code => response['AvsResponse'] },
-          :cvv_result => response['CvResponse']
+          test: test?,
+          authorization: authorization_from(response),
+          avs_result: { code: response['AvsResponse'] },
+          cvv_result: response['CvResponse']
         )
       end
 

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

@@ -31,6 +31,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_payment_method(post, payment_method)
         add_recurring_flag(post, options)
+        add_soft_descriptors(post, options)
         commit('processAuth', post)
       end
 
@@ -41,6 +42,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_payment_method(post, payment_method)
         add_recurring_flag(post, options)
+        add_soft_descriptors(post, options)
         commit('processCard', post)
       end
 
@@ -48,6 +50,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
+        add_soft_descriptors(post, options)
         post['captureAmount'] = amount(money)
         commit('processCapture', post)
       end
@@ -56,6 +59,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_transaction(post, identification)
+        add_soft_descriptors(post, options)
         post['refundAmount'] = amount(money)
         commit('refundCard', post)
       end
@@ -153,6 +157,12 @@ module ActiveMerchant #:nodoc:
         post['recurringFlag'] = options[:recurring_flag]
       end
 
+      def add_soft_descriptors(post, options)
+        post['descriptorName'] = options[:descriptor_name] if options[:descriptor_name]
+        post['descriptorCity'] = options[:descriptor_city] if options[:descriptor_city]
+        post['descriptorState'] = options[:descriptor_state] if options[:descriptor_state]
+      end
+
       def verification_hash(money, currency)
         Digest::MD5.hexdigest(
           (
@@ -201,8 +211,8 @@ module ActiveMerchant #:nodoc:
           success?(response),
           response[:response_message],
           response,
-          :test => test?,
-          :authorization => (response[:card_id] || response[:transaction_id])
+          test: test?,
+          authorization: (response[:card_id] || response[:transaction_id])
         )
       end