effective_orders 4.0.0beta5 → 4.0.0beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd54f1217fe33988f924bf40803efd702916d971
-  data.tar.gz: 291f290fd3cf4b8636ce5103a86b976760e12122
+  metadata.gz: 12e3f1de057495a5b6c3dc1b6cbc8127ef8736bf
+  data.tar.gz: d30298b8aac6de0afee57cc5e9af2552b01d5519
 SHA512:
-  metadata.gz: 546166ac0b6f8948af732a82bdd2ba8b2e59f11ce6f734d10b1d6dd49350926d764331fe179d71f01a3a9d4510786254dfd6bbfeac0cffb992b821d03ea70c6c
-  data.tar.gz: 1d1602f8456cbf830c82ca6f298b85ca465b384240a5867479df1280a7384c1693e5b1970ff21e9b353bba3371268da37fb21ae4fb17a82bef993be0c74c5418
+  metadata.gz: 9524eb918036d200c9d51f5c383e37a05afd43448dffb67e58d25bb43770a20f01e99ff4e09093f86d25d6506c28f7b859848d2c5bef6fe4ca8211b00d6f3b63
+  data.tar.gz: 020f1ae55841895de717445760e905c5e8640101d47ea05e3bc8327a805c5544cb844a02c70402a0d2e1144551de15e55b82edb2666190ababe141e253e0b1db

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

@@ -1,31 +1,29 @@
 stripeCustomerChangeCardHandler = (key, form) ->
   StripeCheckout.configure
     key: key
-    closed: -> EffectiveBootstrap.enable(form) unless form.hasClass('stripe-success')
+    closed: -> EffectiveForm.reset(form) unless form.hasClass('stripe-success')
     token: (token, args) ->
       if token.error
-        message = "An error ocurred when contacting Stripe. Your card has not been charged. Your subscription has not changed. Please refresh the page and try again. #{token.error.message}"
+        message = "An error ocurred when contacting Stripe. Your card has not been charged. Please refresh the page and try again. #{token.error.message}"
 
         form.removeClass('stripe-success')
-        form.find('.effective-orders-customer').find('.invalid-feedback').html(message).show()
+        form.find('.invalid-feedback').html(message).show()
         alert(message)
       else
         form.find("input[name$='[stripe_token]']").val('' + token['id'])
-
-        $customer = form.find('.effective-orders-customer')
-        $customer.find('.payment-status').html("**** **** **** #{token.card.last4} #{token.card.brand} #{token.card.exp_month}/#{token.card.exp_year}")
-
-        if $customer.data('submit')
-          form.addClass('stripe-success').submit()
+        form.addClass('stripe-success').submit() # Submits the form. As this is a remote form, submits via JS
 
 # When we click 'Change credit card', make sure the form collects a credit card
-$(document).on 'click', '.effective-orders-customer .btn-change-card', (event) ->
-  event.preventDefault()
-
+$(document).on 'click', ".effective-orders-stripe-update-card[type='submit']", (event) ->
   $form = $(event.currentTarget).closest('form')
-  stripe = $(event.currentTarget).closest('.effective-orders-customer').data('stripe')
 
-  EffectiveBootstrap.submitting($form)
+  # Get stripe data payload
+  stripe = $form.data('stripe')
+  return unless stripe?
+
+  # Okay, we're good to call stripe
+  event.preventDefault()
+  EffectiveForm.submitting($form) # Disable and spin while we popup stripe
 
   stripeCustomerChangeCardHandler(stripe.key, $form).open
     image: stripe.image

data/app/assets/javascripts/effective_orders/providers/stripe.js.coffee

@@ -1,7 +1,7 @@
 stripeCheckoutHandler = (key, form) ->
   StripeCheckout.configure
     key: key
-    closed: -> EffectiveBootstrap.enable(form) unless form.hasClass('stripe-success')
+    closed: -> EffectiveBootstrap.reset(form) unless form.hasClass('stripe-success')
     token: (token, args) ->
       if token.error
         alert("An error ocurred when contacting Stripe. Your card has not been charged. Please refresh the page and try again. #{token.error.message}")

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

@@ -1,56 +1,42 @@
 stripeSubscriptionHandler = (key, form) ->
   StripeCheckout.configure
     key: key
-    closed: -> EffectiveBootstrap.enable(form) unless form.hasClass('stripe-success')
+    closed: -> EffectiveForm.reset(form) unless form.hasClass('stripe-success')
     token: (token, args) ->
       if token.error
-        message = "An error ocurred when contacting Stripe. Your card has not been charged. Your subscription has not changed. Please refresh the page and try again. #{token.error.message}"
+        message = "An error ocurred when contacting Stripe. Your card has not been charged. Your plan has not changed. Please refresh the page and try again. #{token.error.message}"
 
         form.removeClass('stripe-success')
-        form.find('.effective-orders-stripe-plans').find('.invalid-feedback').html(message).show()
+        form.find('.invalid-feedback').html(message).show()
         alert(message)
       else
         form.find("input[name$='[stripe_token]']").val('' + token['id'])
-        form.addClass('stripe-success').submit()
+        form.addClass('stripe-success').submit() # Submits the form. As this is a remote form, submits via JS
 
-# When I submit a for that needs a subscripter token, do the stripe thing.
-$(document).on 'click', ".effective-orders-subscripter-token-required[type='submit']", (event) ->
-  event.preventDefault()
+# Hijack submit and get a stripe token
+$(document).on 'click', ".effective-orders-stripe-token-required[type='submit']", (event) ->
   $form = $(event.currentTarget).closest('form')
 
-  # Get the stripe data
-  $plans = $form.find('.effective-orders-stripe-plans').first()
-  selected_plan_id = $plans.find("input[name$='[subscripter][stripe_plan_id]']:checked").val()
-  return unless $plans.length > 0 && selected_plan_id.length > 0
+  # Get stripe data payload
+  stripe = $form.data('stripe')
+  return unless stripe?
 
-  EffectiveBootstrap.submitting($form)
+  # Make sure there is a plan selected
+  selected_plan_id = $form.find("input[name$='[stripe_plan_id]']:checked").val() || ''
+  return unless selected_plan_id.length > 0
 
-  stripe = $plans.data('stripe')
+  # Match plan
   plan = stripe.plans.find (plan, _) => plan.id == selected_plan_id
+  return unless plan?
+
+  # Okay, we're good to call stripe
+  event.preventDefault()
+  EffectiveForm.submitting($form) # Disable and spin while we popup stripe
 
   stripeSubscriptionHandler(stripe.key, $form).open
     image: stripe.image
     name: stripe.name
-    description: plan.name
     email: stripe.email
+    description: plan.name
     amount: plan.amount
-    panelLabel: "{{amount}}#{plan.occurrence} Go!"
-
-# When I click on a stripe plan ID radio button, add .effective-orders-subscripter-token-required to the form if required
-$(document).on 'change', "input[name$='[subscripter][stripe_plan_id]']", (event) ->
-  $plan = $(event.currentTarget)
-  return unless $plan.is(':checked')
-
-  selected_plan_id = $plan.val()
-
-  $plans = $plan.closest('.effective-orders-stripe-plans').first()
-  plan = $plans.data('stripe').plans.find (plan, _) => plan.id == selected_plan_id
-
-  token_required = $plans.data('stripe').token_required
-
-  if (plan.amount || 0) > 0 && token_required
-    $plans.closest('form').find("input[type='submit'],button[type='submit']").addClass('effective-orders-subscripter-token-required')
-  else
-    $plans.closest('form').find("input[type='submit'],button[type='submit']").removeClass('effective-orders-subscripter-token-required')
-
-  true
+    panelLabel: "{{amount}}/#{plan.interval} Go!"

data/app/controllers/effective/customers_controller.rb

@@ -2,42 +2,24 @@ module Effective
   class CustomersController < ApplicationController
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:customers] : EffectiveOrders.layout)
 
-    before_action :authenticate_user!
+    include Effective::CrudController
 
-    # Get here by visiting /customer/settings
-    def edit
-      @customer = Effective::Customer.where(user: current_user).first!
-      EffectiveOrders.authorize!(self, :edit, @customer)
+    submit :save, 'Save', redirect: :back, success: -> { 'Successfully updated card.' }
+    page_title 'Customer Settings'
 
-      @subscripter = Effective::Subscripter.new(customer: @customer, user: @customer.user)
-
-      @page_title ||= "Customer #{current_user.to_s}"
+    def resource
+      @customer ||= Effective::Customer.where(user: current_user).first!
+      @subscripter ||= Effective::Subscripter.new(customer: @customer, user: @customer.user)
     end
 
-    def update
-      @customer = Effective::Customer.where(user: current_user).first!
-      EffectiveOrders.authorize!(self, :update, @customer)
-
-      @subscripter = Effective::Subscripter.new(customer: @customer, user: @customer.user)
-      @subscripter.assign_attributes(subscripter_params)
-
-      @page_title ||= "Customer #{current_user.to_s}"
-
-      if (@subscripter.save! rescue false)
-        flash[:success] = "Successfully updated customer settings"
-        redirect_to(effective_orders.customer_settings_path)
-      else
-        flash.now[:danger] = "Unable to update customer settings: #{@subscripter.errors.full_messages.to_sentence}"
-        render :edit
-      end
+    # I don't want save_resource to wrap my save in a transaction
+    def save_resource(resource, action)
+      resource.save!
     end
 
-    private
-
     # StrongParameters
-    def subscripter_params
+    def customer_params
       params.require(:effective_subscripter).permit(:stripe_token)
     end
-
   end
 end

data/app/controllers/effective/subscripter_controller.rb

@@ -0,0 +1,23 @@
+module Effective
+  class SubscripterController < ApplicationController
+    layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:subscriptions] : EffectiveOrders.layout)
+
+    include Effective::CrudController
+
+    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)
+      resource.save!
+    end
+
+    # StrongParameters
+    def subscripter_params
+      params.require(:effective_subscripter).permit!
+    end
+  end
+end

data/app/controllers/effective/webhooks_controller.rb

@@ -26,18 +26,19 @@ module Effective
 
         when 'invoice.payment_succeeded'
           customer = Effective::Customer.where(stripe_customer_id: @event.data.object.customer).first!
-          customer.update_attributes!(status: 'active')
+          customer.update_attributes!(status: EffectiveOrders::ACTIVE)
 
           send_email(:subscription_payment_succeeded, customer)
         when 'invoice.payment_failed'
           customer = Effective::Customer.where(stripe_customer_id: @event.data.object.customer).first!
-          customer.update_attributes!(status: 'past_due')
+          customer.update_attributes!(status: EffectiveOrders::PAST_DUE)
 
           send_email(:subscription_payment_failed, customer)
         when 'customer.subscription.deleted'
           customer = Effective::Customer.where(stripe_customer_id: @event.data.object.customer).first!
           Effective::Subscription.where(customer: customer).destroy_all
           customer.update_attributes!(stripe_subscription_id: nil, status: nil, active_card: nil)
+          customer.subscriptions.delete_all
 
           send_email(:subscription_canceled, customer)
         else

data/app/helpers/effective_subscriptions_helper.rb

@@ -1,32 +1,19 @@
 module EffectiveSubscriptionsHelper
 
-  def effective_customer_fields(form, submit: true)
+  def stripe_plans_collection(form)
     raise 'expected an Effective::FormBuilder object' unless form.class.name == 'Effective::FormBuilder'
-    raise 'form object must be an Effective::Subscripter object' unless form.object.class.name == 'Effective::Subscripter'
 
-    render(
-      partial: 'effective/customers/fields',
-      locals: {
-        f: form,
-        submit: submit,
-        stripe: {
-          email: form.object.customer.user.email,
-          image: stripe_site_image_url,
-          key: EffectiveOrders.stripe[:publishable_key],
-          name: EffectiveOrders.stripe[:site_title],
-        }
-      }
-    )
-  end
+    subscripter = form.object
+    raise 'form object must be a subscripter object' unless subscripter.class.name == 'Effective::Subscripter'
 
-  def stripe_plans_collection(form, include_trial: nil)
-    raise 'expected an Effective::FormBuilder object' unless form.class.name == 'Effective::FormBuilder'
-    raise 'form object must be an acts_as_subscribable object' unless form.object.subscribable.subscripter.present?
-
-    include_trial = form.object.subscribable.trialing? if include_trial.nil?
+    plans = EffectiveOrders.stripe_plans.values.sort do |x, y|
+      amount = (x[:amount] <=> y[:amount])
+      (amount != 0) ? amount : x[:name] <=> y[:name]
+    end
 
-    plans = include_trial ? EffectiveOrders.stripe_plans : EffectiveOrders.stripe_plans.except('trial')
-    plans = plans.values.sort { |x, y| (amount = x[:amount] <=> y[:amount]) != 0 ? amount : x[:name] <=> y[:name] }
+    if (existing = subscripter.customer.stripe_subscription_interval).present?
+      plans.select! { |plan| plan[:interval] == existing }
+    end
 
     plans.map do |plan|
       partial = (
@@ -49,27 +36,34 @@ module EffectiveSubscriptionsHelper
     end
   end
 
-  def effective_subscription_fields(form, label: false, required: true, include_trial: nil)
-    raise 'expected an Effective::FormBuilder object' unless form.class.name == 'Effective::FormBuilder'
-    raise 'form object must be an acts_as_subscribable object' unless form.object.subscripter.present?
-
-    render(
-      partial: 'effective/subscriptions/fields',
-      locals: {
-        form: form,
-        label: label,
-        required: required,
-        include_trial: include_trial,
-        stripe: {
-          email: form.object.subscribable_buyer.email,
-          image: stripe_site_image_url,
-          key: EffectiveOrders.stripe[:publishable_key],
-          name: EffectiveOrders.stripe[:site_title],
-          plans: EffectiveOrders.stripe_plans.values,
-          token_required: form.object.subscripter.token_required?
-        },
-      }
-    )
+  def subscribable_form_with(subscribable)
+    raise 'form object must be an acts_as_subscribable object' unless subscribable.respond_to?(:subscripter)
+
+    subscripter = subscribable.subscripter
+    raise 'subscribable.subscribable_buyer must match current_user' unless subscripter.user == current_user
+
+    render('effective/subscripter/form', subscripter: subscripter)
   end
 
+  def customer_form_with(customer)
+    raise 'form object must be an Effective::Customer object' unless customer.kind_of?(Effective::Customer)
+    raise 'expected customer user to match current user' if customer.user != current_user
+
+    subscripter = Effective::Subscripter.new(customer: customer, user: customer.user)
+
+    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/concerns/acts_as_subscribable.rb

@@ -27,8 +27,6 @@ module ActsAsSubscribable
     validates :trialing_until, presence: true, if: -> { EffectiveOrders.trial? }
     validates :subscription_status, inclusion: { allow_nil: true, in: EffectiveOrders::STATUSES.keys }
 
-    validates :subscripter, associated: true
-
     scope :trialing, -> { where(subscription_status: nil).where('trialing_until > ?', Time.zone.now) }
     scope :trial_past_due, -> { where(subscription_status: nil).where('trialing_until < ?', Time.zone.now) }
     scope :not_trialing, -> { where.not(subscription_status: nil) }
@@ -45,10 +43,6 @@ module ActsAsSubscribable
     @_effective_subscripter ||= Effective::Subscripter.new(subscribable: self, user: subscribable_buyer)
   end
 
-  def subscripter=(atts)
-    subscripter.assign_attributes(atts)
-  end
-
   def subscribed?(stripe_plan_id = nil)
     return false if subscription_status.blank?
     stripe_plan_id ? (subscription&.stripe_plan_id == stripe_plan_id) : true

data/app/models/effective/customer.rb

@@ -5,26 +5,23 @@ module Effective
     attr_accessor :stripe_customer, :stripe_subscription
 
     belongs_to :user
-    has_many :subscribables, as: :subscribable
-
-    has_many :subscriptions, class_name: 'Effective::Subscription', foreign_key: 'customer_id'
-    has_many :subscribables, through: :subscriptions, source: :subscribable
-
-    #accepts_nested_attributes_for :subscriptions
+    has_many :subscriptions, -> { includes(:subscribable) }, class_name: 'Effective::Subscription', foreign_key: 'customer_id'
+    accepts_nested_attributes_for :subscriptions
 
     # Attributes
     # 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) }
 
-    before_validation do
-      subscriptions.each { |subscription| subscription.status = status }
+    after_commit(if: -> { stripe_subscription_id.present? }) do
+      subscriptions.each { |subscription| subscription.subscribable.update_column(:subscription_status, status) }
     end
 
     validates :user, presence: true
@@ -67,14 +64,13 @@ module Effective
     def payment_status
       if status == 'past_due'
         'We ran into an error processing your last payment. Please update or confirm your card details to continue.'
-      elsif active_card.present? && token_required?
-        'Please update or confirm your card details to continue.'
-      elsif active_card.present?
-        'Thanks for your support! The card we have on file is'
-      else
+      elsif status == '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.'
+      else
+        'Please update or confirm your card details to continue.'
       end.html_safe
     end
-
   end
 end

data/app/models/effective/subscripter.rb

@@ -5,36 +5,46 @@ module Effective
     include ActiveModel::Model
 
     attr_accessor :user, :subscribable, :customer
-    attr_accessor :stripe_plan_id, :stripe_token
+    attr_accessor :subscribable_global_id, :stripe_token, :stripe_plan_id, :include_trial
 
     validates :user, presence: true
-    validates :subscribable, presence: true, if: -> { stripe_plan_id }
-    validates :stripe_plan_id, inclusion: { allow_blank: true, in: EffectiveOrders.stripe_plans.keys, message: 'unknown plan' }
+    validates :subscribable, presence: true, if: -> { stripe_plan_id.present? }
+    validates :customer, presence: true
 
-    validate(if: -> { stripe_plan_id && plan && subscribable }) do
-      if plan[:amount] > 0 && stripe_token.blank? && token_required?
-        self.errors.add(:stripe_token, 'updated payment card required')
-        customer.errors.add(:stripe_token, 'updated payment card required')
-      end
-    end
+    validates :stripe_plan_id, inclusion: { allow_blank: true, in: EffectiveOrders.stripe_plans.keys, message: 'unknown plan' }
 
-    validate(if: -> { subscribable }) do
-      subscribable.errors.add(:subscripter, errors.messages.values.flatten.to_sentence) if self.errors.present?
+    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?
     end
 
     def customer
       @customer ||= Effective::Customer.deep.where(user: user).first_or_initialize
     end
 
+    def subscribable_global_id
+      subscribable&.to_global_id
+    end
+
+    def subscribable_global_id=(global_id)
+      @subscribable = GlobalID::Locator.locate(global_id)
+    end
+
+    def user_id=(id)
+      @user = User.find(id)
+    end
+
     def current_plan
-      return nil unless subscribable
-      subscribable.subscription.blank? ? EffectiveOrders.stripe_plans['trial'] : subscribable.subscription.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)
+    end
+
     def token_required?
       customer.token_required?
     end
@@ -44,71 +54,27 @@ module Effective
 
       raise 'is invalid' unless valid?
 
-      begin
-        build! && sync! && customer.save!
-      rescue => e
-        reload!
-
-        self.errors.add(:base, e.message)
-        raise e
-      end
-    end
-
-    def subscribe!(stripe_plan_id)
-      self.stripe_plan_id = stripe_plan_id
-      save!
-    end
-
-    def destroy!
-      return true unless subscription && subscription.persisted? && customer.stripe_subscription.present?
-
-      raise 'is invalid' unless valid?
-
-      subscription.destroy!
-      customer.subscriptions.reload
-
-      sync! && customer.save!
-    end
-
-    def reload!
-      @stripe_token = nil
-      @stripe_plan_id = nil
-      @customer = nil
-      @subscription = nil
-    end
-
-    private
-
-    def subscription
-      return nil unless subscribable
-      @subscription ||= (
-        customer.subscriptions.find { |sub| sub.subscribable == subscribable } ||
-        customer.subscriptions.build(subscribable: subscribable, customer: customer)
-      )
+      create_customer!
+      create_stripe_token!
+      build_subscription!
+      sync_subscription!
+      true
     end
 
-    def build!
-      # Check for an existing customer created within the last hour with this email
-      # This catches an edge case in which a stripe customer is created twice when a first time customer is using a declined card
-      if customer.stripe_customer.blank?
-        Rails.logger.info "STRIPE CUSTOMER CHECK FOR EXISTING: #{user.email}"
-
-        customers = Stripe::Customer.list(created: { gt: (user.created_at - 1.hour).to_i } ).data
-
-        if (existing = customers.find { |cus| cus.email == user.email && (cus.metadata || {})[:user_id] == user.id.to_s })
-          customer.stripe_customer = existing
-          customer.stripe_customer_id = existing.id
-        end
-      end
+    protected
 
-      # Create customer
+    # 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 CUSTOMER CREATE: #{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
+    end
 
-      # Update stripe customer card
+    # Update stripe customer card
+    def create_stripe_token!
       if stripe_token.present?
         Rails.logger.info "STRIPE CUSTOMER SOURCE UPDATE #{stripe_token}"
         customer.stripe_customer.source = stripe_token
@@ -117,34 +83,46 @@ module Effective
         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
 
-      # Assign stripe plan
-      if plan
-        subscription.stripe_plan_id = plan[:id]
+    def build_subscription!
+      return unless plan.present?
+      subscription.stripe_plan_id = plan[:id]
+    end
 
-        # Ensure stripe subscription exists
-        if customer.stripe_subscription.blank?
-          Rails.logger.info "STRIPE SUBSCRIPTION CREATE: #{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
-        end
-      end
+    def sync_subscription!
+      return unless plan.present?
+      customer.stripe_subscription.blank? ? create_subscription! : update_subscription!
 
-      true
+      customer.save!
+    end
+
+    def create_subscription!
+      return unless plan.present?
+      return if customer.stripe_subscription.present?
+
+      Rails.logger.info "STRIPE SUBSCRIPTION CREATE: #{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
+
+      customer.status = customer.stripe_subscription.status
+      customer.stripe_subscription_interval = customer.stripe_subscription.plan.interval
     end
 
-    def sync!
-      return true unless plan && customer.stripe_subscription
+    def update_subscription!
+      return unless plan.present?
+      return if customer.stripe_subscription.blank?
 
       Rails.logger.info "STRIPE SUBSCRIPTION SYNC: #{customer.stripe_subscription_id} #{items}"
 
       if items.length == 0
         customer.stripe_subscription.delete
         customer.stripe_subscription_id = nil
-        customer.status = nil
-        return true
+        customer.status = EffectiveOrders::CANCELED
+        return
       end
 
       # Update stripe subscription items
@@ -189,14 +167,32 @@ module Effective
       #   Stripe::Invoice.create(customer: customer.stripe_customer_id).pay rescue false
       # end
 
-      # Sync status
       customer.status = customer.stripe_subscription.status
+    end
 
-      true
+    def subscribe!(stripe_plan_id)
+      self.stripe_plan_id = stripe_plan_id
+      save!
     end
 
+    # def destroy!
+    #   return true unless subscription && subscription.persisted? && customer.stripe_subscription.present?
+
+    #   raise 'is invalid' unless valid?
+
+    #   subscription.destroy!
+    #   customer.subscriptions.reload
+
+    #   sync! && customer.save!
+    # end
+
     private
 
+    def subscription
+      return nil unless subscribable
+      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

data/app/models/effective/subscription.rb

@@ -20,7 +20,7 @@ module Effective
     validates :customer, presence: true
     validates :subscribable, presence: true
 
-    validates :stripe_plan_id, presence: true, inclusion: { in: EffectiveOrders.stripe_plans.except('trial').keys }
+    validates :stripe_plan_id, presence: true, inclusion: { in: EffectiveOrders.stripe_plans.keys }
     validates :name, presence: true
 
     def to_s

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

@@ -1,145 +1,134 @@
-%h3.effective-heading Customer
-
-%table.table
-  %tbody
-    %tr
-      %th Id
-      %td= customer.stripe_customer.id
-    %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
-
-    - if customer.stripe_customer.currency.present?
-      %tr
-        %th Currency
-        %td= customer.stripe_customer.currency.to_s.upcase
-
-    - if customer.stripe_customer.account_balance.to_i > 0
-      %tr
-        %th Balance
-        %td= price_to_currency(customer.stripe_customer.account_balance.to_i)
-
-= yield if block_given?
-
 - if customer.stripe_subscription.present?
-  %h3.effective-heading Subscription
-
-  %table.table
-    %tbody
-      %tr
-        %th Status
-        %td= customer.stripe_subscription.status.presence || 'unknown'
-
-      - 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?
-    %table.table
-      %thead
-        %tr
-          %th Subscribed
-          %th Plan
-          %th
-      %tbody
-        - customer.subscriptions.each do |sub|
+  .card.my-4
+    .card-header Subscription
+    .card-body
+      %table.table
+        %tbody
+          %tr
+            %th Status
+            %td= customer.stripe_subscription.status.presence || 'unknown'
+
           %tr
-            %td= sub.subscribable
-            %td= sub
-            %td= link_to 'change', edit_polymorphic_path(sub.subscribable)
+            %th Email
+            %td= customer.stripe_customer.email
 
-- if customer.stripe_subscription.blank?
-  %h3.effective-heading Subscription
-  %p No current subscriptions
+          %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-body
+      %table.table
+        %thead
+          %tr
+            %th Name
+            %th Plan
+            %th
+        %tbody
+          - customer.subscriptions.each do |sub|
+            %tr
+              %td= sub.subscribable
+              %td= sub
 
 - if customer.stripe_customer.invoices.present?
-  %h3.effective-heading Invoices
-
-  %table.table
-    %thead
-      %tr
-        %th Date
-        %th Number
-        %th Period
-        %th Items
-        %th Total
-    %tbody
-      - customer.stripe_customer.invoices.each do |invoice|
-        %tr
-          %td= Time.zone.at(invoice.date).strftime('%F')
-          %td= invoice.id
-          %td
-            = Time.zone.at(invoice.lines.first.period.start).strftime('%F')
-            to
-            = Time.zone.at(invoice.lines.first.period.end).strftime('%F')
-          %td
-            - invoice.lines.each do |line|
-              %p= line.description
-
-          %td= price_to_currency(invoice.total)
+  .card.my-4
+    .card-header Invoices
+    .card-body
+      %table.table
+        %thead
+          %tr
+            %th Date
+            %th Invoice
+            %th Total
+        %tbody
+          - customer.stripe_customer.invoices.each do |invoice|
+            %tr
+              %td= Time.zone.at(invoice.date).strftime('%F')
+              %td
+                %p
+                  = invoice.id
+                  %br
+                  = Time.zone.at(invoice.lines.first.period.start).strftime('%F')
+                  to
+                  = Time.zone.at(invoice.lines.first.period.end).strftime('%F')
+
+                %p
+                  - invoice.lines.each do |line|
+                    = line.description
+                    %br
+
+              %td= price_to_currency(invoice.total)
 
 - if customer.upcoming_invoice.present?
-  %p Upcoming Invoice:
-
-  %table.table
-    %tbody
-      %tr
-        %th Date
-        %td= Time.zone.at(customer.upcoming_invoice.date).strftime('%F')
-      %tr
-        %th Items
-        %td
-          %table.table
-            %tbody
-              - customer.upcoming_invoice.lines.each do |line|
-                %tr
-                  %td #{Time.zone.at(line.period.start).strftime('%F')} to #{Time.zone.at(line.period.end).strftime('%F')}
-                  %td= line.description
-                  %td= price_to_currency(line.amount)
-      %tr
-        %th Total
-        %td= price_to_currency(customer.upcoming_invoice.total)
+  .card.my-4
+    .card-header Upcoming Invoice
+    .card-body
+      %table.table
+        %tbody
+          %tr
+            %th Date
+            %td= Time.zone.at(customer.upcoming_invoice.date).strftime('%F')
+          %tr
+            %th Items
+            %td
+              %table.table
+                %tbody
+                  - customer.upcoming_invoice.lines.each do |line|
+                    %tr
+                      %td #{Time.zone.at(line.period.start).strftime('%F')} to #{Time.zone.at(line.period.end).strftime('%F')}
+                      %td= line.description
+                      %td= price_to_currency(line.amount)
+          %tr
+            %th Total
+            %td= price_to_currency(customer.upcoming_invoice.total)

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

@@ -1,12 +1,21 @@
 = javascript_include_tag 'https://checkout.stripe.com/checkout.js'
 
-= effective_form_with(model: subscripter, url: effective_orders.customer_settings_path, method: :put) do |f|
-  = f.hidden_field :stripe_token, value: nil
+.card
+  .card-header Customer Summary
+  .card-body
+    = effective_form_with(model: subscripter, url: effective_orders.customer_settings_path, remote: true, data: { stripe: subscripter_stripe_data(subscripter) }) do |f|
+      = f.hidden_field :stripe_token, value: nil
+      = f.error :stripe_token
 
-  = render(f.object.customer) do
-    %h3.effective-heading Card
-    = effective_customer_fields(f)
+      %p
+        All subscription and billing notifications are sent to:
+        %strong= f.object.user.email
 
-  = f.submit
+      - if f.object.customer.active_card.present?
+        %p
+          All charges are made to
+          %strong= f.object.customer.active_card
 
+      %p= f.object.customer.payment_status
 
+      = f.submit 'Update Card', border: false, left: true, class: 'effective-orders-stripe-update-card'

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

@@ -1,3 +1,4 @@
 %h1.effective-heading= @page_title
 
 = render 'effective/customers/form', subscripter: @subscripter
+= render 'effective/customers/customer', customer: @customer

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

@@ -0,0 +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_flash = <%= raw flash.to_json %>;

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

@@ -0,0 +1,11 @@
+= 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), cards: true, label: false, required: true
+
+  = f.submit 'Choose this Plan', center: true, class: ('effective-orders-stripe-token-required' if f.object.token_required?)

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

@@ -0,0 +1,3 @@
+.effective-radios.card-deck
+  .card.active
+    = render 'effective/subscriptions/plan', plan: subscription.plan, subscribed: true

data/config/routes.rb

@@ -25,8 +25,10 @@ EffectiveOrders::Engine.routes.draw do
     post 'orders/:id', to: 'orders#update'
 
     if EffectiveOrders.subscriptions?
+      match 'subscribe', to: 'subscripter#update', via: :post, as: :subscripter
+
       match 'customer/settings', to: 'customers#edit', as: :customer_settings, via: [:get]
-      match 'customer/settings', to: 'customers#update', via: [:patch, :put]
+      match 'customer/settings', to: 'customers#update', via: [:patch, :put, :post]
       match 'webhooks/stripe', to: 'webhooks#stripe', via: [:post, :put]
     end
 

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

@@ -75,6 +75,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.string    :active_card
 
       t.string    :stripe_subscription_id
+      t.string    :stripe_subscription_interval
       t.string    :status
 
       t.integer   :subscriptions_count, :default => 0

data/lib/effective_orders.rb

@@ -13,8 +13,9 @@ module EffectiveOrders
   # Subscription statuses (as per stripe)
   ACTIVE = 'active'.freeze
   PAST_DUE = 'past_due'.freeze
+  CANCELED = 'canceled'.freeze
 
-  STATUSES = { ACTIVE => ACTIVE, PAST_DUE => PAST_DUE }
+  STATUSES = { ACTIVE => ACTIVE, PAST_DUE => PAST_DUE, CANCELED => CANCELED }
 
   # The following are all valid config keys
   mattr_accessor :orders_table_name
@@ -83,7 +84,7 @@ module EffectiveOrders
   end
 
   def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied unless authorized?(controller, action, resource)
+    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
   def self.permitted_params
@@ -175,35 +176,18 @@ module EffectiveOrders
       #{ }"tiers":null,"tiers_mode":null,"transform_usage":null,"trial_period_days":null,"usage_type":"licensed"},
 
       plans = Stripe::Plan.all.inject({}) do |h, plan|
-        occurrence = case plan.interval
-          when 'daily'    ; '/day'
-          when 'weekly'   ; '/week'
-          when 'monthly'  ; '/month'
-          when 'yearly'   ; '/year'
-          when 'day'      ; plan.interval_count == 1 ? '/day' : " every #{plan.interval_count} days"
-          when 'week'     ; plan.interval_count == 1 ? '/week' : " every #{plan.interval_count} weeks"
-          when 'month'    ; plan.interval_count == 1 ? '/month' : " every #{plan.interval_count} months"
-          when 'year'     ; plan.interval_count == 1 ? '/year' : " every #{plan.interval_count} years"
-          else            ; plan.interval
-        end
-
         h[plan.id] = {
           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}#{occurrence}",
-          occurrence: "#{occurrence}",
+          description: "$#{'%0.2f' % (plan.amount / 100.0)} #{plan.currency.upcase}/#{plan.interval}",
           interval: plan.interval,
           interval_count: plan.interval_count
         }; h
       end
 
-      if trial?
-        plans['trial'] = { id: 'trial', amount: 0, name: trial.fetch(:name), description: trial.fetch(:description) }
-      end
-
       plans
     )
   end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.0.0beta5'.freeze
+  VERSION = '4.0.0beta6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0beta5
+  version: 4.0.0beta6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,6 +140,7 @@ files:
 - app/controllers/effective/providers/pretend.rb
 - app/controllers/effective/providers/refund.rb
 - app/controllers/effective/providers/stripe.rb
+- app/controllers/effective/subscripter_controller.rb
 - app/controllers/effective/webhooks_controller.rb
 - app/datatables/effective_customers_datatable.rb
 - app/datatables/effective_order_items_datatable.rb
@@ -183,9 +184,9 @@ files:
 - app/views/effective/carts/_cart_actions.html.haml
 - app/views/effective/carts/show.html.haml
 - app/views/effective/customers/_customer.html.haml
-- app/views/effective/customers/_fields.html.haml
 - app/views/effective/customers/_form.html.haml
 - app/views/effective/customers/edit.html.haml
+- app/views/effective/customers/update.js.erb
 - app/views/effective/orders/_checkout_actions.html.haml
 - app/views/effective/orders/_checkout_step1.html.haml
 - app/views/effective/orders/_checkout_step2.html.haml
@@ -226,8 +227,9 @@ files:
 - app/views/effective/orders_mailer/subscription_payment_succeeded.html.haml
 - app/views/effective/orders_mailer/subscription_trial_expired.html.haml
 - app/views/effective/orders_mailer/subscription_trial_expiring.html.haml
-- app/views/effective/subscriptions/_fields.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/customers/_fields.html.haml

@@ -1,9 +0,0 @@
-.effective-orders-customer{ data: { stripe: stripe.to_json, submit: submit.to_json } }
-  .card
-    .card-header Credit Card
-    .card-body
-      = f.static_field :stripe_token, label: false, class: 'payment-status', value: f.object.customer.payment_status
-
-      %p= link_to 'Update Card Details', '#', class: 'btn btn-primary btn-change-card'
-
-  %p.invalid-feedback

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

@@ -1,12 +0,0 @@
-= javascript_include_tag 'https://checkout.stripe.com/checkout.js'
-
-= form.fields_for :subscripter, form.object.subscripter do |fs|
-  = fs.hidden_field :stripe_token, value: nil
-
-  - fs.object.stripe_plan_id ||= (fs.object.current_plan || {})[:id]
-
-  = fs.radios :stripe_plan_id, stripe_plans_collection(fs, include_trial: include_trial),
-    label: label,
-    required: required,
-    cards: true,
-    wrapper: { class: 'effective-orders-stripe-plans', data: { stripe: stripe } }