active_paypal_adaptive_payment 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0 0.3.3 (16/Nov/11)
+
+  - add functionality to allow a user to redirect to the correct URL
+    when creating a pre-approval request. In addition, the
+    setup_purchase now allows for the preapproval_key to be submitted
+    and passed along to paypal. (LeviRosol (<https://github.com/LeviRosol>))
+
+## 0.3.2
+
+  - build_adaptive_payment_details_request pay_key fix.
+
+## 0.3.1
+
+  - Add Support of ExecutePayment.
+
 ## 0.3.0
 
   - IPN implemeted

data/README.md

@@ -104,6 +104,8 @@ xml request, raw json response and the URL of the endpoint.
 * Jose Pablo Barrantes (<http://jpablobr.com/>)
 * Zarne Dravitzki (<http://github.com/zarno>)
 * LeviRosol (<https://github.com/LeviRosol>)
+* Florian95 (<https://github.com/Florian95>)
+* akichatov (<https://github.com/akichatov>)
 
 ## Other previous contributors where some code was taken from.
 

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

@@ -28,6 +28,7 @@ module ActiveMerchant #:nodoc:
       end
 
 	    self.test_redirect_url= "https://www.sandbox.paypal.com/webscr?cmd=_ap-payment&paykey="
+      self.test_redirect_pre_approval_url= "https://www.sandbox.paypal.com/webscr?cmd=_ap-preapproval&preapprovalkey="
       self.supported_countries = ['US']
       self.homepage_url = 'http://x.com/'
       self.display_name = 'Paypal Adaptive Payments'
@@ -54,19 +55,6 @@ module ActiveMerchant #:nodoc:
         commit('ExecutePayment', build_adaptive_execute_payment_request(options))
       end
 
-      # Send a preapproval request to pay pal
-      #
-      # ==== Options
-      #
-      # * +:end_date+ - _xs:datetime_ The ending date
-      # * +:start_date+ - _xs:datetime_ The start date (defaults: current)
-      # * +:max_amount+ - _xs:decimal_ The preapproved maximum total amount of all payments.
-      # * +:currency_code+ - The currency code (defaults: USD)
-      # * +:cancel_url+ - URL to redirect the sender’s browser to after canceling the preapproval
-      # * +:return_url+ - URL to redirect the sender’s browser to after the sender has logged into PayPal and confirmed the preapproval
-      # * +:notify_url+ - The URL to which you want all IPN messages for this preapproval to be sent. (Optional)
-      #
-      # To get more details on fields see +Paypal PreApproval API+ at https://www.x.com/docs/DOC-1419
       def preapprove_payment(options)
         commit('Preapproval', build_preapproval_payment(options))
       end
@@ -87,7 +75,6 @@ module ActiveMerchant #:nodoc:
         test? ? EMBEDDED_FLOW_TEST_URL : EMBEDDED_FLOW_LIVE_URL
       end
 
-      #debug method, provides an easy to use debug method for the class
       def debug
         "Url: #{@url}\n\n Request: #{@xml} \n\n Response: #{@response.json}"
       end
@@ -104,10 +91,12 @@ module ActiveMerchant #:nodoc:
             x.errorLanguage opts[:error_language] ||= 'en_US'
           end
           x.actionType 'PAY'
+          x.preapprovalKey opts[:preapproval_key] if opts.key?(:preapproval_key)
           x.senderEmail opts[:sender_email] if opts.key?(:sender_email)
           x.cancelUrl opts[:cancel_url]
           x.returnUrl opts[:return_url]
-          x.ipnNotificationUrl opts[:ipn_notification_url] if opts[:ipn_notification_url]
+          x.ipnNotificationUrl opts[:ipn_notification_url] if
+            opts[:ipn_notification_url]
           x.memo opts[:memo] if opts.key?(:memo)
           x.custom opts[:custom] if opts.key?(:custom)
           x.feesPayer opts[:fees_payer] if opts[:fees_payer]
@@ -119,12 +108,15 @@ module ActiveMerchant #:nodoc:
                 x.email receiver[:email]
                 x.amount receiver[:amount].to_s
                 x.primary receiver[:primary] if receiver.key?(:primary)
-                x.paymentType receiver[:payment_type] if receiver.key?(:payment_type)
-                x.invoiceId receiver[:invoice_id] if receiver.key?(:invoice_id)
+                x.paymentType receiver[:payment_type] if
+                  receiver.key?(:payment_type)
+                x.invoiceId receiver[:invoice_id] if
+                  receiver.key?(:invoice_id)
               end
             end
           end
-          x.reverseAllParallelPaymentsOnError opts[:reverse_all_parallel_payments_on_error] || 'false'
+          x.reverseAllParallelPaymentsOnError(
+            opts[:reverse_all_parallel_payments_on_error] || 'false')
           x.trackingId opts[:tracking_id] if opts[:tracking_id]
          end
       end
@@ -206,20 +198,24 @@ module ActiveMerchant #:nodoc:
           x.requestEnvelope do |x|
             x.detailLevel 'ReturnAll'
             x.errorLanguage opts[:error_language] ||= 'en_US'
-            x.senderEmail opts[:senderEmail]
+            x.senderEmail opts[:senderEmail] if opts.has_key?(:senderEmail)
           end
 
           # required preapproval fields
           x.endingDate opts[:end_date].strftime("%Y-%m-%dT%H:%M:%S")
           x.startingDate opts[:start_date].strftime("%Y-%m-%dT%H:%M:%S")
           x.maxTotalAmountOfAllPayments opts[:max_amount]
-          x.maxNumberOfPayments opts[:maxNumberOfPayments] if opts.has_key?(:maxNumberOfPayments)
+          x.maxAmountPerPayment opts[:maxAmountPerPayment] if opts.has_key?(:maxAmountPerPayment)
+          x.memo opts[:memo] if opts.has_key?(:memo)
+          x.maxNumberOfPayments opts[:maxNumberOfPayments] if
+            opts.has_key?(:maxNumberOfPayments)
           x.currencyCode options[:currency_code]
           x.cancelUrl opts[:cancel_url]
           x.returnUrl opts[:return_url]
 
           # notify url
-          x.ipnNotificationUrl opts[:notify_url] if opts.has_key?(:notify_url)
+          x.ipnNotificationUrl opts[:notify_url] if
+            opts.has_key?(:notify_url)
         end
       end
 
@@ -233,7 +229,8 @@ module ActiveMerchant #:nodoc:
             x.errorLanguage options[:error_language] ||= 'en_US'
           end
           x.preapprovalKey options[:preapproval_key]
-          x.getBillingAddress options[:get_billing_address] if options[:get_billing_address]
+          x.getBillingAddress options[:get_billing_address] if
+            options[:get_billing_address]
         end
       end
 
@@ -303,7 +300,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def test?
-        Base.gateway_mode == :test
+        @config[:test] || Base.gateway_mode == :test
       end
 
       def action_url(action)

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

@@ -4,7 +4,10 @@ module ActiveMerchant
       def self.included(base)
         base.cattr_accessor :test_redirect_url
         base.cattr_accessor :live_redirect_url
+        base.cattr_accessor :test_redirect_pre_approval_url
+        base.cattr_accessor :live_redirect_pre_approval_url
         base.live_redirect_url = 'https://www.paypal.com/webscr?cmd=_ap-payment&paykey='
+        base.live_redirect_pre_approval_url = 'https://www.paypal.com/webscr?cmd=_ap-preapproval&preapprovalkey='
       end
 
       def redirect_url
@@ -14,6 +17,15 @@ module ActiveMerchant
       def redirect_url_for(token)
         redirect_url + token
       end
+
+      def redirect_pre_approval_url
+        test? ? test_redirect_pre_approval_url : live_redirect_pre_approval_url
+      end
+
+      def redirect_pre_approval_url_for(token)
+        redirect_pre_approval_url + token
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_paypal_adaptive_payment
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &6854140 !ruby/object:Gem::Requirement
+  requirement: &13666840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *6854140
+  version_requirements: *13666840
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &6852040 !ruby/object:Gem::Requirement
+  requirement: &13666260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *6852040
+  version_requirements: *13666260
 - !ruby/object:Gem::Dependency
   name: rash
-  requirement: &6850760 !ruby/object:Gem::Requirement
+  requirement: &13665520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *6850760
+  version_requirements: *13665520
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &6847440 !ruby/object:Gem::Requirement
+  requirement: &13664660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *6847440
+  version_requirements: *13664660
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &6843600 !ruby/object:Gem::Requirement
+  requirement: &13663900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *6843600
+  version_requirements: *13663900
 description: ! '    This library is meant to interface with PayPal''s Adaptive Payment
   Gateway.
 
@@ -115,3 +115,4 @@ signing_key:
 specification_version: 3
 summary: ActiveMercant PayPal Adaptive Payment Library
 test_files: []
+has_rdoc: