activemerchant 1.59.0 → 1.60.0

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

@@ -512,7 +512,7 @@ module ActiveMerchant #:nodoc:
           if (billing_address = options[:billing_address])
             doc["v1"].phone do
               doc["v1"].type (options[:phone_number_type] || "4")
-              doc["v1"].nr billing_address[:phone].gsub(/\D/, '')
+              doc["v1"].nr billing_address[:phone].gsub(/\D/, '') if billing_address[:phone]
             end
             doc["v1"].addrLn1 billing_address[:address1]
             doc["v1"].addrLn2 billing_address[:address2]

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

@@ -32,8 +32,6 @@ module ActiveMerchant #:nodoc:
         add_payment_method(params, payment_method)
         add_antifraud_data(params, options)
         params[:email] = options[:email] || 'unknown@email.com'
-
-        # No vaulting for now
         params[:createAlias] = false
 
         commit("authorize", params)
@@ -41,24 +39,20 @@ module ActiveMerchant #:nodoc:
 
       def capture(authorization, options={})
         params = {}
-        _, purchase_number = split_authorization(authorization)
-        params[:purchaseNumber] = purchase_number
-        params[:externalTransactionId] = options[:order_id]
+        add_auth_order_id(params, authorization, options)
         commit("deposit", params)
       end
 
       def void(authorization, options={})
         params = {}
-        action, purchase_number = split_authorization(authorization)
-        params[:purchaseNumber] = purchase_number
-        params[:externalTransactionId] = options[:order_id]
+        add_auth_order_id(params, authorization, options)
+        commit("void", params)
+      end
 
-        case action
-        when "authorize"
-          commit("void", params)
-        when "deposit"
-          commit("cancelDeposit", params)
-        end
+      def refund(amount, authorization, options={})
+        params = {}
+        add_auth_order_id(params, authorization, options)
+        commit("cancelDeposit", params)
       end
 
       def verify(credit_card, options={})
@@ -93,6 +87,11 @@ module ActiveMerchant #:nodoc:
         params[:currencyId] = CURRENCY_CODES[options[:currency] || currency(money)]
       end
 
+      def add_auth_order_id(params, authorization, options)
+        params[:purchaseNumber] = authorization
+        params[:externalTransactionId] = options[:order_id]
+      end
+
       def add_payment_method(params, payment_method)
         params[:firstName] = payment_method.first_name
         params[:lastName] = payment_method.last_name
@@ -134,7 +133,7 @@ module ActiveMerchant #:nodoc:
             message_from(response),
             response,
             :test => test?,
-            :authorization => authorization_from(action, params),
+            :authorization => authorization_from(params),
             :error_code => response["errorCode"]
           )
         end
@@ -149,26 +148,18 @@ module ActiveMerchant #:nodoc:
 
       def url(action, params)
         if (action == "authorize")
-          url = base_url() + "/" + @options[:merchant_id]
+          "#{base_url}/#{@options[:merchant_id]}"
         else
-          url = base_url() + "/" + @options[:merchant_id] + "/" + action + "/" + params[:purchaseNumber]
+          "#{base_url}/#{@options[:merchant_id]}/#{action}/#{params[:purchaseNumber]}"
         end
       end
 
       def method(action)
-        if (action == "authorize")
-          method = :post
-        else
-          method = :put
-        end
-      end
-
-      def split_authorization(authorization)
-        authorization.split("|")
+        (action == "authorize") ? :post : :put
       end
 
-      def authorization_from(action, params)
-        action + "|" + (params[:purchaseNumber] || '')
+      def authorization_from(params)
+        params[:purchaseNumber]
       end
 
       def base_url

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.59.0"
+  VERSION = "1.60.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.59.0
+  version: 1.60.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,7 +194,6 @@ files:
 - lib/active_merchant/billing/gateways/cc5.rb
 - lib/active_merchant/billing/gateways/cecabank.rb
 - lib/active_merchant/billing/gateways/cenpos.rb
-- lib/active_merchant/billing/gateways/certo_direct.rb
 - lib/active_merchant/billing/gateways/checkout.rb
 - lib/active_merchant/billing/gateways/checkout_v2.rb
 - lib/active_merchant/billing/gateways/clearhaus.rb
@@ -277,6 +276,7 @@ files:
 - lib/active_merchant/billing/gateways/orbital.rb
 - lib/active_merchant/billing/gateways/orbital/orbital_soft_descriptors.rb
 - lib/active_merchant/billing/gateways/pac_net_raven.rb
+- lib/active_merchant/billing/gateways/pagarme.rb
 - lib/active_merchant/billing/gateways/pago_facil.rb
 - lib/active_merchant/billing/gateways/pay_conex.rb
 - lib/active_merchant/billing/gateways/pay_gate_xml.rb

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

@@ -1,278 +0,0 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    class CertoDirectGateway < Gateway
-      self.live_url = self.test_url = "https://secure.certodirect.com/gateway/process/v2"
-
-      self.supported_countries = [
-        "BE", "BG", "CZ", "DK", "DE", "EE", "IE", "ES", "FR",
-        "IT", "CY", "LV", "LT", "LU", "HU", "MT", "NL", "AT", "PL",
-        "PT", "RO", "SI", "SK", "FI", "SE", "GB"
-      ]
-
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
-      self.homepage_url = 'http://www.certodirect.com/'
-      self.display_name = 'CertoDirect'
-
-      # Creates a new CertoDirectGateway
-      #
-      # The gateway requires that a valid login and password be passed
-      # in the +options+ hash.
-      #
-      # ==== Options
-      #
-      # * <tt>:login</tt> -- The CertoDirect Shop ID (REQUIRED)
-      # * <tt>:password</tt> -- The CertoDirect Shop Password. (REQUIRED)
-      # * <tt>:test</tt> -- +true+ or +false+. If true, perform transactions against the test server.
-      #   Otherwise, perform transactions against the production server.
-      def initialize(options = {})
-        requires!(options, :login, :password)
-        super
-      end
-
-      # Perform a purchase, which is essentially an authorization and capture in a single operation.
-      #
-      # ==== Parameters
-      #
-      # * <tt>money</tt> -- The amount to be purchased as an Integer value in cents.
-      # * <tt>credit_card</tt> -- The CreditCard details for the transaction.
-      # * <tt>options</tt> -- A hash of optional parameters.
-      def purchase(money, credit_card, options = {})
-        requires!(options, :email, :currency, :ip, :description)
-
-        commit(build_sale_request(money, credit_card, options))
-      end
-
-      # Refund a transaction.
-      #
-      # This transaction indicates to the gateway that
-      # money should flow from the merchant to the customer.
-      #
-      # ==== Parameters
-      #
-      # * <tt>money</tt> -- The amount to be credited to the customer as an Integer value in cents.
-      # * <tt>identification</tt> -- The ID of the original order against which the refund is being issued.
-      # * <tt>options</tt> -- A hash of parameters.
-      def refund(money, identification, options = {})
-        requires!(options, :reason)
-
-        commit(build_refund_request(money, identification, options))
-      end
-
-      # Performs an authorization, which reserves the funds on the customer's credit card, but does not
-      # charge the card.
-      #
-      # ==== Parameters
-      #
-      # * <tt>money</tt> -- The amount to be authorized as an Integer value in cents.
-      # * <tt>credit_card</tt> -- The CreditCard details for the transaction.
-      # * <tt>options</tt> -- A hash of optional parameters.
-      def authorize(money, credit_card, options = {})
-        requires!(options, :email, :currency, :ip, :description)
-
-        commit(build_authorize_request(money, credit_card, options))
-      end
-
-      # Captures the funds from an authorized transaction.
-      #
-      # ==== Parameters
-      #
-      # * <tt>money</tt> -- The amount to be captured as an Integer value in cents.
-      # * <tt>identification</tt> -- The authorization returned from the previous authorize request.
-      def capture(money, identification, options = {})
-        commit(build_capture_request(money, identification))
-      end
-
-      # Void a previous transaction
-      #
-      # ==== Parameters
-      #
-      # * <tt>money</tt> -- The amount to be captured as an Integer value in cents.
-      # * <tt>identification</tt> - The authorization returned from the previous authorize request.
-      def void(money, identification, options = {})
-        commit(build_void_request(money, identification))
-      end
-
-      # Create a recurring payment.
-      #
-      # ==== Parameters
-      #
-      # * <tt>options</tt> -- A hash of parameters.
-      #
-      # ==== Options
-      #
-      def recurring(identification, options={})
-        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
-
-        commit(build_recurring_request(identification, options))
-      end
-
-      private
-
-      def commit(request_xml)
-        begin
-          response = Hash.from_xml(ssl_post(self.live_url, request_xml, headers))
-          Response.new(success?(response),
-                       message(response),
-                       response,
-                       :test          => test?,
-                       :authorization => authorization(response))
-        rescue ResponseError => e
-          raise e unless e.response.code == '403'
-          response = Hash.from_xml(e.response.body)['response']
-          Response.new(false, message(response), {}, :test => test?)
-        end
-      end
-
-      def build_sale_request(money, credit_card, options)
-        build_request_xml('Sale') do |xml|
-          add_order(xml, money, credit_card, options)
-        end
-      end
-
-      def build_authorize_request(money, credit_card, options)
-        build_request_xml('Authorize') do |xml|
-          add_order(xml, money, credit_card, options)
-        end
-      end
-
-      def build_refund_request(money, identification, options)
-        build_request_xml('Refund') do |xml|
-          add_reference_info(xml, money, identification, options)
-          xml.tag! 'reason', options[:reason]
-        end
-      end
-
-      def build_capture_request(money, identification)
-        build_request_xml('Capture') do |xml|
-          add_reference_info(xml, money, identification, options)
-        end
-      end
-
-      def build_void_request(money, identification)
-        build_request_xml('Void') do |xml|
-          add_reference_info(xml, money, identification, options)
-        end
-      end
-
-      def build_recurring_request(identification, options)
-        build_request_xml('Sale') do |xml|
-          xml.tag! 'order' do
-            xml.tag!('test', 'true') if test?
-            xml.tag! 'initial_order_id', identification, :type => 'integer'
-
-            add_order_details(xml, options[:amount], options) if has_any_order_details_key?(options)
-            add_address(xml, 'billing_address', options[:billing_address]) if options[:billing_address]
-            add_address(xml, 'shipping_address', options[:shipping_address]) if options[:shipping_address]
-          end
-        end
-      end
-
-      def build_request_xml(type, &block)
-        xml = Builder::XmlMarkup.new(:indent => 2)
-        xml.tag! 'transaction' do
-          xml.tag! 'type', type
-          yield(xml)
-        end
-        xml.target!
-      end
-
-      def add_order(xml, money, credit_card, options)
-        xml.tag! 'order' do
-          xml.tag!('test', 'true') if test?
-
-          xml.tag!('return_url', options[:return_url]) if options[:return_url]
-          xml.tag!('cancel_url', options[:cancel_url]) if options[:cancel_url]
-
-          xml.tag! 'payment_method_type', 'CreditCard'
-          xml.tag! 'payment_method' do
-            xml.tag! 'number', credit_card.number
-            xml.tag! 'exp_month', "%02i" % credit_card.month
-            xml.tag! 'exp_year', credit_card.year
-            xml.tag! 'holder', credit_card.name
-            xml.tag! 'verification_value', credit_card.verification_value
-          end
-
-          add_order_details(xml, money, options)
-          add_address(xml, 'billing_address', options[:billing_address]) if options[:billing_address]
-          add_address(xml, 'shipping_address', options[:shipping_address]) if options[:shipping_address]
-        end
-      end
-
-      def add_order_details(xml, money, options)
-        xml.tag! 'details' do
-          xml.tag!('amount', localized_amount(money, options[:currency]), :type => 'decimal') if money
-          xml.tag!('currency', options[:currency]) if options[:currency]
-          xml.tag!('email', options[:email]) if options[:email]
-          xml.tag!('ip', options[:ip]) if options[:ip]
-          xml.tag!('shipping', options[:shipping], :type => 'decimal') if options[:shipping]
-          xml.tag!('description', options[:description]) if options[:description]
-        end
-      end
-
-      def add_reference_info(xml, money, identification, options)
-        xml.tag! 'order_id', identification, :type => 'integer'
-        xml.tag! 'amount', localized_amount(money, options[:currency]), :type => 'decimal'
-      end
-
-      def add_address(xml, address_type, address)
-        xml.tag! address_type do
-          xml.tag! 'address', address[:address1]
-          xml.tag! 'city', address[:city]
-          xml.tag! 'country', address[:country]
-          xml.tag! 'first_name', address[:first_name]
-          xml.tag! 'last_name', address[:last_name]
-          xml.tag! 'state', address[:state]
-          xml.tag! 'phone', address[:phone]
-          xml.tag! 'zip', address[:zip]
-        end
-      end
-
-      def has_any_order_details_key?(options)
-        [ :currency, :amount, :email, :ip, :shipping, :description ].any? do |key|
-          options.has_key?(key)
-        end
-      end
-
-      def success?(response)
-        %w(completed forwarding).include?(state(response)) and
-          status(response) == 'success'
-      end
-
-      def error?(response)
-        response['errors']
-      end
-
-      def state(response)
-        response["transaction"].try(:[], "state")
-      end
-
-      def status(response)
-        response['transaction'].try(:[], 'response').try(:[], 'status')
-      end
-
-      def authorization(response)
-        error?(response) ? nil : response["transaction"]["order"]['id'].to_s
-      end
-
-      def message(response)
-        return response['errors'].join('; ') if error?(response)
-
-        if state(response) == 'completed'
-          response["transaction"]["response"]["message"]
-        else
-          response['transaction']['message']
-        end
-      end
-
-      def headers
-        { 'authorization' => basic_auth,
-          'Accept'        => 'application/xml',
-          'Content-Type'  => 'application/xml' }
-      end
-
-      def basic_auth
-        'Basic ' + ["#{@options[:login]}:#{@options[:password]}"].pack('m').delete("\r\n")
-      end
-    end
-  end
-end