paid_up 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4257b227a914f099573fcb7b7f19c8792424c8a
-  data.tar.gz: 6f6698e0edce9fe33f7825e8a22ad32d845e06bd
+  metadata.gz: 954e8e00f2f48658af2ebd13a213bfcf5fce324c
+  data.tar.gz: bd53708ca30d9ec690cd59501dc6b69199db3b3f
 SHA512:
-  metadata.gz: f64b48408433f454e18be2d99305a91b6015ee80b8fc66c603e6f7b6e65154810ac949797090992a3baa532d3c9403f47ee4590da25be1f52001a1a8408cf353
-  data.tar.gz: cec0743c06b83497c3b4d6a12b2696eaafbbd09a5c9e5b9b0eb4df2fdee926152a1b3ce087e59f6b8808569f5cca1a2b666ef5cb110f6cc10f8a63cfbab0b6fe
+  metadata.gz: 722c22b55fb992937f6295aa57516bf220892eb777c0ba91a8dbe67e6563e3d51f6da2ff5b299336438571fbb9b4cf7d135a3390f65335c0aa18531e8b999dc8
+  data.tar.gz: 6870caa2fa1b6c5dd392c5a6b0ac5904c34579d3a4d1b41821d9181f239333f8d4dbe4515f84c7fff6b117f7070a1cb013e4fabe1534296ce201322c29e93615

data/Gemfile

@@ -19,6 +19,7 @@ gem 'stripe', '~> 1.21'
 group :development do
   gem 'jeweler', '~> 2'
   gem 'bundler', '~> 1'
+  gem 'web-console', '~> 3.0'
 end
 
 group :test, :development do
@@ -38,12 +39,4 @@ group :test do
   gem 'shoulda-matchers', '~> 2.8'
   gem 'launchy', '~> 2.1.2', require: false
   gem 'coveralls', '~> 0.8', require: false
-end
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'
+end

data/README.md

@@ -33,7 +33,7 @@ Next, install PaidUp for your user model by executing these commands:
     
 Edit your config file at `config/initializers/paid_up.rb` to set up some other key details.
 
-Set your environment variables with your STRIPE_PUBLISHABLE_KEY and your STRIPE_SECRET_KEY. (Check your operating system or IDE's documentation for details)
+Set your environment variables with your `STRIPE_PUBLISHABLE_KEY` and `STRIPE_SECRET_KEY`. (Check your operating system or IDE's documentation for details. I use the gem `dotenv` for this.)
 
 ## Stripe Setup
 
@@ -45,6 +45,8 @@ Coupons do not need any further configuration, other than adding them to your St
 
 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.
 
+Pay close attention to the settings in `My Account` under `Subscriptions` and `Email`, as they have a big effect on how your site behaves.
+
 ## Features Setup
 
 Set up each `PaidUp::Feature` using the config file. (A config file is used rather than using records in an `ActiveRecord::Base` model because relationships cannot be created at runtime.) Associate the features with the corresponding plans using the `PaidUp::PlanFeatureSetting` model. For an example, check out the seeds file at [`spec/dummy/db/seeds.db`](spec/dummy/db/seeds.db)

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/app/controllers/paid_up/paid_up_controller.rb

@@ -3,10 +3,19 @@ module PaidUp
     helper :all
 
     before_action :set_locale
+    before_filter :warn_if_delinquent
 
   private
     def set_locale
       I18n.locale = params[:locale] || I18n.default_locale
     end
+
+    def warn_if_delinquent
+      if user_signed_in? && params[:controller] != 'paid_up/subscriptions'
+        if current_user.plan.nil? || current_user.stripe_data.delinquent
+          flash[:error] = :account_is_delinquent.l + :to_disable_this_message_subscribe.l(subscribe_link: paid_up.plans_path)
+        end
+      end
+    end
   end
 end

data/app/controllers/paid_up/subscriptions_controller.rb

@@ -9,7 +9,7 @@ module PaidUp
 
     def new
       # nothing to do, @plan set by #set_plan
-      if current_user.can_downgrade_to? @plan || @plan.amount == 0
+      if current_user.can_downgrade_to?(@plan) || @plan.amount == 0
         create
       end
     end
@@ -24,7 +24,7 @@ module PaidUp
       end
     rescue Stripe::InvalidRequestError => e
       flash[:error] = e.message
-      redirect_to plans_path
+      redirect_to subscriptions_path
     rescue Stripe::CardError => e
       flash[:error] = e.message
       redirect_to new_plan_subscription_path

data/app/helpers/paid_up/plans_helper.rb

@@ -38,7 +38,10 @@ module PaidUp
       link = paid_up.new_plan_subscription_path(plan)
       if user_signed_in?
         text ||= :subscribe.l
-        if current_user.can_upgrade_to? plan
+        if current_user.stripe_data.delinquent
+          icon_class = 'arrow-right'
+          css_class += 'btn-info'
+        elsif current_user.can_upgrade_to? plan
           icon_class = 'arrow-up'
           css_class += 'btn-success'
         elsif current_user.can_downgrade_to? plan

data/app/mailers/paid_up/paid_up_mailer.rb

@@ -0,0 +1,6 @@
+module PaidUp
+  class PaidUpMailer < ActionMailer::Base
+    default from: PaidUp.configuration.mail_from_address
+    layout 'mailer'
+  end
+end

data/app/mailers/paid_up/subscription_mailer.rb

@@ -0,0 +1,9 @@
+module PaidUp
+  class SubscriptionMailer < PaidUpMailer
+    def payment_failed_email(invoice)
+      @invoice = invoice
+      @user = User.find_by_stripe_id(@invoice.customer)
+      mail(to: @user.email, subject: :your_site_subscription_payment_failed.l(site: PaidUp.configuration.site_name))
+    end
+  end
+end

data/app/views/layouts/mailer.html.haml

@@ -0,0 +1,3 @@
+%hmtl
+  %body
+    = yield

data/app/views/layouts/mailer.text.haml

@@ -0,0 +1 @@
+= yield

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

@@ -17,7 +17,17 @@
             - if current_user.table_rows_unlimited?(feature.slug)
               = :unlimited.l
             - else
-              = :x_of_y_remaining.l x: current_user.table_rows_remaining(feature.slug), y: current_user.table_rows_allowed(feature.slug)
+              - remaining = current_user.table_rows_remaining(feature.slug)
+              - allowed = current_user.table_rows_allowed(feature.slug)
+              - used = current_user.table_rows(feature.slug)
+              - if remaining < 0
+                = :x_used_y_allowed.l x: used, y: allowed
+              - elsif allowed == 0
+                = :not_allowed.l
+              - elsif remaining == 0
+                = :y_remaining.l y: remaining
+              - else
+                = :x_of_y_remaining.l x: remaining, y: allowed
           - when 'rolify_rows'
             - if can? :own, feature.feature_model
               = icon 'ok'
@@ -26,6 +36,16 @@
             - if current_user.rolify_rows_unlimited?(feature.slug)
               = :unlimited.l
             - else
-              = :x_of_y_remaining.l x: current_user.rolify_rows_remaining(feature.slug), y: current_user.rolify_rows_allowed(feature.slug)
+              - remaining = current_user.rolify_rows_remaining(feature.slug)
+              - allowed = current_user.rolify_rows_allowed(feature.slug)
+              - used = current_user.rolify_rows(feature.slug)
+              - if remaining < 0
+                = :x_used_y_allowed.l x: used, y: allowed
+              - elsif allowed == 0
+                = :not_allowed.l
+              - elsif remaining == 0
+                = :y_remaining.l y: remaining
+              - else
+                = :x_of_y_remaining.l x: remaining, y: allowed
           - else
             = :error.l

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

@@ -1,16 +1,18 @@
 - add_title :my_subscription_information.l
 
-%h2
-  = current_user.plan.title
-  .small= plan_charge_human current_user.plan, current_user.stripe_data.discount
-
-= subscription_dl current_user.subscription
-
-- if current_user.subscription.cancel_at_period_end
-  %h3= :canceled.l
-
-%h3= :abilities.l
-= feature_abilities_table
-
-%p
-  = icon_button_to 'info btn-lg', 'arrow-right', :switch_plans.l, paid_up.plans_path, method: :get
+- if current_user.stripe_data.delinquent
+  %p= :account_is_delinquent.l
+  %p= :to_enable_paid_features_subscribe.l(subscribe_link: paid_up.plans_path)
+  %h3= :abilities.l
+  = feature_abilities_table mode: :delinquent
+  %p= icon_button_to 'info btn-lg', 'arrow-right', :choose_a_plan.l, paid_up.plans_path, method: :get
+- else
+  %h2
+    = current_user.plan.title
+    .small= plan_charge_human current_user.plan, current_user.stripe_data.discount
+  = subscription_dl current_user.subscription
+  - if current_user.subscription.cancel_at_period_end
+    %h3= :canceled.l
+  %h3= :abilities.l
+  = feature_abilities_table
+  %p= icon_button_to 'info btn-lg', 'arrow-right', :switch_plans.l, paid_up.plans_path, method: :get

data/config/locales/en.yml

@@ -21,6 +21,7 @@
 
 en:
   abilities: "Abilities"
+  account_is_delinquent: 'The paid features associated with your account have been disabled pending payment.'
   already_subscribed: "Already Subscribed"
   are_you_sure: "Are you sure?"
   cancel_my_account: 'Cancel My Account'
@@ -29,6 +30,7 @@ en:
   card_ending_with: "%{brand} ending with %{last4}"
   card_number: 'Card Number'
   change_your_password: 'Change your password'
+  choose_a_plan: 'Choose a Plan'
   cost: 'Cost'
   could_not_cancel_subscription: 'Could not cancel subscription'
   could_not_associate_subscription: 'Could not associate subscription'
@@ -57,8 +59,10 @@ en:
   my_subscription_information: 'My Subscription Information'
   no_implicit_conversion_of_type_features: 'No implicit conversion of %{type} Features'
   no_features_associated_with_table: 'No features associated with %{table} table.'
+  not_allowed: 'Not Allowed'
   or_sign_in: "Or, Sign In"
   or_sign_up: "Or, Sign Up"
+  payment_failed_statement: "Hi there,\n\nUnfortunately your most recent invoice payment for %{amount} was declined.\n\nThis could be due to a change in your card number or your card expiring, cancelation of your credit card, or the bank not recognizing the payment and taking action to prevent it.\n\nPlease update your payment information as soon as possible by logging in here:\n\n%{url}"
   paid_thru: "Paid Thru"
   plan_name: "Plan Name"
   plans: "Plans"
@@ -77,6 +81,8 @@ en:
   subscription_plan_pricing: 'Subscription Plan Pricing'
   switch_plans: "Switch Plans"
   thank_you: "Thank You"
+  to_disable_this_message_subscribe: "To disable this message, please <a href='%{subscribe_link}'>Choose a Plan</a>."
+  to_enable_paid_features_subscribe: "To enable the paid features previously associated with your account, please <a href='%{subscribe_link}'>Choose a Plan</a>."
   trial_period: "Trial Period"
   unhappy: "Unhappy?"
   unknown_feature_type: 'Unknown Feature Type'
@@ -87,5 +93,7 @@ en:
   when_using_table_rows_table_must_exist: 'When using table_rows, the table must exist.'
   when_using_rolify_rows_table_must_exist: 'When using rolify_rows, the table must exist.'
   x_of_y_remaining: '%{x} of %{y} remaining'
+  x_used_y_allowed: '%{x} used, %{y} allowed'
   you_are_now_subscribed_to_the_plan: "You are now subscribed to the %{plan_name} Plan"
   you_will_be_charged: "You will be charged %{charge_amount}."
+  your_site_subscription_payment failed: "Your %{site} Subscription Payment Failed."

data/coverage/.last_run.json

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

data/coverage/.resultset.json

@@ -50,6 +50,8 @@
         1,
         null,
         null,
+        1,
+        null,
         null,
         null
       ],
@@ -103,7 +105,6 @@
         1,
         null,
         1,
-        1,
         null,
         1,
         1
@@ -140,7 +141,7 @@
         null,
         null,
         1,
-        97,
+        101,
         null,
         null,
         1,
@@ -151,6 +152,8 @@
         1,
         1,
         1,
+        1,
+        1,
         null,
         null,
         null
@@ -297,8 +300,8 @@
         1,
         null,
         1,
-        498,
-        498,
+        518,
+        518,
         null,
         1,
         null,
@@ -325,10 +328,11 @@
         1,
         1,
         1,
-        6,
-        6,
+        8,
+        8,
         null,
         0,
+        0,
         null,
         null,
         null,
@@ -359,13 +363,13 @@
         1,
         null,
         1,
-        65,
-        65,
-        65,
+        66,
+        66,
+        66,
         null,
         1,
-        1842,
-        1842,
+        4775,
+        4775,
         null,
         null,
         1,
@@ -376,7 +380,7 @@
         null,
         null,
         1,
-        56,
+        57,
         49,
         9,
         9,
@@ -387,28 +391,33 @@
         6,
         null,
         49,
+        0,
+        0,
+        null,
+        49,
         49,
         null,
-        7,
+        8,
         null,
         null,
         null,
         null,
-        7,
+        null,
+        8,
         0,
         null,
-        7,
+        8,
         null,
-        7,
-        7,
+        8,
+        8,
         null,
         0,
         null,
         null,
-        56,
-        56,
-        56,
-        56,
+        57,
+        57,
+        57,
+        57,
         null,
         0,
         null,
@@ -417,7 +426,11 @@
         2,
         null,
         1,
-        662,
+        1043,
+        1043,
+        null,
+        0,
+        null,
         null,
         1,
         21,
@@ -429,7 +442,7 @@
         113,
         null,
         1,
-        41,
+        45,
         null,
         1,
         21,
@@ -441,8 +454,8 @@
         113,
         null,
         1,
-        41,
-        41,
+        45,
+        45,
         null,
         1,
         2,
@@ -451,51 +464,59 @@
         2,
         null,
         1,
-        841,
+        2265,
         0,
         null,
-        841,
+        2265,
         null,
         1,
         201,
         null,
         1,
+        null,
+        null,
+        84,
         84,
         null,
         1,
+        null,
+        null,
+        94,
         94,
         null,
         1,
+        null,
+        2,
         2,
         null,
         1,
-        300,
-        30,
+        302,
+        31,
         null,
         null,
         1,
         1,
-        365,
-        30,
+        368,
+        31,
         null,
-        335,
+        337,
         0,
         null,
-        335,
+        337,
         null,
         null,
-        365,
-        56,
+        368,
+        57,
         null,
         null,
-        365,
+        368,
         0,
         null,
         null,
         1,
         1,
-        32,
-        7,
+        34,
+        8,
         null,
         null,
         1,
@@ -632,7 +653,23 @@
         null,
         null,
         null,
-        1
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
       ],
       "/Users/karen/Gems/paid_up/spec/dummy/config/initializers/assets.rb": [
         null,
@@ -1038,7 +1075,7 @@
         null,
         null,
         1,
-        30,
+        31,
         null,
         null,
         null
@@ -1064,37 +1101,30 @@
       "/Users/karen/Gems/paid_up/spec/dummy/spec/factories/user.rb": [
         1,
         1,
-        8,
+        9,
         1,
         1,
         1,
         2,
+        1,
         null,
         null,
         null,
         null,
         null,
         1,
-        7,
-        null,
+        8,
+        1,
         null,
         null,
         null,
         null,
         null,
         null,
-        7,
         null,
-        null,
-        null
-      ],
-      "/Users/karen/Gems/paid_up/spec/dummy/config/routes.rb": [
         1,
         null,
-        null,
-        null,
-        1,
-        1,
+        7,
         null,
         null,
         null,
@@ -1102,11 +1132,19 @@
         null,
         null,
         null,
+        7,
         null,
+        8,
         null,
         null,
         null
       ],
+      "/Users/karen/Gems/paid_up/spec/dummy/config/routes.rb": [
+        1,
+        1,
+        1,
+        null
+      ],
       "/Users/karen/Gems/paid_up/spec/dummy/app/models/user.rb": [
         1,
         1,
@@ -1228,12 +1266,21 @@
         1,
         null,
         1,
+        1,
         null,
         1,
         1,
         36,
         null,
         null,
+        1,
+        36,
+        0,
+        0,
+        null,
+        null,
+        null,
+        null,
         null
       ],
       "/Users/karen/Gems/paid_up/spec/dummy/app/controllers/application_controller.rb": [
@@ -1369,6 +1416,9 @@
         0,
         0,
         null,
+        0,
+        0,
+        null,
         60,
         60,
         60,
@@ -1667,6 +1717,13 @@
         null,
         null
       ],
+      "/Users/karen/Gems/paid_up/spec/mailers/paid_up/subscription_mailer_spec.rb": [
+        1,
+        null,
+        null,
+        null,
+        null
+      ],
       "/Users/karen/Gems/paid_up/spec/models/group_spec.rb": [
         1,
         1,
@@ -1944,7 +2001,7 @@
         1,
         1,
         null,
-        1778,
+        2159,
         54,
         4,
         null,
@@ -1996,8 +2053,8 @@
         null,
         null,
         1,
-        182,
-        182,
+        186,
+        186,
         null,
         0,
         null,
@@ -2022,8 +2079,8 @@
         1,
         null,
         1,
-        1898,
-        1893,
+        2279,
+        2274,
         5,
         null,
         null,
@@ -2590,9 +2647,21 @@
         null,
         null
       ],
-      "/Users/karen/Gems/paid_up/spec/dummy/db/seeds.rb": [
-        null,
+      "/Users/karen/Gems/paid_up/spec/dummy/lib/tasks/system.rake": [
+        1,
+        1,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
         null,
+        null
+      ],
+      "/Users/karen/Gems/paid_up/spec/dummy/db/seeds.rb": [
         null,
         null,
         null,
@@ -2606,7 +2675,6 @@
         null,
         null,
         null,
-        null,
         1,
         null,
         null,
@@ -2622,7 +2690,6 @@
         null,
         null,
         null,
-        null,
         1,
         null,
         null,
@@ -2638,7 +2705,6 @@
         null,
         null,
         null,
-        null,
         1,
         null,
         null,
@@ -2654,6 +2720,11 @@
         null,
         null,
         null,
+        1,
+        null,
+        null,
+        null,
+        null,
         null,
         1,
         null,
@@ -2661,6 +2732,9 @@
         null,
         null,
         null,
+        null,
+        null,
+        null,
         1,
         null,
         null,
@@ -2671,6 +2745,7 @@
         null,
         null,
         null,
+        null,
         1,
         null,
         null,
@@ -2692,6 +2767,17 @@
         null,
         null,
         null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         null,
         1,
         null,
@@ -2773,6 +2859,13 @@
         null,
         null,
         null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
         null,
         null,
         null,
@@ -2803,6 +2896,12 @@
         null,
         null,
         null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
         null
       ],
       "/Users/karen/Gems/paid_up/app/models/paid_up/unlimited.rb": [
@@ -2901,6 +3000,6 @@
         null
       ]
     },
-    "timestamp": 1455133171
+    "timestamp": 1455582470
   }
 }