payola-payments 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 090fead9a7f25882ede8a67d5d6838ac806a8eb2
-  data.tar.gz: 6e679e1f803897af7c7a41b459b1db6dfa5f1479
+  metadata.gz: 09b8e76fdaef1aec8962ac64e436a9b578fd78af
+  data.tar.gz: bc890a26821355bbb8d58b9e98814ab0f4e609a8
 SHA512:
-  metadata.gz: ee0d82de19027fc019b8dc1646e619ac1042d7a3bbe58899da628e19370c1fb98834bee37b85b674b5a30857b8a7b5f87738509e3424b7eee9607696f0dd4464
-  data.tar.gz: 43ea81aebd4eded6a5ad94a7a4fb798396260627da5648dc8541844b51be8b70d9fe8a615919415271acaba2d3c0295f72d831892812421252c73dee3b52ad9e
+  metadata.gz: 0716e1222343a26dae355bfed19b2b817f42141cb707573b00599930f01bde231f0ee4b2a3f7eb0d625b755121778bc86641aab08a7a147d4b26d16ae6358dcb
+  data.tar.gz: 95d657b2c1e81e7c5dcbf565008145cc26cd4ed6ab9ae25536a43f7431448943b557559fc623b852ac04e7d499dd691d135f656e5989a1b4ea4ca7a272280864

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

@@ -1,6 +1,6 @@
 var PayolaCheckout = {
     initialize: function() {
-        $(document).on('click', '.payola-checkout-button', function(e) {
+        $('.payola-checkout-button').on('click', function(e) {
             e.preventDefault();
             PayolaCheckout.handleCheckoutButtonClick($(this));
         });
@@ -32,7 +32,6 @@ var PayolaCheckout = {
 
     tokenHandler: function(token, options) {
         var form = $("#" + options.form_id);
-        console.log(options.form_id);
         form.append($('<input type="hidden" name="stripeToken">').val(token.id));
         form.append($('<input type="hidden" name="stripeEmail">').val(token.email));
         if (options.signed_custom_fields) {
@@ -47,7 +46,7 @@ var PayolaCheckout = {
             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); }
+            error: function(data) { PayolaCheckout.showError(jQuery.parseJSON(data.responseText).error, options); }
         });
     },
 
@@ -80,8 +79,13 @@ var PayolaCheckout = {
             type: "GET",
             url: options.base_path + "/status/" + guid,
             success: handler,
-            error: handler
+            error: function(xhr){ handler(jQuery.parseJSON(xhr.responseText)) }
         });
     }
 };
-$(function() { PayolaCheckout.initialize(); });
+
+if ('undefined' !== typeof Turbolinks) {
+    $(document).on('page:change', PayolaCheckout.initialize);
+} else {
+    $(document).ready(PayolaCheckout.initialize);
+}

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

@@ -1,6 +1,6 @@
 var PayolaPaymentForm = {
     initialize: function() {
-        $(document).on('submit', '.payola-payment-form', function() {
+        $('.payola-payment-form').on('submit', function() {
             return PayolaPaymentForm.handleSubmit($(this));
         });
     },
@@ -34,7 +34,7 @@ var PayolaPaymentForm = {
                 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); }
+                error: function(data) { PayolaPaymentForm.showError(form, jQuery.parseJSON(data.responseText).error); }
             });
         }
     },
@@ -58,7 +58,9 @@ var PayolaPaymentForm = {
 
     showError: function(form, message) {
         $('.payola-spinner').hide();
-        form.find(':submit').prop('disabled', false);
+        $(form).find(':submit')
+               .prop('disabled', false)
+               .trigger('error', message);
         var error_selector = form.data('payola-error-selector');
         if (error_selector) {
             $(error_selector).text(message);
@@ -72,4 +74,8 @@ var PayolaPaymentForm = {
     }
 };
 
-$(function() { PayolaPaymentForm.initialize(); } );
+if ('undefined' !== typeof Turbolinks) {
+    $(document).on('page:change', PayolaPaymentForm.initialize);
+} else {
+    $(document).ready(PayolaPaymentForm.initialize);
+}

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

@@ -1,6 +1,6 @@
 var PayolaSubscriptionCheckout = {
     initialize: function() {
-        $(document).on('click', '.payola-subscription-checkout-button', function(e) {
+        $('.payola-subscription-checkout-button').on('click', function(e) {
             e.preventDefault();
             PayolaSubscriptionCheckout.handleCheckoutButtonClick($(this));
         });
@@ -10,44 +10,55 @@ var PayolaSubscriptionCheckout = {
         var form = button.parent('form');
         var options = form.data();
 
-        var handler = StripeCheckout.configure({
-            key: options.publishable_key,
-            image: options.plan_image_path,
-            token: function(token) { PayolaSubscriptionCheckout.tokenHandler(token, options); },
-            name: options.name,
-            description: options.description,
-            amount: options.price,
-            panelLabel: options.panel_label,
-            allowRememberMe: options.allow_remember_me,
-            zipCode: options.verify_zip_code,
-            billingAddress: options.billing_address,
-            shippingAddress: options.shipping_address,
-            currency: options.currency,
-            email: options.email || undefined
-        });
+        if (options.stripe_customer_id) {
+          // If an existing Stripe customer id is specified, don't open the Stripe Checkout - just AJAX submit the form
+          PayolaSubscriptionCheckout.submitForm(form.attr('action'), { stripe_customer_id: options.stripe_customer_id }, options);
+        } else {
+          // Open a Stripe Checkout to collect the customer's billing details
+          var handler = StripeCheckout.configure({
+              key: options.publishable_key,
+              image: options.plan_image_path,
+              token: function(token) { PayolaSubscriptionCheckout.tokenHandler(token, options); },
+              name: options.name,
+              description: options.description,
+              amount: options.price+(options.price*(options.tax_percent/100)),
+              panelLabel: options.panel_label,
+              allowRememberMe: options.allow_remember_me,
+              zipCode: options.verify_zip_code,
+              billingAddress: options.billing_address,
+              shippingAddress: options.shipping_address,
+              currency: options.currency,
+              email: options.email || undefined
+          });
 
-        handler.open();
+          handler.open();
+        }
     },
 
     tokenHandler: function(token, options) {
         var form = $("#" + options.form_id);
-        console.log(options.form_id);
         form.append($('<input type="hidden" name="stripeToken">').val(token.id));
         form.append($('<input type="hidden" name="stripeEmail">').val(token.email));
         form.append($('<input type="hidden" name="quantity">').val(options.quantity));
+        form.append($('<input type="hidden" name="coupon">').val(options.coupon));
+        form.append($('<input type="hidden" name="tax_percent">').val(options.tax_percent));
         if (options.signed_custom_fields) {
           form.append($('<input type="hidden" name="signed_custom_fields">').val(options.signed_custom_fields));
         }
 
+        PayolaSubscriptionCheckout.submitForm(form.attr('action'), form.serialize(), options);
+    },
+
+    submitForm: function(url, data, options) {
         $(".payola-subscription-checkout-button").prop("disabled", true);
         $(".payola-subscription-checkout-button-text").hide();
         $(".payola-subscription-checkout-button-spinner").show();
         $.ajax({
             type: "POST",
-            url: form.attr('action'),
-            data: form.serialize(),
+            url: url,
+            data: data,
             success: function(data) { PayolaSubscriptionCheckout.poll(data.guid, 60, options); },
-            error: function(data) { PayolaSubscriptionCheckout.showError(data.responseJSON.error, options); }
+            error: function(data) { PayolaSubscriptionCheckout.showError(jQuery.parseJSON(data.responseText).error, options); }
         });
     },
 
@@ -55,7 +66,8 @@ var PayolaSubscriptionCheckout = {
         var error_div = $("#" + options.error_div_id);
         error_div.html(error);
         error_div.show();
-        $(".payola-subscription-checkout-button").prop("disabled", false);
+        $(".payola-subscription-checkout-button").prop("disabled", false)
+                                                 .trigger("error", error);
         $(".payola-subscription-checkout-button-spinner").hide();
         $(".payola-subscription-checkout-button-text").show();
     },
@@ -80,8 +92,13 @@ var PayolaSubscriptionCheckout = {
             type: "GET",
             url: options.base_path + "/subscription_status/" + guid,
             success: handler,
-            error: handler
+            error: function(xhr) { handler(jQuery.parseJSON(xhr.responseText)) }
         });
     }
 };
-$(function() { PayolaSubscriptionCheckout.initialize(); });
+
+if ('undefined' !== typeof Turbolinks) {
+    $(document).on('page:change', PayolaSubscriptionCheckout.initialize);
+} else {
+    $(document).ready(PayolaSubscriptionCheckout.initialize);
+}

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

@@ -1,12 +1,12 @@
 var PayolaOnestepSubscriptionForm = {
     initialize: function() {
-        $(document).on('submit', '.payola-onestep-subscription-form', function() {
+        $('.payola-onestep-subscription-form').on('submit', function() {
             return PayolaOnestepSubscriptionForm.handleSubmit($(this));
         });
     },
 
     handleSubmit: function(form) {
-        $(':submit').prop('disabled', true);
+        $(form).find(':submit').prop('disabled', true);
         $('.payola-spinner').show();
         Stripe.card.createToken(form, function(status, response) {
             PayolaOnestepSubscriptionForm.stripeResponseHandler(form, status, response);
@@ -40,7 +40,7 @@ var PayolaOnestepSubscriptionForm = {
                 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); }
+                error: function(data) { PayolaOnestepSubscriptionForm.showError(form, jQuery.parseJSON(data.responseText).error); }
             });
         }
     },
@@ -57,7 +57,7 @@ var PayolaOnestepSubscriptionForm = {
             }
         };
         var errorHandler = function(jqXHR){
-            PayolaOnestepSubscriptionForm.showError(form, jqXHR.responseJSON.error);
+            PayolaOnestepSubscriptionForm.showError(form, jQuery.parseJSON(jqXHR.responseText).error);
         };
 
         $.ajax({
@@ -71,7 +71,10 @@ var PayolaOnestepSubscriptionForm = {
 
     showError: function(form, message) {
         $('.payola-spinner').hide();
-        $(':submit').prop('disabled', false);
+        $(form).find(':submit')
+               .prop('disabled', false)
+               .trigger('error', message);
+
         var error_selector = form.data('payola-error-selector');
         if (error_selector) {
             $(error_selector).text(message);
@@ -87,4 +90,8 @@ var PayolaOnestepSubscriptionForm = {
     }
 };
 
-$(function() { PayolaOnestepSubscriptionForm.initialize() } );
+if ('undefined' !== typeof Turbolinks) {
+    $(document).on('page:change', PayolaOnestepSubscriptionForm.initialize);
+} else {
+    $(document).ready(PayolaOnestepSubscriptionForm.initialize);
+}

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

@@ -0,0 +1,97 @@
+var PayolaRegistrationForm = {
+    initialize: function() {
+        $('.payola-register-form').on('submit', function(e) {
+            e.preventDefault();
+            return PayolaRegistrationForm.handleSubmit($(this));
+        });
+    },
+
+    handleSubmit: function(form) {
+        $(form).find(':submit').prop('disabled', true);
+        $('.payola-spinner').show();
+        PayolaRegistrationForm.makeCustomer(form);
+        return false;
+    },
+
+    // Could be more DRY
+    makeCustomer: function(form) {
+
+        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="[user]plan_id">').val(plan_id));
+        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="stripeEmail">').val(email));
+        form.append($('<input type="hidden" name="coupon">').val(coupon));
+        form.append($('<input type="hidden" name="quantity">').val(quantity));
+        form.append(PayolaRegistrationForm.authenticityTokenInput());
+
+        $.ajax({
+            type: "POST",
+            url: action,
+            data: form.serialize(),
+            success: function(data) { PayolaRegistrationForm.poll(form, 60, data.guid, base_path); },
+            error: function(data) { PayolaRegistrationForm.showError(form, jQuery.parseJSON(data.responseText).error); }
+        });
+    },
+
+    poll: function(form, num_retries_left, guid, base_path) {
+        if (num_retries_left === 0) {
+            PayolaRegistrationForm.showError(form, "This seems to be taking too long. Please contact support and give them transaction ID: " + guid);
+        }
+        var handler = function(data) {
+            if (data.status === "active") {
+                form.append($('<input type="hidden" name="payola_subscription_guid"></input>').val(guid));
+                form.append(PayolaRegistrationForm.authenticityTokenInput());
+                form.get(0).submit();
+            } else {
+                setTimeout(function() { PayolaRegistrationForm.poll(form, num_retries_left - 1, guid, base_path); }, 500);
+            }
+        };
+        var errorHandler = function(jqXHR){
+          var responseJSON = jQuery.parseJSON(jqXHR.responseText);
+          if(responseJSON.status === "errored"){
+            PayolaRegistrationForm.showError(form, responseJSON.error);
+          }
+        };
+
+        $.ajax({
+            type: 'GET',
+            dataType: 'json',
+            url: base_path + '/subscription_status/' + guid,
+            success: handler,
+            error: errorHandler
+        });
+    },
+
+    showError: function(form, message) {
+        $('.payola-spinner').hide();
+        $(form).find(':submit').prop('disabled', false);
+        var error_selector = form.data('payola-error-selector');
+        if (error_selector) {
+            $(error_selector).text(message);
+            $(error_selector).show();
+        } else {
+            form.find('.payola-payment-error').text(message);
+            form.find('.payola-payment-error').show();
+        }
+    },
+
+    authenticityTokenInput: function() {
+        return $('<input type="hidden" name="authenticity_token"></input>').val($('meta[name="csrf-token"]').attr("content"));
+    }
+};
+
+if ('undefined' !== typeof Turbolinks) {
+    $(document).on('page:change', PayolaRegistrationForm.initialize);
+} else {
+    $(document).ready(PayolaRegistrationForm.initialize);
+}

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

@@ -1,12 +1,12 @@
 var PayolaSubscriptionForm = {
     initialize: function() {
-        $(document).on('submit', '.payola-subscription-form', function() {
+        $('.payola-subscription-form').on('submit', function() {
             return PayolaSubscriptionForm.handleSubmit($(this));
         });
     },
 
     handleSubmit: function(form) {
-        $(':submit').prop('disabled', true);
+        $(form).find(':submit').prop('disabled', true);
         $('.payola-spinner').show();
         Stripe.card.createToken(form, function(status, response) {
             PayolaSubscriptionForm.stripeResponseHandler(form, status, response);
@@ -37,7 +37,7 @@ var PayolaSubscriptionForm = {
                 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); }
+                error: function(data) { PayolaSubscriptionForm.showError(form, jQuery.parseJSON(data.responseText).error); }
             });
         }
     },
@@ -56,8 +56,9 @@ var PayolaSubscriptionForm = {
             }
         };
         var errorHandler = function(jqXHR){
-          if(jqXHR.responseJSON.status === "errored"){
-            PayolaSubscriptionForm.showError(form, jqXHR.responseJSON.error);
+          var responseJSON = jQuery.parseJSON(jqXHR.responseText);
+          if(responseJSON.status === "errored"){
+            PayolaSubscriptionForm.showError(form, responseJSON.error);
           }
         };
 
@@ -72,7 +73,9 @@ var PayolaSubscriptionForm = {
 
     showError: function(form, message) {
         $('.payola-spinner').hide();
-        $(':submit').prop('disabled', false);
+        $(form).find(':submit')
+               .prop('disabled', false)
+               .trigger('error', message);
         var error_selector = form.data('payola-error-selector');
         if (error_selector) {
             $(error_selector).text(message);
@@ -88,4 +91,8 @@ var PayolaSubscriptionForm = {
     }
 };
 
-$(function() { PayolaSubscriptionForm.initialize() } );
+if ('undefined' !== typeof Turbolinks) {
+    $(document).on('page:change', PayolaSubscriptionForm.initialize);
+} else {
+    $(document).ready(PayolaSubscriptionForm.initialize);
+}

data/app/controllers/payola/cards_controller.rb

@@ -0,0 +1,40 @@
+module Payola
+  class CardsController < ApplicationController
+  
+    before_filter :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"
+      else
+        redirect_to return_to, alert: "Could not create new card"
+      end  
+    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"
+      else
+        redirect_to return_to, alert: "Could not remove the card"
+      end  
+    end
+
+    private
+
+    def check_modify_permissions
+      if self.respond_to?(:payola_can_modify_customer?)
+        redirect_to(
+          return_to,
+          alert: "You cannot modify this customer."
+        ) and return unless self.payola_can_modify_customer?(params[:customer_id])
+      end
+    end
+
+    def return_to
+      params[:return_to] || :back
+    end
+
+  end
+end