activemerchant 1.83.0 → 1.84.0

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
                                   'NL', 'NO', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'CH']
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :solo] # :switch?
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club]
 
       # The homepage URL of the gateway
       self.homepage_url = 'http://www.optimalpayments.com/'
@@ -19,7 +19,6 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Optimal Payments'
 
       def initialize(options = {})
-
         if(options[:login])
           ActiveMerchant.deprecated("The 'login' option is deprecated in favor of 'store_id' and will be removed in a future version.")
           options[:store_id] = options[:login]
@@ -320,8 +319,6 @@ module ActiveMerchant #:nodoc:
           'american_express'=> 'AM',
           'discover'        => 'DI',
           'diners_club'     => 'DC',
-          #'switch'          => '',
-          'solo'            => 'SO'
         }[key]
       end
 

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

@@ -251,7 +251,6 @@ module ActiveMerchant #:nodoc:
         commit(order, :void, options[:trace_number])
       end
 
-
       # ==== Customer Profiles
       # :customer_ref_num should be set unless you're happy with Orbital providing one
       #
@@ -398,7 +397,7 @@ module ActiveMerchant #:nodoc:
           end
 
           xml.tag! :AVSname, ((creditcard && creditcard.name) ? creditcard.name[0..29] : nil)
-          xml.tag! :AVScountryCode, (avs_supported ? (byte_limit(format_address_field(address[:country]), 2)) : '')
+          xml.tag! :AVScountryCode, (avs_supported ? byte_limit(format_address_field(address[:country]), 2) : '')
 
           # Needs to come after AVScountryCode
           add_destination_address(xml, address) if avs_supported

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

@@ -175,11 +175,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def response_error(raw_response)
-        begin
-          parse(raw_response)
-        rescue JSON::ParserError
-          json_error(raw_response)
-        end
+        parse(raw_response)
+      rescue JSON::ParserError
+        json_error(raw_response)
       end
 
       def json_error(raw_response)

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

@@ -213,7 +213,6 @@ module ActiveMerchant #:nodoc:
           :cvv_result => CVVResult.new(response['cvv2_response']),
           test: test?
         )
-
       rescue JSON::ParserError
         unparsable_response(raw_response)
       end

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

@@ -141,7 +141,7 @@ module ActiveMerchant #:nodoc:
           'Authorization' => 'Basic ' + Base64.encode64("#{@options[:api_login]}:#{@options[:api_password]}").strip,
           'Content-Type'  => 'application/x-www-form-urlencoded;charset=UTF-8',
           'Accept'  => 'application/json',
-          'X-PJ-Application-Key'  => "#{@options[:api_key]}"
+          'X-PJ-Application-Key'  => @options[:api_key].to_s
         }
       end
 
@@ -154,17 +154,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        begin
-          JSON.parse(body)
-        rescue JSON::ParserError
-          message = 'Invalid JSON response received from PayJunctionV2Gateway. Please contact PayJunctionV2Gateway if you continue to receive this message.'
-          message += " (The raw response returned by the API was #{body.inspect})"
-          {
-            'errors' => [{
-              'message' => message
-            }]
-          }
-        end
+        JSON.parse(body)
+      rescue JSON::ParserError
+        message = 'Invalid JSON response received from PayJunctionV2Gateway. Please contact PayJunctionV2Gateway if you continue to receive this message.'
+        message += " (The raw response returned by the API was #{body.inspect})"
+        {
+          'errors' => [{
+            'message' => message
+          }]
+        }
       end
 
       def success_from(response)

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

@@ -39,6 +39,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       # Used for capturing, which is currently not supported.
       def add_reference(post, identification)
         auth, trans_id = identification.split(';')
@@ -71,7 +72,6 @@ module ActiveMerchant #:nodoc:
           :test => test_response?(response),
           :authorization => authorization_from(response)
         )
-
       end
 
       def successful?(response)

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

@@ -174,7 +174,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(action, parameters = {})
-
         parameters.update(
           :version => API_VERSION,
           :type => TRANSACTIONS[action.to_sym],

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

@@ -34,6 +34,7 @@ module ActiveMerchant
         params = payment_method.is_a?(String) ? { transaction_type: 'recurring' } : { transaction_type: 'purchase' }
 
         add_invoice(params, options)
+        add_reversal_id(params, options)
         add_payment_method(params, payment_method, options)
         add_address(params, options)
         add_amount(params, amount, options)
@@ -46,6 +47,7 @@ module ActiveMerchant
         params = {transaction_type: 'authorize'}
 
         add_invoice(params, options)
+        add_reversal_id(params, options)
         add_payment_method(params, payment_method, options)
         add_address(params, options)
         add_amount(params, amount, options)
@@ -84,7 +86,7 @@ module ActiveMerchant
       def void(authorization, options = {})
         params = {transaction_type: 'void'}
 
-        add_authorization_info(params, authorization)
+        add_authorization_info(params, authorization, options)
         add_amount(params, amount_from_authorization(authorization), options)
 
         commit(params, options)
@@ -123,15 +125,24 @@ module ActiveMerchant
         params[:merchant_ref] = options[:order_id]
       end
 
+      def add_reversal_id(params, options)
+        params[:reversal_id] = options[:reversal_id] if options[:reversal_id]
+      end
+
       def amount_from_authorization(authorization)
         authorization.split('|').last.to_i
       end
 
-      def add_authorization_info(params, authorization)
+      def add_authorization_info(params, authorization, options = {})
         transaction_id, transaction_tag, method, _ = authorization.split('|')
-        params[:transaction_id] = transaction_id
-        params[:transaction_tag] = transaction_tag
         params[:method] = (method == 'token') ? 'credit_card' : method
+
+        if options[:reversal_id]
+          params[:reversal_id] = options[:reversal_id]
+        else
+          params[:transaction_id] = transaction_id
+          params[:transaction_tag] = transaction_tag
+        end
       end
 
       def add_creditcard_for_tokenization(params, payment_method, options)

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

@@ -70,7 +70,6 @@ module ActiveMerchant #:nodoc:
           # stored authorization
           send_autopay(amount, payment_method, true, options)
         end
-
       end
 
       # Public: Send a purchase Payex request
@@ -387,11 +386,11 @@ module ActiveMerchant #:nodoc:
         }
         response = parse(ssl_post(url, request, headers))
         Response.new(success?(response),
-                     message_from(response),
-                     response,
-                     test: test?,
-                     authorization: build_authorization(response)
-                    )
+          message_from(response),
+          response,
+          test: test?,
+          authorization: build_authorization(response)
+        )
       end
 
       def build_authorization(response)

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

@@ -237,10 +237,6 @@ module ActiveMerchant #:nodoc:
             end
           end
 
-          if requires_start_date_or_issue_number?(credit_card)
-            xml.tag!('ExtData', 'Name' => 'CardStart', 'Value' => startdate(credit_card)) unless credit_card.start_month.blank? || credit_card.start_year.blank?
-            xml.tag!('ExtData', 'Name' => 'CardIssue', 'Value' => format(credit_card.issue_number, :two_digits)) unless credit_card.issue_number.blank?
-          end
           xml.tag! 'ExtData', 'Name' => 'LASTNAME', 'Value' =>  credit_card.last_name
         end
       end

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

@@ -43,8 +43,6 @@ module ActiveMerchant #:nodoc:
         :american_express => 'Amex',
         :jcb => 'JCB',
         :diners_club => 'DinersClub',
-        :switch => 'Switch',
-        :solo => 'Solo'
       }
 
       TRANSACTIONS = {
@@ -80,6 +78,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def build_request(body, options = {})
         xml = Builder::XmlMarkup.new
         xml.instruct!

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       end
       
       def payment_history
-        @payment_history ||= @params['rp_payment_result'].collect{ |result| result.stringify_keys } rescue []
+        @payment_history ||= @params['rp_payment_result'].collect(&:stringify_keys) rescue []
       end
     end
   end

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

@@ -4,60 +4,59 @@ require 'active_merchant/billing/gateways/paypal_express_common'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-      # ==General Parameters
-      # The following parameters are supported for #setup_authorization, #setup_purchase, #authorize and #purchase transactions. I've read
-      # in the docs that they recommend you pass the exact same parameters to both setup and authorize/purchase.
-      #
-      # This information was gleaned from a mix of:
-      # * {PayFlow documentation}[https://developer.paypal.com/docs/classic/payflow/integration-guide/]
-      # * previous ActiveMerchant code
-      # * trial & error
-      #
-      # The following parameters are currently supported.
-      # [<tt>:ip</tt>] (opt) Customer IP Address
-      # [<tt>:order_id</tt>] (opt) An order or invoice number. This will be passed through to the Payflow backend at manager.paypal.com, and show up as "Supplier Reference #"
-      # [<tt>:description</tt>] (opt) Order description, shown to buyer (after redirected to PayPal). If Order Line Items are used (see below), then the description is suppressed. This will not be passed through to the Payflow backend.
-      # [<tt>:billing_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
-      # [<tt>:shipping_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
-      # [<tt>:currency</tt>] (req) Currency of transaction, will be set to USD by default for PayFlow Express if not specified
-      # [<tt>:email</tt>] (opt) Email of buyer; used to pre-fill PayPal login screen
-      # [<tt>:payer_id</tt>] (opt) Unique PayPal buyer account identification number, as returned by details_for request
-      # [<tt>:token</tt>] (req for #authorize & #purchase) Token returned by setup transaction
-      # [<tt>:no_shipping</tt>] (opt) Boolean for whether or not to display shipping address to buyer
-      # [<tt>:address_override</tt>] (opt) Boolean. If true, display shipping address passed by parameters, rather than shipping address on file with PayPal
-      # [<tt>:allow_note</tt>] (opt) Boolean for permitting buyer to add note during checkout. Note contents can be retrieved with details_for transaction
-      # [<tt>:return_url</tt>] (req) URL to which the buyer’s browser is returned after choosing to pay.
-      # [<tt>:cancel_return_url</tt>] (req) URL to which the buyer is returned if the buyer cancels the order.
-      # [<tt>:notify_url</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # [<tt>:comment</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment1
-      # [<tt>:comment2</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment2
-      # [<tt>:discount</tt>] (opt) Total discounts in cents
-      #
-      # ==Line Items
-      # Support for order line items is available, but has to be enabled on the PayFlow backend. This is what I was told by Todd Sieber at Technical Support:
-      #
-      # <em>You will need to call Payflow Support at 1-888-883-9770, choose option #2.  Request that they update your account in "Pandora" under Product Settings >> PayPal Mark and update the Features Bitmap to 1111111111111112.  This is 15 ones and a two.</em>
-      #
-      # See here[https://www.x.com/message/206214#206214] for the forum discussion (requires login to {x.com}[https://x.com]
-      #
-      # [<tt>:items</tt>] (opt) Array of Order Line Items hashes. These are shown to the buyer after redirect to PayPal.
-      #
-      #
-      #
-      #                   The following keys are supported for line items:
-      #                   [<tt>:name</tt>] Name of line item
-      #                   [<tt>:description</tt>] Description of line item
-      #                   [<tt>:amount</tt>] Line Item Amount in Cents (as Integer)
-      #                   [<tt>:quantity</tt>] Line Item Quantity (default to 1 if left blank)
-      #
-      # ====Customization of Payment Page
-      # [<tt>:page_style</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # [<tt>:header_image</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # [<tt>:background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # ====Additional options for old Checkout Experience, being phased out in 2010 and 2011
-      # [<tt>:header_background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # [<tt>:header_border_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-
+    # ==General Parameters
+    # The following parameters are supported for #setup_authorization, #setup_purchase, #authorize and #purchase transactions. I've read
+    # in the docs that they recommend you pass the exact same parameters to both setup and authorize/purchase.
+    #
+    # This information was gleaned from a mix of:
+    # * {PayFlow documentation}[https://developer.paypal.com/docs/classic/payflow/integration-guide/]
+    # * previous ActiveMerchant code
+    # * trial & error
+    #
+    # The following parameters are currently supported.
+    # [<tt>:ip</tt>] (opt) Customer IP Address
+    # [<tt>:order_id</tt>] (opt) An order or invoice number. This will be passed through to the Payflow backend at manager.paypal.com, and show up as "Supplier Reference #"
+    # [<tt>:description</tt>] (opt) Order description, shown to buyer (after redirected to PayPal). If Order Line Items are used (see below), then the description is suppressed. This will not be passed through to the Payflow backend.
+    # [<tt>:billing_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
+    # [<tt>:shipping_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
+    # [<tt>:currency</tt>] (req) Currency of transaction, will be set to USD by default for PayFlow Express if not specified
+    # [<tt>:email</tt>] (opt) Email of buyer; used to pre-fill PayPal login screen
+    # [<tt>:payer_id</tt>] (opt) Unique PayPal buyer account identification number, as returned by details_for request
+    # [<tt>:token</tt>] (req for #authorize & #purchase) Token returned by setup transaction
+    # [<tt>:no_shipping</tt>] (opt) Boolean for whether or not to display shipping address to buyer
+    # [<tt>:address_override</tt>] (opt) Boolean. If true, display shipping address passed by parameters, rather than shipping address on file with PayPal
+    # [<tt>:allow_note</tt>] (opt) Boolean for permitting buyer to add note during checkout. Note contents can be retrieved with details_for transaction
+    # [<tt>:return_url</tt>] (req) URL to which the buyer’s browser is returned after choosing to pay.
+    # [<tt>:cancel_return_url</tt>] (req) URL to which the buyer is returned if the buyer cancels the order.
+    # [<tt>:notify_url</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # [<tt>:comment</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment1
+    # [<tt>:comment2</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment2
+    # [<tt>:discount</tt>] (opt) Total discounts in cents
+    #
+    # ==Line Items
+    # Support for order line items is available, but has to be enabled on the PayFlow backend. This is what I was told by Todd Sieber at Technical Support:
+    #
+    # <em>You will need to call Payflow Support at 1-888-883-9770, choose option #2.  Request that they update your account in "Pandora" under Product Settings >> PayPal Mark and update the Features Bitmap to 1111111111111112.  This is 15 ones and a two.</em>
+    #
+    # See here[https://www.x.com/message/206214#206214] for the forum discussion (requires login to {x.com}[https://x.com]
+    #
+    # [<tt>:items</tt>] (opt) Array of Order Line Items hashes. These are shown to the buyer after redirect to PayPal.
+    #
+    #
+    #
+    #                   The following keys are supported for line items:
+    #                   [<tt>:name</tt>] Name of line item
+    #                   [<tt>:description</tt>] Description of line item
+    #                   [<tt>:amount</tt>] Line Item Amount in Cents (as Integer)
+    #                   [<tt>:quantity</tt>] Line Item Quantity (default to 1 if left blank)
+    #
+    # ====Customization of Payment Page
+    # [<tt>:page_style</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # [<tt>:header_image</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # [<tt>:background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # ====Additional options for old Checkout Experience, being phased out in 2010 and 2011
+    # [<tt>:header_background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # [<tt>:header_border_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
 
     class PayflowExpressGateway < Gateway
       include PayflowCommonAPI
@@ -109,6 +108,7 @@ module ActiveMerchant #:nodoc:
       end
 
       private
+
       def build_get_express_details_request(token)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'GetExpressCheckout' do
@@ -180,7 +180,6 @@ module ActiveMerchant #:nodoc:
             end
             xml.tag! 'DiscountAmt', amount(options[:discount]) if options[:discount]
             xml.tag! 'TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money)
-
           end
 
           xml.tag! 'Tender' do

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

@@ -11,7 +11,7 @@ module ActiveMerchant #:nodoc:
         @express ||= PayflowExpressUkGateway.new(@options)
       end
 
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :solo, :switch]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.supported_countries = ['GB']
       self.homepage_url = 'https://www.paypal.com/uk/webapps/mpp/pro'
       self.display_name = 'PayPal Payments Pro (UK)'

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

@@ -2,7 +2,6 @@ require 'rexml/document'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-
     # In NZ DPS supports ANZ, Westpac, National Bank, ASB and BNZ.
     # In Australia DPS supports ANZ, NAB, Westpac, CBA, St George and Bank of South Australia.
     # The Maybank in Malaysia is supported and the Citibank for Singapore.
@@ -194,11 +193,6 @@ module ActiveMerchant #:nodoc:
           xml.add_element('Cvc2').text = credit_card.verification_value
           xml.add_element('Cvc2Presence').text = '1'
         end
-
-        if requires_start_date_or_issue_number?(credit_card)
-          xml.add_element('DateStart').text = format_date(credit_card.start_month, credit_card.start_year) unless credit_card.start_month.blank? || credit_card.start_year.blank?
-          xml.add_element('IssueNumber').text = credit_card.issue_number unless credit_card.issue_number.blank?
-        end
       end
 
       def add_billing_token(xml, token)

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

@@ -240,7 +240,6 @@ module ActiveMerchant #:nodoc:
         31203 => 'Pending due to currency conflict (accept manually)',
         31204 => 'Pending due to fraud filters (accept manually)',
 
-
         40000 => 'Problem with transaction data',
         40001 => 'Problem with payment data',
         40002 => 'Invalid checksum',
@@ -321,7 +320,6 @@ module ActiveMerchant #:nodoc:
         RESPONSE_CODES[code] || code.to_s
       end
 
-
       class ResponseParser
         attr_reader :raw_response, :parsed, :succeeded, :message, :options
 

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

@@ -81,12 +81,6 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:ExpYear', format(credit_card.year, :four_digits)
           xml.tag! 'n2:CVV2', credit_card.verification_value unless credit_card.verification_value.blank?
 
-          if [ 'switch', 'solo' ].include?(card_brand(credit_card).to_s)
-            xml.tag! 'n2:StartMonth', format(credit_card.start_month, :two_digits) unless credit_card.start_month.blank?
-            xml.tag! 'n2:StartYear', format(credit_card.start_year, :four_digits) unless credit_card.start_year.blank?
-            xml.tag! 'n2:IssueNumber', format(credit_card.issue_number, :two_digits) unless credit_card.issue_number.blank?
-          end
-
           xml.tag! 'n2:CardOwner' do
             xml.tag! 'n2:PayerName' do
               xml.tag! 'n2:FirstName', credit_card.first_name
@@ -110,8 +104,6 @@ module ActiveMerchant #:nodoc:
         when 'master'           then 'MasterCard'
         when 'discover'         then 'Discover'
         when 'american_express' then 'Amex'
-        when 'switch'           then 'Switch'
-        when 'solo'             then 'Solo'
         end
       end
 

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

@@ -41,7 +41,6 @@ module ActiveMerchant #:nodoc:
         commit('capture', money, post)
       end
 
-
       def refund(money, authorization, options = {})
         post = {}
         post[:transactionid] = authorization