effective_orders 4.0.0beta4 → 4.0.0beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c93ba62efdec37fd8c277afca2a28090303b8c
-  data.tar.gz: 8e89c28503192d4373aca8b13762ab8fede41744
+  metadata.gz: bd54f1217fe33988f924bf40803efd702916d971
+  data.tar.gz: 291f290fd3cf4b8636ce5103a86b976760e12122
 SHA512:
-  metadata.gz: 5013c1845227a4117f94eb1a7f414b0fa048ecf8e617da3dd82eee2ad16326246edc726877eb898ba0b97ccc739f8909373126d4b1162cb122f393a68bbc0ee3
-  data.tar.gz: 51328fba62557431d4ed163a67bb9c61996cb38cff150fb8706c9398b55aef69139b1264bcd1dac3028dba64583bf5833f4daa7695ca6a56d519566404d38d81
+  metadata.gz: 546166ac0b6f8948af732a82bdd2ba8b2e59f11ce6f734d10b1d6dd49350926d764331fe179d71f01a3a9d4510786254dfd6bbfeac0cffb992b821d03ea70c6c
+  data.tar.gz: 1d1602f8456cbf830c82ca6f298b85ca465b384240a5867479df1280a7384c1693e5b1970ff21e9b353bba3371268da37fb21ae4fb17a82bef993be0c74c5418

data/README.md

@@ -118,12 +118,12 @@ class Product < ActiveRecord::Base
   acts_as_purchasable
 
   # Attributes
-  # title               :string
+  # name                :string
   # price               :integer, default: 0
   # tax_exempt          :boolean, default: false
   # timestamps
 
-  validates_presence_of :title
+  validates_presence_of :name
   validates_numericality_of :price, greater_than_or_equal_to: 0
 end
 ```
@@ -134,7 +134,7 @@ The database migration will look like the following:
 class CreateProducts < ActiveRecord::Migration
   def self.up
     create_table :products do |t|
-      t.string :title
+      t.string :name
       t.integer :price, :default=>0
       t.boolean :tax_exempt, :default=>false
       t.datetime :updated_at
@@ -160,7 +160,7 @@ This is available for simple_form, formtastic and Rails default FormBuilder.
 
 ```haml
 = simple_form_for(@product) do |f|
-  = f.input :title
+  = f.input :name
   = f.input :tax_exempt
   = f.input :price, as: :effective_price
   = f.button :submit
@@ -185,7 +185,7 @@ or
 So back on the Product#show page, we will render the product with an Add To Cart link
 
 ```haml
-%h4= @product.title
+%h4= @product
 %p= price_to_currency(@product.price)
 %p= link_to_add_to_cart(@product, class: 'btn btn-primary', label: 'Add To My Shopping Cart')
 ```
@@ -570,6 +570,24 @@ render_datatable @datatable
 Please refer to [effective_datatables](https://github.com/code-and-effect/effective_datatables/) for more information about that gem.
 
 
+### Subscriptions
+
+All subscriptions are completed via stripe subscriptions.
+
+There is a hardcoded trial mode, that does not reach out to stripe.
+
+Every `acts_as_subscribable` object starts as trial mode.
+
+Every `acts_as_subscribable_buyer` gets a single stripe subscription, and then can buy quantities of stripe products
+
+
+#### Stripe setup
+
+Create a Product with the name you want customers to see on their receipts
+
+Yearly and a Monthly per team
+
+
 ### Admin Screen
 
 To use the Admin screen, please also install the effective_datatables gem:
@@ -598,16 +616,16 @@ render_datatable @datatable
 
 ## Rake Tasks
 
-### Overwrite order item titles
+### Overwrite order item names
 
-When an order is purchased, the `title()` of each `acts_as_purchasable` object is saved to the database.
+When an order is purchased, the `purchasable_name()` of each `acts_as_purchasable` object is saved to the database. Normally this is just `to_s`.
 
-If you change the output of `acts_as_purchasable`.`title`, any existing order items will remain unchanged.
+If you change the output of `acts_as_purchasable`.`purchasable_name`, any existing order items will remain unchanged.
 
-Run this script to overwrite all saved order item titles with the current `acts_as_purchasable`.`title`.
+Run this script to overwrite all saved order item names with the current `acts_as_purchasable`.`purchasable_name`.
 
 ```ruby
-rake effective_orders:overwrite_order_item_titles
+rake effective_orders:overwrite_order_item_names
 ```
 
 ## Testing in Development

data/app/assets/javascripts/effective_orders.js

@@ -1,4 +1,6 @@
 //= require effective_addresses
 
-//= require_tree ./effective_orders
+//= require ./effective_orders/customers
+//= require ./effective_orders/subscriptions
+//= require_tree ./effective_orders/providers
 

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

@@ -1,25 +1,22 @@
 stripeCustomerChangeCardHandler = (key, form) ->
   StripeCheckout.configure
     key: key
-    closed: ->
-      form.find("input[type='submit']").removeAttr('disabled')
-      $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))
+    closed: -> EffectiveBootstrap.enable(form) unless form.hasClass('stripe-success')
     token: (token, args) ->
       if token.error
-        form.find("input[type='submit']").removeAttr('disabled')
-        $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))
+        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}"
 
-        alert("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}")
+        form.removeClass('stripe-success')
+        form.find('.effective-orders-customer').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('.active-card').html("**** **** **** #{token.card.last4} #{token.card.brand} #{token.card.exp_month}/#{token.card.exp_year}")
+        $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.find("input[type='submit']").prop('disabled', true)
-          $('input[data-disable-with]').each -> try $.rails.disableFormElement($(this))
-          form.submit()
+        if $customer.data('submit')
+          form.addClass('stripe-success').submit()
 
 # When we click 'Change credit card', make sure the form collects a credit card
 $(document).on 'click', '.effective-orders-customer .btn-change-card', (event) ->
@@ -28,9 +25,7 @@ $(document).on 'click', '.effective-orders-customer .btn-change-card', (event) -
   $form = $(event.currentTarget).closest('form')
   stripe = $(event.currentTarget).closest('.effective-orders-customer').data('stripe')
 
-  # Disable the form
-  $form.find("input[type='submit']").prop('disabled', true)
-  $('input[data-disable-with]').each -> try $.rails.disableFormElement($(this))
+  EffectiveBootstrap.submitting($form)
 
   stripeCustomerChangeCardHandler(stripe.key, $form).open
     image: stripe.image

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

@@ -1,32 +1,22 @@
 stripeCheckoutHandler = (key, form) ->
   StripeCheckout.configure
     key: key
-    closed: ->
-      form.find("input[type='submit']").removeAttr('disabled')
-      $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))
+    closed: -> EffectiveBootstrap.enable(form) unless form.hasClass('stripe-success')
     token: (token, args) ->
       if token.error
-        form.find("input[type='submit']").removeAttr('disabled')
-        $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))
-
         alert("An error ocurred when contacting Stripe. Your card has not been charged. Please refresh the page and try again. #{token.error.message}")
       else
         form.find("input[name$='[stripe_token]']").val('' + token['id'])
+        form.addClass('stripe-success').submit()
 
-        form.find("input[type='submit']").prop('disabled', true)
-        $('input[data-disable-with]').each -> try $.rails.disableFormElement($(this))
-        form.submit()
-
-$(document).on 'click', "#effective-orders-new-charge-form form input[type='submit']", (event) ->
+$(document).on 'click', "#effective-orders-new-charge-form form [type='submit']", (event) ->
   event.preventDefault()
 
   obj = $('#effective-orders-new-charge-form')
   $form = obj.find('form').first()
   stripe = obj.data('stripe')
 
-  # Disable the form
-  $form.find("input[type='submit']").prop('disabled', true)
-  $('input[data-disable-with]').each -> try $.rails.disableFormElement($(this))
+  EffectiveBootstrap.submitting($form)
 
   stripeCheckoutHandler(stripe.key, $form).open
     image: stripe.image

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

@@ -1,35 +1,29 @@
 stripeSubscriptionHandler = (key, form) ->
   StripeCheckout.configure
     key: key
-    closed: ->
-      form.find("input[type='submit']").removeAttr('disabled')
-      $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))
+    closed: -> EffectiveBootstrap.enable(form) unless form.hasClass('stripe-success')
     token: (token, args) ->
       if token.error
-        form.find("input[type='submit']").removeAttr('disabled')
-        $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))
+        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}"
 
-        alert("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}")
+        form.removeClass('stripe-success')
+        form.find('.effective-orders-stripe-plans').find('.invalid-feedback').html(message).show()
+        alert(message)
       else
         form.find("input[name$='[stripe_token]']").val('' + token['id'])
+        form.addClass('stripe-success').submit()
 
-        form.find("input[type='submit']").prop('disabled', true)
-        $('input[data-disable-with]').each -> try $.rails.disableFormElement($(this))
-        form.submit()
-
-$(document).on 'click', "input[type='submit'].effective-orders-subscripter-token-required", (event) ->
+# 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()
-
-  $submit = $(event.currentTarget)
-  $form = $submit.closest('form')
-
-  # Disable the form
-  $submit.prop('disabled', true)
-  $('input[data-disable-with]').each -> try $.rails.disableFormElement($(this))
+  $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
+
+  EffectiveBootstrap.submitting($form)
 
   stripe = $plans.data('stripe')
   plan = stripe.plans.find (plan, _) => plan.id == selected_plan_id
@@ -42,32 +36,21 @@ $(document).on 'click', "input[type='submit'].effective-orders-subscripter-token
     amount: plan.amount
     panelLabel: "{{amount}}#{plan.occurrence} Go!"
 
-# When a plan is selected, toggle the selected-class on each plan.
-# Set the submit button's class if a customer token is required
+# 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')
 
-  $plans = $plan.closest('.effective-orders-stripe-plans').first()
-  selected_class = $plans.data('selected-class')
   selected_plan_id = $plan.val()
 
-  $plans.find("input[name$='[subscripter][stripe_plan_id]']").each (_, item) =>
-    if $(item).is(':checked')
-      $(item).siblings('.panel').addClass(selected_class)
-    else
-      $(item).siblings('.panel').removeClass(selected_class)
-
+  $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']").addClass('effective-orders-subscripter-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']").removeClass('effective-orders-subscripter-token-required')
+    $plans.closest('form').find("input[type='submit'],button[type='submit']").removeClass('effective-orders-subscripter-token-required')
 
-# When the 'Select' button is clicked, set the radio button input
-$(document).on 'click', '.effective-orders-stripe-plan .btn-select-plan', (event) ->
-  val = $(event.currentTarget).closest('.effective-orders-stripe-plan').find('input:radio').val()
-  $(event.currentTarget).closest('.effective-orders-stripe-plans').find('input:radio').val([val]).trigger('change')
-  false
+  true

data/app/assets/stylesheets/effective_orders.scss

@@ -1,3 +1,2 @@
 @import 'effective_orders/cart';
 @import 'effective_orders/order';
-@import 'effective_orders/subscriptions';

data/app/controllers/admin/orders_controller.rb

@@ -188,7 +188,7 @@ module Admin
         :payment_provider, :payment_card, :payment, :send_mark_as_paid_email_to_buyer,
         order_items_attributes: [
           :quantity, :_destroy, purchasable_attributes: [
-            :title, :price, :tax_exempt
+            :name, :price, :tax_exempt
           ]
         ]
       )

data/app/datatables/effective_order_items_datatable.rb

@@ -37,8 +37,8 @@ class EffectiveOrderItemsDatatable < Effective::Datatable
       order_item[:state] || 'abandoned'
     end
 
-    col :title do |order_item|
-      order_item.quantity == 1 ? order_item.title : "#{order_item.title} (#{order_item.quantity} purchased)"
+    col :name do |order_item|
+      order_item.quantity == 1 ? order_item.name : "#{order_item.name} (#{order_item.quantity} purchased)"
     end
 
     # col :subtotal, as: :price

data/app/helpers/effective_orders_helper.rb

@@ -14,9 +14,9 @@ module EffectiveOrdersHelper
     order_item_list = content_tag(:ul) do
       order.order_items.map do |item|
         content_tag(:li) do
-          title = item.title.split('<br>')
-          "#{item.quantity}x #{title.first} for #{price_to_currency(item.price)}".tap do |output|
-            title[1..-1].each { |line| output << "<br>#{line}" }
+          names = item.name.split('<br>')
+          "#{item.quantity}x #{names.first} for #{price_to_currency(item.price)}".tap do |output|
+            names[1..-1].each { |line| output << "<br>#{line}" }
           end.html_safe
         end
       end.join.html_safe

data/app/helpers/effective_paypal_helper.rb

@@ -37,7 +37,7 @@ module EffectivePaypalHelper
 
     order.order_items.each_with_index do |item, x|
       values["item_number_#{x+1}"] = x+1
-      values["item_name_#{x+1}"] = item.title
+      values["item_name_#{x+1}"] = item.name
       values["quantity_#{x+1}"] = item.quantity
       values["amount_#{x+1}"] = '%.2f' % (item.price / 100.0)
       values["tax_#{x+1}"] = '%.2f' % ((item.tax / 100.0) / item.quantity)  # Tax for 1 of these items

data/app/helpers/effective_subscriptions_helper.rb

@@ -1,7 +1,7 @@
 module EffectiveSubscriptionsHelper
 
   def effective_customer_fields(form, submit: true)
-    raise 'expected a SimpleForm::FormBuilder object' unless form.class.name == 'SimpleForm::FormBuilder'
+    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(
@@ -19,11 +19,11 @@ module EffectiveSubscriptionsHelper
     )
   end
 
-  def stripe_plans_collection(form, include_trial: nil, selected_class: 'selected panel-primary')
-    raise 'expected a SimpleForm::FormBuilder object' unless form.class.name == 'SimpleForm::FormBuilder'
+  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.subscribed?('trial') if include_trial.nil?
+    include_trial = form.object.subscribable.trialing? if include_trial.nil?
 
     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] }
@@ -41,7 +41,6 @@ module EffectiveSubscriptionsHelper
         f: form,
         plan: plan,
         selected: Array(form.object.stripe_plan_id).include?(plan[:id]),
-        selected_class: selected_class,
         subscribable: form.object.subscribable,
         subscribed: form.object.subscribable.subscribed?(plan[:id])
       })
@@ -50,8 +49,8 @@ module EffectiveSubscriptionsHelper
     end
   end
 
-  def effective_subscription_fields(form, label: false, required: true, include_trial: nil, item_wrapper_class: 'col-sm-6 col-md-4 col-lg-3', selected_class: 'selected panel-primary', wrapper_class: 'row')
-    raise 'expected a SimpleForm::FormBuilder object' unless form.class.name == 'SimpleForm::FormBuilder'
+  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(
@@ -61,17 +60,14 @@ module EffectiveSubscriptionsHelper
         label: label,
         required: required,
         include_trial: include_trial,
-        item_wrapper_class: item_wrapper_class,
-        selected_class: selected_class,
         stripe: {
-          email: form.object.buyer.email,
+          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?
         },
-        wrapper_class: wrapper_class
       }
     )
   end

data/app/mailers/effective/orders_mailer.rb

@@ -116,7 +116,7 @@ module Effective
       @subscribable = subscribable
 
       mail(
-        to: @subscribable.buyer.email,
+        to: @subscribable.subscribable_buyer.email,
         from: EffectiveOrders.mailer[:default_from],
         subject: subject_for_subscription_trial_expiring(@subscribable)
       )
@@ -129,7 +129,7 @@ module Effective
       @subscribable = subscribable
 
       mail(
-        to: @subscribable.buyer.email,
+        to: @subscribable.subscribable_buyer.email,
         from: EffectiveOrders.mailer[:default_from],
         subject: subject_for_subscription_trial_expired(@subscribable)
       )

data/app/models/concerns/acts_as_purchasable.rb

@@ -1,8 +1,6 @@
 module ActsAsPurchasable
   extend ActiveSupport::Concern
 
-  mattr_accessor :descendants
-
   module ActiveRecord
     def acts_as_purchasable(*options)
       @acts_as_purchasable = options || []
@@ -20,7 +18,7 @@ module ActsAsPurchasable
   end
 
   included do
-    belongs_to :purchased_order, class_name: 'Effective::Order' # Set when purchased
+    belongs_to :purchased_order, class_name: 'Effective::Order', optional: true # Set when purchased
 
     has_many :cart_items, as: :purchasable, dependent: :delete_all, class_name: 'Effective::CartItem'
 
@@ -76,8 +74,8 @@ module ActsAsPurchasable
     end
   end
 
-  def title
-    self[:title] || to_s
+  def purchasable_name
+    to_s
   end
 
   def tax_exempt
@@ -113,4 +111,3 @@ module ActsAsPurchasable
   end
 
 end
-

data/app/models/concerns/acts_as_subscribable.rb

@@ -6,6 +6,11 @@ module ActsAsSubscribable
   module ActiveRecord
     def acts_as_subscribable(*options)
       @acts_as_subscribable = options || []
+
+      instance = new()
+      raise 'must respond to trialing_until' unless instance.respond_to?(:trialing_until)
+      raise 'must respond to subscription_status' unless instance.respond_to?(:subscription_status)
+
       include ::ActsAsSubscribable
       (ActsAsSubscribable.descendants ||= []) << self
     end
@@ -15,17 +20,29 @@ module ActsAsSubscribable
     has_one :subscription, as: :subscribable, class_name: 'Effective::Subscription'
     has_one :customer, through: :subscription, class_name: 'Effective::Customer'
 
+    before_validation(if: -> { trialing_until.blank? && EffectiveOrders.trial? }) do
+      self.trialing_until = (Time.zone.now + EffectiveOrders.trial.fetch(:length)).end_of_day
+    end
+
+    validates :trialing_until, presence: true, if: -> { EffectiveOrders.trial? }
+    validates :subscription_status, inclusion: { allow_nil: true, in: EffectiveOrders::STATUSES.keys }
+
     validates :subscripter, associated: true
 
-    scope :subscribed, -> { where(id: joins(:subscription)) }  # All resources with a subscription
-    scope :trialing, -> { where.not(id: joins(:subscription)) } # All resources without a subscription
+    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) }
+
+    scope :subscribed, -> { where(subscription_status: EffectiveOrders::ACTIVE) }
+    scope :subscription_past_due, -> { where(subscription_status: EffectiveOrders::PAST_DUE) }
+    scope :not_subscribed, -> { where(subscription_status: nil) }
   end
 
   module ClassMethods
   end
 
   def subscripter
-    @_effective_subscripter ||= Effective::Subscripter.new(subscribable: self, user: buyer)
+    @_effective_subscripter ||= Effective::Subscripter.new(subscribable: self, user: subscribable_buyer)
   end
 
   def subscripter=(atts)
@@ -33,35 +50,32 @@ module ActsAsSubscribable
   end
 
   def subscribed?(stripe_plan_id = nil)
-    case stripe_plan_id
-    when nil
-      subscription.present?  # Subscribed to any subscription?
-    when (EffectiveOrders.stripe_plans['trial'] || {})[:id]
-      subscription.blank? || subscription.new_record? || subscription.stripe_plan_id == stripe_plan_id
-    else
-      subscription && subscription.persisted? && subscription.errors.blank? && subscription.stripe_plan_id == stripe_plan_id
-    end
+    return false if subscription_status.blank?
+    stripe_plan_id ? (subscription&.stripe_plan_id == stripe_plan_id) : true
   end
 
   def subscription_active?
-    (trialing? && !trial_expired?) || (subscribed? && subscription.active?)
+    subscribed? && subscription_status == EffectiveOrders::ACTIVE
+  end
+
+  def subscription_past_due?
+    subscribed? && subscription_status == EffectiveOrders::PAST_DUE
   end
 
   def trialing?
-    !subscribed?
+    subscription_status.blank?
   end
 
-  def trial_expired?
-    trialing? && Time.zone.now > trial_expires_at
+  def trial_active?
+    trialing? && trialing_until > Time.zone.now
   end
 
-  def trial_expires_at
-    # The rake task send_trial_expiring_emails depends on this beginning_of_day
-    ((created_at || Time.zone.now) + EffectiveOrders.subscriptions[:trial_period]).beginning_of_day
+  def trial_past_due?
+    trialing? && trialing_until < Time.zone.now
   end
 
-  def buyer
-    raise 'acts_as_subscribable object requires the buyer be defined to return the User buying this item.'
+  def subscribable_buyer
+    raise 'acts_as_subscribable object requires the subscribable_buyer method be defined to return the User buying this item.'
   end
 
 end

data/app/models/effective/cart.rb

@@ -39,7 +39,7 @@ module Effective
       end
 
       if item.quantity_enabled? && (existing ? existing.quantity : quantity) > item.quantity_remaining
-        raise EffectiveOrders::SoldOutException, "#{item.title} is sold out"
+        raise EffectiveOrders::SoldOutException, "#{item.purchasable_name} is sold out"
       end
 
       existing ||= cart_items.build(purchasable: item, quantity: quantity, unique: (unique.to_s unless unique.kind_of?(Proc)))

data/app/models/effective/cart_item.rb

@@ -12,6 +12,14 @@ module Effective
     validates :purchasable, presence: true
     validates :quantity, presence: true
 
+    def to_s
+      name || 'New Cart Item'
+    end
+
+    def name
+      purchasable&.purchasable_name
+    end
+
     def price
       if (purchasable.price || 0).kind_of?(Integer)
         purchasable.price || 0
@@ -20,12 +28,8 @@ module Effective
       end
     end
 
-    def title
-      purchasable.try(:title) || 'New Cart Item'
-    end
-
     def tax_exempt
-      purchasable.try(:tax_exempt) || false
+      purchasable&.tax_exempt || false
     end
 
     def subtotal

data/app/models/effective/customer.rb

@@ -5,10 +5,12 @@ 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
+    #accepts_nested_attributes_for :subscriptions
 
     # Attributes
     # stripe_customer_id            :string  # cus_xja7acoa03
@@ -27,7 +29,7 @@ module Effective
 
     validates :user, presence: true
     validates :stripe_customer_id, presence: true
-    validates :status, if: -> { stripe_subscription_id.present? }, inclusion: { in: %w(active past_due) }
+    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

data/app/models/effective/order.rb

@@ -179,7 +179,7 @@ module Effective
           self.note_internal ||= item.note_internal
 
           item.order_items.select { |oi| oi.purchasable.kind_of?(Effective::Product) }.map do |oi|
-            product = Effective::Product.new(title: oi.purchasable.title, price: oi.purchasable.price, tax_exempt: oi.purchasable.tax_exempt)
+            product = Effective::Product.new(name: oi.purchasable.purchasable_name, price: oi.purchasable.price, tax_exempt: oi.purchasable.tax_exempt)
             Effective::CartItem.new(quantity: oi.quantity, purchasable: product)
           end
         else
@@ -194,7 +194,7 @@ module Effective
 
       retval = cart_items.map do |item|
         order_items.build(
-          title: item.title,
+          name: item.name,
           quantity: item.quantity,
           price: item.price,
           tax_exempt: (item.tax_exempt || false),

data/app/models/effective/order_item.rb

@@ -9,7 +9,7 @@ module Effective
     delegate :purchased?, :declined?, to: :order
 
     # Attributes
-    # title                 :string
+    # name                  :string
     # quantity              :integer
     # price                 :integer, default: 0
     # tax_exempt            :boolean
@@ -18,7 +18,7 @@ module Effective
     validates :purchasable, associated: true, presence: true
     accepts_nested_attributes_for :purchasable
 
-    validates :title, presence: true
+    validates :name, presence: true
     validates :quantity, presence: true, numericality: { greater_than: 0 }
     validates :price, presence: true
     validates :tax_exempt, inclusion: { in: [true, false] }
@@ -27,7 +27,7 @@ module Effective
     scope :sold_by, lambda { |user| sold().where(seller_id: user.id) }
 
     def to_s
-      (quantity || 0) > 1 ? "#{quantity}x #{title}" : title
+      (quantity || 0) > 1 ? "#{quantity}x #{name}" : name
     end
 
     def subtotal

data/app/models/effective/product.rb

@@ -5,18 +5,18 @@ module Effective
     acts_as_purchasable
 
     # Attributes
-    # title         :string
+    # name          :string
     # price         :integer, default: 0
     # tax_exempt    :boolean, default: false
     #
     # timestamps
 
-    validates :title, presence: true
+    validates :name, presence: true
     validates :price, presence: true
     validates :tax_exempt, inclusion: { in: [true, false] }
 
     def to_s
-      self[:title] || 'New Product'
+      name || 'New Product'
     end
 
   end

data/app/models/effective/subscripter.rb

@@ -184,10 +184,10 @@ module Effective
       end
 
       # When upgrading a plan, invoice immediately.
-      if current_plan && current_plan[:id] != 'trial' && plan[:amount] > current_plan[:amount]
-        Rails.logger.info " -> INVOICE GENERATED"
-        Stripe::Invoice.create(customer: customer.stripe_customer_id).pay rescue false
-      end
+      # if current_plan && current_plan[:id] != 'trial' && plan[:amount] > current_plan[:amount]
+      #   Rails.logger.info " -> INVOICE GENERATED"
+      #   Stripe::Invoice.create(customer: customer.stripe_customer_id).pay rescue false
+      # end
 
       # Sync status
       customer.status = customer.stripe_subscription.status

data/app/models/effective/subscription.rb

@@ -8,42 +8,31 @@ module Effective
     belongs_to :subscribable, polymorphic: true
 
     # Attributes
-    # stripe_plan_id          :string  # This will be 'bronze' or something like that
-    # status                  :string
-    #
+    # stripe_plan_id          :string
     # name                    :string
-    # price                   :integer, default: 0
     #
     # timestamps
 
     before_validation(if: -> { plan && (stripe_plan_id_changed? || new_record?) }) do
       self.name = "#{plan[:name]} #{plan[:description]}"
-      self.price = plan[:amount]
     end
 
     validates :customer, presence: true
     validates :subscribable, presence: true
 
     validates :stripe_plan_id, presence: true, inclusion: { in: EffectiveOrders.stripe_plans.except('trial').keys }
-    validates :status, presence: true, inclusion: { in: %w(active past_due) }
-
     validates :name, presence: true
-    validates :price, numericality: { greater_than_or_equal_to: 0, only_integer: true }
 
     def to_s
-      name.presence || 'New Subscription'
+      name || 'New Subscription'
     end
 
     def plan
       EffectiveOrders.stripe_plans[stripe_plan_id]
     end
 
-    def active?
-      status == 'active'
-    end
-
     def <=>(other)
-      (name || '') <=> (other.try(:name) || '')
+      name.to_s <=> other&.name.to_s
     end
 
   end

data/app/views/admin/orders/_order_item_fields.html.haml

@@ -2,7 +2,7 @@
   .row.align-items-center
     = f.fields_for :purchasable, (f.object.purchasable || Effective::Product.new) do |pf|
       .col-md-1= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
-      .col-md-4= pf.text_field :title, maxlength: 255
+      .col-md-4= pf.text_field :name, maxlength: 255
       .col-md-2= pf.price_field :price
 
       - if defined?(EffectiveQbSync)

data/app/views/effective/carts/_cart.html.haml

@@ -11,7 +11,7 @@
           %td.quantity
             = item.quantity
           %td.item
-            = item.title.html_safe
+            = item.name.html_safe
             = ' - '
             = link_to_remove_from_cart(item)
           %td.price

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

@@ -76,7 +76,7 @@
       - if customer.stripe_subscription.items.present?
         %tr
           %th Plans
-          %td= tableize_hash(customer.stripe_subscription.items.inject({}) { |h, item| h[item.plan.name] = item.quantity; h }, th: false)
+          %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
@@ -118,7 +118,7 @@
             = Time.zone.at(invoice.lines.first.period.end).strftime('%F')
           %td
             - invoice.lines.each do |line|
-              %p #{line.quantity}x #{line.plan.try(:name)} #{line.description}
+              %p= line.description
 
           %td= price_to_currency(invoice.total)
 
@@ -130,12 +130,6 @@
       %tr
         %th Date
         %td= Time.zone.at(customer.upcoming_invoice.date).strftime('%F')
-      %tr
-        %th Period
-        %td
-          = Time.zone.at(customer.upcoming_invoice.period_start).strftime('%F')
-          to
-          = Time.zone.at(customer.upcoming_invoice.period_end).strftime('%F')
       %tr
         %th Items
         %td
@@ -143,7 +137,6 @@
             %tbody
               - customer.upcoming_invoice.lines.each do |line|
                 %tr
-                  %td #{line.quantity}x #{line.plan.name}
                   %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)

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

@@ -1,12 +1,9 @@
 .effective-orders-customer{ data: { stripe: stripe.to_json, submit: submit.to_json } }
-  - if f.object.token_required?
-    = f.input :stripe_token, as: :effective_static_control, label: 'Credit Card', required: true,
-      value: f.object.customer.payment_status + ' ' + content_tag(:span, '', class: 'active-card')
+  .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= link_to 'Update Card Details', '#', class: 'btn btn-primary btn-change-card'
 
-  - else
-    = f.input :stripe_token, as: :effective_static_control, label: 'Credit Card', required: false,
-      value: f.object.customer.payment_status + ' ' + content_tag(:span, f.object.customer.active_card, class: 'active-card')
-
-    %p= link_to 'Update Card Details', '#', class: 'btn btn-default btn-change-card'
+  %p.invalid-feedback

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

@@ -1,13 +1,12 @@
 = javascript_include_tag 'https://checkout.stripe.com/checkout.js'
 
-= simple_form_for(subscripter, (EffectiveOrders.simple_form_options || {}).merge(url: effective_orders.customer_settings_path, method: :put)) do |f|
-  = f.input :stripe_token, as: :hidden, input_html: { value: nil }
+= effective_form_with(model: subscripter, url: effective_orders.customer_settings_path, method: :put) do |f|
+  = f.hidden_field :stripe_token, value: nil
 
   = render(f.object.customer) do
     %h3.effective-heading Card
     = effective_customer_fields(f)
 
-  .form-actions
-    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
+  = f.submit
 
 

data/app/views/effective/orders/_order_items.html.haml

@@ -24,7 +24,7 @@
               - else
                 = '-'
           %td.item
-            = item.title.html_safe
+            = item.name.html_safe
 
           %td.price= price_to_currency(item.subtotal)
 

data/app/views/effective/orders/moneris/_form.html.haml

@@ -19,7 +19,7 @@
 
   - order.order_items.each_with_index do |item, x|
     = hidden_field_tag("id#{x}", x)
-    = hidden_field_tag("description#{x}", item.title)
+    = hidden_field_tag("description#{x}", item.name)
     = hidden_field_tag("quantity#{x}", item.quantity)
     = hidden_field_tag("price#{x}", '%.2f' % (item.price / 100.0))
     = hidden_field_tag("subtotal#{x}", '%.2f' % (item.subtotal / 100.0))

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

@@ -1,16 +1,12 @@
 = javascript_include_tag 'https://checkout.stripe.com/checkout.js'
 
-= form.simple_fields_for :subscripter, form.object.subscripter do |fs|
-  = fs.input :stripe_token, as: :hidden, input_html: { value: nil }
+= 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.input :stripe_plan_id, as: :radio_buttons, collection: stripe_plans_collection(fs, include_trial: include_trial, selected_class: selected_class),
+  = fs.radios :stripe_plan_id, stripe_plans_collection(fs, include_trial: include_trial),
     label: label,
     required: required,
-    wrapper_html: { class: "effective-orders-stripe-plans #{wrapper_class}", data: { selected_class: selected_class, stripe: stripe } },
-    item_wrapper_class: "effective-orders-stripe-plan #{item_wrapper_class}",
-    item_wrapper_tag: 'div'
-
-  - if fs.object.customer.persisted?
-    = effective_customer_fields(fs)
+    cards: true,
+    wrapper: { class: 'effective-orders-stripe-plans', data: { stripe: stripe } }

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

@@ -1,21 +1,20 @@
-.panel.panel-default{class: (selected_class if selected)}
-  .panel-heading.text-center
-    %h3= plan[:name]
-    %p= plan[:description]
-  .panel-body
-    %p Includes features
+.card-header.text-center
+  %h3= plan[:name]
+  %p= plan[:description]
 
-    - if plan[:amount] == 0
-      %p Free plan
+.card-body
+  %p Includes features
 
-    %hr
-    .visible-when-unselected.text-center
-      = link_to 'Select', '#', class: 'btn btn-default btn-select-plan'
+  - if plan[:amount] == 0
+    %p Free plan
 
-    .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
+  .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/config/effective_orders.rb

@@ -225,19 +225,19 @@ EffectiveOrders.setup do |config|
 
   # if Rails.env.production?
   #   config.stripe = {
-  #     secret_key: '',
-  #     publishable_key: '',
+  #     secret_key: 'sk_xxx',
+  #     publishable_key: 'pk_xxx',
   #     currency: 'usd',
   #     site_title: 'My Site',
-  #     site_image: '' # A relative URL pointing to a square image of your brand or product. The recommended minimum size is 128x128px.
+  #     site_image: 'logo.png' # A relative or absolute URL pointing to a square image of your brand or product. The recommended minimum size is 128x128px.
   #   }
   # else
   #   config.stripe = {
-  #     secret_key: '',
-  #     publishable_key: '',
+  #     secret_key: 'sk_test_xxx',
+  #     publishable_key: 'pk_test_xxx',
   #     currency: 'usd',
-  #     site_title: 'My Development Site',  # Displayed on the Embedded Stripe Form
-  #     site_image: '' # A relative URL pointing to a square image of your brand or product. The recommended minimum size is 128x128px.
+  #     site_title: 'My Site',
+  #     site_image: 'logo.png' # A relative or absolute URL pointing to a square image of your brand or product. The recommended minimum size is 128x128px.
   #   }
   # end
 
@@ -245,11 +245,17 @@ EffectiveOrders.setup do |config|
   config.subscriptions = false
 
   # config.subscriptions = {
-  #   trial_name: 'Free Trial',
-  #   trial_description: '45-Day Free Trial',
-  #   trial_period: 45.days,
-  #   trial_remind_at: [1.day, 3.days, 7.days],  # Send email notification to trialing users 1, 3 and 7 days before expiring. false to disable.
-  #   webhook_secret: 'whsec_1234567890'
+  #   webhook_secret: 'whsec_xxx'
+  # }
+
+  # Trial
+  config.trial = false
+
+  # config.trial = {
+  #   name: 'Free Trial',
+  #   description: '45-Day Free Trial',
+  #   length: 45.days,
+  #   remind_at: [1.day, 3.days, 7.days],  # Send email notification to trialing users 1, 3 and 7 days before expiring. false to disable.
   # }
 
 end

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

@@ -32,7 +32,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.string    :purchasable_type
       t.integer   :purchasable_id
 
-      t.string    :title
+      t.string    :name
       t.integer   :quantity
       t.integer   :price, :default => 0
       t.boolean   :tax_exempt
@@ -91,10 +91,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.string    :subscribable_type
 
       t.string    :stripe_plan_id
-      t.string    :status
-
       t.string    :name
-      t.integer   :price, :default => 0
 
       t.timestamps
     end
@@ -106,7 +103,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
     create_table <%= @products_table_name %> do |t|
       t.integer   :purchased_order_id
 
-      t.string    :title
+      t.string    :name
       t.integer   :price
       t.boolean   :tax_exempt, :default => false
 

data/lib/effective_orders.rb

@@ -10,6 +10,12 @@ module EffectiveOrders
 
   STATES = { PENDING => PENDING, CONFIRMED => CONFIRMED, PURCHASED => PURCHASED, DECLINED => DECLINED }
 
+  # Subscription statuses (as per stripe)
+  ACTIVE = 'active'.freeze
+  PAST_DUE = 'past_due'.freeze
+
+  STATUSES = { ACTIVE => ACTIVE, PAST_DUE => PAST_DUE }
+
   # The following are all valid config keys
   mattr_accessor :orders_table_name
   mattr_accessor :order_items_table_name
@@ -57,6 +63,7 @@ module EffectiveOrders
   mattr_accessor :paypal
   mattr_accessor :stripe
   mattr_accessor :subscriptions  # Stripe subscriptions
+  mattr_accessor :trial          # Trial mode
 
   def self.setup
     yield self
@@ -125,6 +132,10 @@ module EffectiveOrders
     subscriptions.kind_of?(Hash)
   end
 
+  def self.trial?
+    trial.kind_of?(Hash)
+  end
+
   def self.single_payment_processor?
     [cheque?, moneris?, paypal?, stripe?].select { |enabled| enabled }.length == 1
   end
@@ -157,6 +168,12 @@ module EffectiveOrders
     return {} unless (stripe? && subscriptions?)
 
     @stripe_plans ||= (
+      Rails.logger.info "STRIPE PLAN LIST"
+
+      # {"id":"plan_ChLx90ggbWvB8i","object":"plan","amount":100000,"billing_scheme":"per_unit","created":1523984756,"currency":"usd",
+      #{ }"interval":"year","interval_count":1,"livemode":false,"metadata":{},"nickname":"Yearly","product":"prod_ChLwW0XqdykIki",
+      #{ }"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'
@@ -172,7 +189,8 @@ module EffectiveOrders
 
         h[plan.id] = {
           id: plan.id,
-          name: plan.name,
+          product_id: plan.product,
+          name: plan.nickname,
           amount: plan.amount,
           currency: plan.currency,
           description: "$#{'%0.2f' % (plan.amount / 100.0)} #{plan.currency.upcase}#{occurrence}",
@@ -182,12 +200,9 @@ module EffectiveOrders
         }; h
       end
 
-      plans['trial'] = {
-        id: 'trial',
-        amount: 0,
-        name: (subscriptions[:trial_name] || 'Free Trial'),
-        description: (subscriptions[:trial_description] || 'Free Trial')
-      }
+      if trial?
+        plans['trial'] = { id: 'trial', amount: 0, name: trial.fetch(:name), description: trial.fetch(:description) }
+      end
 
       plans
     )

data/lib/effective_orders/version.rb

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

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -68,10 +68,10 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
   # so that this mailer will not have to guess at your app's acts_as_purchasable objects
   def preview_order_items
     [
-      { title: 'Item One', quantity: 2, price: 999, tax_exempt: false },
-      { title: 'Item Two', quantity: 1, price: 25000, tax_exempt: false },
-      { title: 'Item Three', quantity: 1, price: 8999, tax_exempt: false },
-      { title: 'Item Four', quantity: 1, price: 100000, tax_exempt: false }
+      { name: 'Item One', quantity: 2, price: 999, tax_exempt: false },
+      { name: 'Item Two', quantity: 1, price: 25000, tax_exempt: false },
+      { name: 'Item Three', quantity: 1, price: 8999, tax_exempt: false },
+      { name: 'Item Four', quantity: 1, price: 100000, tax_exempt: false }
     ]
   end
 

data/lib/tasks/effective_orders_tasks.rake

@@ -1,28 +1,28 @@
-# rake effective_orders:overwrite_order_item_titles
+# rake effective_orders:overwrite_order_item_names
 
 namespace :effective_orders do
-  desc 'Overwrite all order item titles with current acts_as_purchasable object title'
-  task overwrite_order_item_titles: :environment do
-    puts 'WARNING: this task will overwrite all existing order items with new titles. Proceed? (y/n)'
+  desc 'Overwrite all order item names with current acts_as_purchasable object names'
+  task overwrite_order_item_names: :environment do
+    puts 'WARNING: this task will overwrite all existing order items with new names. Proceed? (y/n)'
     (puts 'Aborted' and exit) unless STDIN.gets.chomp.downcase == 'y'
 
     Effective::OrderItem.transaction do
       begin
 
         Effective::OrderItem.includes(:purchasable).find_each do |order_item|
-          new_title = order_item.purchasable.title
+          new_name = order_item.purchasable.purchasable_name
 
-          unless new_title
+          unless new_name
             raise "acts_as_purchasable object #{order_item.purchasable_type.try(:classify)}<#{order_item.purchasable_id}>.title() from Effective::OrderItem<#{order_item.id}> cannot be nil."
           end
 
-          order_item.update_column(:title, new_title) # This intentionally skips validation
+          order_item.update_column(:name, new_name) # This intentionally skips validation
         end
 
-        puts 'Successfully updated all order item titles.'
+        puts 'Successfully updated all order item names.'
       rescue => e
         puts "An error has occurred: #{e.message}"
-        puts "(effective_orders) Rollback. No order item titles have been changed."
+        puts "(effective_orders) Rollback. No order item names have been changed."
         raise ActiveRecord::Rollback
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0beta4
+  version: 4.0.0beta5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,6 @@ files:
 - app/assets/stylesheets/effective_orders.scss
 - app/assets/stylesheets/effective_orders/_cart.scss
 - app/assets/stylesheets/effective_orders/_order.scss
-- app/assets/stylesheets/effective_orders/_subscriptions.scss
 - app/controllers/admin/customers_controller.rb
 - app/controllers/admin/order_items_controller.rb
 - app/controllers/admin/orders_controller.rb

data/app/assets/stylesheets/effective_orders/_subscriptions.scss

@@ -1,14 +0,0 @@
-// This is the radio button form input
-.effective-orders-stripe-plans {
-  input { display: none; }
-  label { width: 100%; padding-left: 0px; }
-  .radio + .radio { margin-top: 10px; }
-
-  .visible-when-selected { display: none; }
-  .visible-when-unselected { display: block; }
-
-  label > .selected {
-    .visible-when-selected { display: block; }
-    .visible-when-unselected { display: none; }
-  }
-}