payola-payments 1.4.0 → 1.5.0

data/app/assets/stylesheets/payola/application.css

@@ -3,12 +3,12 @@
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
  *= require_tree .
  *= require_self

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

@@ -3,7 +3,7 @@ module Payola
     extend ActiveSupport::Concern
 
     included do
-      before_filter :find_affiliate
+      before_action :find_affiliate
     end
 
     def find_affiliate

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

@@ -3,7 +3,7 @@ module Payola
     extend ActiveSupport::Concern
 
     def render_payola_status(object)
-      render nothing: true, status: 404 and return unless object
+      head :not_found and return unless object
 
       errors = ([object.error.presence] + object.errors.full_messages).compact.to_sentence
 

data/app/controllers/payola/application_controller.rb

@@ -1,5 +1,13 @@
 module Payola
   class ApplicationController < ::ApplicationController
     helper PriceHelper
+
+    private
+
+    def return_to
+      return params[:return_to] if params[:return_to]
+      request.headers["Referer"] or raise ActionController::RedirectBackError
+    end
+
   end
 end

data/app/controllers/payola/cards_controller.rb

@@ -1,24 +1,26 @@
 module Payola
   class CardsController < ApplicationController
-  
-    before_filter :check_modify_permissions, only: [:create, :destroy]
-    
+
+    before_action :check_modify_permissions, only: [:create, :destroy]
+
     def create
       if params[:customer_id].present? && params[:stripeToken].present?
         Payola::CreateCard.call(params[:customer_id], params[:stripeToken])
-        redirect_to return_to, notice: "Succesfully created new card"
+        flash_options = { notice: t('payola.cards.created') }
       else
-        redirect_to return_to, alert: "Could not create new card"
-      end  
+        flash_options = { alert: t('payola.cards.not_created') }
+      end
+      redirect_to return_to, flash: flash_options
     end
 
     def destroy
       if params[:id].present? && params[:customer_id].present?
         Payola::DestroyCard.call(params[:id], params[:customer_id])
-        redirect_to return_to, notice: "Succesfully removed the card"
+        flash_options = { notice: t('payola.cards.destroyed') }
       else
-        redirect_to return_to, alert: "Could not remove the card"
-      end  
+        flash_options = { alert: t('payola.cards.not_destroyed') }
+      end
+      redirect_to return_to, flash: flash_options
     end
 
     private
@@ -27,14 +29,12 @@ module Payola
       if self.respond_to?(:payola_can_modify_customer?)
         redirect_to(
           return_to,
-          alert: "You cannot modify this customer."
+          alert: t('payola.cards.not_authorized')
         ) and return unless self.payola_can_modify_customer?(params[:customer_id])
+      else
+        raise NotImplementedError.new("Please implement ApplicationController#payola_can_modify_customer?")
       end
     end
 
-    def return_to
-      params[:return_to] || :back
-    end
-
   end
 end

data/app/controllers/payola/customers_controller.rb

@@ -1,20 +1,21 @@
 module Payola
   class CustomersController < ApplicationController
-     
-    before_filter :check_modify_permissions, only: [:update]
- 
+
+    before_action :check_modify_permissions, only: [:update]
+
     def update
       if params[:id].present?
         Payola::UpdateCustomer.call(params[:id], customer_params)
-        redirect_to return_to, notice: "Succesfully updated customer"
+        flash_options = { notice: t('payola.customers.updated') }
       else
-        redirect_to return_to, alert: "Could not update customer"
-      end  
+        flash_options = { alert: t('payola.customers.not_updated') }
+      end
+      redirect_to return_to, flash: flash_options
     end
 
     private
 
-    # Only including default_source for now, though other attributes can be used 
+    # Only including default_source for now, though other attributes can be used
     # (https://stripe.com/docs/api#update_customer)
     def customer_params
       params.require(:customer).permit(:default_source)
@@ -24,14 +25,12 @@ module Payola
       if self.respond_to?(:payola_can_modify_customer?)
         redirect_to(
           return_to,
-          alert: "You cannot modify this customer."
+          alert: t('payola.customers.not_authorized')
         ) and return unless self.payola_can_modify_customer?(params[:id])
+      else
+        raise NotImplementedError.new("Please implement ApplicationController#payola_can_modify_customer?")
       end
     end
 
-    def return_to
-      params[:return_to] || :back
-    end
-
   end
 end

data/app/controllers/payola/subscriptions_controller.rb

@@ -4,8 +4,8 @@ module Payola
     include Payola::StatusBehavior
     include Payola::AsyncBehavior
 
-    before_filter :find_plan_coupon_and_quantity, only: [:create, :change_plan]
-    before_filter :check_modify_permissions, only: [:destroy, :change_plan, :change_quantity, :update_card]
+    before_action :find_plan_coupon_and_quantity, only: [:create, :change_plan]
+    before_action :check_modify_permissions, only: [:destroy, :change_plan, :change_quantity, :update_card]
 
     def show
       show_object(Subscription)
@@ -21,15 +21,15 @@ module Payola
 
     def destroy
       subscription = Subscription.find_by!(guid: params[:guid])
-      Payola::CancelSubscription.call(subscription, at_period_end: ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(params[:at_period_end]))
+      Payola::CancelSubscription.call(subscription, at_period_end: to_boolean(params[:at_period_end]))
       redirect_to confirm_subscription_path(subscription)
     end
 
     def change_plan
       @subscription = Subscription.find_by!(guid: params[:guid])
-      Payola::ChangeSubscriptionPlan.call(@subscription, @plan)
+      Payola::ChangeSubscriptionPlan.call(@subscription, @plan, @quantity)
 
-      confirm_with_message("Subscription plan updated")
+      confirm_with_message(t('payola.subscriptions.plan_updated'))
     end
 
     def change_quantity
@@ -37,14 +37,14 @@ module Payola
       @subscription = Subscription.find_by!(guid: params[:guid])
       Payola::ChangeSubscriptionQuantity.call(@subscription, @quantity)
 
-      confirm_with_message("Subscription quantity updated")
+      confirm_with_message(t('payola.subscriptions.quantity_updated'))
     end
 
     def update_card
       @subscription = Subscription.find_by!(guid: params[:guid])
       Payola::UpdateCard.call(@subscription, params[:stripeToken])
 
-      confirm_with_message("Card updated")
+      confirm_with_message(t('payola.subscriptions.card_updated'))
     end
 
     private
@@ -76,8 +76,10 @@ module Payola
       if self.respond_to?(:payola_can_modify_subscription?)
         redirect_to(
           confirm_subscription_path(subscription),
-          alert: "You cannot modify this subscription."
+          alert: t('payola.subscriptions.not_authorized')
         ) and return unless self.payola_can_modify_subscription?(subscription)
+      else
+        raise NotImplementedError.new("Please implement ApplicationController#payola_can_modify_subscription?")
       end
     end
 
@@ -89,5 +91,11 @@ module Payola
       end
     end
 
+    TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE', 'on', 'ON'].to_set
+
+    def to_boolean(value)
+      TRUE_VALUES.include?(value)
+    end
+
   end
 end

data/app/controllers/payola/transactions_controller.rb

@@ -4,7 +4,7 @@ module Payola
     include Payola::StatusBehavior
     include Payola::AsyncBehavior
 
-    before_filter :find_product_and_coupon, only: [:create]
+    before_action :find_product_and_coupon, only: [:create]
 
     def show
       show_object(Sale)

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

@@ -14,7 +14,8 @@ module Payola
 
       before_create :create_stripe_plan, if: -> { Payola.create_stripe_plans }
 
-      has_many :subscriptions, :class_name => "Payola::Subscription"
+      has_many :subscriptions, :class_name => "Payola::Subscription", as: :plan,
+        dependent: :restrict_with_exception
 
       Payola.register_subscribable(self)
     end

data/app/models/payola/subscription.rb

@@ -101,8 +101,13 @@ module Payola
       self.canceled_at          = Time.at(stripe_sub.canceled_at) if stripe_sub.canceled_at
       self.quantity             = stripe_sub.quantity
       self.stripe_status        = stripe_sub.status
+      self.amount               = stripe_sub.plan.amount
+      self.currency             = stripe_sub.plan.respond_to?(:currency) ? stripe_sub.plan.currency : Payola.default_currency
       self.cancel_at_period_end = stripe_sub.cancel_at_period_end
 
+      # Support for discounts is added to stripe-ruby-mock in v2.2.0, 84f08eb
+      self.coupon               = stripe_sub.discount && stripe_sub.discount.coupon.id if stripe_sub.respond_to?(:discount)
+
       self.save!
       self
     end

data/app/services/payola/cancel_subscription.rb

@@ -2,15 +2,16 @@ module Payola
   class CancelSubscription
     def self.call(subscription, options = {})
       secret_key = Payola.secret_key_for_sale(subscription)
-      Stripe.api_key = secret_key
       customer = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key)
-      customer.subscriptions.retrieve(subscription.stripe_id,secret_key).delete(options,secret_key)
+      customer.subscriptions.retrieve(subscription.stripe_id, secret_key).delete(options, secret_key)
       
-      unless options[:at_period_end] == true
+      if options[:at_period_end] == true
+        # Store that the subscription will be canceled at the end of the billing period
+        subscription.update_attributes(cancel_at_period_end: true)
+      else
+        # Cancel the subscription immediately
         subscription.cancel!
       end
     end
-
   end
 end
-

data/app/services/payola/change_subscription_plan.rb

@@ -1,6 +1,6 @@
 module Payola
   class ChangeSubscriptionPlan
-    def self.call(subscription, plan, coupon_code = nil)
+    def self.call(subscription, plan, quantity = 1, coupon_code = nil)
       secret_key = Payola.secret_key_for_sale(subscription)
       old_plan = subscription.plan
 
@@ -9,9 +9,11 @@ module Payola
         sub.plan = plan.stripe_id
         sub.prorate = should_prorate?(subscription, plan, coupon_code)
         sub.coupon = coupon_code if coupon_code.present?
+        sub.quantity = quantity
         sub.save
 
         subscription.plan = plan
+        subscription.quantity = quantity
         subscription.save!
 
         subscription.instrument_plan_changed(old_plan)

data/app/services/payola/change_subscription_quantity.rb

@@ -13,7 +13,7 @@ module Payola
         subscription.quantity = quantity
         subscription.save!
 
-        subscription.instrument_plan_changed(old_quantity)
+        subscription.instrument_quantity_changed(old_quantity)
 
       rescue RuntimeError, Stripe::StripeError => e
         subscription.errors[:base] << e.message

data/app/services/payola/create_sale.rb

@@ -5,13 +5,23 @@ module Payola
       affiliate = params[:affiliate]
       coupon    = params[:coupon]
 
+      if params[:stripe_customer_id].present?
+        customer = Stripe::Customer.retrieve(params[:stripe_customer_id], Payola.secret_key)
+        email = customer.email
+        token = customer.default_source
+      else
+        email = params[:stripeEmail]
+        token = params[:stripeToken]
+      end
+
       Payola::Sale.new do |s|
         s.product = product
-        s.email = params[:stripeEmail]
-        s.stripe_token = params[:stripeToken]
+        s.email = email
+        s.stripe_token = token
         s.affiliate_id = affiliate.try(:id)
         s.currency = product.respond_to?(:currency) ? product.currency : Payola.default_currency
         s.signed_custom_fields = params[:signed_custom_fields]
+        s.stripe_customer_id = customer.id if customer
 
         if coupon
           s.coupon = coupon

data/app/services/payola/create_subscription.rb

@@ -5,7 +5,7 @@ module Payola
       affiliate = params[:affiliate]
 
       if params[:stripe_customer_id].present?
-        customer = Stripe::Customer.retrieve(params[:stripe_customer_id])
+        customer = Stripe::Customer.retrieve(params[:stripe_customer_id], Payola.secret_key)
         email = customer.email
       else
         email = params[:stripeEmail]

data/app/services/payola/start_subscription.rb

@@ -73,7 +73,15 @@ module Payola
       if stripe_customer_id
         # Retrieve the customer from Stripe and use it for this subscription
         customer = Stripe::Customer.retrieve(stripe_customer_id, secret_key)
-        return customer unless customer.try(:deleted)
+
+        unless customer.try(:deleted)
+          if customer.default_source.nil? && subscription.stripe_token.present?
+            customer.source = subscription.stripe_token
+            customer.save
+          end
+
+          return customer
+        end
       end
 
       if subscription.plan.amount > 0 and not subscription.stripe_token.present?

data/app/services/payola/update_customer.rb

@@ -3,7 +3,7 @@ module Payola
     def self.call(stripe_customer_id, options)
       secret_key = Payola.secret_key
       customer = Stripe::Customer.retrieve(stripe_customer_id, secret_key)
-      customer.save(options)
+      customer.save(options.to_h)
     end
   end
 end

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

@@ -1,4 +1,5 @@
 <%
+  quantity = local_assigns.fetch :quantity, 1
   button_class = local_assigns.fetch :button_class, 'stripe-button-el'
   button_text = local_assigns.fetch :button_text, "Update Plan"
 %>
@@ -6,5 +7,6 @@
 <%= 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 %>
+  <%= hidden_field_tag 'quantity', quantity %>
   <%= button_tag button_text, class: button_class %>
 <% end %>

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

@@ -27,7 +27,7 @@
   form_id = "#{button_id}-form"
 
   currency = plan.respond_to?(:currency) ? plan.currency : Payola.default_currency
-  tax_percent = local_assigns.fetch(:tax_percent, Payola.default_tax_percent).to_i
+  tax_percent = local_assigns.fetch(:tax_percent, Payola.default_tax_percent).to_f.round(2)
   stripe_customer_id = local_assigns.fetch(:stripe_customer_id, nil)
 
   error_div_id = local_assigns.fetch :error_div_id, ''

data/app/views/payola/transactions/_checkout.html.erb

@@ -16,6 +16,7 @@
   billing_address = local_assigns.fetch :billing_address, false
   shipping_address = local_assigns.fetch :shipping_address, false
   bitcoin = local_assigns.fetch :bitcoin, false
+  stripe_customer_id = local_assigns.fetch :stripe_customer_id, nil
 
   sale = Payola::Sale.new(product: sellable)
 
@@ -52,7 +53,8 @@
     verify_zip_code: verify_zip_code,
     billing_address: billing_address,
     shipping_address: shipping_address,
-    bitcoin: bitcoin
+    bitcoin: bitcoin,
+    stripe_customer_id: stripe_customer_id
   }
 
   raw_data[:signed_custom_fields] = sale.verifier.generate(custom_fields) if custom_fields
@@ -73,6 +75,6 @@
     <span class="payola-checkout-button-spinner" style="display: none; <%= button_inner_style %>">Please wait...</span>
   </button>
   <% if show_default_error_div %>
-    <div class="payola-error-target" style="display:none", id="<%= error_div_id %>"></div>
+    <div class="payola-error-target" style="display: none;" id="<%= error_div_id %>"></div>
   <% end %>
 <% end %>

data/config/locales/en.yml

@@ -0,0 +1,17 @@
+en:
+  payola:
+    cards:
+      created: Successfully created new card
+      not_created: Could not create new card
+      destroyed: Successfully removed the card
+      not_destroyed: Could not remove the card
+      not_authorized: You cannot modify this customer.
+    customers:
+      updated: Successfully updated customer
+      not_updated: Could not update customer
+      not_authorized: You cannot modify this customer.
+    subscriptions:
+      plan_updated: Subscription plan updated
+      quantity_updated: Subscription quantity updated
+      card_updated: Card updated
+      not_authorized: You cannot modify this subscription.

data/db/migrate/20151205004838_change_tax_percent_format_in_payola_subscriptions.rb

@@ -0,0 +1,9 @@
+class ChangeTaxPercentFormatInPayolaSubscriptions < ActiveRecord::Migration
+  def up
+    change_column :payola_subscriptions, :tax_percent, :decimal, :precision => 4, :scale => 2
+  end
+
+  def down
+    change_column :payola_subscriptions, :tax_percent, :integer
+  end
+end