activemerchant 1.50.0 → 1.51.0

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

@@ -109,6 +109,7 @@ module ActiveMerchant #:nodoc:
           doc.registerTokenRequest(transaction_attributes(options)) do
             doc.orderId(truncate(options[:order_id], 24))
             doc.accountNumber(creditcard.number)
+            doc.cardValidationNum(creditcard.verification_value) if creditcard.verification_value
           end
         end
 
@@ -163,6 +164,7 @@ module ActiveMerchant #:nodoc:
         add_payment_method(doc, payment_method)
         add_pos(doc, payment_method)
         add_descriptor(doc, options)
+        add_debt_repayment(doc, options)
       end
 
       def add_descriptor(doc, options)
@@ -174,6 +176,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_debt_repayment(doc, options)
+        doc.debtRepayment(true) if options[:debt_repayment] == true
+      end
+
       def add_payment_method(doc, payment_method)
         if payment_method.is_a?(String)
           doc.token do
@@ -264,6 +270,12 @@ module ActiveMerchant #:nodoc:
           end
         end
 
+        if parsed.empty?
+          %w(response message).each do |attribute|
+            parsed[attribute.to_sym] = doc.xpath("//litleOnlineResponse").attribute(attribute).value
+          end
+        end
+
         parsed
       end
 

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

@@ -32,9 +32,7 @@ module ActiveMerchant #:nodoc:
 
         add_invoice(post, options)
         add_amount(post, money, options)
-
         add_credit_card(post, credit_card)
-
         add_authorize_flag(post, options)
 
         commit(post)
@@ -45,7 +43,6 @@ module ActiveMerchant #:nodoc:
 
         add_invoice(post, options)
         add_amount(post, money, options)
-
         add_authorization_token(post, authorization_token, options[:credit_card_verification])
 
         commit(post)
@@ -78,6 +75,16 @@ module ActiveMerchant #:nodoc:
         commit(post)
       end
 
+
+      def refund(money, authorization, options={})
+        post = new_request
+        add_amount(post, money, options)
+        add_invoice(post, options)
+        add_refund_specific_fields(post, authorization)
+
+        commit(post)
+      end
+
       private
 
         def new_request
@@ -95,40 +102,38 @@ module ActiveMerchant #:nodoc:
         end
 
         def add_invoice(post, options)
-          requires!(options, :order_id)
-
-          post[:ms] = options[:order_id]     # "Merchant Session", must be unique per request
-          post[:mo] = options[:invoice]      # "Order Details", displayed in Paystation Admin
-          post[:mr] = options[:description]  # "Merchant Reference Code", seen from Paystation Admin
+          post[:ms] = options[:order_id] || generate_unique_id
+          post[:mo] = options[:invoice]
+          post[:mr] = options[:description]
         end
 
         def add_credit_card(post, credit_card)
-
           post[:cn] = credit_card.number
           post[:ct] = credit_card.brand
           post[:ex] = format_date(credit_card.month, credit_card.year)
           post[:cc] = credit_card.verification_value if credit_card.verification_value?
-
         end
 
-        # bill a token (stored via "store") rather than a Credit Card
         def add_token(post, token)
           post[:fp] = "t"    # turn on "future payments" - what paystation calls Token Billing
           post[:ft] = token
         end
 
         def store_credit_card(post, options)
-
           post[:fp] = "t"                                # turn on "future payments" - what paystation calls Token Billing
           post[:fs] = "t"                                # tells paystation to store right now, not bill
           post[:ft] = options[:token] if options[:token] # specify a token to use that, or let Paystation generate one
-
         end
 
         def add_authorize_flag(post, options)
           post[:pa] = "t" # tells Paystation that this is a pre-auth authorisation payment (account must be in pre-auth mode)
         end
 
+        def add_refund_specific_fields(post, authorization)
+          post[:rc] = "t"
+          post[:rt] = authorization
+        end
+
         def add_authorization_token(post, auth_token, verification_value = nil)
           post[:cp] = "t" # Capture Payment flag – tells Paystation this transaction should be treated as a capture payment
           post[:cx] = auth_token
@@ -136,10 +141,8 @@ module ActiveMerchant #:nodoc:
         end
 
         def add_amount(post, money, options)
-
           post[:am] = amount(money)
           post[:cu] = options[:currency] || currency(money)
-
         end
 
         def parse(xml_response)
@@ -147,8 +150,6 @@ module ActiveMerchant #:nodoc:
 
           xml = REXML::Document.new(xml_response)
 
-          # for normal payments, the root node is <Response>
-          # for "future payments", it's <PaystationFuturePaymentResponse>
           xml.elements.each("#{xml.root.name}/*") do |element|
             response[element.name.underscore.to_sym] = element.text
           end
@@ -157,12 +158,9 @@ module ActiveMerchant #:nodoc:
         end
 
         def commit(post)
-
-          post[:tm] = "T" if test? # test mode
-
+          post[:tm] = "T" if test?
           pstn_prefix_params = post.collect { |key, value| "pstn_#{key}=#{CGI.escape(value.to_s)}" }.join("&")
 
-          # need include paystation param as "initiator flag for payment engine"
           data     = ssl_post(self.live_url, "#{pstn_prefix_params}&paystation=_empty")
           response = parse(data)
           message  = message_from(response)
@@ -188,8 +186,6 @@ module ActiveMerchant #:nodoc:
     end
 
     class PaystationResponse < Response
-      # add a method to response so we can easily get the token
-      # for Validate transactions
       def token
         @params["future_payment_token"]
       end

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

@@ -192,6 +192,10 @@ module ActiveMerchant #:nodoc:
         end
 
         top
+      rescue JSON::ParserError
+        {
+          "error" => "Invalid response received from the PayU API. (The raw response was `#{body}`)."
+        }
       end
 
       def commit(url, parameters)

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

@@ -38,10 +38,10 @@ module ActiveMerchant #:nodoc:
       self.display_name        = "Redsys"
 
       CURRENCY_CODES = {
-        "ARS" => '032',
-        "AUD" => '036',
+        "ARS" => '32',
+        "AUD" => '36',
         "BRL" => '986',
-        "BOB" => '068',
+        "BOB" => '68',
         "CAD" => '124',
         "CHF" => '756',
         "CLP" => '152',
@@ -50,6 +50,7 @@ module ActiveMerchant #:nodoc:
         "GBP" => '826',
         "GTQ" => '320',
         "JPY" => '392',
+        "MYR" => '458',
         "MXN" => '484',
         "NZD" => '554',
         "PEN" => '604',

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

@@ -88,9 +88,9 @@ module ActiveMerchant #:nodoc:
 
       def scrub(transcript)
         transcript.
-          gsub(%r((pwd=).+(/>))i, '\1[FILTERED]\2').
-          gsub(%r((<Number>).+(</Number>))i, '\1[FILTERED]\2').
-          gsub(%r((<Verification>).+(</Verification>))i, '\1[FILTERED]\2')
+          gsub(%r((pwd=).+?(/>))i, '\1[FILTERED]\2').
+          gsub(%r((<Number>).+?(</Number>))i, '\1[FILTERED]\2').
+          gsub(%r((<Verification>).+?(</Verification>))i, '\1[FILTERED]\2')
       end
 
       private

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

@@ -120,25 +120,23 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def credit(money, source, options = {})
-        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
-        refund(money, source, options)
-      end
-
-      # Performs a refund transaction.
       #
       # ==== Parameters
       #
       # * <tt>money</tt> - The amount to be authorized as an integer value in cents.
-      # * <tt>source</tt> - The CreditCard or Check object to be used as the target for the refund.
-      def refund(money, source, options = {})
+      # * <tt>source</tt> - The CreditCard or Check object to be used as the target for the credit.
+      def credit(money, source, options = {})
         if card_brand(source) == "check"
-          virtual_check.refund(money, source, options)
+          virtual_check.credit(money, source, options)
         else
-          bankcard.refund(money, source, options)
+          bankcard.credit(money, source, options)
         end
       end
 
+      def refund(money, reference, options={})
+        bankcard.refund(money, reference, options)
+      end
+
       # Stores a credit card in the Sage vault.
       #
       # ==== Parameters

data/lib/active_merchant/billing/gateways/sage/sage_bankcard.rb

@@ -47,17 +47,19 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, credit_card, options = {})
-        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
-        refund(money, credit_card, options)
-      end
-
-      def refund(money, credit_card, options = {})
         post = {}
         add_credit_card(post, credit_card)
         add_transaction_data(post, money, options)
         commit(:credit, post)
       end
 
+      def refund(money, reference, options={})
+        post = {}
+        add_reference(post, reference)
+        add_transaction_data(post, money, options)
+        commit(:refund, post)
+      end
+
       private
 
       def add_credit_card(post, credit_card)

data/lib/active_merchant/billing/gateways/sage/sage_core.rb

@@ -20,7 +20,8 @@ module ActiveMerchant #:nodoc:
         :authorization      => '02',
         :capture            => '11',
         :void               => '04',
-        :credit             => '06'
+        :credit             => '06',
+        :refund             => '10'
       }
 
       def initialize(options = {})
@@ -30,7 +31,7 @@ module ActiveMerchant #:nodoc:
 
       private
       def add_invoice(post, options)
-        post[:T_ordernum] = options[:order_id].slice(0, 20)
+        post[:T_ordernum] = (options[:order_id] || generate_unique_id).slice(0, 20)
         post[:T_tax] = amount(options[:tax]) unless options[:tax].blank?
         post[:T_shipping] = amount(options[:shipping]) unless options[:shipping].blank?
       end

data/lib/active_merchant/billing/gateways/sage/sage_virtual_check.rb

@@ -22,11 +22,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, credit_card, options = {})
-        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
-        refund(money, source, options)
-      end
-
-      def refund(money, credit_card, options = {})
         post = {}
         add_check(post, credit_card)
         add_check_customer_data(post, options)

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

@@ -42,6 +42,7 @@ module ActiveMerchant #:nodoc:
         'incorrect_cvc' => STANDARD_ERROR_CODE[:incorrect_cvc],
         'incorrect_zip' => STANDARD_ERROR_CODE[:incorrect_zip],
         'card_declined' => STANDARD_ERROR_CODE[:card_declined],
+        'call_issuer' => STANDARD_ERROR_CODE[:call_issuer],
         'processing_error' => STANDARD_ERROR_CODE[:processing_error]
       }
 
@@ -123,7 +124,7 @@ module ActiveMerchant #:nodoc:
 
       def verify(payment, options = {})
         MultiResponse.run(:use_first_response) do |r|
-          r.process { authorize(50, payment, options.merge(currency: "USD")) }
+          r.process { authorize(50, payment, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
         end
       end
@@ -222,6 +223,10 @@ module ActiveMerchant #:nodoc:
           gsub(%r((&?three_d_secure\[cryptogram\]=)[\w=]*(&?)), '\1[FILTERED]\2')
       end
 
+      def supports_network_tokenization?
+        true
+      end
+
       private
 
       class StripePaymentToken < PaymentToken
@@ -295,6 +300,11 @@ module ActiveMerchant #:nodoc:
         card = {}
         if emv_payment?(creditcard)
           add_emv_creditcard(post, creditcard.icc_data)
+          post[:card][:read_method] = "contactless" if creditcard.contactless
+          if creditcard.encrypted_pin_cryptogram.present? && creditcard.encrypted_pin_ksn.present?
+            post[:card][:encrypted_pin] = creditcard.encrypted_pin_cryptogram
+            post[:card][:encrypted_pin_key_id] = creditcard.encrypted_pin_ksn
+          end
         elsif creditcard.respond_to?(:number)
           if creditcard.respond_to?(:track_data) && creditcard.track_data.present?
             card[:swipe_data] = creditcard.track_data
@@ -418,7 +428,7 @@ module ActiveMerchant #:nodoc:
 
         success = !response.key?("error")
 
-        card = response["card"] || response["active_card"] || response["source"] || {}
+        card = card_from_response(response)
         avs_code = AVS_CODE_TRANSLATOR["line1: #{card["address_line1_check"]}, zip: #{card["address_zip_check"]}"]
         cvc_code = CVC_CODE_TRANSLATOR[card["cvc_check"]]
 
@@ -429,8 +439,8 @@ module ActiveMerchant #:nodoc:
           :authorization => success ? response["id"] : response["error"]["charge"],
           :avs_result => { :code => avs_code },
           :cvv_result => cvc_code,
-          :emv_authorization => card["emv_auth_data"],
-          :error_code => success ? nil : STANDARD_ERROR_CODE_MAPPING[response["error"]["code"]]
+          :emv_authorization => emv_authorization_from_response(response),
+          :error_code => success ? nil : error_code_from(response)
         )
       end
 
@@ -459,6 +469,25 @@ module ActiveMerchant #:nodoc:
       def emv_payment?(payment)
         payment.respond_to?(:emv?) && payment.emv?
       end
+
+      def card_from_response(response)
+        response["card"] || response["active_card"] || response["source"] || {}
+      end
+
+      def emv_authorization_from_response(response)
+        return response["error"]["emv_auth_data"] if response["error"]
+
+        card_from_response(response)["emv_auth_data"]
+      end
+
+      def error_code_from(response)
+        code = response['error']['code']
+        decline_code = response['error']['decline_code'] if code == 'card_declined'
+
+        error_code = STANDARD_ERROR_CODE_MAPPING[decline_code]
+        error_code ||= STANDARD_ERROR_CODE_MAPPING[code]
+        error_code
+      end
     end
   end
 end

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

@@ -73,27 +73,34 @@ module ActiveMerchant #:nodoc:
         post = {}
         post[:client_id] = @options[:client_id]
         post[:user_name] = "#{creditcard.first_name} #{creditcard.last_name}"
-        post[:email] = options[:email]
+        post[:email] = options[:email] || "unspecified@example.com"
         post[:cc_number] = creditcard.number
-        post[:cvv] = creditcard.verification_value
-        post[:expiration_month] = creditcard.month
-        post[:expiration_year] = creditcard.year
+        post[:cvv] = creditcard.verification_value unless options[:recurring]
+        post[:expiration_month] = "#{creditcard.month}"
+        post[:expiration_year] = "#{creditcard.year}"
         post[:original_ip] = options[:ip] if options[:ip]
         post[:original_device] = options[:device_fingerprint] if options[:device_fingerprint]
         if(billing_address = (options[:billing_address] || options[:address]))
           post[:address] = {
             "address1" => billing_address[:address1],
             "city"     => billing_address[:city],
-            "state"    => billing_address[:state],
             "country"  => billing_address[:country]
           }
           if(post[:country] == "US")
             post[:address]["zip"] = billing_address[:zip]
+            post[:address]["state"] = billing_address[:state]
           else
+            post[:address]["region"] = billing_address[:state]
             post[:address]["postcode"] = billing_address[:zip]
           end
         end
-        commit('/credit_card/create', post)
+
+        if options[:recurring] == true
+          post[:client_secret] = @options[:client_secret]
+          commit('/credit_card/transfer', post)
+        else
+          commit('/credit_card/create', post)
+        end
       end
 
       private

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

@@ -22,7 +22,6 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, credit_card, options={})
         response = create_token(true, credit_card.first_name+' '+credit_card.last_name, credit_card.month, credit_card.year, credit_card.number, credit_card.verification_value)
-
         if response.success?
           options[:authorizeOnly] = true
           post = create_post_for_auth_or_purchase(response.authorization, money, options)
@@ -95,7 +94,7 @@ module ActiveMerchant #:nodoc:
       def create_post_for_auth_or_purchase(token, money, options)
       {
         "token" => token,
-        "orderDescription" => options[:description],
+        "orderDescription" => options[:description] || 'Worldpay Order',
         "amount" => money,
         "currencyCode" => options[:currency] || default_currency,
         "name" => options[:billing_address]&&options[:billing_address][:name] ? options[:billing_address][:name] : '',

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.50.0"
+  VERSION = "1.51.0"
 end