payola-payments 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d521cb632f52fe32dbb63dd06926fd551fb0f44b
-  data.tar.gz: 6c9f77ab172e04d2b89cb4fe8c257ec2ae4efcb7
+  metadata.gz: 4c4d4f9f5bd8ecf269a31f484690a7fdd910e39d
+  data.tar.gz: 4caf45459de1c9d0913cd6c025d86cf96ea805aa
 SHA512:
-  metadata.gz: a27328550b968b7824f42f91b8fafe9562cf9fef30bc5b482e752aa83f2822f396664579ed3983ead027b577863a81cc4c464bcc22a6c7e1bb3a51720824c34b
-  data.tar.gz: 1fe5bcdc56753e6887a1bd70cc8465bd4c1fb807be1c6802b7e6258ee76c4f076f2dab9cb9a53a437459204ffaf45fed790c459bd03f12665779280de08a4340
+  metadata.gz: 14920d40f2f7d4ebaeadfc6e34c75dea86a277eecf3d2f0e44f6e85e2106a0ef16e63f90b32fb2adec4099137572950f2a64e2882259e01d3ac0898b49e61118
+  data.tar.gz: 598088dfc2c1a12c955e801522ff2ec8c21c04846971df7f399635b5eee9f1e14ac9b32f5d5d570993975269fe8accfe57977555763ea39608aa517d780e6a23

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

@@ -7,13 +7,13 @@ var PayolaCheckout = {
     },
 
     handleCheckoutButtonClick: function(button) {
-        form = button.parent('form');
-        options = form.data();
+        var form = button.parent('form');
+        var options = form.data();
 
         var handler = StripeCheckout.configure({
             key: options.publishable_key,
             image: options.product_image_path,
-            token: function(token) { PayolaCheckout.tokenHandler(token, options) },
+            token: function(token) { PayolaCheckout.tokenHandler(token, options); },
             name: options.name,
             description: options.description,
             amount: options.price,
@@ -45,8 +45,8 @@ var PayolaCheckout = {
             type: "POST",
             url: options.base_path + "/buy/" + options.product_class + "/" + options.product_permalink,
             data: form.serialize(),
-            success: function(data) { PayolaCheckout.poll(data.guid, 60, options) },
-            error: function(data) { PayolaCheckout.showError(data.responseJSON.error, options) }
+            success: function(data) { PayolaCheckout.poll(data.guid, 60, options); },
+            error: function(data) { PayolaCheckout.showError(data.responseJSON.error, options); }
         });
     },
 
@@ -60,7 +60,7 @@ var PayolaCheckout = {
     },
 
     poll: function(guid, num_retries_left, options) {
-        if (num_retries_left == 0) {
+        if (num_retries_left === 0) {
             PayolaCheckout.showError("This seems to be taking too long. Please contact support and give them transaction ID: " + guid, options);
             return;
         }
@@ -71,9 +71,9 @@ var PayolaCheckout = {
             } else if (data.status === "errored") {
                 PayolaCheckout.showError(data.error, options);
             } else {
-                setTimeout(function() { PayolaCheckout.poll(guid, num_retries_left - 1, options) }, 500);
+                setTimeout(function() { PayolaCheckout.poll(guid, num_retries_left - 1, options); }, 500);
             }
         });
     }
-}
-PayolaCheckout.initialize();
+};
+$(function() { PayolaCheckout.initialize(); });

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

@@ -34,15 +34,15 @@ var PayolaPaymentForm = {
                 type: "POST",
                 url: base_path + "/buy/" + product + "/" + permalink,
                 data: data_form.serialize(),
-                success: function(data) { PayolaPaymentForm.poll(form, 60, data.guid, base_path) },
-                error: function(data) { PayolaPaymentForm.showError(form, data.responseJSON.error) }
+                success: function(data) { PayolaPaymentForm.poll(form, 60, data.guid, base_path); },
+                error: function(data) { PayolaPaymentForm.showError(form, data.responseJSON.error); }
             });
         }
     },
 
     poll: function(form, num_retries_left, guid, base_path) {
-        if (num_retries_left == 0) {
-            PayolaPaymentForm.showError(form, "This seems to be taking too long. Please contact support and give them transaction ID: " + guid)
+        if (num_retries_left === 0) {
+            PayolaPaymentForm.showError(form, "This seems to be taking too long. Please contact support and give them transaction ID: " + guid);
         }
         $.get(base_path + '/status/' + guid, function(data) {
             if (data.status === "finished") {
@@ -52,7 +52,7 @@ var PayolaPaymentForm = {
             } else if (data.status === "errored") {
                 PayolaPaymentForm.showError(form, data.error);
             } else {
-                setTimeout(function() { PayolaPaymentForm.poll(form, num_retries_left - 1, guid, base_path) }, 500);
+                setTimeout(function() { PayolaPaymentForm.poll(form, num_retries_left - 1, guid, base_path); }, 500);
             }
         });
     },
@@ -68,4 +68,4 @@ var PayolaPaymentForm = {
     }
 };
 
-$(function() { PayolaPaymentForm.initialize() } );
+$(function() { PayolaPaymentForm.initialize(); } );

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

@@ -35,15 +35,15 @@ var PayolaSubscriptionForm = {
                 type: "POST",
                 url: base_path + "/subscribe/" + plan_type + "/" + plan_id,
                 data: data_form.serialize(),
-                success: function(data) { PayolaSubscriptionForm.poll(form, 60, data.guid, base_path) },
-                error: function(data) { PayolaSubscriptionForm.showError(form, data.responseJSON.error) }
+                success: function(data) { PayolaSubscriptionForm.poll(form, 60, data.guid, base_path); },
+                error: function(data) { PayolaSubscriptionForm.showError(form, data.responseJSON.error); }
             });
         }
     },
 
     poll: function(form, num_retries_left, guid, base_path) {
-        if (num_retries_left == 0) {
-            PayolaSubscriptionForm.showError(form, "This seems to be taking too long. Please contact support and give them transaction ID: " + guid)
+        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) {
             if (data.status === "active") {
@@ -53,7 +53,7 @@ var PayolaSubscriptionForm = {
             } else if (data.status === "errored") {
                 PayolaSubscriptionForm.showError(form, data.error);
             } else {
-                setTimeout(function() { PayolaSubscriptionForm.poll(form, num_retries_left - 1, guid, base_path) }, 500);
+                setTimeout(function() { PayolaSubscriptionForm.poll(form, num_retries_left - 1, guid, base_path); }, 500);
             }
         });
     },
@@ -71,4 +71,4 @@ var PayolaSubscriptionForm = {
     }
 };
 
-$(function() { PayolaSubscriptionForm.initialize() } );
+$(function() { PayolaSubscriptionForm.initialize(); } );

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

@@ -0,0 +1,17 @@
+module Payola
+  module AffiliateBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      before_filter :find_affiliate
+    end
+
+    def find_affiliate
+      affiliate_code = cookies[:aff] || params[:aff]
+      @affiliate = Affiliate.where('lower(code) = lower(?)', affiliate_code).first
+      if @affiliate
+        cookies[:aff] = affiliate_code
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Payola
+  module AsyncBehavior
+    extend ActiveSupport::Concern
+
+    def show_object(object_class)
+      object = object_class.find_by!(guid: params[:guid])
+      redirector = object.redirector
+
+      new_path = redirector.respond_to?(:redirect_path) ? redirector.redirect_path(object) : '/'
+      redirect_to new_path
+    end
+
+    def object_status(object_class)
+      object = object_class.find_by(guid: params[:guid])
+      render nothing: true, status: 404 and return unless object
+      render json: {guid: object.guid, status: object.state, error: object.error}
+    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
+      )
+
+      object = object_creator_class.call(create_params)
+
+      if object.save
+        Payola.queue!(object_processor_class, object.guid)
+        render json: { guid: object.guid }
+      else
+        render json: { error: object.errors.full_messages.join(". ") }, status: 400
+      end
+    end
+  end
+end

data/app/controllers/payola/subscriptions_controller.rb

@@ -1,37 +1,21 @@
 module Payola
   class SubscriptionsController < ApplicationController
-    before_filter :find_plan_and_coupon_and_affiliate, only: [:create, :change_plan]
+    include Payola::AffiliateBehavior
+    include Payola::AsyncBehavior
+
+    before_filter :find_plan_and_coupon, only: [:create, :change_plan]
     before_filter :check_modify_permissions, only: [:destroy, :change_plan, :update_card]
 
     def show
-      subscription = Subscription.find_by!(guid: params[:guid])
-      plan = subscription.plan
-
-      new_path = plan.respond_to?(:redirect_path) ? plan.redirect_path(subscription) : '/'
-      redirect_to new_path
+      show_object(Subscription)
     end
 
     def status
-      @subscription = Subscription.where(guid: params[:guid]).first
-      render nothing: true, status: 404 and return unless @subscription
-      render json: {guid: @subscription.guid, status: @subscription.state, error: @subscription.error}
+      object_status(Subscription)
     end
 
     def create
-      create_params = params.permit!.merge(
-        plan: @plan,
-        coupon: @coupon,
-        affiliate: @affiliate
-      )
-
-      @subscription = CreateSubscription.call(create_params)
-
-      if @subscription.save
-        Payola.queue!(Payola::ProcessSubscription, @subscription.guid)
-        render json: { guid: @subscription.guid }
-      else
-        render json: { error: @subscription.errors.full_messages.join(". ") }, status: 400
-      end
+      create_object(Subscription, CreateSubscription, ProcessSubscription, :plan, @plan)
     end
 
     def destroy
@@ -41,44 +25,36 @@ module Payola
     end
 
     def change_plan
-      subscription = Subscription.find_by!(guid: params[:guid])
-      Payola::ChangeSubscriptionPlan.call(subscription, @plan)
+      @subscription = Subscription.find_by!(guid: params[:guid])
+      Payola::ChangeSubscriptionPlan.call(@subscription, @plan)
 
-      if subscription.valid?
-        redirect_to confirm_subscription_path(subscription), notice: "Subscription plan updated"
-      else
-        redirect_to confirm_subscription_path(subscription), alert: subscription.errors.full_messages.to_sentence
-      end
+      confirm_with_message("Subscription plan updated")
     end
 
     def update_card
-      subscription = Subscription.find_by!(guid: params[:guid])
-      Payola::UpdateCard.call(subscription, params[:stripeToken])
+      @subscription = Subscription.find_by!(guid: params[:guid])
+      Payola::UpdateCard.call(@subscription, params[:stripeToken])
 
-      if subscription.valid?
-        redirect_to confirm_subscription_path(subscription), notice: "Card updated"
-      else
-        redirect_to confirm_subscription_path(subscription), alert: subscription.errors.full_messages.to_sentence
-      end
+      confirm_with_message("Card updated")
     end
 
     private
 
-    def find_plan_and_coupon_and_affiliate
+    def find_plan_and_coupon
+      find_plan
+      find_coupon
+    end
+
+    def find_plan
       @plan_class = Payola.subscribables[params[:plan_class]]
 
       raise ActionController::RoutingError.new('Not Found') unless @plan_class && @plan_class.subscribable?
 
       @plan = @plan_class.find_by!(id: params[:plan_id])
-      
-      @coupon = cookies[:cc] || params[:cc] || params[:coupon_code] || params[:coupon]
-
-      affiliate_code = cookies[:aff] || params[:aff]
-      @affiliate = Affiliate.where('lower(code) = lower(?)', affiliate_code).first
-      if @affiliate
-        cookies[:aff] = affiliate_code
-      end
+    end
 
+    def find_coupon
+      @coupon = cookies[:cc] || params[:cc] || params[:coupon_code] || params[:coupon]
     end
 
     def check_modify_permissions
@@ -90,5 +66,14 @@ module Payola
         ) and return unless self.payola_can_modify_subscription?(subscription)
       end
     end
+
+    def confirm_with_message(message)
+      if @subscription.valid?
+        redirect_to confirm_subscription_path(@subscription), notice: message
+      else
+        redirect_to confirm_subscription_path(@subscription), alert: @subscription.errors.full_messages.to_sentence
+      end
+    end
+
   end
 end

data/app/controllers/payola/transactions_controller.rb

@@ -1,47 +1,38 @@
 module Payola
   class TransactionsController < ApplicationController
-    before_filter :find_product_and_coupon_and_affiliate, only: [:create]
+    include Payola::AffiliateBehavior
+    include Payola::AsyncBehavior
 
-    def show
-      sale = Sale.find_by!(guid: params[:guid])
-      product = sale.product
+    before_filter :find_product_and_coupon, only: [:create]
 
-      new_path = product.respond_to?(:redirect_path) ? product.redirect_path(sale) : '/'
-      redirect_to new_path
+    def show
+      show_object(Sale)
     end
 
     def status
-      @sale = Sale.where(guid: params[:guid]).first
-      render nothing: true, status: 404 and return unless @sale
-      render json: {guid: @sale.guid, status: @sale.state, error: @sale.error}
+      object_status(Sale)
     end
 
     def create
-      create_params = params.permit!.merge(
-        product: @product,
-        coupon: @coupon,
-        affiliate: @affiliate
-      )
-
-      @sale = CreateSale.call(create_params)
-
-      if @sale.save
-        Payola.queue!(Payola::ProcessSale, @sale.guid)
-        render json: { guid: @sale.guid }
-      else
-        render json: { error: @sale.errors.full_messages.join(". ") }, status: 400
-      end
+      create_object(Sale, CreateSale, ProcessSale, :product, @product)
     end
 
     private
-    def find_product_and_coupon_and_affiliate
+    def find_product_and_coupon
+      find_product
+      find_coupon
+    end
+
+    def find_product
       @product_class = Payola.sellables[params[:product_class]]
 
       raise ActionController::RoutingError.new('Not Found') unless @product_class && @product_class.sellable?
 
       @product = @product_class.find_by!(permalink: params[:permalink])
-      coupon_code = cookies[:cc] || params[:cc] || params[:coupon_code]
+    end
 
+    def find_coupon
+      coupon_code = cookies[:cc] || params[:cc] || params[:coupon_code]
       @coupon = Coupon.where('lower(code) = lower(?)', coupon_code).first
       if @coupon
         cookies[:cc] = coupon_code
@@ -49,13 +40,6 @@ module Payola
       else
         @price = @product.price
       end
-
-      affiliate_code = cookies[:aff] || params[:aff]
-      @affiliate = Affiliate.where('lower(code) = lower(?)', affiliate_code).first
-      if @affiliate
-        cookies[:aff] = affiliate_code
-      end
-
     end
 
   end

data/app/mailers/payola/admin_mailer.rb

@@ -3,30 +3,22 @@ module Payola
     helper Payola::PriceHelper
 
     def receipt(sale_guid)
-      ActiveRecord::Base.connection_pool.with_connection do
-        @sale = Payola::Sale.find_by(guid: sale_guid)
-        @product = @sale.product
-        mail(from: Payola.support_email, to: Payola.support_email)
-      end
+      send_admin_mail(sale_guid)
     end
 
     def refund(sale_guid)
-      ActiveRecord::Base.connection_pool.with_connection do
-        @sale = Payola::Sale.find_by(guid: sale_guid)
-        @product = @sale.product
-        mail(from: Payola.support_email, to: Payola.support_email)
-      end
+      send_admin_mail(sale_guid)
     end
 
     def dispute(sale_guid)
-      ActiveRecord::Base.connection_pool.with_connection do
-        @sale = Payola::Sale.find_by(guid: sale_guid)
-        @product = @sale.product
-        mail(from: Payola.support_email, to: Payola.support_email)
-      end
+      send_admin_mail(sale_guid)
     end
 
     def failure(sale_guid)
+      send_admin_mail(sale_guid)
+    end
+
+    def send_admin_mail(sale_guid)
       ActiveRecord::Base.connection_pool.with_connection do
         @sale = Payola::Sale.find_by(guid: sale_guid)
         @product = @sale.product

data/app/mailers/payola/receipt_mailer.rb

@@ -9,6 +9,8 @@ module Payola
         @product = @sale.product
 
         if Payola.pdf_receipt
+          require 'docverter'
+
           pdf = Docverter::Conversion.run do |c|
             c.from = 'html'
             c.to = 'pdf'

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

@@ -0,0 +1,20 @@
+require 'active_support/concern'
+
+module Payola
+  module GuidBehavior
+    extend ActiveSupport::Concern
+    
+    included do
+      before_save :populate_guid
+      validates_uniqueness_of :guid
+    end
+
+    def populate_guid
+      if new_record?
+        while !valid? || self.guid.nil?
+          self.guid = Payola.guid_generator.call
+        end
+      end
+    end
+  end
+end