unlock_paypal 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a65af1d4188b89aa50c67dcc27c45faf92639877
-  data.tar.gz: 046a70f4f37e4ced378dadbd33c690f89b220f33
+  metadata.gz: 80e9846b30eeb857dd6329b9adf7c0d5772c113b
+  data.tar.gz: 3f6e20da6ee1328bb230a0978bf1790890c88a33
 SHA512:
-  metadata.gz: e1e1b0a34cd69bac567592935806c230036cb351ac3cbc64fd761c52daa6e5436dc5a2a18f7538eae20f05589d5db431a00ae859ec51f2b25a9a84ebcab8f8d3
-  data.tar.gz: 7a360f2fefd6280b508b559f709aebee7303da7c45343383088af76108609d0c16c439df52088abc9d7d316982812c16accef9ffc1e5996ec7411ed978d2eb96
+  metadata.gz: b176fdda696c8db7a35a002922af84e9d7d49e65236820a4f0d4be00219d193d96514689b583ce0333495ff30f8a21b00b665e4525af84d444f2f2e069e468f1
+  data.tar.gz: 014c37227571cc76b7b7a5aef4bb0768227f9e450330c93a098455dbba0996518aa3246f86826976a7f263a0fa0c84b3b6314a094d4291e4e6e0a5149b8e85af

data/app/controllers/unlock_paypal/contributions_controller.rb

@@ -52,49 +52,27 @@ class UnlockPaypal::ContributionsController < ::ApplicationController
     @contribution.gateway_data["ipn_url"] = details.ipn_url
     @contribution.gateway_data["agreed"] = details.agreed?
     @contribution.save!
-    paypal = PayPal::Recurring.new({
+    recurring = PayPal::Recurring.new({
+      ipn_url: details.ipn_url,
+      description: details.description,
+      amount: details.amount,
+      currency: details.currency,
+      frequency: 1,
       token: params[:token],
+      period: :monthly,
       payer_id: params[:PayerID],
-      description: details.description,
-      amount:  details.amount,
-      currency: details.currency
+      start_at: Time.now,
+      failed: 3,
+      outstanding: :next_billing
     }.merge(@contribution.paypal_auth))
-    payment = paypal.request_payment
-    if payment.approved? && payment.completed?
-      recurring = PayPal::Recurring.new({
-        ipn_url: details.ipn_url,
-        description: details.description,
-        amount: details.amount,
-        currency: details.currency,
-        frequency: 1,
-        token: params[:token],
-        period: :monthly,
-        payer_id: params[:PayerID],
-        start_at: Time.now,
-        failed: 3,
-        outstanding: :next_billing
-      }.merge(@contribution.paypal_auth))
-      profile = recurring.create_recurring_profile
-      if profile.valid? && profile.profile_id.present? && profile.status == "ActiveProfile"
-        profile_data = {}
-        profile_data["profile_id"] = profile.profile_id
-        profile_data["profile_status"] = profile.status
-        @contribution.update gateway_data: @contribution.gateway_data.merge(profile_data)
-        @contribution.activate!
-        return redirect_to initiative_contribution_path(@initiative.id, @contribution)
-      else
-        if payment.errors.size > 0
-          payment.errors.each do |error|
-            error[:messages].each do |message|
-              @contribution.errors.add(:base, "#{error[:code]} #{message} (PayPal)")
-            end
-          end
-        else
-          error = t('flash.actions.create.alert', resource_name: @contribution.class.model_name.human)
-          @contribution.errors.add(:base, "#{error} (PayPal - create_recurring_profile)")
-        end
-        return render '/initiatives/contributions/new'
-      end
+    profile = recurring.create_recurring_profile
+    if profile.valid? && profile.profile_id.present? && profile.status == "ActiveProfile"
+      profile_data = {}
+      profile_data["profile_id"] = profile.profile_id
+      profile_data["profile_status"] = profile.status
+      @contribution.update gateway_data: @contribution.gateway_data.merge(profile_data)
+      @contribution.activate!
+      return redirect_to initiative_contribution_path(@initiative.id, @contribution)
     else
       if payment.errors.size > 0
         payment.errors.each do |error|
@@ -104,7 +82,7 @@ class UnlockPaypal::ContributionsController < ::ApplicationController
         end
       else
         error = t('flash.actions.create.alert', resource_name: @contribution.class.model_name.human)
-        @contribution.errors.add(:base, "#{error} (PayPal - request_payment)")
+        @contribution.errors.add(:base, "#{error} (PayPal - create_recurring_profile)")
       end
       return render '/initiatives/contributions/new'
     end

data/lib/unlock_paypal/version.rb

@@ -1,3 +1,3 @@
 module UnlockPaypal
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unlock_paypal
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Daniel Weinmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails