paid_up 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bcbfa8b886ace05a249ff1dda01562116d7eb5c
-  data.tar.gz: 9a3e88ec68321ae0e03bfd6512ebabbbdff00772
+  metadata.gz: 7db38d9e4239f5e00398569781f9815754cb17d4
+  data.tar.gz: 1fca9230db0e9c5566cba8b45788a5ba62605a9a
 SHA512:
-  metadata.gz: 2510e57c6c5805f76283610c48cd22ec1d09691c0c199d74177cbdc00b8357d9eb8c591d628f8b9ed4716bb84cdf748074381a5dea5a8644cd32785cb973305b
-  data.tar.gz: 82ab394b686c6ae14194f01ee8a89fe9b5a80af9d71e408d12180ca7b78200e06f8b94a29687fbd60507e69bb269d3683cbb3dbf6d83398c6919befc34574a65
+  metadata.gz: 7c231aa9bc9fe587e2a4fc3319df4475babdd602165975fa4f404065f253a6cf520934d0865c497a4790d43ebf9dcedcc704f7e5c1d2cecfd754f38972469b69
+  data.tar.gz: f875a8cd9d45dffeb709a3293a34e81880567799d2958ee3086f102b8fe262c1b917a2ff7bfe3a789778459f117aac63a52e8e66f871fe9bbc51ed3dcb9f479e

data/README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/gemvein/paid_up.svg)](https://travis-ci.org/gemvein/paid_up)
 [![Coverage Status](https://coveralls.io/repos/gemvein/paid_up/badge.png)](https://coveralls.io/r/gemvein/paid_up)
 
-Paid Up is a start-to-finish Stripe subscription engine. You set up the plans you want on Stripe, and the gem gives you a way to tie those plans to authenticated users, granting them abilities based on the features outlined for their plan.
+Paid Up is a start-to-finish Stripe subscription engine. You set up the plans and coupons you want on Stripe, and the gem gives you a way to tie those plans and coupons to authenticated users, granting them abilities based on the features outlined for their plan.
 
 * Ruby 2, Rails 4
 * Authentication by Devise
@@ -37,7 +37,11 @@ Set your environment variables with your STRIPE_PUBLISHABLE_KEY and your STRIPE_
 
 ## Stripe Setup
 
-Using your own code or Stripe's convenient web interface, add the plans you intend to offer. Each will also need a record in your own database, so for each `Stripe::Plan` you create, note the `id` and use it as the `stripe_id` in the corresponding `PaidUp::Plan`. At a minimum, you will need an anonymous plan, a free plan, both with a cost amount of `0`; and also at least one paid plan.
+Using your own code or Stripe's convenient web interface, add the plans and coupons you intend to offer.
+
+Each plan will also need a record in your own database, so for each `Stripe::Plan` you create, note the `id` and use it as the `stripe_id` in the corresponding `PaidUp::Plan`. At a minimum, you will need an anonymous plan, a free plan, both with a cost amount of `0`; and also at least one paid plan.
+
+Coupons do not need any further configuration, other than adding them to your Stripe Account.
 
 Next, add a `Stripe::Customer` to serve as the Anonymous User, and subscribe that customer to the anonymous plan. Note the customer's `id` and copy that into your stripe configuration file.
 
@@ -97,7 +101,15 @@ The resources referred to in your config will need to call `paid_for`, like this
 
 ### Upgrading
 
-Version 0.8.0 introduced database changes to the foreign key columns to work with Rails 4.2.5. Let me know if you need help migrating your app to the newly named foreign keys.
+#### Version 0.9.0
+
+Version 0.9.0 enabled coupon codes, which are saved on the user's record. Be sure to run `rake paid_up:install:migrations` and migrate your database after upgrading.
+
+#### Version 0.8.0
+
+Version 0.8.0 introduced database changes to the foreign key columns to work with namespacing in Rails 4.2.5:
+
+`paid_up_plan_feature_settings`.`plan_id` must be changed to `paid_up_plan_feature_settings`.`paid_up_plan_id`.
 
 ## Contributing to Paid Up
  

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0

data/app/controllers/paid_up/subscriptions_controller.rb

@@ -16,6 +16,7 @@ module PaidUp
 
     def create
       # @plan set by #set_plan
+      current_user.update_attribute(:coupon_code, params[:coupon_code])
       if current_user.subscribe_to_plan(@plan, params[:stripeToken])
         redirect_to subscriptions_path, flash: { notice: :you_are_now_subscribed_to_the_plan.l(plan_name: current_user.plan.title) }
       else

data/app/helpers/paid_up/plans_helper.rb

@@ -2,8 +2,24 @@ module PaidUp
   module PlansHelper
     include ::ActionView::Helpers::NumberHelper
 
-    def plan_charge_human(plan)
-      plan.money.format + '/' + plan_period_phrase(plan)
+    def plan_charge_human(plan, discount)
+      if !discount.nil? and !discount.coupon.nil?
+        orig_amount = plan.amount
+        amount = orig_amount
+        amount -= (discount.coupon.percent_off || 0) * 0.01 * amount
+        amount -= (discount.coupon.amount_off || 0)
+        amount = amount > 0 ? amount : 0
+
+        orig_money = Money.new(orig_amount, plan.currency)
+        money = Money.new(amount, plan.currency)
+
+        html = content_tag :s, (orig_money.format + '/' + plan_period_phrase(plan))
+        html << ' '
+        html << content_tag(:span, (money.format + '/' + plan_period_phrase(plan)), class: 'text-danger')
+      else
+        html = plan.money.format + '/' + plan_period_phrase(plan)
+      end
+      html
     end
 
     def plan_period_phrase(plan)

data/app/views/paid_up/features/_table.html.haml

@@ -9,7 +9,7 @@
   - for plan in plans
     %tr{ class: highlight_plan == plan ? 'info' : ''}
       %td= plan.title
-      %td= plan_charge_human plan
+      %td= plan_charge_human plan, user_signed_in? ? current_user.stripe_data.discount : nil
       - for feature in features
         %td= feature_display feature, plan
       - if should_add_buttons

data/app/views/paid_up/plans/index.html.haml

@@ -6,7 +6,7 @@
       .well
         %h2
           = plan.title
-          .small= plan_charge_human plan
+          .small= plan_charge_human plan, user_signed_in? ? current_user.stripe_data.discount : nil
         %p= plan.description.html_safe
         %div{class:plan.title.gsub(' ',"_").downcase+'_subscribe_button'}
           = plan_button plan

data/app/views/paid_up/subscriptions/index.html.haml

@@ -2,7 +2,7 @@
 
 %h2
   = current_user.plan.title
-  .small= plan_charge_human current_user.plan
+  .small= plan_charge_human current_user.plan, current_user.stripe_data.discount
 
 = subscription_dl current_user.subscription
 

data/app/views/paid_up/subscriptions/new.html.haml

@@ -4,7 +4,7 @@
 = features_table only: @plan, should_add_buttons: false
 
 %h2= :select_payment_info.l
-%p= :you_will_be_charged.l charge_amount: plan_charge_human(@plan)
+%p= :you_will_be_charged.l charge_amount: plan_charge_human(@plan, current_user.stripe_data.discount)
 .row
   .col-md-6
     = form_tag paid_up.plan_subscriptions_path(@plan), class: 'form-horizontal', id: 'payment-form' do
@@ -49,6 +49,11 @@
           .col-xs-2
             /
             %input.form-control#exp-year.col-xs-1{ size: '4', data: { stripe: 'exp-year' } }
+        .form-group
+          %label.control-label.col-xs-2{for: 'coupon_code'}
+            = :coupon_code.l
+          .col-md-10
+            %input.form-control#coupon_code{ size: '16', name: 'coupon_code', value: current_user.coupon_code }
       .form-group
         .col-xs-10.col-xs-offset-2
           %button#submit-button.form-control.btn.btn-info

data/config/locales/en.yml

@@ -35,6 +35,7 @@ en:
   could_not_create_subscription: 'Could not create subscription'
   could_not_subscribe_to_plan: "Could not subscribe to %{plan}"
   could_not_update_subscription: 'Could not update subscription'
+  coupon_code: 'Coupon Code'
   currently_awaiting_confirmation_for_resource: "Currently awaiting confirmation for %{resource}"
   cvc: 'CVC'
   default_currency: 'usd'

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 95.52
+    "covered_percent": 95.74
   }
 }

data/coverage/.resultset.json

@@ -140,7 +140,7 @@
         null,
         null,
         1,
-        79,
+        97,
         null,
         null,
         1,
@@ -166,7 +166,7 @@
         null,
         null,
         1,
-        1356,
+        1374,
         null,
         null,
         null,
@@ -182,7 +182,7 @@
         1,
         null,
         1,
-        1356,
+        1374,
         null,
         null,
         1,
@@ -202,7 +202,7 @@
         null,
         null,
         1,
-        1275,
+        1293,
         null,
         null,
         1,
@@ -232,12 +232,12 @@
         null,
         1,
         null,
-        1,
+        3,
         0,
-        1,
+        3,
         1,
         null,
-        0,
+        2,
         null,
         null,
         null,
@@ -297,8 +297,8 @@
         1,
         null,
         1,
-        486,
-        486,
+        498,
+        498,
         null,
         1,
         null,
@@ -359,13 +359,13 @@
         1,
         null,
         1,
-        50,
-        50,
-        50,
+        65,
+        65,
+        65,
         null,
         1,
-        1638,
-        1638,
+        1842,
+        1842,
         null,
         null,
         1,
@@ -376,31 +376,39 @@
         null,
         null,
         1,
-        44,
-        37,
-        6,
+        56,
+        49,
+        9,
+        9,
+        9,
+        null,
+        49,
         6,
         6,
         null,
-        37,
-        37,
+        49,
+        49,
         null,
         7,
         null,
         null,
         null,
+        null,
+        7,
         0,
         null,
         7,
+        null,
+        7,
         7,
         null,
         0,
         null,
         null,
-        44,
-        44,
-        44,
-        44,
+        56,
+        56,
+        56,
+        56,
         null,
         0,
         null,
@@ -409,7 +417,7 @@
         2,
         null,
         1,
-        656,
+        662,
         null,
         1,
         21,
@@ -443,10 +451,10 @@
         2,
         null,
         1,
-        793,
+        841,
         0,
         null,
-        793,
+        841,
         null,
         1,
         201,
@@ -461,32 +469,32 @@
         2,
         null,
         1,
-        273,
+        300,
         30,
         null,
         null,
         1,
         1,
-        323,
+        365,
         30,
         null,
-        293,
+        335,
         0,
         null,
-        293,
+        335,
         null,
         null,
-        323,
-        44,
+        365,
+        56,
         null,
         null,
-        323,
+        365,
         0,
         null,
         null,
         1,
         1,
-        14,
+        32,
         7,
         null,
         null,
@@ -1084,6 +1092,7 @@
         1,
         null,
         null,
+        null,
         1,
         1,
         null,
@@ -1138,9 +1147,9 @@
       ],
       "/Users/karen/Gems/paid_up/spec/support/features.rb": [
         1,
-        210,
-        210,
-        210,
+        216,
+        216,
+        216,
         null
       ],
       "/Users/karen/Gems/paid_up/spec/support/groups.rb": [
@@ -1162,11 +1171,11 @@
       ],
       "/Users/karen/Gems/paid_up/spec/support/plans.rb": [
         1,
-        210,
-        210,
-        210,
-        210,
-        210,
+        216,
+        216,
+        216,
+        216,
+        216,
         null
       ],
       "/Users/karen/Gems/paid_up/spec/support/stripe.rb": [
@@ -1177,11 +1186,11 @@
         null,
         null,
         null,
-        6,
+        9,
         null,
         null,
         1,
-        6,
+        9,
         0,
         null,
         null,
@@ -1191,13 +1200,13 @@
         null,
         null,
         null,
-        6,
+        9,
         null
       ],
       "/Users/karen/Gems/paid_up/spec/support/users.rb": [
         1,
-        41,
-        37,
+        44,
+        40,
         29,
         59,
         16,
@@ -1222,7 +1231,7 @@
         null,
         1,
         1,
-        30,
+        36,
         null,
         null,
         null
@@ -1322,6 +1331,22 @@
         null,
         1,
         176,
+        12,
+        12,
+        12,
+        12,
+        12,
+        null,
+        12,
+        12,
+        null,
+        12,
+        12,
+        12,
+        null,
+        164,
+        null,
+        176,
         null,
         null,
         1,
@@ -1399,7 +1424,7 @@
         null,
         1,
         1,
-        26,
+        32,
         null,
         1,
         1,
@@ -1521,6 +1546,7 @@
         1,
         1,
         1,
+        1,
         3,
         3,
         3,
@@ -1538,6 +1564,45 @@
         2,
         null,
         null,
+        1,
+        1,
+        3,
+        3,
+        3,
+        null,
+        1,
+        3,
+        null,
+        1,
+        3,
+        2,
+        2,
+        null,
+        1,
+        2,
+        2,
+        null,
+        null,
+        null,
+        null,
+        1,
+        1,
+        1,
+        3,
+        3,
+        null,
+        1,
+        3,
+        null,
+        1,
+        3,
+        2,
+        2,
+        null,
+        1,
+        2,
+        2,
+        null,
         null,
         1,
         1,
@@ -1559,6 +1624,7 @@
         null,
         null,
         null,
+        null,
         null
       ],
       "/Users/karen/Gems/paid_up/app/controllers/paid_up/subscriptions_controller.rb": [
@@ -1580,8 +1646,9 @@
         null,
         1,
         null,
-        12,
-        12,
+        18,
+        18,
+        18,
         null,
         0,
         null,
@@ -1595,7 +1662,7 @@
         null,
         1,
         1,
-        16,
+        22,
         null,
         null,
         null
@@ -1877,7 +1944,7 @@
         1,
         1,
         null,
-        1736,
+        1778,
         54,
         4,
         null,
@@ -1937,7 +2004,7 @@
         null,
         null,
         1,
-        180,
+        168,
         null,
         null,
         1,
@@ -1945,8 +2012,8 @@
         null,
         null,
         1,
-        182,
-        182,
+        194,
+        194,
         null,
         0,
         null,
@@ -1955,8 +2022,8 @@
         1,
         null,
         1,
-        1856,
-        1851,
+        1898,
+        1893,
         5,
         null,
         null,
@@ -2834,6 +2901,6 @@
         null
       ]
     },
-    "timestamp": 1454871905
+    "timestamp": 1455131667
   }
 }

data/db/migrate/20160210165128_add_coupon_code_column_to_users.rb

@@ -0,0 +1,5 @@
+class AddCouponCodeColumnToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :coupon_code, :string
+  end
+end

data/lib/paid_up/mixins/subscriber.rb

@@ -35,14 +35,22 @@ module PaidUp::Mixins
               subscription.save
               reload
             end
+            if coupon_code.present?
+              stripe_data.coupon = coupon_code
+              stripe_data.save
+            end
             subscription.plan = plan_to_set.stripe_id
             result = subscription.save || ( raise(:could_not_update_subscription.l) && false )
           else # Totally new subscription
-            customer = Stripe::Customer.create(
-                :source => stripeToken,
-                :plan => plan_to_set.stripe_id,
-                :email => email
-            ) || ( raise(:could_not_create_subscription.l) && false )
+            args = {
+              source: stripeToken,
+              plan: plan_to_set.stripe_id,
+              email: email
+            }
+            if coupon_code.present?
+              args[:coupon] = coupon_code
+            end
+            customer = Stripe::Customer.create(args) || ( raise(:could_not_create_subscription.l) && false )
 
             if stripe_id != customer.id # There is an update to be made, so we go ahead
               result = update_attributes(stripe_id: customer.id) || ( raise(:could_not_associate_subscription.l) && false )

data/paid_up.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: paid_up 0.8.1 ruby lib
+# stub: paid_up 0.9.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.8.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Karen Lundgren"]
-  s.date = "2016-02-07"
+  s.date = "2016-02-10"
   s.description = "Allows a model of your choosing (such as users) to subscribe to a plan, which enables features."
   s.email = "karen.e.lundgren@gmail.com"
   s.extra_rdoc_files = [
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
     "db/migrate/20150407110101_create_paid_up_plans_table.rb",
     "db/migrate/20150519164237_add_stripe_id_column_to_users.rb",
     "db/migrate/20160207113800_create_paid_up_plan_feature_settings_table.rb",
+    "db/migrate/20160210165128_add_coupon_code_column_to_users.rb",
     "lib/generators/paid_up/install/install_generator.rb",
     "lib/generators/paid_up/install/templates/ability.rb",
     "lib/generators/paid_up/install/templates/initializer.rb",
@@ -133,6 +134,7 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20160207184112_create_paid_up_plans_table.paid_up.rb",
     "spec/dummy/db/migrate/20160207184113_add_stripe_id_column_to_users.paid_up.rb",
     "spec/dummy/db/migrate/20160207184114_create_paid_up_plan_feature_settings_table.paid_up.rb",
+    "spec/dummy/db/migrate/20160210165341_add_coupon_code_column_to_users.paid_up.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/seeds.rb",
     "spec/dummy/db/test.sqlite3",