activemerchant 1.104.0 → 1.105.0

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

@@ -9,9 +9,9 @@ module ActiveMerchant #:nodoc:
 
       ALLOWED_METHOD_STATES = %w[automatic manual].freeze
       ALLOWED_CANCELLATION_REASONS = %w[duplicate fraudulent requested_by_customer abandoned].freeze
-      CREATE_INTENT_ATTRIBUTES = %i[description statement_descriptor receipt_email save_payment_method]
+      CREATE_INTENT_ATTRIBUTES = %i[description statement_descriptor_suffix statement_descriptor receipt_email save_payment_method]
       CONFIRM_INTENT_ATTRIBUTES = %i[receipt_email return_url save_payment_method setup_future_usage off_session]
-      UPDATE_INTENT_ATTRIBUTES = %i[description statement_descriptor receipt_email setup_future_usage]
+      UPDATE_INTENT_ATTRIBUTES = %i[description statement_descriptor_suffix statement_descriptor receipt_email setup_future_usage]
       DEFAULT_API_VERSION = '2019-05-16'
 
       def create_intent(money, payment_method, options = {})
@@ -149,6 +149,11 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def add_connected_account(post, options = {})
+        super(post, options)
+        post[:application_fee_amount] = options[:application_fee] if options[:application_fee]
+      end
+
       def add_whitelisted_attribute(post, options, attribute)
         post[attribute] = options[attribute] if options[attribute]
         post
@@ -224,18 +229,6 @@ module ActiveMerchant #:nodoc:
         post
       end
 
-      def add_connected_account(post, options = {})
-        return unless options[:transfer_destination]
-
-        post[:transfer_data] = {}
-        post[:transfer_data][:destination] = options[:transfer_destination]
-        post[:transfer_data][:amount] = options[:transfer_amount] if options[:transfer_amount]
-        post[:on_behalf_of] = options[:on_behalf_of] if options[:on_behalf_of]
-        post[:transfer_group] = options[:transfer_group] if options[:transfer_group]
-        post[:application_fee_amount] = options[:application_fee] if options[:application_fee]
-        post
-      end
-
       def add_billing_address(post, options = {})
         return unless billing = options[:billing_address] || options[:address]
 

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

@@ -166,7 +166,7 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new :indent => 2
         xml.instruct! :xml, :encoding => 'UTF-8'
         xml.declare! :DOCTYPE, :paymentService, :PUBLIC, '-//WorldPay//DTD WorldPay PaymentService v1//EN', 'http://dtd.worldpay.com/paymentService_v1.dtd'
-        xml.tag! 'paymentService', 'version' => '1.4', 'merchantCode' => @options[:login] do
+        xml.paymentService 'version' => '1.4', 'merchantCode' => @options[:login] do
           yield xml
         end
         xml.target!
@@ -174,8 +174,8 @@ module ActiveMerchant #:nodoc:
 
       def build_order_modify_request(authorization)
         build_request do |xml|
-          xml.tag! 'modify' do
-            xml.tag! 'orderModification', 'orderCode' => authorization do
+          xml.modify do
+            xml.orderModification 'orderCode' => authorization do
               yield xml
             end
           end
@@ -184,25 +184,26 @@ module ActiveMerchant #:nodoc:
 
       def build_order_inquiry_request(authorization, options)
         build_request do |xml|
-          xml.tag! 'inquiry' do
-            xml.tag! 'orderInquiry', 'orderCode' => authorization
+          xml.inquiry do
+            xml.orderInquiry 'orderCode' => authorization
           end
         end
       end
 
       def build_authorization_request(money, payment_method, options)
         build_request do |xml|
-          xml.tag! 'submit' do
-            xml.tag! 'order', order_tag_attributes(options) do
+          xml.submit do
+            xml.order order_tag_attributes(options) do
               xml.description(options[:description].blank? ? 'Purchase' : options[:description])
               add_amount(xml, money, options)
               if options[:order_content]
-                xml.tag! 'orderContent' do
+                xml.orderContent do
                   xml.cdata! options[:order_content]
                 end
               end
               add_payment_method(xml, money, payment_method, options)
               add_shopper(xml, options)
+              add_risk_data(xml, options[:risk_data]) if options[:risk_data]
               add_hcg_additional_data(xml, options) if options[:hcg_additional_data]
               add_instalments_data(xml, options) if options[:instalments]
               add_moto_flag(xml, options) if options.dig(:metadata, :manual_entry)
@@ -219,23 +220,21 @@ module ActiveMerchant #:nodoc:
 
       def build_capture_request(money, authorization, options)
         build_order_modify_request(authorization) do |xml|
-          xml.tag! 'capture' do
+          xml.capture do
             time = Time.now
-            xml.tag! 'date', 'dayOfMonth' => time.day, 'month' => time.month, 'year'=> time.year
+            xml.date 'dayOfMonth' => time.day, 'month' => time.month, 'year'=> time.year
             add_amount(xml, money, options)
           end
         end
       end
 
       def build_void_request(authorization, options)
-        build_order_modify_request(authorization) do |xml|
-          xml.tag! 'cancel'
-        end
+        build_order_modify_request(authorization, &:cancel)
       end
 
       def build_refund_request(money, authorization, options)
         build_order_modify_request(authorization) do |xml|
-          xml.tag! 'refund' do
+          xml.refund do
             add_amount(xml, money, options.merge(:debit_credit_indicator => 'credit'))
           end
         end
@@ -243,12 +242,12 @@ module ActiveMerchant #:nodoc:
 
       def build_store_request(credit_card, options)
         build_request do |xml|
-          xml.tag! 'submit' do
-            xml.tag! 'paymentTokenCreate' do
+          xml.submit do
+            xml.paymentTokenCreate do
               add_authenticated_shopper_id(xml, options)
-              xml.tag! 'createToken'
-              xml.tag! 'paymentInstrument' do
-                xml.tag! 'cardDetails' do
+              xml.createToken
+              xml.paymentInstrument do
+                xml.cardDetails do
                   add_card(xml, credit_card, options)
                 end
               end
@@ -258,11 +257,97 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_additional_3ds_data(xml, options)
-        xml.tag! 'additional3DSData', 'dfReferenceId' => options[:session_id]
+        xml.additional3DSData 'dfReferenceId' => options[:session_id]
       end
 
       def add_3ds_exemption(xml, options)
-        xml.tag! 'exemption', 'type' => options[:exemption_type], 'placement' => options[:exemption_placement] || 'AUTHORISATION'
+        xml.exemption 'type' => options[:exemption_type], 'placement' => options[:exemption_placement] || 'AUTHORISATION'
+      end
+
+      def add_risk_data(xml, risk_data)
+        xml.riskData do
+          add_authentication_risk_data(xml, risk_data[:authentication_risk_data])
+          add_shopper_account_risk_data(xml, risk_data[:shopper_account_risk_data])
+          add_transaction_risk_data(xml, risk_data[:transaction_risk_data])
+        end
+      end
+
+      def add_authentication_risk_data(xml, authentication_risk_data)
+        return unless authentication_risk_data
+
+        timestamp = authentication_risk_data.fetch(:authentication_date, {})
+
+        xml.authenticationRiskData('authenticationMethod' => authentication_risk_data[:authentication_method]) do
+          xml.authenticationTimestamp do
+            xml.date(
+              'dayOfMonth' => timestamp[:day_of_month],
+              'month' => timestamp[:month],
+              'year' => timestamp[:year],
+              'hour' => timestamp[:hour],
+              'minute' => timestamp[:minute],
+              'second' => timestamp[:second]
+            )
+          end
+        end
+      end
+
+      def add_shopper_account_risk_data(xml, shopper_account_risk_data)
+        return unless shopper_account_risk_data
+
+        data = {
+          'transactionsAttemptedLastDay' => shopper_account_risk_data[:transactions_attempted_last_day],
+          'transactionsAttemptedLastYear' => shopper_account_risk_data[:transactions_attempted_last_year],
+          'purchasesCompletedLastSixMonths' => shopper_account_risk_data[:purchases_completed_last_six_months],
+          'addCardAttemptsLastDay' => shopper_account_risk_data[:add_card_attempts_last_day],
+          'previousSuspiciousActivity' => shopper_account_risk_data[:previous_suspicious_activity],
+          'shippingNameMatchesAccountName' => shopper_account_risk_data[:shipping_name_matches_account_name],
+          'shopperAccountAgeIndicator' => shopper_account_risk_data[:shopper_account_age_indicator],
+          'shopperAccountChangeIndicator' => shopper_account_risk_data[:shopper_account_change_indicator],
+          'shopperAccountPasswordChangeIndicator' => shopper_account_risk_data[:shopper_account_password_change_indicator],
+          'shopperAccountShippingAddressUsageIndicator' => shopper_account_risk_data[:shopper_account_shipping_address_usage_indicator],
+          'shopperAccountPaymentAccountIndicator' => shopper_account_risk_data[:shopper_account_payment_account_indicator]
+        }.reject { |_k, v| v.nil? }
+
+        xml.shopperAccountRiskData(data) do
+          add_date_element(xml, 'shopperAccountCreationDate', shopper_account_risk_data[:shopper_account_creation_date])
+          add_date_element(xml, 'shopperAccountModificationDate', shopper_account_risk_data[:shopper_account_modification_date])
+          add_date_element(xml, 'shopperAccountPasswordChangeDate', shopper_account_risk_data[:shopper_account_password_change_date])
+          add_date_element(xml, 'shopperAccountShippingAddressFirstUseDate', shopper_account_risk_data[:shopper_account_shipping_address_first_use_date])
+          add_date_element(xml, 'shopperAccountPaymentAccountFirstUseDate', shopper_account_risk_data[:shopper_account_payment_account_first_use_date])
+        end
+      end
+
+      def add_transaction_risk_data(xml, transaction_risk_data)
+        return unless transaction_risk_data
+
+        data = {
+          'shippingMethod' => transaction_risk_data[:shipping_method],
+          'deliveryTimeframe' => transaction_risk_data[:delivery_timeframe],
+          'deliveryEmailAddress' => transaction_risk_data[:delivery_email_address],
+          'reorderingPreviousPurchases' => transaction_risk_data[:reordering_previous_purchases],
+          'preOrderPurchase' => transaction_risk_data[:pre_order_purchase],
+          'giftCardCount' => transaction_risk_data[:gift_card_count]
+        }.reject { |_k, v| v.nil? }
+
+        xml.transactionRiskData(data) do
+          xml.transactionRiskDataGiftCardAmount do
+            amount_hash = {
+              'value' => transaction_risk_data.dig(:transaction_risk_data_gift_card_amount, :value),
+              'currencyCode' => transaction_risk_data.dig(:transaction_risk_data_gift_card_amount, :currency),
+              'exponent' => transaction_risk_data.dig(:transaction_risk_data_gift_card_amount, :exponent)
+            }
+            debit_credit_indicator = transaction_risk_data.dig(:transaction_risk_data_gift_card_amount, :debit_credit_indicator)
+            amount_hash['debitCreditIndicator'] = debit_credit_indicator if debit_credit_indicator
+            xml.amount(amount_hash)
+          end
+          add_date_element(xml, 'transactionRiskDataPreOrderDate', transaction_risk_data[:transaction_risk_data_pre_order_date])
+        end
+      end
+
+      def add_date_element(xml, name, date)
+        xml.tag! name do
+          xml.date('dayOfMonth' => date[:day_of_month], 'month' => date[:month], 'year' => date[:year])
+        end
       end
 
       def add_amount(xml, money, options)
@@ -276,25 +361,25 @@ module ActiveMerchant #:nodoc:
 
         amount_hash['debitCreditIndicator'] = options[:debit_credit_indicator] if options[:debit_credit_indicator]
 
-        xml.tag! 'amount', amount_hash
+        xml.amount amount_hash
       end
 
       def add_payment_method(xml, amount, payment_method, options)
         if options[:payment_type] == :pay_as_order
           if options[:merchant_code]
-            xml.tag! 'payAsOrder', 'orderCode' => payment_method, 'merchantCode' => options[:merchant_code] do
+            xml.payAsOrder 'orderCode' => payment_method, 'merchantCode' => options[:merchant_code] do
               add_amount(xml, amount, options)
             end
           else
-            xml.tag! 'payAsOrder', 'orderCode' => payment_method do
+            xml.payAsOrder 'orderCode' => payment_method do
               add_amount(xml, amount, options)
             end
           end
         else
-          xml.tag! 'paymentDetails', credit_fund_transfer_attribute(options) do
+          xml.paymentDetails credit_fund_transfer_attribute(options) do
             if options[:payment_type] == :token
               xml.tag! 'TOKEN-SSL', 'tokenScope' => options[:token_scope] do
-                xml.tag! 'paymentTokenID', options[:token_id]
+                xml.paymentTokenID options[:token_id]
               end
             else
               xml.tag! card_code_for(payment_method) do
@@ -303,10 +388,10 @@ module ActiveMerchant #:nodoc:
             end
             add_stored_credential_options(xml, options)
             if options[:ip] && options[:session_id]
-              xml.tag! 'session', 'shopperIPAddress' => options[:ip], 'id' => options[:session_id]
+              xml.session 'shopperIPAddress' => options[:ip], 'id' => options[:session_id]
             else
-              xml.tag! 'session', 'shopperIPAddress' => options[:ip] if options[:ip]
-              xml.tag! 'session', 'id' => options[:session_id] if options[:session_id]
+              xml.session 'shopperIPAddress' => options[:ip] if options[:ip]
+              xml.session 'id' => options[:session_id] if options[:session_id]
             end
 
             if three_d_secure = options[:three_d_secure]
@@ -317,26 +402,30 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_three_d_secure(three_d_secure, xml)
-        xml.tag! 'info3DSecure' do
-          xml.tag! 'threeDSVersion', three_d_secure[:version]
+        xml.info3DSecure do
+          xml.threeDSVersion three_d_secure[:version]
           if three_d_secure[:version] =~ /^2/
-            xml.tag! 'dsTransactionId', three_d_secure[:ds_transaction_id]
+            xml.dsTransactionId three_d_secure[:ds_transaction_id]
           else
-            xml.tag! 'xid', three_d_secure[:xid]
+            xml.xid three_d_secure[:xid]
           end
-          xml.tag! 'cavv', three_d_secure[:cavv]
-          xml.tag! 'eci', three_d_secure[:eci]
+          xml.cavv three_d_secure[:cavv]
+          xml.eci three_d_secure[:eci]
         end
       end
 
       def add_card(xml, payment_method, options)
-        xml.tag! 'cardNumber', payment_method.number
-        xml.tag! 'expiryDate' do
-          xml.tag! 'date', 'month' => format(payment_method.month, :two_digits), 'year' => format(payment_method.year, :four_digits)
+        xml.cardNumber payment_method.number
+        xml.expiryDate do
+          xml.date(
+            'month' => format(payment_method.month, :two_digits),
+            'year' => format(payment_method.year, :four_digits)
+          )
         end
 
-        xml.tag! 'cardHolderName', options[:execute_threed] && !options[:three_ds_version]&.start_with?('2') ? '3D' : payment_method.name
-        xml.tag! 'cvc', payment_method.verification_value
+        card_holder_name = options[:execute_threed] && !options[:three_ds_version]&.start_with?('2') ? '3D' : payment_method.name
+        xml.cardHolderName card_holder_name
+        xml.cvc payment_method.verification_value
 
         add_address(xml, (options[:billing_address] || options[:address]))
       end
@@ -351,7 +440,7 @@ module ActiveMerchant #:nodoc:
 
       def add_stored_credential_using_normalized_fields(xml, options)
         if options[:stored_credential][:initial_transaction]
-          xml.tag! 'storedCredentials', 'usage' => 'FIRST'
+          xml.storedCredentials 'usage' => 'FIRST'
         else
           reason = case options[:stored_credential][:reason_type]
                    when 'installment' then 'INSTALMENT'
@@ -359,8 +448,8 @@ module ActiveMerchant #:nodoc:
                    when 'unscheduled' then 'UNSCHEDULED'
                    end
 
-          xml.tag! 'storedCredentials', 'usage' => 'USED', 'merchantInitiatedReason' => reason do
-            xml.tag! 'schemeTransactionIdentifier', options[:stored_credential][:network_transaction_id] if options[:stored_credential][:network_transaction_id]
+          xml.storedCredentials 'usage' => 'USED', 'merchantInitiatedReason' => reason do
+            xml.schemeTransactionIdentifier options[:stored_credential][:network_transaction_id] if options[:stored_credential][:network_transaction_id]
           end
         end
       end
@@ -369,29 +458,29 @@ module ActiveMerchant #:nodoc:
         return unless options[:stored_credential_usage]
 
         if options[:stored_credential_initiated_reason]
-          xml.tag! 'storedCredentials', 'usage' => options[:stored_credential_usage], 'merchantInitiatedReason' => options[:stored_credential_initiated_reason] do
-            xml.tag! 'schemeTransactionIdentifier', options[:stored_credential_transaction_id] if options[:stored_credential_transaction_id]
+          xml.storedCredentials 'usage' => options[:stored_credential_usage], 'merchantInitiatedReason' => options[:stored_credential_initiated_reason] do
+            xml.schemeTransactionIdentifier options[:stored_credential_transaction_id] if options[:stored_credential_transaction_id]
           end
         else
-          xml.tag! 'storedCredentials', 'usage' => options[:stored_credential_usage]
+          xml.storedCredentials 'usage' => options[:stored_credential_usage]
         end
       end
 
       def add_shopper(xml, options)
         return unless options[:execute_threed] || options[:email] || options[:customer]
 
-        xml.tag! 'shopper' do
-          xml.tag! 'shopperEmailAddress', options[:email] if  options[:email]
+        xml.shopper do
+          xml.shopperEmailAddress options[:email] if options[:email]
           add_authenticated_shopper_id(xml, options)
-          xml.tag! 'browser' do
-            xml.tag! 'acceptHeader', options[:accept_header]
-            xml.tag! 'userAgentHeader', options[:user_agent]
+          xml.browser do
+            xml.acceptHeader options[:accept_header]
+            xml.userAgentHeader options[:user_agent]
           end
         end
       end
 
       def add_authenticated_shopper_id(xml, options)
-        xml.tag!('authenticatedShopperID', options[:customer]) if options[:customer]
+        xml.authenticatedShopperID options[:customer] if options[:customer]
       end
 
       def add_address(xml, address)
@@ -399,40 +488,40 @@ module ActiveMerchant #:nodoc:
 
         address = address_with_defaults(address)
 
-        xml.tag! 'cardAddress' do
-          xml.tag! 'address' do
+        xml.cardAddress do
+          xml.address do
             if m = /^\s*([^\s]+)\s+(.+)$/.match(address[:name])
-              xml.tag! 'firstName', m[1]
-              xml.tag! 'lastName', m[2]
+              xml.firstName m[1]
+              xml.lastName m[2]
             end
-            xml.tag! 'address1', address[:address1]
-            xml.tag! 'address2', address[:address2] if address[:address2]
-            xml.tag! 'postalCode', address[:zip]
-            xml.tag! 'city', address[:city]
-            xml.tag! 'state', address[:state]
-            xml.tag! 'countryCode', address[:country]
-            xml.tag! 'telephoneNumber', address[:phone] if address[:phone]
+            xml.address1 address[:address1]
+            xml.address2 address[:address2] if address[:address2]
+            xml.postalCode address[:zip]
+            xml.city address[:city]
+            xml.state address[:state]
+            xml.countryCode address[:country]
+            xml.telephoneNumber address[:phone] if address[:phone]
           end
         end
       end
 
       def add_hcg_additional_data(xml, options)
-        xml.tag! 'hcgAdditionalData' do
+        xml.hcgAdditionalData do
           options[:hcg_additional_data].each do |k, v|
-            xml.tag! 'param', {name: k.to_s}, v
+            xml.param({name: k.to_s}, v)
           end
         end
       end
 
       def add_instalments_data(xml, options)
-        xml.tag! 'thirdPartyData' do
-          xml.tag! 'instalments', options[:instalments]
-          xml.tag! 'cpf', options[:cpf] if options[:cpf]
+        xml.thirdPartyData do
+          xml.instalments options[:instalments]
+          xml.cpf options[:cpf] if options[:cpf]
         end
       end
 
       def add_moto_flag(xml, options)
-        xml.tag! 'dynamicInteractionType', 'type' => 'MOTO'
+        xml.dynamicInteractionType 'type' => 'MOTO'
       end
 
       def address_with_defaults(address)

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

@@ -104,7 +104,7 @@ module ActiveMerchant #:nodoc:
             'city'=>options[:billing_address]&&options[:billing_address][:city] ? options[:billing_address][:city] : '',
             'state'=>options[:billing_address]&&options[:billing_address][:state] ? options[:billing_address][:state] : '',
             'countryCode'=>options[:billing_address]&&options[:billing_address][:country] ? options[:billing_address][:country] : ''
-           },
+          },
           'customerOrderCode' => options[:order_id],
           'orderType' => 'ECOM',
           'authorizeOnly' => options[:authorizeOnly] ? true : false

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.104.0'
+  VERSION = '1.105.0'
 end