effective_orders 4.1.5 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cbc4c38cb22371fa03bfa9319d76cbf3e45ac1a3c75edfedb6486d36bd91d7b
-  data.tar.gz: ec41a7da268206d32b25cb8cbf4cf6cd3de2c552159cc9f823e730c02a6e06b0
+  metadata.gz: cba395b26b2db05cfcbfd3340db1c83318f97a190130b7f009363314a45b2a51
+  data.tar.gz: 5e9e3a2de5aee44d4fbde7374dee306ad9acffa30513f97e073050d04acb2955
 SHA512:
-  metadata.gz: 6f983b6121c2842fbe5ac6a05d105d088d085f05ee42e2fbafd92e8dc99850e511b2696d8a962df8a73604dbb2a830c7343c606f94859471c3fce88aa3ed70ed
-  data.tar.gz: e155ef077626ed3f479f7a11fbc6c1f83475e01352e54d8b0e3aef781675e07013799092c8ae3a16f63a8863dbbc3a95d84d10750d3c8386b23d6fac151ef204
+  metadata.gz: 0c4bbcc96e0ba2ace04bb7779b4c56aaa2578fb3b7c05ecfb2979b94c4fd8a12581fc3d9a77de1f267cf3ff1e00104f122b49dc29354ea7b95e5c91c2b2c5f1e
+  data.tar.gz: b48693aa3680d77555a459366c7379ba96b6b2894c40dbe01bd1a630440843a414d393a2cc84946130c1a59ae5290d5576f15d0cd16145ad2df31ee22e01f7a7

data/app/assets/javascripts/effective_orders/subscriptions.js.coffee

@@ -20,7 +20,9 @@ $(document).on 'change keyup', '.effective-orders-subscripter-plan-quantity', (e
   return unless $plan.length == 1
 
   # Assign the quantity to each quantity field
-  $plan.closest('form').find(".effective-orders-stripe-plan:not([data-plan-id='#{$plan.data('id')}'])").find("input[name$='[quantity]']").val($obj.val())
+  $plan.closest('form')
+    .find(".effective-orders-stripe-plan:not([data-plan-id='#{$plan.data('id')}'])")
+    .find("input[name$='[quantity]']").val($obj.val())
 
   quantity = $obj.val() || 0
 
@@ -28,11 +30,9 @@ $(document).on 'change keyup', '.effective-orders-subscripter-plan-quantity', (e
     # Assign all totals
     plan = $(this)
     amount = parseInt(plan.data('amount'))
-    interval = plan.data('plan-interval')
+    interval = plan.data('interval')
 
     total = (quantity * amount)
-    total = (total / 12) if interval == 'year'
-
     total = '$' + (total / 100.0).toFixed(2)
 
     plan.find('#effective_subscripter_total_amount').text(total)
@@ -53,6 +53,9 @@ $(document).on 'click', ".effective-orders-stripe-token-required[type='submit'],
   stripe = $form.data('stripe')
   return unless stripe?
 
+  plans = $form.data('plans')
+  return unless plans?
+
   # If we're doing choose button mode
   if $obj.data('choose-stripe-plan-id')
     $form.find("input[name$='[stripe_plan_id]']").val($obj.data('choose-stripe-plan-id'))
@@ -63,7 +66,7 @@ $(document).on 'click', ".effective-orders-stripe-token-required[type='submit'],
   return unless selected_plan_id.length > 0
 
   # Match plan
-  plan = stripe.plans.find (plan, _) => plan.id == selected_plan_id
+  plan = plans.find (plan, _) => plan.id == selected_plan_id
   return unless plan?
 
   # Okay, we're good to call stripe

data/app/helpers/effective_stripe_helper.rb

@@ -4,7 +4,7 @@ module EffectiveStripeHelper
     plan = (
       case obj
       when Hash            ; obj
-      when ::Stripe::Plan  ; EffectiveOrders.stripe_plans.find { |plan| plan.id == obj.id }
+      when ::Stripe::Plan  ; EffectiveOrders.stripe_plans.find { |plan| plan[:id] == obj.id }
       else                 ; raise 'unexpected object'
       end
     )

data/app/helpers/effective_subscriptions_helper.rb

@@ -1,10 +1,16 @@
 module EffectiveSubscriptionsHelper
 
-  def stripe_plans_collection(subscripter = nil)
-    EffectiveOrders.stripe_plans.values.sort do |x, y|
-      amount = (x[:amount] <=> y[:amount])
-      (amount != 0) ? amount : x[:name] <=> y[:name]
-    end
+  def subscripter_stripe_data(subscripter)
+    {
+      email: current_user.email,
+      image: stripe_site_image_url,
+      key: EffectiveOrders.stripe[:publishable_key],
+      name: EffectiveOrders.stripe[:site_title],
+    }
+  end
+
+  def subscripter_stripe_plans(subscripter)
+    EffectiveOrders.stripe_plans
   end
 
   def subscribable_form_with(subscribable)
@@ -25,14 +31,6 @@ module EffectiveSubscriptionsHelper
     render('effective/customers/form', subscripter: subscripter)
   end
 
-  def subscripter_stripe_data(subscripter)
-    {
-      email: current_user.email,
-      image: stripe_site_image_url,
-      key: EffectiveOrders.stripe[:publishable_key],
-      name: EffectiveOrders.stripe[:site_title],
-      plans: EffectiveOrders.stripe_plans.values
-    }
-  end
+
 
 end

data/app/models/effective/subscripter.rb

@@ -11,7 +11,11 @@ module Effective
     validates :subscribable, presence: true, if: -> { stripe_plan_id.present? }
     validates :customer, presence: true
 
-    validates :stripe_plan_id, inclusion: { allow_blank: true, in: EffectiveOrders.stripe_plans.keys, message: 'unknown plan' }
+    validates :stripe_plan_id, inclusion: {
+      allow_blank: true,
+      in: EffectiveOrders.stripe_plans.map { |plan| plan[:id] },
+      message: 'unknown plan'
+    }
 
     validate(if: -> { stripe_plan_id && plan && plan[:amount] > 0 }) do
       self.errors.add(:stripe_token, 'updated payment card required') if stripe_token.blank? && token_required?
@@ -43,7 +47,7 @@ module Effective
     end
 
     def plan
-      EffectiveOrders.stripe_plans[stripe_plan_id]
+      EffectiveOrders.stripe_plans.find { |plan| plan[:id] == stripe_plan_id }
     end
 
     def quantity=(value)

data/app/models/effective/subscription.rb

@@ -45,7 +45,9 @@ module Effective
     validates :customer, presence: true
     validates :subscribable, presence: true
 
-    validates :stripe_plan_id, presence: true, inclusion: { in: EffectiveOrders.stripe_plans.keys }
+    validates :stripe_plan_id, presence: true
+    validates :stripe_plan_id, inclusion: { in: EffectiveOrders.stripe_plans.map { |plan| plan[:id] } }
+
     validates :stripe_subscription_id, presence: true
 
     validates :name, presence: true
@@ -59,7 +61,7 @@ module Effective
     end
 
     def plan
-      EffectiveOrders.stripe_plans[stripe_plan_id]
+      EffectiveOrders.stripe_plans.find { |plan| plan[:id] == stripe_plan_id }
     end
 
     def stripe_subscription

data/app/views/effective/customers/_customer.html.haml

@@ -6,14 +6,12 @@
         %thead
           %tr
             %th Subscribed
-            %th Plan
             %th Quantity
             %th Interval
         %tbody
           - customer.subscriptions.each do |sub|
             %tr
               %td= sub.subscribable
-              %td= sub
               %td= sub.quantity
               %td= sub.interval
 

data/app/views/effective/subscripter/_form.html.haml

@@ -1,23 +1,23 @@
 = javascript_include_tag 'https://checkout.stripe.com/checkout.js'
 
-= effective_form_with(model: subscripter, url: effective_orders.subscripter_path, remote: true, data: { stripe: subscripter_stripe_data(subscripter) }) do |f|
+- stripe = subscripter_stripe_data(subscripter)
+- plans = subscripter_stripe_plans(subscripter)
+
+- subscripter.quantity ||= subscripter.subscribable.subscribable_quantity_used
+- subscripter.stripe_plan_id ||= Hash(plans.first)[:id]
+
+= effective_form_with(model: subscripter, url: effective_orders.subscripter_path, remote: true, data: { stripe: stripe, plans: plans }) do |f|
   = f.hidden_field :subscribable_global_id
   = f.hidden_field :stripe_token, value: nil
-  = f.error :stripe_token
-
   = f.hidden_field :stripe_plan_id
-
-  - stripe_plans = stripe_plans_collection(f.object)
-  - stripe_plans = stripe_plans.select { |plan| plan[:name].include?('per User') }
-
-  - f.object.stripe_plan_id ||= (stripe_plans.first || {})[:id]
+  = f.error :stripe_token
 
   - if f.object.subscribable.subscribed?
     - quantity_used = f.object.subscribable.subscribable_quantity_used.to_i
     - quantity_purchased = f.object.subscribable.subscription.quantity
 
     .text-center
-      %p 
+      %p
         You currently have <strong>#{pluralize(quantity_used, 'member')}</strong> in your team
         and have space for <strong>#{pluralize(quantity_purchased, 'member')}</strong>.
 
@@ -26,39 +26,28 @@
       - else
         %p To add more members you will need to update your plan.
 
-      %p To pay for less than #{pluralize(quantity_used, 'member')} you'll have to remove some first.
+      %p To pay for less than #{pluralize(quantity_used, 'member')}, remove some team members first.
 
-  .card.mb-4
-    .card-body.text-center
-      %h5.card-title Billing Cycle
+  - else
+    .text-center
+      %p
+        You are not currently subscribed to any plan.
+        %br
+        For full access, upgrade to a paid plan below.
+        %br
+        To upgrade with fewer people, remove some team members first.
 
-      = f.radios :stripe_plan_id, stripe_plans.map { |plan| [plan[:name], plan[:id]] }, label: false, buttons: true
+  .card.mb-4
+    .card-body.card-subscripter
+      %h5.card-title.subscripter-title Billing Cycle
 
-      %hr
+      = f.radios :stripe_plan_id, plans.map { |plan| [plan[:name], plan[:id]] }, label: false, buttons: true
 
-      - stripe_plans.select { |plan| plan[:interval] == 'month' }.each do |plan|
-        = f.show_if(:stripe_plan_id, plan[:id]) do
-          .effective-orders-stripe-plan{'data-id': plan[:id], 'data-amount': plan[:amount], 'data-interval': plan[:interval]}
-            .d-flex.justify-content-around.align-items-center
-              = f.number_field :quantity, class: 'effective-orders-subscripter-plan-quantity form-control-lg', autocomplete: 'off', required: true
-              %div= 'x'
-              = f.static_field :price_per_person do
-                = price_to_currency(plan[:amount])
-              %div= '='
-              = f.static_field :total_amount do
-                = price_to_currency(plan[:amount] * f.object.quantity.to_i)
+      %hr.mt-4.mb-4
 
-      - stripe_plans.select { |plan| plan[:interval] == 'year' }.each do |plan|
+      - plans.each do |plan|
         = f.show_if(:stripe_plan_id, plan[:id]) do
-          .effective-orders-stripe-plan{'data-id': plan[:id], 'data-amount': plan[:amount], 'data-interval': plan[:interval]}
-            .d-flex.justify-content-around.align-items-center
-              = f.number_field :quantity, class: 'effective-orders-subscripter-plan-quantity form-control-lg', autocomplete: 'off', required: true
-              %div= 'x'
-              = f.static_field :price_per_person do
-                = price_to_currency(plan[:amount] / 12)
-              %div= '='
-              = f.static_field :total_amount do
-                = price_to_currency(plan[:amount] * f.object.quantity.to_i)
+          = render 'effective/subscripter/plan', plan: plan, f: f
 
   = f.submit(border: false, center: true) do
-    = f.save('Update Plan', class: ('effective-orders-stripe-token-required' if f.object.token_required?))
+    = f.save('Continue to Billing', class: ('effective-orders-stripe-token-required' if f.object.token_required?))

data/app/views/effective/subscripter/_plan.html.haml

@@ -0,0 +1,23 @@
+.effective-orders-stripe-plan{data: plan}
+  .d-flex.justify-content-around.align-top
+    = f.integer_field :quantity, autocomplete: 'off', required: true, label: 'Total People', maxlength: 3,
+      class: 'effective-orders-subscripter-plan-quantity form-control-lg'
+
+    .subscripter-math-symbol= 'x'
+
+    = f.static_field :price_per_person, label: 'Price Per Person' do
+      = price_to_currency(plan[:amount])
+
+      - if plan[:savings]
+        .subscripter-savings.text-danger
+          Save #{price_to_currency(plan[:savings])}/person
+
+    .subscripter-math-symbol= '='
+
+    = f.static_field :total_amount, label: 'Total Amount' do
+      = price_to_currency(plan[:amount] * f.object.quantity.to_i)
+
+      - if plan[:savings]
+        .subscripter-total-savings.text-danger
+          Save
+          %span #{price_to_currency(f.object.quantity.to_i * plan[:savings])}

data/lib/effective_orders.rb

@@ -166,7 +166,7 @@ module EffectiveOrders
   end
 
   def self.stripe_plans
-    return {} unless (stripe? && subscriptions?)
+    return [] unless (stripe? && subscriptions?)
 
     @stripe_plans ||= (
       Rails.logger.info '[STRIPE] index plans'
@@ -177,24 +177,53 @@ module EffectiveOrders
         raise e if Rails.env.production?
         Rails.logger.info "[STRIPE ERROR]: #{e.message}"
         Rails.logger.info "[STRIPE ERROR]: effective_orders continuing with empty stripe plans. This would fail loudly in Rails.env.production."
-        {}
+        []
       end
 
-      plans.inject({}) do |h, plan|
-        h[plan.id] = {
+      plans = plans.map do |plan|
+        {
           id: plan.id,
           product_id: plan.product,
           name: plan.nickname,
           amount: plan.amount,
           currency: plan.currency,
-          description: "$#{'%0.2f' % (plan.amount / 100.0)} #{plan.currency.upcase}/#{plan.interval}",
+          description: ("$#{'%0.2f' % (plan.amount / 100.0)}" + ' ' + plan.currency.upcase + '/' +  plan.interval.to_s),
           interval: plan.interval,
           interval_count: plan.interval_count
-        }; h
+        }
+      end.sort do |x, y|
+        val ||= (x[:interval] <=> y[:interval])
+        val = nil if val == 0
+
+        val ||= (x[:amount] <=> y[:amount])
+        val = nil if val == 0
+
+        val ||= (x[:name] <=> y[:name])
+        val = nil if val == 0
+
+        val || (x[:id] <=> y[:id])
+      end
+
+      # Calculate savings for any yearly per user plans, based on their matching monthly plans
+      plans.select { |plan| plan[:interval] == 'year' && plan[:name].downcase.include?('per') }.each do |yearly|
+        monthly_name = yearly[:name].downcase.gsub('year', 'month')
+        monthly = plans.find { |plan| plan[:interval] == 'month' && plan[:name].downcase == monthly_name }
+        next unless monthly
+
+        savings = (monthly[:amount].to_i * 12) - yearly[:amount].to_i
+        next unless savings > 0
+
+        yearly[:savings] = savings
       end
+
+      plans
     )
   end
 
+  def self.stripe_plans_collection
+    stripe_plans.map { |plan| [plan[:name], plan[:id]] }
+  end
+
   class SoldOutException < Exception; end
   class AlreadyPurchasedException < Exception; end
 end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.1.5'.freeze
+  VERSION = '4.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -231,6 +231,7 @@ files:
 - app/views/effective/orders_mailer/subscription_trialing.html.haml
 - app/views/effective/orders_mailer/subscription_updated.html.haml
 - app/views/effective/subscripter/_form.html.haml
+- app/views/effective/subscripter/_plan.html.haml
 - app/views/layouts/effective_orders_mailer_layout.html.haml
 - config/effective_orders.rb
 - config/routes.rb