payola-payments 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09b8e76fdaef1aec8962ac64e436a9b578fd78af
-  data.tar.gz: bc890a26821355bbb8d58b9e98814ab0f4e609a8
+  metadata.gz: 23ef9ea875996e25766aa0560f06183bd084aeea
+  data.tar.gz: 735177781079c4dc153e9373ebfd8c6c1751dc8c
 SHA512:
-  metadata.gz: 0716e1222343a26dae355bfed19b2b817f42141cb707573b00599930f01bde231f0ee4b2a3f7eb0d625b755121778bc86641aab08a7a147d4b26d16ae6358dcb
-  data.tar.gz: 95d657b2c1e81e7c5dcbf565008145cc26cd4ed6ab9ae25536a43f7431448943b557559fc623b852ac04e7d499dd691d135f656e5989a1b4ea4ca7a272280864
+  metadata.gz: 81f1013db2d2ee0593cba32fdcc170ab0f35b5e849bdb815260b25c3811cfd5537a3654ee4e21ed879d44a11c24fbcd5a1ff7c83aa1cadea1de53867aaa4a8c9
+  data.tar.gz: 52d25e3d2ad2ffb3b44226dfc77ab92caaa1783d4657ebd48d994c11760998bed702c7a758e2c89c613bafe572f98855857980787d6b641be70cf2bae70b14fd

data/CHANGELOG.md

@@ -0,0 +1,200 @@
+# Payola Changelog
+
+Payola adheres to [Semantic Versioning](http://semver.org/).
+
+All notable changes to Payola will be documented in this file.
+
+## v1.5.0 - 2016-10-27
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.4.0...v1.5.0)
+
+### Security
+- Raise error if `payola_can_modify_customer/subscription?` unimplemented. #246
+
+### Enhancements
+- Unpegged Stripe gem and stripe-ruby-mock. #255
+- Take optional `stripe_customer_id` when creating a sale. #183
+- Clean up error target HTML attributes. #198
+- Update `cancel_at_period_end` in `CancelSubscription` service. #200
+- Synchronize subscription amount and currency fields with Stripe. #202
+- Send the `plan_id` along with the form submission. #206
+- Set a customer's payment source if nil. #210
+- Maintain the active coupon code on a subscription. #211
+- Disallow deleting a plan if it has any related subscriptions. #221
+- Flash message i18n. #229
+- Rails 5.0 support. #232
+- Add client side validation to subscription_form_onestep.js. #262
+
+### Bug Fixes
+- Stop setting `Stripe.api_key` directly in `CancelSubscription` service. #201
+- Convert tax_percent from integer to decimal (at most two decimal places). #189
+- Submit all subscription options for existing stripe customers. #207
+- Update subscription quantity when a subscription is changed. #218
+- Fix flash message typo 'Successfully'. #228
+- Make tax percentage migration reversible. #242
+- Call `instrument_quantity_changed` from `ChangeSubscriptionQuantity`. #250
+- Fix api_key String spec errors with stripe-ruby-mock 2.3.1. #261
+- Ensure ENV keys are seen as Strings by recent stripe-ruby versions. #265
+
+## v1.4.0 - 2016-01-28
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.3.2...v1.4.0)
+
+### Enhancements
+- Add a wrapper for the error function to pass xhr.responseJSON to checkout
+  buttons.
+- Support free trials and plans by allowing subscription creation without
+  credit card. #144, #145
+- Support cancelling subscription at period end. #146
+- Trigger `error` event on Payola HTML elements when an error occurs. #147
+- Allows coupon to be applied to changing subscription, and turns off prorating
+  in that scenario per Stripe instructions. #150
+- Support for subscription creation with trial_end and optional stripeToken. #151
+- Add config option to determine whether to create plans in Stripe. #156
+- Allow `Plan#trial_period_days` attribute to remain optional. #160
+- Accept tax percentage for subscriptions. #167
+- Functionality to manage multiple cards and update customer attributes. Includes optional authorization check `payola_can_modify_customer?`. #168
+- Optionally include checkout.stripe.com assets with `include_stripe_checkout_assets`. #169
+- Improve support for subscription `at_period_end`. #165
+- Support reusing existing Stripe customer for subscriptions. #170
+- Listen for customer.subscription.deleted webhooks and cancel the associated subscription. #172
+- Show plan interval in description instead of hardcoding to 'month'. #176
+- Support coupons in `subscriptions/_checkout` partial. #179
+- Allow sales to be refunded on the client side. #181
+- Introduce `return_to` to support custom return paths after customer/card actions. #180
+- `StartSubscription` no longer requires Stripe token for free plans. #190
+- Turbolinks compatibility. #191
+
+### Bug Fixes
+- Disable only Payola-related submit button(s) on page. #113
+- Fix jQuery XHR JSON error handling. #159
+- Ensure Payola.create_stripe_plans global gets set back to true. #164
+- Registration form no longer uses hardcoded `/users` path. #171
+- Remove debugging output in javascripts. #177
+- Remove weird copy of StartSubscription service specs. #178
+- Only cancel subscription in `SubscriptionDeleted` if it can be canceled. #186
+
+## v1.3.2 - 2015-05-18
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.3.1...v1.3.2)
+
+- Lock stripe-ruby-mock to v2.1.0 to work around test issues
+- Properly bubble subscription errors up to the user
+- Handle card declines
+- Add bitcoin option to checkout button
+- Move the Payola Pro message out of initializers
+
+## v1.3.1 - 2015-03-18
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.3.0...v1.3.1)
+
+- Fix a problem when creating subscription invoice payments
+- Peg Stripe gem at 1.20.1 pending a fix to rebelidealist/stripe-ruby-mock#203
+
+## v1.3.0 - 2015-02-28
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.2.7...v1.3.0)
+
+- Support Stripe API version 2015-02-18
+
+## v1.2.7 - 2015-02-28
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.2.6...v1.2.7)
+
+- Fix Javascript error handling for one-step subscriptions
+- Add some docs about events and turbolinks incompatibility
+- Support namespaced models for plans
+
+## v1.2.6 - 2015-01-26
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.2.5...v1.2.6)
+
+- Fix Javascript error handling for subscriptions
+
+## v1.2.5 - 2015-01-25
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.2.4...v1.2.5)
+
+- Capure all attributes from Stripe when starting a subscription
+- Allow for use of Checkout for Subscriptions
+- Only re-use active or canceled subscriptions
+- Make plan creation idempotent
+
+## v1.2.4 - 2015-01-06
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.2.3...v1.2.4)
+
+- Fix regressions in v1.2.3
+
+## v1.2.3 - 2015-01-03
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.2.2...v1.2.3)
+
+- Add support for Rails 4.2
+- Re-use customers and create invoice items for setup fees
+- Add an active flag on `Payola::Coupon`
+- Fix load-order problems
+- Add support for subscription quantities
+- Properly handle form errors
+
+## v1.2.2 - 2014-11-29
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.2.1...v1.2.2)
+
+- Optionally invert subscription controller flow
+- Fix the CSRF token behavior
+
+## v1.2.1 - 2014-11-20
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.2.0...v1.2.1)
+
+- Make guid generator overrideable
+- Bumped minimum version of AASM to 4.0
+- Fixed a bug with the auto emails not working for webhook events
+- Code cleanup
+- Test coverage improvements
+
+## v1.2.0 - 2014-11-17
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.1.4...v1.2.0)
+
+- Subscriptions
+
+## v1.1.4 - 2014-11-07
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.1.3...v1.1.4)
+
+- Pass the created customer to `additional_charge_attributes`
+- Add Payola Pro license
+
+## v1.1.3 - 2014-11-07
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.1.2...v1.1.3)
+
+- Add options for requesting billing and shipping addresses via Checkout
+- Add a callable to add additional attributes to a Stripe::Charge
+- Only talk about PDFs if PDFs are enabled
+
+## v1.1.2 - 2014-11-06
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.1.1...v1.1.2)
+
+- Default the `From` address on receipt emails to `Payola.support_email`
+
+## v1.1.1 - 2014-11-03
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.1.0...v1.1.1)
+
+- ActiveJob can't serialize a class or a symbol so we have to `to_s` them
+
+## v1.1.0 - 2014-11-03
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.0.8...v1.1.0)
+
+- Add customizable mailers
+- Pass currency through properly and add a `default_currency` config option
+- Use data attributes to set up the checkout button instead of a JS snippet
+- Add a polymorphic `owner` association on `Payola::Sale`.
+- Allow the price to be overridden on the Checkout form
+
+## v1.0.8 - 2014-10-27
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.0.7...v1.0.8)
+
+- Add basic support for custom forms
+- Allow passing signed data from checkout button into the charge verifier
+- Correctly pass the price into the Checkout button, which allows the `{{amount}}` macro to work properly
+- I18n the formatted_price helper
+
+## v1.0.7 - 2014-10-21
+[Full Changelog](https://github.com/peterkeen/payola/compare/v1.0.6...v1.0.7)
+
+- Add support for ActiveJob workers
+- Document how to set Stripe keys
+- Add a callback to fetch the publishable key
+- Unpin the Rails version to allow anything >= 4.1
+- Allow Payola to be mounted anywhere, as long as it has 'as: :payola' in the mount spec
+
+## v1.0.6 - 2014-10-19
+- First public release

data/LICENSE

@@ -0,0 +1,6 @@
+Copyright (c) Cora Street Press LLC
+
+Payola is an Open Source project licensed under the terms of
+the LGPLv3 license.  Please see <http://www.gnu.org/licenses/lgpl-3.0.html>
+for license text.
+

data/README.md

@@ -0,0 +1,80 @@
+# Payola
+
+[![Gem Version](https://badge.fury.io/rb/payola-payments.svg)](http://badge.fury.io/rb/payola-payments) [![CircleCI](https://circleci.com/gh/peterkeen/payola.svg?style=shield)](https://circleci.com/gh/peterkeen/payola) [![Code Climate](https://codeclimate.com/github/peterkeen/payola/badges/gpa.svg)](https://codeclimate.com/github/peterkeen/payola) [![Test Coverage](https://codeclimate.com/github/peterkeen/payola/badges/coverage.svg)](https://codeclimate.com/github/peterkeen/payola) [![Dependency Status](https://gemnasium.com/peterkeen/payola.svg)](https://gemnasium.com/peterkeen/payola)
+
+Payments with Stripe for your Rails application.
+
+## What does this do?
+
+Payola is a drop-in Rails engine that lets you sell one or more products by just including a module in your models. It includes:
+
+* An easy to embed, easy to customize, async Stripe Checkout button
+* Asynchronous payments, usable with any background processing system
+* Full webhook integration
+* Easy extension hooks for adding your own functionality
+* Customizable emails
+
+To see Payola in action, check out the site for [Mastering Modern Payments: Using Stripe with Rails](https://www.masteringmodernpayments.com). Read the book to find out the whys behind Payola's design.
+
+## Installation
+
+Add Payola to your Gemfile:
+
+```ruby
+gem 'payola-payments'
+```
+
+Run the installer:
+
+```bash
+$ rails g payola:install
+$ rake db:migrate
+```
+
+(**Note**: do not run `rake payola:install:migrations`. Payola's migrations live inside the gem and do not get copied into your application.)
+
+Optionally, tell Stripe about your application. Add this as a webhook in your [Stripe dashboard](https://dashboard.stripe.com/account/webhooks):
+
+```
+https://your.website.example.com/payola/events
+```
+
+### Disable Turbolinks
+
+Payola does not currently play nice with turbolinks. Disable it by removing the turbolinks include in your `application.js`.
+
+## Additional Setup Resources
+
+
+[One-time payments](https://github.com/peterkeen/payola/wiki/One-time-payments)
+
+[Configuration options](https://github.com/peterkeen/payola/wiki/Configuration-options)
+
+[Subscriptions](https://github.com/peterkeen/payola/wiki/Subscriptions)
+
+## TODO
+
+* Multiple subscriptions per customer
+* Affiliate tracking
+* Easy metered billing
+
+## License
+
+Please see the LICENSE file for licensing details.
+
+## Changelog
+
+Please see [CHANGELOG.md](CHANGELOG.md).
+
+## Contributing
+
+1. Fork the project
+2. Make your changes, including tests that exercise the code
+3. Summarize your changes in [CHANGELOG.md](CHANGELOG.md)
+4. Make a pull request
+
+Version announcements happen on the [Payola Payments Google group](https://groups.google.com/forum/#!forum/payola-payments) and [@payolapayments](https://twitter.com/payolapayments).
+
+## Author
+
+Pete Keen, [@zrail](https://twitter.com/zrail), [https://www.petekeen.net](https://www.petekeen.net)

data/Rakefile

@@ -10,14 +10,15 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Payola'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-Bundler::GemHelper.install_tasks
+load 'rails/tasks/statistics.rake'
+require 'bundler/gem_tasks'
 
 Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
@@ -25,6 +26,6 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
 
-task :default => :spec
+task default: :spec

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

@@ -2,12 +2,12 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
 //= require_tree .

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

@@ -10,24 +10,30 @@ var PayolaCheckout = {
         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); },
-            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,
-            bitcoin: options.bitcoin,
-            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
+          PayolaCheckout.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.product_image_path,
+              token: function(token) { PayolaCheckout.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,
+              bitcoin: options.bitcoin,
+              email: options.email || undefined
+          });
 
-        handler.open();
+          handler.open();
+        }
     },
 
     tokenHandler: function(token, options) {
@@ -38,13 +44,17 @@ var PayolaCheckout = {
           form.append($('<input type="hidden" name="signed_custom_fields">').val(options.signed_custom_fields));
         }
 
+        PayolaCheckout.submitForm(form.attr('action'), form.serialize(), options);
+    },
+
+    submitForm: function(url, data, options) {
         $(".payola-checkout-button").prop("disabled", true);
         $(".payola-checkout-button-text").hide();
         $(".payola-checkout-button-spinner").show();
         $.ajax({
             type: "POST",
-            url: options.base_path + "/buy/" + options.product_class + "/" + options.product_permalink,
-            data: form.serialize(),
+            url: url,
+            data: data,
             success: function(data) { PayolaCheckout.poll(data.guid, 60, options); },
             error: function(data) { PayolaCheckout.showError(jQuery.parseJSON(data.responseText).error, options); }
         });

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

@@ -12,7 +12,12 @@ var PayolaSubscriptionCheckout = {
 
         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);
+          PayolaSubscriptionCheckout.submitForm(form.attr('action'), {
+            stripe_customer_id: options.stripe_customer_id,
+            coupon: options.coupon,
+            tax_percent: options.tax_percent,
+            signed_custom_fields: options.signed_custom_fields || undefined
+          }, options);
         } else {
           // Open a Stripe Checkout to collect the customer's billing details
           var handler = StripeCheckout.configure({
@@ -39,6 +44,7 @@ var PayolaSubscriptionCheckout = {
         var form = $("#" + 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="plan_id">').val(options.plan_id));
         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));

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

@@ -6,6 +6,10 @@ var PayolaOnestepSubscriptionForm = {
     },
 
     handleSubmit: function(form) {
+        if (!PayolaOnestepSubscriptionForm.validateForm(form)) {
+            return false;
+        }
+
         $(form).find(':submit').prop('disabled', true);
         $('.payola-spinner').show();
         Stripe.card.createToken(form, function(status, response) {
@@ -14,6 +18,29 @@ var PayolaOnestepSubscriptionForm = {
         return false;
     },
 
+    validateForm: function(form) {
+        var cardNumber = $( "input[data-stripe='number']" ).val();
+        if (!Stripe.card.validateCardNumber(cardNumber)) {
+            PayolaOnestepSubscriptionForm.showError(form, 'The card number is not a valid credit card number.');
+            return false;
+        }
+
+        var expMonth = $("[data-stripe='exp_month']").val();
+        var expYear = $("[data-stripe='exp_year']").val();
+        if (!Stripe.card.validateExpiry(expMonth, expYear)) {
+            PayolaOnestepSubscriptionForm.showError(form, "Your card's expiration month/year is invalid.");
+            return false;
+        }
+
+        var cvc = $( "input[data-stripe='cvc']" ).val();
+        if(!Stripe.card.validateCVC(cvc)) {
+            PayolaOnestepSubscriptionForm.showError(form, "Your card's security code is invalid.");
+            return false;
+        }
+
+        return true;
+    },
+
     stripeResponseHandler: function(form, status, response) {
         if (response.error) {
             PayolaOnestepSubscriptionForm.showError(form, response.error.message);