activemerchant 1.125.0 → 1.129.0

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

@@ -144,6 +144,11 @@ module ActiveMerchant #:nodoc:
         store_request(credit_card, options)
       end
 
+      def inquire(authorization, options = {})
+        order_id = order_id_from_authorization(authorization.to_s) || options[:order_id]
+        commit('direct_inquiry', build_order_inquiry_request(order_id, options), :ok, options)
+      end
+
       def supports_scrubbing
         true
       end
@@ -237,6 +242,7 @@ module ActiveMerchant #:nodoc:
               add_sub_merchant_data(xml, options[:sub_merchant_data]) if options[:sub_merchant_data]
               add_hcg_additional_data(xml, options) if options[:hcg_additional_data]
               add_instalments_data(xml, options) if options[:instalments]
+              add_additional_data(xml, money, options) if options[:level_2_data] || options[:level_3_data]
               add_moto_flag(xml, options) if options.dig(:metadata, :manual_entry)
               add_additional_3ds_data(xml, options) if options[:execute_threed] && options[:three_ds_version] && options[:three_ds_version] =~ /^2/
               add_3ds_exemption(xml, options) if options[:exemption_type]
@@ -245,6 +251,91 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_additional_data(xml, amount, options)
+        level_two_data = options[:level_2_data] || {}
+        level_three_data = options[:level_3_data] || {}
+        level_two_and_three_data = level_two_data.merge(level_three_data).symbolize_keys
+
+        xml.branchSpecificExtension do
+          xml.purchase do
+            add_level_two_and_three_data(xml, amount, level_two_and_three_data)
+          end
+        end
+      end
+
+      def add_level_two_and_three_data(xml, amount, data)
+        xml.invoiceReferenceNumber data[:invoice_reference_number] if data.include?(:invoice_reference_number)
+        xml.customerReference data[:customer_reference] if data.include?(:customer_reference)
+        xml.cardAcceptorTaxId data[:card_acceptor_tax_id] if data.include?(:card_acceptor_tax_id)
+
+        {
+          sales_tax: 'salesTax',
+          discount_amount: 'discountAmount',
+          shipping_amount: 'shippingAmount',
+          duty_amount: 'dutyAmount'
+        }.each do |key, tag|
+          next unless data.include?(key)
+
+          xml.tag! tag do
+            data_amount = data[key].symbolize_keys
+            add_amount(xml, data_amount[:amount].to_i, data_amount)
+          end
+        end
+
+        xml.discountName data[:discount_name] if data.include?(:discount_name)
+        xml.discountCode data[:discount_code] if data.include?(:discount_code)
+
+        add_date_element(xml, 'shippingDate', data[:shipping_date]) if data.include?(:shipping_date)
+
+        if data.include?(:shipping_courier)
+          xml.shippingCourier(
+            data[:shipping_courier][:priority],
+            data[:shipping_courier][:tracking_number],
+            data[:shipping_courier][:name]
+          )
+        end
+
+        add_optional_data_level_two_and_three(xml, data)
+
+        if data.include?(:item) && data[:item].kind_of?(Array)
+          data[:item].each { |item| add_items_into_level_three_data(xml, item.symbolize_keys) }
+        elsif data.include?(:item)
+          add_items_into_level_three_data(xml, data[:item].symbolize_keys)
+        end
+      end
+
+      def add_items_into_level_three_data(xml, item)
+        xml.item do
+          xml.description item[:description] if item[:description]
+          xml.productCode item[:product_code] if item[:product_code]
+          xml.commodityCode item[:commodity_code] if item[:commodity_code]
+          xml.quantity item[:quantity] if item[:quantity]
+
+          {
+            unit_cost: 'unitCost',
+            item_total: 'itemTotal',
+            item_total_with_tax: 'itemTotalWithTax',
+            item_discount_amount: 'itemDiscountAmount',
+            tax_amount: 'taxAmount'
+          }.each do |key, tag|
+            next unless item.include?(key)
+
+            xml.tag! tag do
+              data_amount = item[key].symbolize_keys
+              add_amount(xml, data_amount[:amount].to_i, data_amount)
+            end
+          end
+        end
+      end
+
+      def add_optional_data_level_two_and_three(xml, data)
+        xml.shipFromPostalCode data[:ship_from_postal_code] if data.include?(:ship_from_postal_code)
+        xml.destinationPostalCode data[:destination_postal_code] if data.include?(:destination_postal_code)
+        xml.destinationCountryCode data[:destination_country_code] if data.include?(:destination_country_code)
+        add_date_element(xml, 'orderDate', data[:order_date].symbolize_keys) if data.include?(:order_date)
+        xml.taxExempt data[:tax_exempt] if data.include?(:tax_exempt)
+      end
+
       def order_tag_attributes(options)
         { 'orderCode' => clean_order_id(options[:order_id]), 'installationId' => options[:inst_id] || @options[:inst_id] }.reject { |_, v| !v.present? }
       end
@@ -718,9 +809,18 @@ module ActiveMerchant #:nodoc:
         resp_params = { action: action }
 
         parse_elements(doc.root, resp_params)
+        extract_issuer_response(doc.root, resp_params)
+
         resp_params
       end
 
+      def extract_issuer_response(doc, response)
+        return unless issuer_response = doc.at_xpath('//paymentService//reply//orderStatus//payment//IssuerResponseCode')
+
+        response[:issuer_response_code] = issuer_response['code']
+        response[:issuer_response_description] = issuer_response['description']
+      end
+
       def parse_elements(node, response)
         node_name = node.name.underscore
         node.attributes.each do |k, v|
@@ -743,9 +843,11 @@ module ActiveMerchant #:nodoc:
           'Content-Type' => 'text/xml',
           'Authorization' => encoded_credentials
         }
-        if options[:cookie]
-          headers['Cookie'] = options[:cookie] if options[:cookie]
-        end
+
+        # ensure cookie included on follow-up '3ds' and 'capture_request' calls, using the cookie saved from the preceding response
+        # cookie should be present in options on the 3ds and capture calls, but also still saved in the instance var in case
+        cookie = options[:cookie] || @cookie || nil
+        headers['Cookie'] = cookie if cookie
 
         headers['Idempotency-Key'] = idempotency_key if idempotency_key
         headers
@@ -761,7 +863,7 @@ module ActiveMerchant #:nodoc:
           raw[:is3DSOrder] = true
         end
         success = success_from(action, raw, success_criteria)
-        message = message_from(success, raw, success_criteria)
+        message = message_from(success, raw, success_criteria, action)
 
         Response.new(
           success,
@@ -798,7 +900,8 @@ module ActiveMerchant #:nodoc:
       def handle_response(response)
         case response.code.to_i
         when 200...300
-          @cookie = response['Set-Cookie']
+          cookie = response.header['Set-Cookie']&.match('^[^;]*')
+          @cookie = cookie[0] if cookie
           response.body
         else
           raise ResponseError.new(response)
@@ -809,10 +912,10 @@ module ActiveMerchant #:nodoc:
         success_criteria_success?(raw, success_criteria) || action_success?(action, raw)
       end
 
-      def message_from(success, raw, success_criteria)
+      def message_from(success, raw, success_criteria, action)
         return 'SUCCESS' if success
 
-        raw[:iso8583_return_code_description] || raw[:error] || required_status_message(raw, success_criteria)
+        raw[:iso8583_return_code_description] || raw[:error] || required_status_message(raw, success_criteria, action) || raw[:issuer_response_description]
       end
 
       # success_criteria can be:
@@ -829,6 +932,8 @@ module ActiveMerchant #:nodoc:
         case action
         when 'store'
           raw[:token].present?
+        when 'direct_inquiry'
+          raw[:last_event].present?
         else
           false
         end
@@ -838,8 +943,11 @@ module ActiveMerchant #:nodoc:
         raw[:iso8583_return_code_code] || raw[:error_code] || nil unless success == 'SUCCESS'
       end
 
-      def required_status_message(raw, success_criteria)
-        "A transaction status of #{success_criteria.collect { |c| "'#{c}'" }.join(' or ')} is required." if !success_criteria.include?(raw[:last_event])
+      def required_status_message(raw, success_criteria, action)
+        return if success_criteria.include?(raw[:last_event])
+        return unless %w[cancel refund inquiry credit fast_credit].include?(action)
+
+        "A transaction status of #{success_criteria.collect { |c| "'#{c}'" }.join(' or ')} is required."
       end
 
       def authorization_from(action, raw, options)

data/lib/active_merchant/billing/response.rb

@@ -85,7 +85,21 @@ module ActiveMerchant #:nodoc:
         (primary_response ? primary_response.success? : true)
       end
 
-      %w(params message test authorization avs_result cvv_result error_code emv_authorization test? fraud_review?).each do |m|
+      def avs_result
+        return @primary_response.try(:avs_result) if @use_first_response
+
+        result = responses.reverse.find { |r| r.avs_result['code'].present? }
+        result.try(:avs_result) || responses.last.try(:avs_result)
+      end
+
+      def cvv_result
+        return @primary_response.try(:cvv_result) if @use_first_response
+
+        result = responses.reverse.find { |r| r.cvv_result['code'].present? }
+        result.try(:cvv_result) || responses.last.try(:cvv_result)
+      end
+
+      %w(params message test authorization error_code emv_authorization test? fraud_review?).each do |m|
         class_eval %(
           def #{m}
             (@responses.empty? ? nil : primary_response.#{m})

data/lib/active_merchant/connection.rb

@@ -85,8 +85,6 @@ module ActiveMerchant
           result =
             case method
             when :get
-              raise ArgumentError, 'GET requests do not support a request body' if body
-
               http.get(endpoint.request_uri, headers)
             when :post
               debug body

data/lib/active_merchant/country.rb

@@ -184,6 +184,7 @@ module ActiveMerchant #:nodoc:
       { alpha2: 'KP', name: 'Korea, Democratic People\'s Republic of', alpha3: 'PRK', numeric: '408' },
       { alpha2: 'KR', name: 'Korea, Republic of', alpha3: 'KOR', numeric: '410' },
       { alpha2: 'XK', name: 'Kosovo', alpha3: 'XKX', numeric: '900' },
+      { alpha2: 'QZ', name: 'Kosovo', alpha3: 'XKX', numeric: '900' },
       { alpha2: 'KW', name: 'Kuwait', alpha3: 'KWT', numeric: '414' },
       { alpha2: 'KG', name: 'Kyrgyzstan', alpha3: 'KGZ', numeric: '417' },
       { alpha2: 'LA', name: 'Lao People\'s Democratic Republic', alpha3: 'LAO', numeric: '418' },

data/lib/active_merchant/errors.rb

@@ -23,10 +23,13 @@ module ActiveMerchant #:nodoc:
     end
 
     def to_s
-      "Failed with #{response.code} #{response.message if response.respond_to?(:message)}"
+      "Failed with #{response.code if response.respond_to?(:code)} #{response.message if response.respond_to?(:message)}"
     end
   end
 
+  class OAuthResponseError < ResponseError # :nodoc:
+  end
+
   class ClientCertificateError < ActiveMerchantError # :nodoc
   end
 

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.125.0'
+  VERSION = '1.129.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.125.0
+  version: 1.129.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +198,8 @@ files:
 - lib/active_merchant/billing/gateway.rb
 - lib/active_merchant/billing/gateways.rb
 - lib/active_merchant/billing/gateways/adyen.rb
+- lib/active_merchant/billing/gateways/airwallex.rb
+- lib/active_merchant/billing/gateways/alelo.rb
 - lib/active_merchant/billing/gateways/allied_wallet.rb
 - lib/active_merchant/billing/gateways/authorize_net.rb
 - lib/active_merchant/billing/gateways/authorize_net_arb.rb
@@ -206,6 +222,7 @@ files:
 - lib/active_merchant/billing/gateways/bpoint.rb
 - lib/active_merchant/billing/gateways/braintree.rb
 - lib/active_merchant/billing/gateways/braintree/braintree_common.rb
+- lib/active_merchant/billing/gateways/braintree/token_nonce.rb
 - lib/active_merchant/billing/gateways/braintree_blue.rb
 - lib/active_merchant/billing/gateways/braintree_orange.rb
 - lib/active_merchant/billing/gateways/bridge_pay.rb
@@ -223,6 +240,7 @@ files:
 - lib/active_merchant/billing/gateways/checkout_v2.rb
 - lib/active_merchant/billing/gateways/citrus_pay.rb
 - lib/active_merchant/billing/gateways/clearhaus.rb
+- lib/active_merchant/billing/gateways/commerce_hub.rb
 - lib/active_merchant/billing/gateways/commercegate.rb
 - lib/active_merchant/billing/gateways/conekta.rb
 - lib/active_merchant/billing/gateways/creditcall.rb
@@ -230,6 +248,8 @@ files:
 - lib/active_merchant/billing/gateways/ct_payment.rb
 - lib/active_merchant/billing/gateways/culqi.rb
 - lib/active_merchant/billing/gateways/cyber_source.rb
+- lib/active_merchant/billing/gateways/cyber_source/cyber_source_common.rb
+- lib/active_merchant/billing/gateways/cyber_source_rest.rb
 - lib/active_merchant/billing/gateways/d_local.rb
 - lib/active_merchant/billing/gateways/data_cash.rb
 - lib/active_merchant/billing/gateways/decidir.rb
@@ -357,6 +377,7 @@ files:
 - lib/active_merchant/billing/gateways/payway.rb
 - lib/active_merchant/billing/gateways/payway_dot_com.rb
 - lib/active_merchant/billing/gateways/pin.rb
+- lib/active_merchant/billing/gateways/plexo.rb
 - lib/active_merchant/billing/gateways/plugnpay.rb
 - lib/active_merchant/billing/gateways/priority.rb
 - lib/active_merchant/billing/gateways/pro_pay.rb
@@ -370,6 +391,8 @@ files:
 - lib/active_merchant/billing/gateways/quickpay/quickpay_v10.rb
 - lib/active_merchant/billing/gateways/quickpay/quickpay_v4to7.rb
 - lib/active_merchant/billing/gateways/qvalent.rb
+- lib/active_merchant/billing/gateways/rapyd.rb
+- lib/active_merchant/billing/gateways/reach.rb
 - lib/active_merchant/billing/gateways/realex.rb
 - lib/active_merchant/billing/gateways/redsys.rb
 - lib/active_merchant/billing/gateways/s5.rb
@@ -382,6 +405,8 @@ files:
 - lib/active_merchant/billing/gateways/secure_pay_au.rb
 - lib/active_merchant/billing/gateways/secure_pay_tech.rb
 - lib/active_merchant/billing/gateways/securion_pay.rb
+- lib/active_merchant/billing/gateways/shift4.rb
+- lib/active_merchant/billing/gateways/simetrik.rb
 - lib/active_merchant/billing/gateways/skip_jack.rb
 - lib/active_merchant/billing/gateways/smart_ps.rb
 - lib/active_merchant/billing/gateways/so_easy_pay.rb
@@ -455,7 +480,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.4.12
 signing_key: 
 specification_version: 4
 summary: Framework and tools for dealing with credit card transactions.