activemerchant 1.39.2 → 1.40.0

data/CHANGELOG

@@ -1,5 +1,11 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.40.0 (October 18th, 2013)
+
+* Paymill: Revert Add support for specifying the :customer [melari]
+* Quickpay: Make v7 of the API default [kvs]
+* Bitpay: Add return [tahnok]
+
 == Version 1.39.2 (October 10th, 2013)
 
 * Eway Rapid: Fix a bug with access codes that have equal signs in them [odorcic]

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

@@ -116,7 +116,6 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         post[:token] = card_token
         post[:description] = options[:description]
-        post[:client] = options[:customer]
         commit(:post, 'transactions', post)
       end
 

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

@@ -159,7 +159,7 @@ module ActiveMerchant #:nodoc:
       # Using the API-key, requires that you use version 4+. Specify :version => 4/5/6/7 in options.
       def initialize(options = {})
         requires!(options, :login, :password)
-        @protocol = options.delete(:version) || 3 # default to protocol version 3
+        @protocol = options.delete(:version) || 7 # default to protocol version 7
         super
       end
 

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

@@ -183,14 +183,14 @@ module ActiveMerchant #:nodoc:
           if options[:track_data]
             card[:swipe_data] = options[:track_data]
           else
-            card[:number] = creditcard
+            card = creditcard
           end
           post[:card] = card
         end
       end
 
       def add_customer(post, options)
-        post[:customer] = options[:customer] if options[:customer] && post[:card].blank?
+        post[:customer] = options[:customer] if options[:customer]
       end
 
       def add_flags(post, options)

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

@@ -48,6 +48,10 @@ 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?
+      end
+
       def json_error(raw_response)
         msg = 'Invalid response received from the WebPay API.  Please contact support@webpay.jp if you continue to receive this message.'
         msg += "  (The raw response returned by the API was #{raw_response.inspect})"

data/lib/active_merchant/billing/integrations/bit_pay.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/bit_pay/helper.rb'
 require File.dirname(__FILE__) + '/bit_pay/notification.rb'
+require File.dirname(__FILE__) + '/bit_pay/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -19,6 +20,10 @@ module ActiveMerchant #:nodoc:
         def self.helper(order, account, options = {})
           Helper.new(order, account, options)
         end
+
+        def self.return(query_string, options = {})
+          Return.new(query_string)
+        end
       end
     end
   end

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

@@ -34,7 +34,7 @@ module ActiveMerchant #:nodoc:
                                     :country  => 'buyerCountry'
 
           mapping :notify_url, 'notificationURL'
-          mapping :return_url, 'returnURL'
+          mapping :return_url, 'redirectURL'
           mapping :id, 'id'
 
           def generate_invoice_id

data/lib/active_merchant/billing/integrations/bit_pay/return.rb

@@ -0,0 +1,10 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module BitPay
+        class Return < ActiveMerchant::Billing::Integrations::Return
+	      end
+      end
+    end
+  end
+end

data/lib/active_merchant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.39.2
+  version: 1.40.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -403,6 +403,7 @@ files:
 - lib/active_merchant/billing/integrations/authorize_net_sim.rb
 - lib/active_merchant/billing/integrations/bit_pay/helper.rb
 - lib/active_merchant/billing/integrations/bit_pay/notification.rb
+- lib/active_merchant/billing/integrations/bit_pay/return.rb
 - lib/active_merchant/billing/integrations/bit_pay.rb
 - lib/active_merchant/billing/integrations/bogus/helper.rb
 - lib/active_merchant/billing/integrations/bogus/notification.rb

metadata.gz.sig

@@ -1,2 +1 @@
-W!���S�UDM^O�
-Tp�^����_����i~������ʐ�RjS���ǝ��<z�cN;���y�ţ��b.e�|�����9���&�
+����D�|xr`�
���}�^�]?D�؆������������sݸ�9���bY=jԜۄK�1I��n�'{�����u��&�i~�ܧ�BL��\�]7�CqZT�ö�!W4QO: �<>u9��a�