payola-payments 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b22da0af6dd975621942e21d8cbb0c53d9313b7
-  data.tar.gz: 0f417cc9ddcdc23fc2cb9b3a7a930489269ba320
+  metadata.gz: 247fe7a59796463c2fe0ed750a5ca659eb76423b
+  data.tar.gz: 5c42d5a2a48234a91d33e0f6bf9c250fc1cc412b
 SHA512:
-  metadata.gz: f3cca9d9ff83f689ef48d576c8c13469f0770c3f4b8da64b99a0a7751c688bb7add4de4bf042678bf4a8b88d44e66a9c933dfdb0586af49247dcc9261be34fac
-  data.tar.gz: e18f346ba5cb2a0ba01399535b9ad32f413c5afce3ea93a75754b57c42627449fb83b9df3db9c32722c113eeec524fb75bd2c3b76a53d48a05f60e651e1f28f9
+  metadata.gz: 68fbf08cf3771d397a60ce0918cd7ab0b2db98ac981b32fa3d80140651ec558c65eb40f42cff32a37ff88f444d10acad8b207c1179e06624cb06a9bcae40d5d6
+  data.tar.gz: 5343de6dd80fb7357678a70fcac9f30bc0806903e1a83f08a6ec7dc66aa48463356f87c964caa19b11e0da1c1f9e5ec14cbd482fc764ae8ba79d5b76efd41b20

data/app/assets/javascripts/payola/checkout_button.js

@@ -65,7 +65,7 @@ var PayolaCheckout = {
             return;
         }
 
-        $.get(options.base_path + "/status/" + guid, function(data) {
+        var handler = function(data) {
             if (data.status === "finished") {
                 window.location = options.base_path + "/confirm/" + guid;
             } else if (data.status === "errored") {
@@ -73,6 +73,13 @@ var PayolaCheckout = {
             } else {
                 setTimeout(function() { PayolaCheckout.poll(guid, num_retries_left - 1, options); }, 500);
             }
+        };
+
+        $.ajax({
+            type: "GET",
+            url: options.base_path + "/status/" + guid,
+            success: handler,
+            error: handler
         });
     }
 };

data/app/assets/javascripts/payola/subscription_form_onestep.js

@@ -20,20 +20,24 @@ var PayolaOnestepSubscriptionForm = {
         } else {
             var email = form.find("[data-payola='email']").val();
             var coupon = form.find("[data-payola='coupon']").val();
+            var quantity = form.find("[data-payola='quantity']").val();
 
             var base_path = form.data('payola-base-path');
             var plan_type = form.data('payola-plan-type');
             var plan_id = form.data('payola-plan-id');
 
+            var action = $(form).attr('action');
+
             form.append($('<input type="hidden" name="plan_type">').val(plan_type));
             form.append($('<input type="hidden" name="plan_id">').val(plan_id));
             form.append($('<input type="hidden" name="stripeToken">').val(response.id));
             form.append($('<input type="hidden" name="stripeEmail">').val(email));
             form.append($('<input type="hidden" name="coupon">').val(coupon));
+            form.append($('<input type="hidden" name="quantity">').val(quantity));
             form.append(PayolaOnestepSubscriptionForm.authenticityTokenInput());
             $.ajax({
                 type: "POST",
-                url: form.action,
+                url: action,
                 data: form.serialize(),
                 success: function(data) { PayolaOnestepSubscriptionForm.poll(form, 60, data.guid, base_path); },
                 error: function(data) { PayolaOnestepSubscriptionForm.showError(form, data.responseJSON.error); }
@@ -45,7 +49,7 @@ var PayolaOnestepSubscriptionForm = {
         if (num_retries_left === 0) {
             PayolaOnestepSubscriptionForm.showError(form, "This seems to be taking too long. Please contact support and give them transaction ID: " + guid);
         }
-        $.get(base_path + '/subscription_status/' + guid, function(data) {
+        var handler = function(data) {
             if (data.status === "active") {
                 window.location = base_path + '/confirm_subscription/' + guid;
             } else if (data.status === "errored") {
@@ -53,6 +57,13 @@ var PayolaOnestepSubscriptionForm = {
             } else {
                 setTimeout(function() { PayolaOnestepSubscriptionForm.poll(form, num_retries_left - 1, guid, base_path); }, 500);
             }
+        };
+
+        $.ajax({
+            type: 'GET',
+            url: base_path + '/subscription_status/' + guid,
+            success: handler,
+            error: handler
         });
     },
 

data/app/assets/javascripts/payola/subscription_form_twostep.js

@@ -20,6 +20,7 @@ var PayolaSubscriptionForm = {
         } else {
             var email = form.find("[data-payola='email']").val();
             var coupon = form.find("[data-payola='coupon']").val();
+            var quantity = form.find("[data-payola='quantity']").val();
 
             var base_path = form.data('payola-base-path');
             var plan_type = form.data('payola-plan-type');
@@ -29,6 +30,7 @@ var PayolaSubscriptionForm = {
             data_form.append($('<input type="hidden" name="stripeToken">').val(response.id));
             data_form.append($('<input type="hidden" name="stripeEmail">').val(email));
             data_form.append($('<input type="hidden" name="coupon">').val(coupon));
+            data_form.append($('<input type="hidden" name="quantity">').val(quantity));
             data_form.append(PayolaSubscriptionForm.authenticityTokenInput());
             $.ajax({
                 type: "POST",
@@ -44,7 +46,7 @@ var PayolaSubscriptionForm = {
         if (num_retries_left === 0) {
             PayolaSubscriptionForm.showError(form, "This seems to be taking too long. Please contact support and give them transaction ID: " + guid);
         }
-        $.get(base_path + '/subscription_status/' + guid, function(data) {
+        var handler = function(data) {
             if (data.status === "active") {
                 form.append($('<input type="hidden" name="payola_subscription_guid"></input>').val(guid));
                 form.append(PayolaSubscriptionForm.authenticityTokenInput());
@@ -54,6 +56,13 @@ var PayolaSubscriptionForm = {
             } else {
                 setTimeout(function() { PayolaSubscriptionForm.poll(form, num_retries_left - 1, guid, base_path); }, 500);
             }
+        };
+
+        $.ajax({
+            type: 'GET',
+            url: base_path + '/subscription_status/' + guid,
+            success: handler,
+            error: handler
         });
     },
 

data/app/controllers/concerns/payola/async_behavior.rb

@@ -16,11 +16,20 @@ module Payola
     end
 
     def create_object(object_class, object_creator_class, object_processor_class, product_key, product)
-      create_params = params.permit!.merge(
-        product_key => product,
-        coupon: @coupon,
-        affiliate: @affiliate
-      )
+      create_params = if object_class == Subscription
+        params.permit!.merge(
+          product_key => product,
+          coupon: @coupon,
+          quantity: @quantity,
+          affiliate: @affiliate
+        )
+      else
+        params.permit!.merge(
+          product_key => product,
+          coupon: @coupon,
+          affiliate: @affiliate
+        )
+      end
 
       object = object_creator_class.call(create_params)
 

data/app/controllers/payola/subscriptions_controller.rb

@@ -4,8 +4,8 @@ module Payola
     include Payola::StatusBehavior
     include Payola::AsyncBehavior
 
-    before_filter :find_plan_and_coupon, only: [:create, :change_plan]
-    before_filter :check_modify_permissions, only: [:destroy, :change_plan, :update_card]
+    before_filter :find_plan_coupon_and_quantity, only: [:create, :change_plan]
+    before_filter :check_modify_permissions, only: [:destroy, :change_plan, :change_quantity, :update_card]
 
     def show
       show_object(Subscription)
@@ -32,6 +32,14 @@ module Payola
       confirm_with_message("Subscription plan updated")
     end
 
+    def change_quantity
+      find_quantity
+      @subscription = Subscription.find_by!(guid: params[:guid])
+      Payola::ChangeSubscriptionQuantity.call(@subscription, @quantity)
+
+      confirm_with_message("Subscription quantity updated")
+    end
+
     def update_card
       @subscription = Subscription.find_by!(guid: params[:guid])
       Payola::UpdateCard.call(@subscription, params[:stripeToken])
@@ -41,9 +49,10 @@ module Payola
 
     private
 
-    def find_plan_and_coupon
+    def find_plan_coupon_and_quantity
       find_plan
       find_coupon
+      find_quantity
     end
 
     def find_plan
@@ -58,6 +67,10 @@ module Payola
       @coupon = cookies[:cc] || params[:cc] || params[:coupon_code] || params[:coupon]
     end
 
+    def find_quantity
+      @quantity = params[:quantity].blank? ? 1 : params[:quantity].to_i
+    end
+
     def check_modify_permissions
       subscription = Subscription.find_by!(guid: params[:guid])
       if self.respond_to?(:payola_can_modify_subscription?)

data/app/controllers/payola/transactions_controller.rb

@@ -35,7 +35,7 @@ module Payola
     def find_coupon
       coupon_code = cookies[:cc] || params[:cc] || params[:coupon_code]
       @coupon = Coupon.where('lower(code) = lower(?)', coupon_code).first
-      if @coupon
+      if @coupon && @coupon.active?
         cookies[:cc] = coupon_code
         @price = @product.price * (1 - @coupon.percent_off / 100.0)
       else

data/app/models/concerns/payola/plan.rb

@@ -12,7 +12,7 @@ module Payola
 
       validates_uniqueness_of :stripe_id
 
-      before_save :create_stripe_plan, on: :create
+      before_create :create_stripe_plan
 
       has_many :subscriptions, :class_name => "Payola::Subscription"
 

data/app/models/payola/subscription.rb

@@ -20,7 +20,7 @@ module Payola
 
     include AASM
 
-    attr_accessor :old_plan
+    attr_accessor :old_plan, :old_quantity
 
     aasm column: 'state', skip_validation_on_save: true do
       state :pending, initial: true
@@ -116,6 +116,12 @@ module Payola
       Payola.instrument(instrument_key('plan_changed', false), self)
     end
 
+    def instrument_quantity_changed(old_quantity)
+      self.old_quantity = old_quantity
+      Payola.instrument(instrument_key('quantity_changed'), self)
+      Payola.instrument(instrument_key('quantity_changed', false), self)
+    end
+
     def redirector
       plan
     end

data/app/services/payola/change_subscription_quantity.rb

@@ -0,0 +1,25 @@
+module Payola
+  class ChangeSubscriptionQuantity
+    def self.call(subscription, quantity)
+      secret_key = Payola.secret_key_for_sale(subscription)
+      old_quantity = subscription.quantity
+
+      begin
+        customer = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key)
+        sub = customer.subscriptions.retrieve(subscription.stripe_id)
+        sub.quantity = quantity
+        sub.save
+
+        subscription.quantity = quantity
+        subscription.save!
+
+        subscription.instrument_plan_changed(old_quantity)
+
+      rescue RuntimeError, Stripe::StripeError => e
+        subscription.errors[:base] << e.message
+      end
+
+      subscription
+    end
+  end
+end

data/app/services/payola/charge_card.rb

@@ -22,10 +22,14 @@ module Payola
     end
 
     def self.create_customer(sale, secret_key)
-      Stripe::Customer.create({
-        card: sale.stripe_token,
-        email: sale.email
-      }, secret_key)
+      if sale.stripe_customer_id.present?
+        Stripe::Customer.retrieve(sale.stripe_customer_id, secret_key)
+      else
+        Stripe::Customer.create({
+          card: sale.stripe_token,
+          email: sale.email
+        }, secret_key)
+      end
     end
 
     def self.create_charge(sale, customer, secret_key)

data/app/services/payola/create_subscription.rb

@@ -13,6 +13,7 @@ module Payola
         s.coupon = params[:coupon]
         s.signed_custom_fields = params[:signed_custom_fields]
         s.setup_fee = params[:setup_fee]
+        s.quantity = params[:quantity]
 
         s.owner = owner
         s.amount = plan.amount

data/app/services/payola/start_subscription.rb

@@ -1,35 +1,42 @@
 module Payola
   class StartSubscription
+    attr_reader :subscription, :secret_key
+    
     def self.call(subscription)
       subscription.save!
       secret_key = Payola.secret_key_for_sale(subscription)
 
+      new(subscription, secret_key).run
+    end
+
+    def initialize(subscription, secret_key)
+      @subscription = subscription
+      @secret_key = secret_key
+    end
+
+    def run
       begin
         subscription.verify_charge!
 
+        customer = find_or_create_customer
+
         create_params = {
-          card:  subscription.stripe_token,
-          email: subscription.email,
-          plan:  subscription.plan.stripe_id,
+          plan: subscription.plan.stripe_id,
+          quantity: subscription.quantity
         }
         create_params[:coupon] = subscription.coupon if subscription.coupon.present?
-        create_params[:account_balance] = subscription.setup_fee if subscription.setup_fee.present?
-
-        customer = Stripe::Customer.create(create_params, secret_key)
+        stripe_sub = customer.subscriptions.create(create_params)
 
         card = customer.cards.data.first
         subscription.update_attributes(
-          stripe_id:          customer.subscriptions.data.first.id,
+          stripe_id:          stripe_sub.id,
           stripe_customer_id: customer.id,
           card_last4:         card.last4,
           card_expiration:    Date.new(card.exp_year, card.exp_month, 1),
           card_type:          card.respond_to?(:brand) ? card.brand : card.type
         )
         subscription.activate!
-      rescue Stripe::StripeError => e
-        subscription.update_attributes(error: e.message)
-        subscription.fail!
-      rescue RuntimeError => e
+      rescue Stripe::StripeError, RuntimeError => e
         subscription.update_attributes(error: e.message)
         subscription.fail!
       end
@@ -37,5 +44,34 @@ module Payola
       subscription
     end
 
+    def find_or_create_customer
+      subs = Subscription.where(owner: subscription.owner) if subscription.owner
+      if subs && subs.length > 1
+        first_sub = subs.first
+        customer_id = first_sub.stripe_customer_id
+        return Stripe::Customer.retrieve(customer_id, secret_key)
+      else
+        customer_create_params = {
+          card:  subscription.stripe_token,
+          email: subscription.email
+        }
+  
+        customer = Stripe::Customer.create(customer_create_params, secret_key)
+      end
+
+      if subscription.setup_fee.present?
+        plan = subscription.plan
+        description = plan.try(:setup_fee_description, subscription) || 'Setup Fee'
+        Stripe::InvoiceItem.create(
+          customer: customer.id,
+          amount: subscription.setup_fee,
+          currency: subscription.currency,
+          description: description
+        )
+      end
+
+      customer
+    end
   end
-end
+
+end

data/app/views/payola/subscriptions/_change_plan.html.erb

@@ -3,7 +3,7 @@
   button_text = local_assigns.fetch :button_text, "Update Plan"
 %>
 
-<%= form_for subscription, method: :post, url: change_subscription_plan(subscription) do |f| %>
+<%= form_for subscription, method: :post, url: payola.change_subscription_plan_path(subscription) do |f| %>
   <%= hidden_field_tag 'plan_class', new_plan.plan_class %>
   <%= hidden_field_tag 'plan_id', new_plan.id %>
   <%= button_tag button_text, class: button_class %>

data/config/database.yml.ci

@@ -0,0 +1,6 @@
+ test:
+   adapter: postgresql
+   database: app_test
+   pool: 5
+   username:
+   password:

data/config/routes.rb

@@ -8,6 +8,7 @@ Payola::Engine.routes.draw do
   match '/subscription_status/:guid'      => 'subscriptions#status',   via: :get,    as: :subscription_status
   match '/cancel_subscription/:guid'      => 'subscriptions#destroy',  via: :delete, as: :cancel_subscription
   match '/change_plan/:guid'              => 'subscriptions#change_plan', via: :post, as: :change_subscription_plan
+  match '/change_quantity/:guid'          => 'subscriptions#change_quantity', via: :post, as: :change_subscription_quantity
   match '/update_card/:guid'              => 'subscriptions#update_card', via: :post, as: :update_card
 
   mount StripeEvent::Engine => '/events'

data/db/migrate/20141213205847_add_active_to_payola_coupon.rb

@@ -0,0 +1,5 @@
+class AddActiveToPayolaCoupon < ActiveRecord::Migration
+  def change
+    add_column :payola_coupons, :active, :boolean, default: true
+  end
+end

data/lib/payola.rb

@@ -75,10 +75,10 @@ module Payola
       self.background_worker = nil
       self.event_filter = lambda { |event| event }
       self.charge_verifier = lambda { |event| true }
-      self.publishable_key = ENV['STRIPE_PUBLISHABLE_KEY']
-      self.secret_key = ENV['STRIPE_SECRET_KEY']
-      self.secret_key_retriever = lambda { |sale| Payola.secret_key }
-      self.publishable_key_retriever = lambda { |sale| Payola.publishable_key }
+      self.publishable_key = lambda { ENV['STRIPE_PUBLISHABLE_KEY'] }
+      self.secret_key = lambda { ENV['STRIPE_SECRET_KEY'] }
+      self.secret_key_retriever = lambda { |sale| Payola.secret_key.respond_to?(:call) ? Payola.secret_key.call() : Payola.secret_key  }
+      self.publishable_key_retriever = lambda { |sale| Payola.publishable_key.respond_to?(:call) ? Payola.publishable_key.call() : Payola.publishable_key }
       self.support_email = 'sales@example.com'
       self.default_currency = 'usd'
       self.sellables = {}

data/lib/payola/engine.rb

@@ -20,7 +20,7 @@ module Payola
 
     initializer :inject_helpers do |app|
       ActiveSupport.on_load :action_controller do
-        ::ApplicationController.send(:helper, Payola::PriceHelper)
+        ::ActionController::Base.send(:helper, Payola::PriceHelper)
       end
 
       ActiveSupport.on_load :action_mailer do