activemerchant 1.64.0 → 1.65.0

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

@@ -20,7 +20,8 @@ module ActiveMerchant #:nodoc:
         :void => 'VOID',
         :abort => 'ABORT',
         :store => 'TOKEN',
-        :unstore => 'REMOVETOKEN'
+        :unstore => 'REMOVETOKEN',
+        :repeat => 'REPEAT'
       }
 
       CREDIT_CARDS = {
@@ -87,7 +88,7 @@ module ActiveMerchant #:nodoc:
         add_customer_data(post, options)
         add_optional_data(post, options)
 
-        commit(:purchase, post)
+        commit((options[:repeat] ? :repeat : :purchase), post)
       end
 
       def authorize(money, payment_method, options = {})
@@ -130,7 +131,7 @@ module ActiveMerchant #:nodoc:
 
         post = {}
 
-        add_credit_reference(post, identification)
+        add_related_reference(post, identification)
         add_amount(post, money, options)
         add_invoice(post, options)
 
@@ -195,7 +196,7 @@ module ActiveMerchant #:nodoc:
         add_pair(post, :SecurityKey, security_key)
       end
 
-      def add_credit_reference(post, identification)
+      def add_related_reference(post, identification)
         order_id, transaction_id, authorization, security_key = identification.split(';')
 
         add_pair(post, :RelatedVendorTxCode, order_id)
@@ -267,7 +268,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_payment_method(post, payment_method, options)
-        if payment_method.respond_to?(:number)
+        if options[:repeat]
+          add_related_reference(post, payment_method)
+        elsif payment_method.respond_to?(:number)
           add_credit_card(post, payment_method)
         else
           add_token_details(post, payment_method, options)

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

@@ -475,7 +475,7 @@ module ActiveMerchant #:nodoc:
           "Authorization" => "Basic " + Base64.encode64(key.to_s + ":").strip,
           "User-Agent" => "Stripe/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           "Stripe-Version" => api_version(options),
-          "X-Stripe-Client-User-Agent" => user_agent,
+          "X-Stripe-Client-User-Agent" => stripe_client_user_agent(options),
           "X-Stripe-Client-User-Metadata" => {:ip => options[:ip]}.to_json
         }
         headers.merge!("Idempotency-Key" => idempotency_key) if idempotency_key
@@ -483,6 +483,11 @@ module ActiveMerchant #:nodoc:
         headers
       end
 
+      def stripe_client_user_agent(options)
+        return user_agent unless options[:application]
+        JSON.dump(JSON.parse(user_agent).merge!({application: options[:application]}))
+      end
+
       def api_version(options)
         options[:version] || @options[:version] || "2015-04-07"
       end

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

@@ -175,6 +175,10 @@ module ActiveMerchant #:nodoc:
 
         verify: 9,
 
+        purchase_echeck: 11,
+        refund_echeck: 16,
+        void_echeck: 16,
+
         wallet_sale: 14,
       }
 
@@ -187,7 +191,15 @@ module ActiveMerchant #:nodoc:
         if credit_card?(payment_method)
           action = :purchase
           request = build_xml_transaction_request do |doc|
-            add_payment_method(doc, payment_method)
+            add_credit_card(doc, payment_method)
+            add_contact(doc, payment_method.name, options)
+            add_amount(doc, amount)
+            add_order_number(doc, options)
+          end
+        elsif echeck?(payment_method)
+          action = :purchase_echeck
+          request = build_xml_transaction_request do |doc|
+            add_echeck(doc, payment_method)
             add_contact(doc, payment_method.name, options)
             add_amount(doc, amount)
             add_order_number(doc, options)
@@ -207,7 +219,7 @@ module ActiveMerchant #:nodoc:
       def authorize(amount, payment_method, options={})
         if credit_card?(payment_method)
           request = build_xml_transaction_request do |doc|
-            add_payment_method(doc, payment_method)
+            add_credit_card(doc, payment_method)
             add_contact(doc, payment_method.name, options)
             add_amount(doc, amount)
           end
@@ -243,14 +255,14 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(amount, authorization, options={})
-        transaction_id = split_authorization(authorization)[1]
+        action, transaction_id = split_authorization(authorization)
 
         request = build_xml_transaction_request do |doc|
-          add_amount(doc, amount)
+          add_amount(doc, amount) unless action == 'purchase_echeck'
           add_original_transaction_data(doc, transaction_id)
         end
 
-        commit(:refund, request)
+        commit(refund_type(action), request)
       end
 
       def credit(amount, payment_method, options={})
@@ -264,7 +276,7 @@ module ActiveMerchant #:nodoc:
 
       def verify(credit_card, options={})
         request = build_xml_transaction_request do |doc|
-          add_payment_method(doc, credit_card)
+          add_credit_card(doc, credit_card)
           add_contact(doc, credit_card.name, options)
         end
 
@@ -286,7 +298,7 @@ module ActiveMerchant #:nodoc:
               add_customer_id(doc, customer_id)
               doc["v1"].pmt do
                 doc["v1"].type 0 # add
-                add_payment_method(doc, payment_method)
+                add_credit_card(doc, payment_method)
               end
             end
           end
@@ -383,8 +395,9 @@ module ActiveMerchant #:nodoc:
 
           message = RESPONSE_MESSAGES[code]
           extended = EXTENDED_RESPONSE_MESSAGES[extended_code]
+          ach_response = response["achResponse"]
 
-          [message, extended].compact.join('. ')
+          [message, extended, ach_response].compact.join('. ')
         else
           response["faultstring"]
         end
@@ -401,7 +414,11 @@ module ActiveMerchant #:nodoc:
 
       # -- helper methods ----------------------------------------------------
       def credit_card?(payment_method)
-        payment_method.respond_to?(:number)
+        payment_method.respond_to?(:verification_value)
+      end
+
+      def echeck?(payment_method)
+        payment_method.respond_to?(:routing_number)
       end
 
       def split_authorization(authorization)
@@ -409,7 +426,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def void_type(action)
-        :"void_#{action}"
+        action == 'purchase_echeck' ? :void_echeck : :"void_#{action}"
+      end
+
+      def refund_type(action)
+        action == 'purchase_echeck' ? :refund_echeck : :refund
       end
 
       # -- request methods ---------------------------------------------------
@@ -482,7 +503,7 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def add_payment_method(doc, payment_method)
+      def add_credit_card(doc, payment_method)
         doc["v1"].card {
           doc["v1"].pan payment_method.number
           doc["v1"].sec payment_method.verification_value if payment_method.verification_value?
@@ -490,6 +511,13 @@ module ActiveMerchant #:nodoc:
         }
       end
 
+      def add_echeck(doc, payment_method)
+        doc["v1"].achEcheck {
+          doc["v1"].bankRtNr payment_method.routing_number
+          doc["v1"].acctNr payment_method.account_number
+        }
+      end
+
       def expiration_date(payment_method)
         yy = format(payment_method.year, :two_digits)
         mm = format(payment_method.month, :two_digits)
@@ -540,6 +568,12 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_name(doc, payment_method)
+        doc["v1"].contact do
+          doc["v1"].fullName payment_method.name
+        end
+      end
+
       def add_original_transaction_data(doc, authorization)
         doc["v1"].origTranData do
           doc["v1"].tranNr authorization

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

@@ -126,6 +126,7 @@ module ActiveMerchant #:nodoc:
         post[:payer_email_message] = options[:payer_email_message] if options[:payer_email_message]
         post[:payee_email_message] = options[:payee_email_message] if options[:payee_email_message]
         post[:reference_id] = options[:order_id] if options[:order_id]
+        post[:unique_id] = options[:unique_id] if options[:unique_id]
         post[:redirect_uri] = options[:redirect_uri] if options[:redirect_uri]
         post[:callback_uri] = options[:callback_uri] if options[:callback_uri]
         post[:fallback_uri] = options[:fallback_uri] if options[:fallback_uri]

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

@@ -60,10 +60,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, authorization, options = {})
-        MultiResponse.run do |r|
-          r.process{inquire_request(authorization, options, "CAPTURED", "SETTLED", "SETTLED_BY_MERCHANT")}
-          r.process{refund_request(money, authorization, options)}
+        response = MultiResponse.run do |r|
+          r.process { inquire_request(authorization, options, "CAPTURED", "SETTLED", "SETTLED_BY_MERCHANT") }
+          r.process { refund_request(money, authorization, options) }
         end
+
+        return response if response.success?
+        return response unless options[:force_full_refund_if_unsettled]
+
+        void(authorization, options ) if response.params["last_event"] == "AUTHORISED"
       end
 
       def verify(credit_card, options={})

data/lib/active_merchant/posts_data.rb

@@ -41,7 +41,7 @@ module ActiveMerchant #:nodoc:
 
     def raw_ssl_request(method, endpoint, data, headers = {})
       logger.warn "#{self.class} using ssl_strict=false, which is insecure" if logger unless ssl_strict
-      logger.warn "#{self.class} posting to plaintext endpoint, which is insecure" if logger unless endpoint =~ /^https:/
+      logger.warn "#{self.class} posting to plaintext endpoint, which is insecure" if logger unless endpoint.to_s =~ /^https:/
 
       connection = new_connection(endpoint)
       connection.open_timeout = open_timeout

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.64.0"
+  VERSION = "1.65.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.64.0
+  version: 1.65.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -161,6 +161,7 @@ files:
 - lib/active_merchant/billing/cvv_result.rb
 - lib/active_merchant/billing/gateway.rb
 - lib/active_merchant/billing/gateways.rb
+- lib/active_merchant/billing/gateways/adyen.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
@@ -170,7 +171,6 @@ files:
 - lib/active_merchant/billing/gateways/bank_frick.rb
 - lib/active_merchant/billing/gateways/banwire.rb
 - lib/active_merchant/billing/gateways/barclaycard_smartpay.rb
-- lib/active_merchant/billing/gateways/barclays_epdq.rb
 - lib/active_merchant/billing/gateways/barclays_epdq_extra_plus.rb
 - lib/active_merchant/billing/gateways/be2bill.rb
 - lib/active_merchant/billing/gateways/beanstream.rb
@@ -332,6 +332,7 @@ files:
 - lib/active_merchant/billing/gateways/realex.rb
 - lib/active_merchant/billing/gateways/redsys.rb
 - lib/active_merchant/billing/gateways/s5.rb
+- lib/active_merchant/billing/gateways/safe_charge.rb
 - lib/active_merchant/billing/gateways/sage.rb
 - lib/active_merchant/billing/gateways/sage_pay.rb
 - lib/active_merchant/billing/gateways/sallie_mae.rb

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

@@ -1,314 +0,0 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    class BarclaysEpdqGateway < Gateway
-      self.test_url = 'https://secure2.mde.epdq.co.uk:11500'
-      self.live_url = 'https://secure2.epdq.co.uk:11500'
-
-      self.supported_countries = ['GB']
-      self.default_currency = 'GBP'
-      self.supported_cardtypes = [:visa, :master, :american_express, :maestro, :switch ]
-      self.money_format = :cents
-      self.homepage_url = 'http://www.barclaycard.co.uk/business/accepting-payments/epdq-mpi/'
-      self.display_name = 'Barclays ePDQ MPI'
-
-      def initialize(options = {})
-        requires!(options, :login, :password, :client_id)
-        super
-      end
-
-      def authorize(money, creditcard, options = {})
-        document = Document.new(self, @options) do
-          add_order_form(options[:order_id]) do
-            add_consumer(options) do
-              add_creditcard(creditcard)
-            end
-            add_transaction(:PreAuth, money)
-          end
-        end
-
-        commit(document)
-      end
-
-      def purchase(money, creditcard, options = {})
-        # disable fraud checks if this is a repeat order:
-        if options[:payment_number] && (options[:payment_number] > 1)
-          no_fraud = true
-        else
-          no_fraud = options[:no_fraud]
-        end
-        document = Document.new(self, @options, :no_fraud => no_fraud) do
-          add_order_form(options[:order_id], options[:group_id]) do
-            add_consumer(options) do
-              add_creditcard(creditcard)
-            end
-            add_transaction(:Auth, money, options)
-          end
-        end
-        commit(document)
-      end
-
-      # authorization is your unique order ID, not the authorization
-      # code returned by ePDQ
-      def capture(money, authorization, options = {})
-        document = Document.new(self, @options) do
-          add_order_form(authorization) do
-            add_transaction(:PostAuth, money)
-          end
-        end
-
-        commit(document)
-      end
-
-      # authorization is your unique order ID, not the authorization
-      # code returned by ePDQ
-      def credit(money, creditcard_or_authorization, options = {})
-        if creditcard_or_authorization.is_a?(String)
-          ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
-          refund(money, creditcard_or_authorization, options)
-        else
-          credit_new_order(money, creditcard_or_authorization, options)
-        end
-      end
-
-      def refund(money, authorization, options = {})
-        credit_existing_order(money, authorization, options)
-      end
-
-      def void(authorization, options = {})
-        document = Document.new(self, @options) do
-          add_order_form(authorization) do
-            add_transaction(:Void)
-          end
-        end
-
-        commit(document)
-      end
-
-      private
-      def credit_new_order(money, creditcard, options)
-        document = Document.new(self, @options) do
-          add_order_form do
-            add_consumer(options) do
-              add_creditcard(creditcard)
-            end
-            add_transaction(:Credit, money)
-          end
-        end
-
-        commit(document)
-      end
-
-      def credit_existing_order(money, authorization, options)
-        order_id, _ = authorization.split(":")
-        document = Document.new(self, @options) do
-          add_order_form(order_id) do
-            add_transaction(:Credit, money)
-          end
-        end
-
-        commit(document)
-      end
-
-      def parse(body)
-        parser = Parser.new(body)
-        response = parser.parse
-        Response.new(response[:success], response[:message], response,
-          :test => test?,
-          :authorization => response[:authorization],
-          :avs_result => response[:avsresponse],
-          :cvv_result => response[:cvv_result],
-          :order_id => response[:order_id],
-          :raw_response => response[:raw_response]
-        )
-      end
-
-      def commit(document)
-        url = (test? ? self.test_url : self.live_url)
-        data = ssl_post(url, document.to_xml)
-        parse(data)
-      end
-
-      class Parser
-        def initialize(response)
-          @response = response
-        end
-
-        def parse
-          require 'iconv' unless String.method_defined?(:encode)
-          if String.method_defined?(:encode)
-            doc = REXML::Document.new(@response.encode("UTF-8", "ISO-8859-1"))
-          else
-            ic = Iconv.new('UTF-8', 'ISO-8859-1')
-            doc = REXML::Document.new(ic.iconv(@response))
-          end
-
-          auth_type = find(doc, "//Transaction/Type").to_s
-
-          message = find(doc, "//Message/Text")
-          if message.blank?
-            message = find(doc, "//Transaction/CardProcResp/CcReturnMsg")
-          end
-
-          case auth_type
-          when 'Credit', 'Void'
-            success = find(doc, "//CcReturnMsg") == "Approved."
-          else
-            success = find(doc, "//Transaction/AuthCode").present?
-          end
-
-          {
-            :success => success,
-            :message => message,
-            :transaction_id => find(doc, "//Transaction/Id"),
-            :avs_result => find(doc, "//Transaction/AvsRespCode"),
-            :cvv_result => find(doc, "//Transaction/Cvv2Resp"),
-            :authorization => find(doc, "//OrderFormDoc/Id"),
-            :raw_response => @response
-          }
-        end
-
-        def find(doc, xpath)
-          REXML::XPath.first(doc, xpath).try(:text)
-        end
-      end
-
-      class Document
-        attr_reader :type, :xml
-
-        PAYMENT_INTERVALS = {
-          :days => 'D',
-          :months => 'M'
-        }
-
-        EPDQ_CARD_TYPES = {
-          :visa => 1,
-          :master => 2,
-          :switch => 9,
-          :maestro => 10,
-        }
-
-        def initialize(gateway, options = {}, document_options = {}, &block)
-          @gateway = gateway
-          @options = options
-          @document_options = document_options
-          @xml = Builder::XmlMarkup.new(:indent => 2)
-          build(&block)
-        end
-
-        def to_xml
-          @xml.target!
-        end
-
-        def build(&block)
-          xml.instruct!(:xml, :version => '1.0')
-          xml.EngineDocList do
-            xml.DocVersion "1.0"
-            xml.EngineDoc do
-              xml.ContentType "OrderFormDoc"
-              xml.User do
-                xml.Name(@options[:login])
-                xml.Password(@options[:password])
-                xml.ClientId({ :DataType => "S32" }, @options[:client_id])
-              end
-              xml.Instructions do
-                if @document_options[:no_fraud]
-                  xml.Pipeline "PaymentNoFraud"
-                else
-                  xml.Pipeline "Payment"
-                end
-              end
-              instance_eval(&block)
-            end
-          end
-        end
-
-        def add_order_form(order_id=nil, group_id=nil, &block)
-          xml.OrderFormDoc do
-            xml.Mode 'P'
-            xml.Id(order_id) if order_id
-            xml.GroupId(group_id) if group_id
-            instance_eval(&block)
-          end
-        end
-
-        def add_consumer(options=nil, &block)
-          xml.Consumer do
-            if options
-              xml.Email(options[:email]) if options[:email]
-              billing_address = options[:billing_address] || options[:address]
-              if billing_address
-                xml.BillTo do
-                  xml.Location do
-                    xml.Address do
-                      xml.Street1 billing_address[:address1]
-                      xml.Street2 billing_address[:address2]
-                      xml.City billing_address[:city]
-                      xml.StateProv billing_address[:state]
-                      xml.PostalCode billing_address[:zip]
-                      xml.Country billing_address[:country_code]
-                    end
-                  end
-                end
-              end
-            end
-            instance_eval(&block)
-          end
-        end
-
-        def add_creditcard(creditcard)
-          xml.PaymentMech do
-            xml.CreditCard do
-              xml.Type({ :DataType => 'S32' }, EPDQ_CARD_TYPES[creditcard.brand.to_sym])
-              xml.Number creditcard.number
-              xml.Expires({ :DataType => 'ExpirationDate', :Locale => 826 }, format_expiry_date(creditcard))
-              if creditcard.verification_value.present?
-                xml.Cvv2Indicator 1
-                xml.Cvv2Val creditcard.verification_value
-              else
-                xml.Cvv2Indicator 5
-              end
-              xml.IssueNum(creditcard.issue_number) if creditcard.issue_number.present?
-            end
-          end
-        end
-
-        def add_transaction(auth_type, amount = nil, options = {})
-          @auth_type = auth_type
-          xml.Transaction do
-            xml.Type @auth_type.to_s
-            if options[:payment_number] && options[:payment_number] > 1
-              xml.CardholderPresentCode({ :DataType => 'S32' }, 8)
-            else
-              xml.CardholderPresentCode({ :DataType => 'S32' }, 7)
-            end
-            if options[:payment_number]
-              xml.PaymentNumber({ :DataType => 'S32' }, options[:payment_number])
-            end
-            if options[:total_payments]
-              xml.TotalNumberPayments({ :DataType => 'S32' }, options[:total_payments])
-            end
-            if amount
-              xml.CurrentTotals do
-                xml.Totals do
-                  xml.Total({ :DataType => 'Money', :Currency => 826 }, amount)
-                end
-              end
-            end
-          end
-        end
-
-        # date must be formatted MM/YY
-        def format_expiry_date(creditcard)
-          month_str = "%02d" % creditcard.month
-          if match = creditcard.year.to_s.match(/^\d{2}(\d{2})$/)
-            year_str = "%02d" % match[1].to_i
-          else
-            year_str = "%02d" % creditcard.year
-          end
-          "#{month_str}/#{year_str}"
-        end
-      end
-    end
-  end
-end
-