effective_orders 4.0.6 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc3ed0ca01bf36b49326b92714290faff406bb8
-  data.tar.gz: eb4eec1d4d0d58c97e3554a96357147b5b65ab90
+  metadata.gz: f15a457703f171efde10a8a750dcd7b8c7092e3f
+  data.tar.gz: 182e31f6db68aac1ff8f6a50fdf405f5e3307ae5
 SHA512:
-  metadata.gz: c29cc4865ee5d538a801640dfca5986c8cff2924cc06767fece44a959cfbe2d17cdb82a55df6535e2af386317bd909b154646cee9cc1e8809a22937a24216775
-  data.tar.gz: 2eb4b69106c3080f17e46badefc133749ddd1e33359b926ff7798d8b83af219db256faf7586682da4aeb9e0066a1c6a8e1ca890eda82c026614b73bc1c9714b3
+  metadata.gz: 0ed4b21b9c7d9bd6ad1ac9615874b1735eb69826bd5db89ab18df7f96889a8282edcd1ca37b363e6e4f0dcc0001c608a83df431b8e6ab7361d5633ca1f2b3326
+  data.tar.gz: d59aa7963b0436533fbf99fbe9e1d6ee79dbdbf8278b7d361fde6e16187023e935436492a7b04a1d4df80d682d7b4725e4e6ebb2fe4233c40ad993a9861cc691

data/README.md

@@ -20,7 +20,7 @@ Please check out [Effective Orders 3.x](https://github.com/code-and-effect/effec
 
 ## Getting Started
 
-Please first install the [effective_addresses](https://github.com/code-and-effect/effective_addresses), [effective_datatables](https://github.com/code-and-effect/effective_datatables) and [effective_form_inputs](https://github.com/code-and-effect/effective_form_inputs) gems.
+Please first install the [effective_addresses](https://github.com/code-and-effect/effective_addresses), [effective_datatables](https://github.com/code-and-effect/effective_datatables) and [effective_bootstrap](https://github.com/code-and-effect/effective_bootstrap) gems.
 
 Add to your Gemfile:
 

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

@@ -13,6 +13,30 @@ stripeSubscriptionHandler = (key, form) ->
         form.find("input[name$='[stripe_token]']").val('' + token['id'])
         form.addClass('stripe-success').submit() # Submits the form. As this is a remote form, submits via JS
 
+# This updates the form whenever a quantity change is made
+$(document).on 'change keyup', '.effective-orders-subscripter-plan-quantity', (event) ->
+  $obj = $(event.currentTarget)
+  $plan = $obj.closest('.effective-orders-stripe-plan')
+  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())
+
+  quantity = $obj.val() || 0
+
+  # Assign all totals
+  $plan.closest('form').find(".effective-orders-stripe-plan").each ->
+    plan = $(this)
+    amount = parseInt(plan.data('amount'))
+    interval = plan.data('plan-interval')
+
+    total = (quantity * amount)
+    total = (total / 12) if interval == 'year'
+
+    total = '$' + (total / 100.0).toFixed(2)
+
+    plan.find('#effective_subscripter_total_amount').text(total)
+
 # Hijack submit and get a stripe token
 $(document).on 'click', ".effective-orders-stripe-token-required[type='submit'],[data-choose-stripe-plan-id]", (event) ->
   $obj = $(event.currentTarget)
@@ -44,8 +68,4 @@ $(document).on 'click', ".effective-orders-stripe-token-required[type='submit'],
     name: stripe.name
     email: stripe.email
     description: plan.name
-    amount: plan.amount
-    panelLabel: "{{amount}}/#{plan.interval} Go!"
-
-$(document).on 'change', "input[name='effective_subscripter[stripe_plan_id]']", (event) ->
-  $(event.currentTarget).closest('form').find(".effective-orders-stripe-token-required[type='submit']").click()
+    panelLabel: 'Update Plan'

data/app/controllers/effective/customers_controller.rb

@@ -4,18 +4,12 @@ module Effective
 
     include Effective::CrudController
 
-    submit :save, 'Save', redirect: :back, success: -> { 'Successfully updated card.' }
+    submit :save, 'Save', success: -> { 'Successfully updated card.' }
     page_title 'Customer Settings'
 
     def resource
-      @customer ||= Effective::Customer.where(user: current_user).first!
-      @subscripter ||= Effective::Subscripter.new(customer: @customer, user: @customer.user)
-    end
-
-    # I don't want save_resource to wrap my save in a transaction
-    def save_resource(resource, action, to_assign)
-      resource.assign_attributes(to_assign)
-      resource.save!
+      @customer = Effective::Customer.where(user: current_user).first!
+      @subscripter ||= Effective::Subscripter.new(customer: @customer, current_user: current_user)
     end
 
     # StrongParameters

data/app/controllers/effective/subscripter_controller.rb

@@ -7,12 +7,7 @@ module Effective
     submit :save, 'Save', redirect: :back, success: -> { 'Successfully updated plan.' }
 
     def resource
-      @subscripter ||= Effective::Subscripter.new(user: current_user)
-    end
-
-    # I don't want save_resource to wrap my save in a transaction
-    def save_resource(resource, action = :save, &block)
-      resource.save!
+      @subscripter ||= Effective::Subscripter.new(current_user: current_user)
     end
 
     # StrongParameters

data/app/controllers/effective/webhooks_controller.rb

@@ -42,17 +42,13 @@ module Effective
         # when 'charge.failed' # Card declined. 4000 0000 0000 0341
 
         when 'invoice.payment_succeeded'
-          customer.update_attributes!(status: EffectiveOrders::ACTIVE)
-
+          subscriptions.each { |subscription| subscription.update!(status: EffectiveOrders::ACTIVE) }
           send_email(:subscription_payment_succeeded, customer)
         when 'invoice.payment_failed'
-          customer.update_attributes!(status: EffectiveOrders::PAST_DUE)
-
+          subscriptions.each { |subscription| subscription.update!(status: EffectiveOrders::PAST_DUE) }
           send_email(:subscription_payment_failed, customer)
         when 'customer.subscription.deleted'
-          customer.update_attributes!(stripe_subscription_id: nil, status: nil, active_card: nil)
-          customer.subscriptions.delete_all
-
+          subscriptions.each { |subscription| subscription.destroy! }
           send_email(:subscription_canceled, customer)
         when 'customer.subscription.created'
           send_email(:subscription_created, customer)
@@ -79,6 +75,15 @@ module Effective
       )
     end
 
+    def subscriptions
+      customer.subscriptions.select { |subscription| stripe_plan_ids.include?(subscription.stripe_plan_id) }
+    end
+
+    def stripe_plan_ids
+      return unless @event.respond_to?(:data)
+      @stripe_plan_ids ||= @event.data.object.lines.map { |line| line.plan.id }
+    end
+
     def send_email(email, *mailer_args)
       Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
       Effective::OrdersMailer.public_send(:subscription_event_to_admin, email.to_s, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])

data/app/helpers/effective_subscriptions_helper.rb

@@ -1,45 +1,10 @@
 module EffectiveSubscriptionsHelper
 
-  def render_plan(plan, subscribed: true)
-    render(render_plan_partial(plan), plan: plan, subscribed: subscribed)
-  end
-
-  def render_plan_partial(plan)
-    if lookup_context.template_exists?("effective/subscriptions/#{plan[:id].downcase}", [], true)
-      "effective/subscriptions/#{plan[:id].downcase}" # Render the app's views/effective/subscriptions/_gold.html.haml
-    elsif lookup_context.template_exists?("effective/subscriptions/#{plan[:name].downcase}", [], true)
-      "effective/subscriptions/#{plan[:name].downcase}" # Render the app's views/effective/subscriptions/_gold.html.haml
-    else
-      'effective/subscriptions/plan' # Render effective_orders default plan panel
-    end
-  end
-
-  def stripe_plans_collection(form)
-    raise 'expected an Effective::FormBuilder object' unless form.class.name == 'Effective::FormBuilder'
-
-    subscripter = form.object
-    raise 'form object must be a subscripter object' unless subscripter.class.name == 'Effective::Subscripter'
-
-    plans = EffectiveOrders.stripe_plans.values.sort do |x, y|
+  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
-
-    if (existing = subscripter.customer.stripe_subscription_interval).present?
-      plans.select! { |plan| plan[:interval] == existing }
-    end
-
-    plans.map do |plan|
-      content = render(partial: render_plan_partial(plan), locals: {
-        f: form,
-        plan: plan,
-        selected: Array(form.object.stripe_plan_id).include?(plan[:id]),
-        subscribable: form.object.subscribable,
-        subscribed: form.object.subscribable.subscribed?(plan[:id])
-      })
-
-      [content, plan[:id]]
-    end
   end
 
   def subscribable_form_with(subscribable)

data/app/models/concerns/acts_as_purchasable.rb

@@ -29,7 +29,10 @@ module ActsAsPurchasable
       through: :order_items, class_name: 'Effective::Order', source: :order
 
     # Database max integer value is 2147483647.  So let's round that down and use a max/min of $20 million (2000000000)
-    validates :price, presence: true, numericality: { less_than_or_equal_to: 2000000000, message: 'maximum price is $20,000,000' }
+    validates :price, presence: true
+    validates :price, numericality: { less_than_or_equal_to: 2000000000, message: 'maximum price is $20,000,000' }
+    validates :price, numericality: { greater_than_or_equal_to: -2000000000, message: 'minimum price is -$20,000,000' }
+
     validates :tax_exempt, inclusion: { in: [true, false] }
 
     with_options(if: -> { quantity_enabled? }) do

data/app/models/concerns/acts_as_subscribable.rb

@@ -44,7 +44,9 @@ module ActsAsSubscribable
   end
 
   def subscripter
-    @_effective_subscripter ||= Effective::Subscripter.new(subscribable: self, user: subscribable_buyer)
+    @_effective_subscripter ||= begin
+      Effective::Subscripter.new(subscribable: self, user: subscribable_buyer, quantity: (subscription&.quantity || 0), stripe_plan_id: subscription&.stripe_plan_id)
+    end
   end
 
   def subscribed?(stripe_plan_id = nil)
@@ -76,5 +78,8 @@ module ActsAsSubscribable
     raise 'acts_as_subscribable object requires the subscribable_buyer method be defined to return the User buying this item.'
   end
 
-end
+  def subscribable_quantity_used
+    raise 'acts_as_subscribable object requires the subscribable_quantity_used method be defined to determine how many are in use.'
+  end
 
+end

data/app/models/effective/customer.rb

@@ -2,7 +2,7 @@ module Effective
   class Customer < ActiveRecord::Base
     self.table_name = EffectiveOrders.customers_table_name.to_s
 
-    attr_accessor :stripe_customer, :stripe_subscription
+    attr_accessor :stripe_customer
 
     belongs_to :user
     has_many :subscriptions, -> { includes(:subscribable) }, class_name: 'Effective::Subscription', foreign_key: 'customer_id'
@@ -12,21 +12,12 @@ module Effective
     # stripe_customer_id            :string  # cus_xja7acoa03
     # active_card                   :string  # **** **** **** 4242 Visa 05/12
 
-    # stripe_subscription_id        :string  # Each user gets one stripe subscription object, which can contain many items
-    # stripe_subscription_interval  :string
-    # status                        :string
-
     # timestamps
 
     scope :deep, -> { includes(subscriptions: :subscribable) }
 
-    after_commit do
-      subscriptions.each { |subscription| subscription.subscribable.update_column(:subscription_status, status) }
-    end
-
     validates :user, presence: true
     validates :stripe_customer_id, presence: true
-    validates :status, if: -> { stripe_subscription_id.present? }, inclusion: { in: EffectiveOrders::STATUSES.keys }
 
     def self.for_user(user)
       Effective::Customer.where(user: user).first_or_initialize
@@ -47,28 +38,29 @@ module Effective
       end
     end
 
-    def stripe_subscription
-      @stripe_subscription ||= if stripe_subscription_id.present?
-        Rails.logger.info "[STRIPE] get subscription: #{stripe_subscription_id}"
-        ::Stripe::Subscription.retrieve(stripe_subscription_id)
-      end
-    end
-
     def upcoming_invoice
-      @upcoming_invoice ||= if stripe_customer_id.present? && stripe_subscription_id.present?
+      @upcoming_invoice ||= if stripe_customer_id.present?
         Rails.logger.info "[STRIPE] get upcoming invoice: #{stripe_customer_id}"
         ::Stripe::Invoice.upcoming(customer: stripe_customer_id) rescue nil
       end
     end
 
     def token_required?
-      active_card.blank? || (active_card.present? && stripe_subscription_id.present? && status != 'active')
+      active_card.blank? || past_due?
+    end
+
+    def past_due?
+      subscriptions.any? { |subscription| subscription.past_due? }
+    end
+
+    def active?
+      subscriptions.present? && subscriptions.all? { |subscription| subscription.active? }
     end
 
     def payment_status
-      if status == 'past_due'
+      if past_due?
         'We ran into an error processing your last payment. Please update or confirm your card details to continue.'
-      elsif status == 'active'
+      elsif active?
         "Your payment is in good standing. Thanks so much for your support!"
       elsif active_card.blank?
         'No credit card on file. Please add a card.'

data/app/models/effective/subscripter.rb

@@ -4,8 +4,8 @@ module Effective
   class Subscripter
     include ActiveModel::Model
 
-    attr_accessor :user, :subscribable, :customer
-    attr_accessor :subscribable_global_id, :stripe_token, :stripe_plan_id, :include_trial
+    attr_accessor :current_user, :user, :subscribable, :customer
+    attr_accessor :subscribable_global_id, :stripe_token, :stripe_plan_id, :quantity
 
     validates :user, presence: true
     validates :subscribable, presence: true, if: -> { stripe_plan_id.present? }
@@ -17,10 +17,23 @@ module Effective
       self.errors.add(:stripe_token, 'updated payment card required') if stripe_token.blank? && token_required?
     end
 
+    validate(if: -> { stripe_plan_id && subscribable }) do
+      quantity_used = [subscribable.subscribable_quantity_used, 0].max
+      self.errors.add(:quantity, "must be #{quantity_used} or greater") unless quantity >= quantity_used
+    end
+
+    def to_s
+      'Your Plan'
+    end
+
     def customer
       @customer ||= Effective::Customer.deep.where(user: user).first_or_initialize
     end
 
+    def current_user=(user)
+      @user = user
+    end
+
     def subscribable_global_id
       subscribable&.to_global_id
     end
@@ -29,20 +42,12 @@ module Effective
       @subscribable = GlobalID::Locator.locate(global_id)
     end
 
-    def user_id=(id)
-      @user = User.find(id)
-    end
-
-    def current_plan
-      subscribable&.subscription&.plan
-    end
-
     def plan
       EffectiveOrders.stripe_plans[stripe_plan_id]
     end
 
-    def stripe_plan_id
-      @stripe_plan_id || (current_plan[:id] if current_plan)
+    def quantity
+      (@quantity.to_i if @quantity.present?)
     end
 
     def token_required?
@@ -50,142 +55,113 @@ module Effective
     end
 
     def save!
-      return true if (plan == current_plan) && stripe_token.blank?  # No work to do
-
       raise 'is invalid' unless valid?
 
       create_customer!
       create_stripe_token!
-      build_subscription!
-      sync_subscription!
+      save_subscription!
       true
     end
 
     def destroy!
       return true unless plan
 
-      subscribable.subscription.destroy!
-      subscribable.update_column(:subscription_status, nil)
-      sync_subscription!
+      subscription = subscribable.subscription
+
+      Rails.logger.info " -> [STRIPE] delete subscription"
+      subscription.stripe_subscription.delete
+      subscription.destroy!
+      
       true
     end
 
     protected
 
-    # This should work even if the rest of the form doesn't. Careful with our transactions...
     def create_customer!
-      if customer.stripe_customer.blank?
-        Rails.logger.info "[STRIPE] create customer: #{user.email}"
-        customer.stripe_customer = Stripe::Customer.create(email: user.email, description: user.to_s, metadata: { user_id: user.id })
-        customer.stripe_customer_id = customer.stripe_customer.id
-        customer.save!
-      end
+      return if customer.stripe_customer.present?
+
+      Rails.logger.info "[STRIPE] create customer: #{user.email}"
+      customer.stripe_customer = Stripe::Customer.create(email: user.email, description: user.to_s, metadata: { user_id: user.id })
+      customer.stripe_customer_id = customer.stripe_customer.id
+      customer.save!
     end
 
     # Update stripe customer card
     def create_stripe_token!
-      if stripe_token.present?
-        Rails.logger.info "[STRIPE] update source: #{stripe_token}"
-        customer.stripe_customer.source = stripe_token
-        customer.stripe_customer.save
-
-        if customer.stripe_customer.default_source.present?
-          card = customer.stripe_customer.sources.retrieve(customer.stripe_customer.default_source)
-          customer.active_card = "**** **** **** #{card.last4} #{card.brand} #{card.exp_month}/#{card.exp_year}"
-          customer.save!
-        end
-      end
-    end
+      return if stripe_token.blank?
 
-    def build_subscription!
-      return unless plan.present?
-      subscription.stripe_plan_id = plan[:id]
-    end
+      Rails.logger.info "[STRIPE] update source: #{stripe_token}"
+      customer.stripe_customer.source = stripe_token
+      customer.stripe_customer.save
 
-    def sync_subscription!
-      return unless plan.present?
-      customer.stripe_subscription.blank? ? create_subscription! : update_subscription!
+      return if customer.stripe_customer.default_source.blank?
 
+      card = customer.stripe_customer.sources.retrieve(customer.stripe_customer.default_source)
+      customer.active_card = "**** **** **** #{card.last4} #{card.brand} #{card.exp_month}/#{card.exp_year}"
       customer.save!
     end
 
-    def create_subscription!
+    def save_subscription!
       return unless plan.present?
-      return if customer.stripe_subscription.present?
 
-      Rails.logger.info "[STRIPE] create subscription: #{items(metadata: false)}"
-      customer.stripe_subscription = Stripe::Subscription.create(customer: customer.stripe_customer_id, items: items(metadata: false), metadata: metadata)
-      customer.stripe_subscription_id = customer.stripe_subscription.id
+      subscription.assign_attributes(stripe_plan_id: stripe_plan_id, quantity: quantity)
 
-      customer.status = customer.stripe_subscription.status
-      customer.stripe_subscription_interval = customer.stripe_subscription.plan.interval
+      cancel_subscription!
+      create_subscription! || update_subscription!
+      true
     end
 
-    def update_subscription!
-      return unless plan.present?
-      return if customer.stripe_subscription.blank?
-
-      Rails.logger.info "[STRIPE] update subscription: #{customer.stripe_subscription_id} #{items}"
+    def cancel_subscription!
+      return false unless subscription.persisted? && subscription.stripe_plan_id_changed?
 
-      if items.length == 0
-        customer.stripe_subscription.delete
-        customer.stripe_subscription_id = nil
-        customer.status = EffectiveOrders::CANCELED
-        return
-      end
+      item = items.first
+      stripe_item = subscription.stripe_subscription.items.first
 
-      # Update stripe subscription items. Keep track if quantity changed here or not
-      quantity_increased = false
+      return false unless stripe_item.present? && item[:plan] != stripe_item['plan']['id']
 
-      customer.stripe_subscription.items.each do |stripe_item|
-        item = items.find { |item| item[:plan] == stripe_item['plan']['id'] }
+      Rails.logger.info " -> [STRIPE] cancel plan: #{stripe_item['plan']['id']}"
+      subscription.stripe_subscription.delete
+      subscription.assign_attributes(stripe_subscription: nil, stripe_subscription_id: nil)
 
-        next if item.blank? || item[:quantity] == stripe_item['quantity']
-
-        quantity_increased ||= (item[:quantity] > stripe_item['quantity']) # Any quantity increased
+      true
+    end
 
-        stripe_item.quantity = item[:quantity]
-        stripe_item.metadata = item[:metadata]
+    def create_subscription!
+      return false unless subscription.stripe_subscription.blank?
 
-        Rails.logger.info " -> [STRIPE] update plan: #{item[:plan]}"
-        stripe_item.save
-      end
+      Rails.logger.info "[STRIPE] create subscription: #{items}"
+      stripe_subscription = Stripe::Subscription.create(customer: customer.stripe_customer_id, items: items, metadata: metadata)
 
-      # Create stripe subscription items
-      items.each do |item|
-        next if customer.stripe_subscription.items.find { |stripe_item| item[:plan] == stripe_item['plan']['id'] }
+      subscription.update!(
+        stripe_subscription: stripe_subscription,
+        stripe_subscription_id: stripe_subscription.id,
+        status: stripe_subscription.status,
+        name: stripe_subscription.plan.nickname,
+        interval: stripe_subscription.plan.interval,
+        quantity: quantity
+      )
+    end
 
-        Rails.logger.info " -> [STRIPE] create plan: #{item[:plan]}"
-        customer.stripe_subscription.items.create(plan: item[:plan], quantity: item[:quantity], metadata: item[:metadata])
-      end
+    def update_subscription!
+      return false unless subscription.stripe_subscription.present?
 
-      # Delete stripe subscription items
-      customer.stripe_subscription.items.each do |stripe_item|
-        next if items.find { |item| item[:plan] == stripe_item['plan']['id'] }
+      stripe_item = subscription.stripe_subscription.items.first
+      item = items.first
 
-        Rails.logger.info " -> [STRIPE] delete plan: #{stripe_item['plan']['id']}"
-        stripe_item.delete
-      end
+      return false unless stripe_item.present? && item[:plan] == stripe_item['plan']['id']
+      return false unless item[:quantity] != subscription.stripe_subscription.quantity
 
-      # Update metadata
-      if customer.stripe_subscription.metadata.to_h != metadata
-        Rails.logger.info " -> [STRIPE] update metadata: #{metadata}"
-        customer.stripe_subscription.metadata = metadata
-        customer.stripe_subscription.save
-      end
+      Rails.logger.info " -> [STRIPE] update plan: #{item[:plan]}"
+      stripe_item.quantity = item[:quantity]
+      stripe_item.save
 
-      # When upgrading a plan, invoice immediately.
-      if quantity_increased
-        Rails.logger.info " -> [STRIPE] generate invoice"
-        Stripe::Invoice.create(customer: customer.stripe_customer_id).pay
-      end
+      subscription.update!(status: subscription.stripe_subscription.status)
 
-      customer.status = customer.stripe_subscription.status
-    end
+      # Invoice immediately
+      Rails.logger.info " -> [STRIPE] generate invoice"
+      Stripe::Invoice.create(customer: customer.stripe_customer_id).pay
 
-    def subscribe!(stripe_plan_id)
-      self.stripe_plan_id = stripe_plan_id
-      save!
+      true
     end
 
     private
@@ -195,33 +171,18 @@ module Effective
       customer.subscriptions.find { |sub| sub.subscribable == subscribable } || customer.subscriptions.build(subscribable: subscribable, customer: customer)
     end
 
-    def items(metadata: true)
-      customer.subscriptions.group_by { |sub| sub.stripe_plan_id }.map do |plan, subscriptions|
-        if metadata
-          { plan: plan, quantity: subscriptions.length, metadata: metadata(subscriptions: subscriptions) }
-        else
-          { plan: plan, quantity: subscriptions.length }
-        end
-      end
+    def items
+      [{ plan: subscription.stripe_plan_id, quantity: subscription.quantity }]
     end
 
     # The stripe metadata limit is 500 characters
-    def metadata(subscriptions: nil)
-      retval = { user_id: user.id.to_s, user: user.to_s.truncate(500) }
-
-      (subscriptions || customer.subscriptions).group_by { |sub| sub.subscribable_type }.each do |subscribable_type, subs|
-        subs = subs.sort
-
-        if subs.length == 1
-          retval[subscribable_type.downcase + '_id'] = subs.map { |sub| sub.subscribable.id }.join(',')
-          retval[subscribable_type.downcase] = subs.map { |sub| sub.subscribable.to_s }.join(',').truncate(500)
-        else
-          retval[subscribable_type.downcase + '_ids'] = subs.map { |sub| sub.subscribable.id }.join(',')
-          retval[subscribable_type.downcase.pluralize] = subs.map { |sub| sub.subscribable.to_s }.join(',').truncate(500)
-        end
-      end
-
-      retval
+    def metadata
+      {
+        :user_id => user.id.to_s,
+        :user => user.to_s.truncate(500),
+        (subscription.subscribable_type.downcase + '_id').to_sym => subscription.subscribable.id.to_s,
+        subscription.subscribable_type.downcase.to_sym => subscription.subscribable.to_s
+      }
     end
 
   end

data/app/models/effective/subscription.rb

@@ -1,27 +1,58 @@
-# This links the acts_as_subscribable_buyer (customer) to the acts_as_subscribable (subscribable)
-
 module Effective
   class Subscription < ActiveRecord::Base
     self.table_name = EffectiveOrders.subscriptions_table_name.to_s
 
+    attr_accessor :stripe_subscription
+
     belongs_to :customer, class_name: 'Effective::Customer', counter_cache: true
     belongs_to :subscribable, polymorphic: true
 
     # Attributes
-    # stripe_plan_id          :string
-    # name                    :string
+    # stripe_plan_id            :string
+    # stripe_subscription_id    :string
+    # name                      :string
+    # description               :string
+    # interval                  :string
+    # quantity                  :integer
+    #
+    # status                    :string
     #
     # timestamps
 
     before_validation(if: -> { plan && (stripe_plan_id_changed? || new_record?) }) do
-      self.name = "#{plan[:name]} #{plan[:description]}"
+      self.name = plan[:name]
+      self.description = plan[:description]
+    end
+
+    after_save(on: [:create, :update]) do
+      subscribable.subscription_name = name if subscribable.respond_to?(:subscription_name=)
+      subscribable.subscription_description = description if subscribable.respond_to?(:subscription_description=)
+      subscribable.subscription_interval = interval if subscribable.respond_to?(:subscription_interval=)
+      subscribable.subscription_quantity = quantity if subscribable.respond_to?(:subscription_quantity=)
+      subscribable.subscription_status = status if subscribable.respond_to?(:subscription_status=)
+      subscribable.save!(validate: false)
+    end
+
+    after_destroy do
+      subscribable.subscription_name = nil if subscribable.respond_to?(:subscription_name=)
+      subscribable.subscription_description = nil if subscribable.respond_to?(:subscription_description=)
+      subscribable.subscription_interval = nil if subscribable.respond_to?(:subscription_interval=)
+      subscribable.subscription_quantity = nil if subscribable.respond_to?(:subscription_quantity=)
+      subscribable.subscription_status = nil if subscribable.respond_to?(:subscription_status=)
+      subscribable.save!(validate: false)
     end
 
     validates :customer, presence: true
     validates :subscribable, presence: true
 
     validates :stripe_plan_id, presence: true, inclusion: { in: EffectiveOrders.stripe_plans.keys }
+    validates :stripe_subscription_id, presence: true
+
     validates :name, presence: true
+    validates :interval, presence: true
+    validates :quantity, presence: true, numericality: { greater_than: 0 }
+
+    validates :status, inclusion: { in: EffectiveOrders::STATUSES.keys }
 
     def to_s
       name || 'New Subscription'
@@ -31,9 +62,28 @@ module Effective
       EffectiveOrders.stripe_plans[stripe_plan_id]
     end
 
+    def stripe_subscription
+      @stripe_subscription ||= if stripe_subscription_id.present?
+        Rails.logger.info "[STRIPE] get subscription: #{stripe_subscription_id}"
+        ::Stripe::Subscription.retrieve(stripe_subscription_id)
+      end
+    end
+
     def <=>(other)
       name.to_s <=> other&.name.to_s
     end
 
+    def active?
+      status == 'active'
+    end
+
+    def past_due?
+      status == 'past_due'
+    end
+
+    def canceled?
+      status == 'canceled'
+    end
+
   end
 end

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

@@ -1,85 +1,21 @@
-- if customer.stripe_subscription.present?
-  .card.my-4
-    .card-header Subscription
-    .card-body
-      %table.table
-        %tbody
-          %tr
-            %th Status
-            %td= customer.stripe_subscription.status.presence || 'unknown'
-
-          %tr
-            %th Email
-            %td= customer.stripe_customer.email
-
-          %tr
-            %th Card
-            %td
-              - if customer.stripe_customer.default_source.present?
-                - card = customer.stripe_customer.sources.retrieve(customer.stripe_customer.default_source)
-                = "**** **** **** #{card.last4} #{card.brand} #{card.exp_month}/#{card.exp_year}"
-              - else
-                None
-
-          %tr
-            %th Currency
-            %td= customer.stripe_customer.currency.to_s.upcase
-
-          - if customer.stripe_subscription.discount.present?
-            %tr
-              %th Coupon
-              %td= stripe_coupon_description(customer.stripe_subscription.discount.coupon)
-
-          - if customer.stripe_subscription.start.present?
-            %tr
-              %th Started
-              %td= Time.zone.at(customer.stripe_subscription.start).strftime('%F')
-
-          - if customer.stripe_subscription.ended_at.present?
-            %tr
-              %th Ended
-              %td= Time.zone.at(customer.stripe_subscription.ended_at).strftime('%F')
-
-          - if customer.stripe_subscription.canceled_at.present?
-            %tr
-              %th Cancelled
-              %td= Time.zone.at(customer.stripe_subscription.canceled_at).strftime('%F')
-
-          - if customer.stripe_subscription.current_period_start.present?
-            %tr
-              %th Current Period Start
-              %td= Time.zone.at(customer.stripe_subscription.current_period_start).strftime('%F')
-
-          - if customer.stripe_subscription.current_period_end.present?
-            %tr
-              %th Current Period End
-              %td= Time.zone.at(customer.stripe_subscription.current_period_end).strftime('%F')
-
-          - if customer.stripe_subscription.metadata.present? && false
-            %tr
-              %th Metadata
-              %td= tableize_hash(customer.stripe_subscription.metadata.to_h, th: false)
-
-          - if customer.stripe_subscription.items.present?
-            %tr
-              %th Plans
-              %td= tableize_hash(customer.stripe_subscription.items.inject({}) { |h, item| h[item.plan.nickname] = item.quantity; h }, th: false)
-
 - if customer.subscriptions.present?
   .card.my-4
-    .card-header Subscribed
+    .card-header Subscriptions
     .card-body
       %table.table
         %thead
           %tr
-            %th Name
+            %th Subscribed
             %th Plan
-            %th
+            %th Quantity
+            %th Interval
         %tbody
           - customer.subscriptions.each do |sub|
             %tr
               %td= sub.subscribable
               %td= sub
+              %td= sub.quantity
+              %td= sub.interval
 
 - if customer.stripe_customer.invoices.present?
   .card.my-4
@@ -94,10 +30,10 @@
         %tbody
           - customer.stripe_customer.invoices.each do |invoice|
             %tr
-              %td= Time.zone.at(invoice.date).strftime('%F')
+              %td= link_to Time.zone.at(invoice.date).strftime('%F'), invoice.invoice_pdf
               %td
                 %p
-                  = invoice.id
+                  = invoice.number
                   %br
                   = Time.zone.at(invoice.lines.first.period.start).strftime('%F')
                   to

data/app/views/effective/customers/update.js.erb

@@ -1,5 +1,5 @@
 <% resource = (@_effective_resource || Effective::Resource.new(controller_path)) %>
 <% @resource = instance_variable_get('@' + resource.name) if resource.name %>
 
-EffectiveForm.remote_form_payload = $("<div><%= j render_resource_form(resource, subscripter: @subscripter) %></div>");
+EffectiveForm.remote_form_payload = "<%= j render('effective/customers/form', subscripter: @subscripter) %>";
 EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;

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

@@ -1,11 +1,64 @@
 = 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|
-  = f.hidden_field :user_id, value: current_user.id
   = f.hidden_field :subscribable_global_id
   = f.hidden_field :stripe_token, value: nil
   = f.error :stripe_token
 
-  = f.radios :stripe_plan_id, stripe_plans_collection(f), inline: false, cards: false, label: false, required: true
+  = f.hidden_field :stripe_plan_id
 
-  = f.submit 'Choose Plan', center: true, border: false, class: ('effective-orders-stripe-token-required' if f.object.token_required?)
+  - 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]
+
+  - 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 
+        You currently have <strong>#{pluralize(quantity_used, 'member')}</strong> in your team
+        and have space for <strong>#{pluralize(quantity_purchased, 'member')}</strong>.
+
+      - if quantity_purchased > quantity_used
+        %p You can add #{pluralize(quantity_purchased - quantity_used, 'more member')} without updating your plan.
+      - 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.
+
+  .card.mb-4
+    .card-body.text-center
+      %h5.card-title Billing Cycle
+
+      = f.radios :stripe_plan_id, stripe_plans.map { |plan| [plan[:name], plan[:id]] }, label: false, buttons: true
+
+      %hr
+
+      - 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)
+
+      - stripe_plans.select { |plan| plan[:interval] == 'year' }.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)
+
+  = f.submit(border: false, center: true) do
+    = f.save('Update Plan', class: ('effective-orders-stripe-token-required' if f.object.token_required?))

data/db/migrate/01_create_effective_orders.rb.erb

@@ -73,9 +73,6 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
 
       t.string    :stripe_customer_id
       t.string    :active_card
-
-      t.string    :stripe_subscription_id
-      t.string    :stripe_subscription_interval
       t.string    :status
 
       t.integer   :subscriptions_count, :default => 0
@@ -92,7 +89,13 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.string    :subscribable_type
 
       t.string    :stripe_plan_id
+      t.string    :stripe_subscription_id
+
       t.string    :name
+      t.string    :description
+      t.string    :interval
+      t.integer   :quantity
+      t.string    :status
 
       t.timestamps
     end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.0.6'.freeze
+  VERSION = '4.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -231,8 +231,6 @@ 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/subscriptions/_plan.html.haml
-- app/views/effective/subscriptions/_subscription.html.haml
 - app/views/layouts/effective_orders_mailer_layout.html.haml
 - config/effective_orders.rb
 - config/routes.rb

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

@@ -1,20 +0,0 @@
-.card-header.text-center
-  %h3= plan[:name]
-  %p= plan[:description]
-
-.card-body
-  %p Includes features
-
-  - if plan[:amount] == 0
-    %p Free plan
-
-  .visible-when-unselected.text-center
-    = link_to 'Select', '#', class: 'btn btn-secondary', 'data-toggle': 'card'
-
-  .visible-when-selected.text-center
-    - if subscribed
-      %p
-        %strong Your current plan
-    - else
-      %p This is #{['an amazing', 'a great', 'an excellent', 'an exceptional', 'a marvelous', 'a wonderful'].sample} plan
-

data/app/views/effective/subscriptions/_subscription.html.haml

@@ -1,3 +0,0 @@
-.effective-radios.card-deck
-  .card.active
-    = render_plan(subscription.plan)