activemerchant 1.40.0 → 1.41.0

data/CHANGELOG

@@ -1,5 +1,12 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.41.0 (October 24th, 2013)
+
+* Stripe: Payments won't fail when specifying a customer with a creditcard number [melari]
+* Add Conekta gateway [leofischer]
+* Wirecard: Add support for void and refund [duff]
+* Orbital: Mandatory field fix [juicedM3, jduff]
+
 == Version 1.40.0 (October 18th, 2013)
 
 * Paymill: Revert Add support for specifying the :customer [melari]

data/CONTRIBUTORS

@@ -420,3 +420,7 @@ MoneyMovers (September 2013)
 Be2Bill (September 2013)
 
 * Michaël Hoste (MichaelHoste)
+
+Conekta (October 2013)
+
+* Leo Fischer (leofischer)

data/README.md

@@ -94,6 +94,7 @@ The [ActiveMerchant Wiki](http://github.com/Shopify/active_merchant/wikis) conta
 * [CardSave](http://www.cardsave.net/) - GB
 * [CardStream](http://www.cardstream.com/) - GB
 * [CertoDirect](http://www.certodirect.com/) - BE, BG, CZ, DK, DE, EE, IE, EL, ES, FR, IT, CY, LV, LT, LU, HU, MT, NL, AT, PL, PT, RO, SI, SK, FI, SE, GB
+* [Conekta](https://conekta.io) - MX
 * [CyberSource](http://www.cybersource.com) - US, BR, CA, CN, DK, FI, FR, DE, JP, MX, NO, SE, GB, SG
 * [DataCash](http://www.datacash.com/) - GB
 * [Efsnet](http://www.concordefsnet.com/) - US

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

@@ -0,0 +1,233 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class ConektaGateway < Gateway
+      self.live_url = 'https://api.conekta.io/'
+
+      self.supported_countries = ['MX']
+      self.supported_cardtypes = [:visa, :master]
+      self.homepage_url = 'https://conekta.io/'
+      self.display_name = 'Conekta Gateway'
+      self.money_format = :cents
+      self.default_currency = 'MXN'
+
+      def initialize(options = {})
+        requires!(options, :key)
+        options[:version] ||= '0.2.0'
+        super
+      end
+
+      def purchase(money, payment_source, options = {})
+        post = {}
+
+        add_order(post, money, options)
+        add_payment_source(post, payment_source, options)
+        add_details_data(post, options)
+
+        commit(:post, 'charges', post)
+      end
+
+      def authorize(money, payment_source, options = {})
+        post = {}
+
+        add_order(post, money, options)
+        add_payment_source(post, payment_source, options)
+        add_details_data(post, options)
+
+        post[:capture] = false
+        commit(:post, "charges", post)
+      end
+
+      def capture(identifier, money, options = {})
+        post = {}
+
+        post[:order_id] = identifier
+        add_order(post, money, options)
+
+        commit(:post, "charges/#{identifier}/capture", post)
+      end
+
+      def refund(identifier, money, options)
+        post = {}
+
+        post[:order_id] = identifier
+        add_order(post, money, options)
+
+        commit(:post, "charges/#{identifier}/refund", post)
+      end
+
+      def store(creditcard, options = {})
+        post = {}
+        add_payment_source(post, creditcard, options)
+        post[:name] = options[:name]
+        post[:email] = options[:email]
+
+        path = if options[:customer]
+          "customers/#{CGI.escape(options[:customer])}"
+        else
+          'customers'
+        end
+
+        commit(:post, path, post)
+      end
+
+      def unstore(customer_id, options = {})
+        commit(:delete, "customers/#{CGI.escape(customer_id)}", nil)
+      end
+
+      private
+
+      def add_order(post, money, options)
+        post[:description] = options[:description]
+        post[:reference_id] = options[:order_id]
+        post[:amount] = amount(money)
+      end
+
+      def add_details_data(post, options)
+        details = {}
+        details[:name] = options[:customer]
+        details[:email] = options[:email]
+        details[:phone] = options[:phone]
+        details[:device_fingerprint] = options[:device_fingerprint]
+        details[:ip] = options[:ip]
+        add_billing_address(details, options)
+        add_line_items(details, options)
+        add_shipment(details, options)
+
+        post[:details] = details
+      end
+
+      def add_shipment(post, options)
+        shipment = {}
+        shipment[:carrier] = options[:carrier]
+        shipment[:service] = options[:service]
+        shipment[:tracking_number] = options[:tracking_number]
+        shipment[:price] = options[:price]
+        add_shipment_address(shipment, options)
+        post[:shipment] = shipment
+      end
+
+      def add_shipment_address(post, options)
+        address = {}
+        address[:street1] = options[:address1]
+        address[:street2] = options[:address2]
+        address[:street3] = options[:address3]
+        address[:city] = options[:city]
+        address[:state] = options[:state]
+        address[:country] = options[:country]
+        address[:zip] = options[:zip]
+        post[:address] = address
+      end
+
+      def add_line_items(post, options)
+        post[:line_items] = (options[:line_items] || []).collect do |line_item|
+          line_item
+        end
+      end
+
+      def add_billing_address(post, options)
+        address = {}
+        address[:street1] = options[:address1]
+        address[:street2] = options[:address2]
+        address[:street3] = options[:address3]
+        address[:city] = options[:city]
+        address[:state] = options[:state]
+        address[:country] = options[:country]
+        address[:zip] = options[:zip]
+        address[:company_name] = options[:company_name]
+        address[:tax_id] = options[:tax_id]
+        address[:name] = options[:name]
+        address[:phone] = options[:phone]
+        address[:email] = options[:email]
+        post[:billing_address] = address
+      end
+
+      def add_address(post, options)
+        address = {}
+        address[:street1] = options[:address1]
+        address[:street2] = options[:address2]
+        address[:street3] = options[:address3]
+        address[:city] = options[:city]
+        address[:state] = options[:state]
+        address[:country] = options[:country]
+        address[:zip] = options[:zip]
+        post[:address] = address
+      end
+
+      def add_payment_source(post, payment_source, options)
+        if payment_source.kind_of?(String)
+          post[:card] = payment_source
+        elsif payment_source.respond_to?(:number)
+          card = {}
+          card[:name] = payment_source.name
+          card[:cvc] = payment_source.verification_value
+          card[:number] = payment_source.number
+          card[:exp_month] = "#{sprintf("%02d", payment_source.month)}"
+          card[:exp_year] = "#{"#{payment_source.year}"[-2, 2]}"
+          post[:card] = card
+          add_address(post[:card], options)
+        end
+      end
+
+      def parse(body)
+        return {} unless body
+        JSON.parse(body)
+      end
+
+      def headers(meta)
+        @@ua ||= JSON.dump({
+          :bindings_version => ActiveMerchant::VERSION,
+          :lang => 'ruby',
+          :lang_version => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
+          :platform => RUBY_PLATFORM,
+          :publisher => 'active_merchant'
+        })
+
+        {
+          "Accept" => "application/vnd.conekta-v#{options[:version]}+json",
+          "Authorization" => "Basic " + Base64.encode64("#{options[:key]}:"),
+          "RaiseHtmlError" => "false",
+          "User-Agent" => "Conekta ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          "X-Conekta-Client-User-Agent" => @@ua,
+          "X-Conekta-Client-User-Metadata" => meta.to_json
+        }
+      end
+
+      def commit(method, url, parameters, options = {})
+        success = false
+        begin
+          raw_response = parse(ssl_request(method, live_url + url, (parameters ? parameters.to_query : nil), headers(options[:meta])))
+          success = (raw_response.key?("object") && (raw_response["object"] != "error"))
+        rescue ResponseError => e
+          raw_response = response_error(e.response.body)
+        rescue JSON::ParserError
+          raw_response = json_error(raw_response)
+        end
+
+        Response.new(
+          success,
+          raw_response["message"],
+          raw_response,
+          :test => test?,
+          :authorization => raw_response["id"]
+        )
+      end
+
+      def response_error(raw_response)
+        begin
+          parse(raw_response)
+        rescue JSON::ParserError
+          json_error(raw_response)
+        end
+      end
+
+      def json_error(raw_response)
+        msg = 'Invalid response received from the Conekta API.'
+        msg += "  (The raw response returned by the API was #{raw_response.inspect})"
+        {
+          "message" => msg
+        }
+      end
+    end
+  end
+end
+

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

@@ -146,7 +146,7 @@ module ActiveMerchant #:nodoc:
       # A – Authorization request
       def authorize(money, creditcard, options = {})
         order = build_new_order_xml(AUTH_ONLY, money, options) do |xml|
-          add_creditcard(xml, creditcard, options[:currency]) unless creditcard.nil? && options[:profile_txn]
+          add_creditcard(xml, creditcard, options[:currency])
           add_address(xml, creditcard, options)
           if @options[:customer_profiles]
             add_customer_data(xml, options)
@@ -159,7 +159,7 @@ module ActiveMerchant #:nodoc:
       # AC – Authorization and Capture
       def purchase(money, creditcard, options = {})
         order = build_new_order_xml(AUTH_AND_CAPTURE, money, options) do |xml|
-          add_creditcard(xml, creditcard, options[:currency]) unless creditcard.nil? && options[:profile_txn]
+          add_creditcard(xml, creditcard, options[:currency])
           add_address(xml, creditcard, options)
           if @options[:customer_profiles]
             add_customer_data(xml, options)
@@ -327,8 +327,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_creditcard(xml, creditcard, currency=nil)
-        xml.tag! :AccountNum, creditcard.number
-        xml.tag! :Exp, expiry_date(creditcard)
+        unless creditcard.nil?
+          xml.tag! :AccountNum, creditcard.number
+          xml.tag! :Exp, expiry_date(creditcard)
+        end
 
         xml.tag! :CurrencyCode, currency_code(currency)
         xml.tag! :CurrencyExponent, '2' # Will need updating to support currencies such as the Yen.
@@ -342,10 +344,12 @@ module ActiveMerchant #:nodoc:
         #   Null-fill this attribute OR
         #   Do not submit the attribute at all.
         # - http://download.chasepaymentech.com/docs/orbital/orbital_gateway_xml_specification.pdf
-        if %w( visa discover ).include?(creditcard.brand)
-          xml.tag! :CardSecValInd, (creditcard.verification_value? ? '1' : '9')
+        unless creditcard.nil?
+          if %w( visa discover ).include?(creditcard.brand)
+            xml.tag! :CardSecValInd, (creditcard.verification_value? ? '1' : '9')
+          end
+          xml.tag! :CardSecVal,  creditcard.verification_value if creditcard.verification_value?
         end
-        xml.tag! :CardSecVal,  creditcard.verification_value if creditcard.verification_value?
       end
 
       def add_refund(xml, currency=nil)

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

@@ -127,7 +127,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_amount(post, money, options)
         add_creditcard(post, creditcard, options)
-        add_customer(post, options)
+        add_customer(post, creditcard, options)
         add_customer_data(post,options)
         post[:description] = options[:description] || options[:email]
         add_flags(post, options)
@@ -189,8 +189,8 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_customer(post, options)
-        post[:customer] = options[:customer] if options[:customer]
+      def add_customer(post, creditcard, options)
+        post[:customer] = options[:customer] if options[:customer] && !creditcard.respond_to?(:number)
       end
 
       def add_flags(post, options)

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

@@ -48,8 +48,8 @@ module ActiveMerchant #:nodoc:
         post[:amount] = localized_amount(money, post[:currency].upcase)
       end
 
-      def add_customer(post, options)
-        post[:customer] = options[:customer] if options[:customer] && post[:card].blank?
+      def add_customer(post, creditcard, options)
+        post[:customer] = options[:customer] if options[:customer] && !creditcard.respond_to?(:number)
       end
 
       def json_error(raw_response)

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

@@ -3,10 +3,7 @@ require 'base64'
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class WirecardGateway < Gateway
-      # Test server location
       self.test_url = 'https://c3-test.wirecard.com/secure/ssl-gateway'
-
-      # Live server location
       self.live_url = 'https://c3.wirecard.com/secure/ssl-gateway'
 
       # The Namespaces are not really needed, because it just tells the System, that there's actually no namespace used.
@@ -29,57 +26,51 @@ module ActiveMerchant #:nodoc:
       # number 5551234 within area code 202 (country code 1).
       VALID_PHONE_FORMAT = /\+\d{1,3}(\(?\d{3}\)?)?\d{3}-\d{4}-\d{3}/
 
-      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb, :switch ]
       self.supported_countries = %w(AD CY GI IM MT RO CH AT DK GR IT MC SM TR BE EE HU LV NL SK GB BG FI IS LI NO SI VA FR IL LT PL ES CZ DE IE LU PT SE)
-
-      # Wirecard supports all major credit and debit cards:
-      # Visa, Mastercard, American Express, Diners Club,
-      # JCB, Switch, VISA Carte Bancaire, Visa Electron and UATP cards.
-      # They also support the latest anti-fraud systems such as Verified by Visa or Master Secure Code.
-      self.supported_cardtypes = [
-        :visa, :master, :american_express, :diners_club, :jcb, :switch
-      ]
-
-      # The homepage URL of the gateway
       self.homepage_url = 'http://www.wirecard.com'
-
-      # The name of the gateway
       self.display_name = 'Wirecard'
-
-      # The currency should normally be EUROs
       self.default_currency = 'EUR'
-
-      # 100 is 1.00 Euro
       self.money_format = :cents
 
+      # Public: Create a new Wirecard gateway.
+      #
+      # options - A hash of options:
+      #           :login         - The username
+      #           :password      - The password
+      #           :signature     - The BusinessCaseSignature
       def initialize(options = {})
-        # verify that username and password are supplied
-        requires!(options, :login, :password)
-        # unfortunately Wirecard also requires a BusinessCaseSignature in the XML request
-        requires!(options, :signature)
+        requires!(options, :login, :password, :signature)
         super
       end
 
-      # Authorization
       def authorize(money, creditcard, options = {})
         options[:credit_card] = creditcard
         commit(:preauthorization, money, options)
       end
 
-      # Capture Authorization
       def capture(money, authorization, options = {})
         options[:preauthorization] = authorization
         commit(:capture, money, options)
       end
 
-      # Purchase
       def purchase(money, creditcard, options = {})
         options[:credit_card] = creditcard
         commit(:purchase, money, options)
       end
 
-      private
+      def void(identification, options = {})
+        options[:preauthorization] = identification
+        commit(:reversal, nil, options)
+      end
+
+      def refund(money, identification, options = {})
+        options[:preauthorization] = identification
+        commit(:bookback, money, options)
+      end
 
+
+      private
       def prepare_options_hash(options)
         result = @options.merge(options)
         setup_address_hash!(result)
@@ -156,9 +147,11 @@ module ActiveMerchant #:nodoc:
               add_invoice(xml, money, options)
               add_creditcard(xml, options[:credit_card])
               add_address(xml, options[:billing_address])
-            when :capture
+            when :capture, :bookback
               xml.tag! 'GuWID', options[:preauthorization]
               add_amount(xml, money)
+            when :reversal
+              xml.tag! 'GuWID', options[:preauthorization]
             end
           end
         end

data/lib/active_merchant/billing/integrations/ipay88/helper.rb

@@ -46,12 +46,16 @@ module ActiveMerchant #:nodoc:
             add_field mappings[:signature], signature
           end
 
+          def amount_in_dollars
+            sprintf("%.2f", @amount_in_cents.to_f/100)
+          end
+
           def amount=(money)
             @amount_in_cents = money.respond_to?(:cents) ? money.cents : money
             if money.is_a?(String) or @amount_in_cents.to_i < 0
               raise ArgumentError, "money amount must be either a Money object or a positive integer in cents."
             end
-            add_field mappings[:amount], sprintf("%.2f", @amount_in_cents.to_f/100)
+            add_field mappings[:amount], amount_in_dollars
           end
 
           def currency(symbol)
@@ -103,7 +107,7 @@ module ActiveMerchant #:nodoc:
             components  = [merchant_key]
             components << fields[mappings[:account]]
             components << fields[mappings[:order]]
-            components << amount_in_cents.to_s.gsub(/[.,]/, '')
+            components << amount_in_dollars.to_s.gsub(/0+$/, '').gsub(/[.,]/, '')
             components << fields[mappings[:currency]]
             components.join
           end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.40.0"
+  VERSION = "1.41.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.40.0
+  version: 1.41.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -278,6 +278,7 @@ files:
 - lib/active_merchant/billing/gateways/card_stream_modern.rb
 - lib/active_merchant/billing/gateways/cc5.rb
 - lib/active_merchant/billing/gateways/certo_direct.rb
+- lib/active_merchant/billing/gateways/conekta.rb
 - lib/active_merchant/billing/gateways/cyber_source.rb
 - lib/active_merchant/billing/gateways/data_cash.rb
 - lib/active_merchant/billing/gateways/efsnet.rb