activemerchant 1.66.0 → 1.67.0

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

@@ -34,7 +34,7 @@ module ActiveMerchant
         params = {transaction_type: 'purchase'}
 
         add_invoice(params, options)
-        add_payment_method(params, payment_method)
+        add_payment_method(params, payment_method, options)
         add_address(params, options)
         add_amount(params, amount, options)
         add_soft_descriptors(params, options)
@@ -46,7 +46,7 @@ module ActiveMerchant
         params = {transaction_type: 'authorize'}
 
         add_invoice(params, options)
-        add_payment_method(params, payment_method)
+        add_payment_method(params, payment_method, options)
         add_address(params, options)
         add_amount(params, amount, options)
         add_soft_descriptors(params, options)
@@ -119,9 +119,9 @@ module ActiveMerchant
         params[:method] = method
       end
 
-      def add_payment_method(params, payment_method)
+      def add_payment_method(params, payment_method, options)
         if payment_method.is_a? Check
-          add_echeck(params, payment_method)
+          add_echeck(params, payment_method, options)
         else
           add_creditcard(params, payment_method)
         end
@@ -140,14 +140,17 @@ module ActiveMerchant
         params[:credit_card] = credit_card
       end
 
-      def add_echeck(params, echeck)
+      def add_echeck(params, echeck, options)
         tele_check = {}
 
-        tele_check[:check_number] = echeck.number
+        tele_check[:check_number] = echeck.number || "001"
         tele_check[:check_type] = "P"
         tele_check[:routing_number] = echeck.routing_number
         tele_check[:account_number] = echeck.account_number
         tele_check[:accountholder_name] = "#{echeck.first_name} #{echeck.last_name}"
+        tele_check[:customer_id_type] = options[:customer_id_type] if options[:customer_id_type]
+        tele_check[:customer_id_number] = options[:customer_id_number] if options[:customer_id_number]
+        tele_check[:client_email] = options[:client_email] if options[:client_email]
 
         params[:method] = 'tele_check'
         params[:tele_check] = tele_check

data/lib/active_merchant/billing/gateways/quickpay/quickpay_v10.rb

@@ -16,25 +16,33 @@ module ActiveMerchant
 
       def purchase(money, credit_card_or_reference, options = {})
         MultiResponse.run(true) do |r|
+          if credit_card_or_reference.is_a?(String)
+            r.process { create_token(credit_card_or_reference, options) }
+            credit_card_or_reference = r.authorization
+          end
           r.process { create_payment(money, options) }
           r.process {
             post = authorization_params(money, credit_card_or_reference, options)
             add_autocapture(post, false)
-            commit(synchronized_path("/payments/#{r.authorization}/authorize"), post)
+            commit(synchronized_path("/payments/#{r.responses.last.params["id"]}/authorize"), post)
           }
           r.process {
             post = capture_params(money, credit_card_or_reference, options)
-            commit(synchronized_path("/payments/#{r.authorization}/capture"), post)
+            commit(synchronized_path("/payments/#{r.responses.last.params["id"]}/capture"), post)
           }
         end
       end
 
       def authorize(money, credit_card_or_reference, options = {})
         MultiResponse.run(true) do |r|
+          if credit_card_or_reference.is_a?(String)
+            r.process { create_token(credit_card_or_reference, options) }
+            credit_card_or_reference = r.authorization
+          end
           r.process { create_payment(money, options) }
           r.process {
             post = authorization_params(money, credit_card_or_reference, options)
-            commit(synchronized_path("/payments/#{r.authorization}/authorize"), post)
+            commit(synchronized_path("/payments/#{r.responses.last.params["id"]}/authorize"), post)
           }
         end
       end
@@ -71,12 +79,10 @@ module ActiveMerchant
         MultiResponse.run do |r|
           r.process { create_store(options) }
           r.process { authorize_store(r.authorization, credit_card, options)}
-          r.process { create_token(r.authorization, options.merge({id: r.authorization}))}
         end
       end
 
       def unstore(identification)
-        identification = identification.split(";").last
         commit(synchronized_path "/cards/#{identification}/cancel")
       end
 
@@ -93,11 +99,11 @@ module ActiveMerchant
 
       private
 
-        def authorization_params(money, credit_card, options = {})
+        def authorization_params(money, credit_card_or_reference, options = {})
           post = {}
 
           add_amount(post, money, options)
-          add_credit_card_or_reference(post, credit_card)
+          add_credit_card_or_reference(post, credit_card_or_reference)
           add_additional_params(:authorize, post, options)
 
           post
@@ -126,7 +132,7 @@ module ActiveMerchant
 
         def create_token(identification, options)
           post = {}
-          post[:id] = options[:id]
+          # post[:id] = options[:id]
           commit(synchronized_path("/cards/#{identification}/tokens"), post)
         end
 
@@ -150,15 +156,15 @@ module ActiveMerchant
 
           Response.new(success, message_from(success, response), response,
             :test => test?,
-            :authorization => authorization_from(response, params[:id])
+            :authorization => authorization_from(response)
           )
         end
 
-        def authorization_from(response, auth_id)
+        def authorization_from(response)
           if response["token"]
-            "#{response["token"]};#{auth_id}"
+            response["token"].to_s
           else
-             response["id"]
+             response["id"].to_s
           end
         end
 
@@ -205,8 +211,7 @@ module ActiveMerchant
         def add_credit_card_or_reference(post, credit_card_or_reference, options = {})
           post[:card]             ||= {}
           if credit_card_or_reference.is_a?(String)
-            reference = credit_card_or_reference.split(";").first
-            post[:card][:token] = reference
+            post[:card][:token] = credit_card_or_reference
           else
             post[:card][:number]     = credit_card_or_reference.number
             post[:card][:cvd]        = credit_card_or_reference.verification_value

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

@@ -103,11 +103,8 @@ module ActiveMerchant
           response,
           :test => (response[:message] =~ %r{\[ test system \]}),
           :authorization => authorization_from(response),
-          :cvv_result => response[:cvnresult],
-          :avs_result => {
-            :street_match => response[:avspostcoderesponse],
-            :postal_match => response[:avspostcoderesponse]
-          }
+          avs_result: AVSResult.new(code: response[:avspostcoderesponse]),
+          cvv_result: CVVResult.new(response[:cvnresult])
         )
       end
 

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://process.sandbox.safecharge.com/service.asmx/Process'
       self.live_url = 'https://process.safecharge.com/service.asmx/Process'
 
-      self.supported_countries = ['US']
+      self.supported_countries = ['AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'GR', 'ES', 'FI', 'FR', 'HR', 'HU', 'IE', 'IS', 'IT', 'LI', 'LT', 'LU', 'LV', 'MT', 'NL', 'NO', 'PL', 'PT', 'RO', 'SE', 'SE', 'SI', 'SK', 'GB', 'US']
       self.default_currency = 'USD'
       self.supported_cardtypes = [:visa, :master]
 
@@ -114,6 +114,7 @@ module ActiveMerchant #:nodoc:
         post[:sg_ClientPassword] = @options[:client_password]
         post[:sg_ResponseFormat] = "4"
         post[:sg_Version] = VERSION
+        post[:sg_ClientUniqueID] = options[:order_id] if options[:order_id]
       end
 
       def add_payment(post, payment)

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

@@ -4,7 +4,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://stage.wepayapi.com/v2'
       self.live_url = 'https://wepayapi.com/v2'
 
-      self.supported_countries = ['US']
+      self.supported_countries = ['US', 'CA']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.homepage_url = 'https://www.wepay.com/'
       self.default_currency = 'USD'
@@ -224,12 +224,17 @@ module ActiveMerchant #:nodoc:
       end
 
       def headers(options)
-        {
-          "Content-Type"  => "application/json",
-          "User-Agent"    => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
-          "Authorization" => "Bearer #{@options[:access_token]}",
-          "Api-Version"   => api_version(options)
+        headers = {
+          "Content-Type"      => "application/json",
+          "User-Agent"        => "ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
+          "Authorization"     => "Bearer #{@options[:access_token]}",
+          "Api-Version"       => api_version(options)
         }
+
+        headers["Client-IP"] = options[:ip] if options[:ip]
+        headers["WePay-Risk-Token"] = options[:risk_token] if options[:risk_token]
+
+        headers
       end
 
       def api_version(options)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.66.0"
+  VERSION = "1.67.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.66.0
+  version: 1.67.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -207,6 +207,7 @@ files:
 - lib/active_merchant/billing/gateways/data_cash.rb
 - lib/active_merchant/billing/gateways/dibs.rb
 - lib/active_merchant/billing/gateways/digitzs.rb
+- lib/active_merchant/billing/gateways/ebanx.rb
 - lib/active_merchant/billing/gateways/efsnet.rb
 - lib/active_merchant/billing/gateways/elavon.rb
 - lib/active_merchant/billing/gateways/element.rb
@@ -244,6 +245,7 @@ files:
 - lib/active_merchant/billing/gateways/itransact.rb
 - lib/active_merchant/billing/gateways/iveri.rb
 - lib/active_merchant/billing/gateways/jetpay.rb
+- lib/active_merchant/billing/gateways/jetpay_v2.rb
 - lib/active_merchant/billing/gateways/komoju.rb
 - lib/active_merchant/billing/gateways/kushki.rb
 - lib/active_merchant/billing/gateways/latitude19.rb