effective_orders 4.4.9 → 4.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f309d8560e78018e04639fa0e733cc40632b33048b22b30458e888216420d9
-  data.tar.gz: 6562b45ee4e8e400d94d85e568126ad67648eda2525bdc7fdbfefa6b78bc3ab1
+  metadata.gz: d2216991c7430e4902a33b35ee0d8d4ea9e637c927a587b1dbedf1eaf4cf57fe
+  data.tar.gz: a51f8b35bfebb1e375664ee006e24717cec9ddac464f17e008296a87e2883c81
 SHA512:
-  metadata.gz: c15aa6b827a544df46d52c2fff312a7dd4500bfd2e5c94cd3a59a88687ef29e053555038685601d578e92c385b00a3e253daec03b7893405adb21d75dad54a80
-  data.tar.gz: 39eabeb2eacc02d433ea2eb2545bb007d56d3cc96e0868f87febd719903dbb574c776c197ab301216c1f994c81619fb2d71fd26b6c26d843ffdad3086de20a6a
+  metadata.gz: 7b5a07d109578b5bc7654ca5eaa6ec3f18b7cd89841b15e7f0a5a1128089e9715cd9b317c884ef0afb6cb4a9fed7f0934b7693f7e0b3ba4648544769a00ef3be
+  data.tar.gz: e94f3d309875b26bbf6f185990e80e1d1911ae0d320050550915dd7970f025a07645c402aa1b6422e114f1e1563b1d86420cba3a8d8058123ce437650c900269

data/app/datatables/admin/effective_orders_datatable.rb

@@ -14,11 +14,13 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   filters do
-    scope :purchased, default: true
-    scope :deferred
-    scope :refunds
-    scope :not_purchased
-    scope :all
+    if attributes[:user_id].blank? && attributes[:parent_id].blank?
+      scope :purchased, default: true
+      scope :deferred
+      scope :refunds
+      scope :not_purchased
+      scope :all
+    end
   end
 
   datatable do
@@ -43,6 +45,8 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
       col :email, visible: false
     end
 
+    col :parent, visible: false, search: :string
+
     col :cc, visible: false
 
     if EffectiveOrders.billing_address
@@ -90,6 +94,10 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
       scope = scope.where(user: user)
     end
 
+    if attributes[:parent_id].present? && attributes[:parent_type].present?
+      scope = scope.where(parent_id: attributes[:parent_id], parent_type: attributes[:parent_type])
+    end
+
     scope
   end
 

data/app/datatables/effective_orders_datatable.rb

@@ -21,6 +21,8 @@ class EffectiveOrdersDatatable < Effective::Datatable
       '#' + order.to_param
     end
 
+    col :parent, visible: false, search: :string
+
     unless attributes[:not_purchased]
       col :purchased_at do |order|
         order.purchased_at&.strftime('%F %H:%M') || 'not purchased'
@@ -69,6 +71,10 @@ class EffectiveOrdersDatatable < Effective::Datatable
       scope = scope.not_purchased
     end
 
+    if attributes[:parent_id].present? && attributes[:parent_type].present?
+      scope = scope.where(parent_id: attributes[:parent_id], parent_type: attributes[:parent_type])
+    end
+
     scope
   end
 

data/app/helpers/effective_orders_helper.rb

@@ -86,13 +86,13 @@ module EffectiveOrdersHelper
     end
   end
 
-  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil)
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, namespace: namespace }
+  def render_checkout_step1(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
     render(partial: 'effective/orders/checkout_step1', locals: locals)
   end
 
-  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil)
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, namespace: namespace }
+  def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
     render(partial: 'effective/orders/checkout_step2', locals: locals)
   end
 

data/app/models/concerns/acts_as_purchasable.rb

@@ -5,15 +5,15 @@ module ActsAsPurchasable
     def acts_as_purchasable(*options)
       @acts_as_purchasable = options || []
 
-      if table_exists?
-        instance = new()
-        raise 'must respond_to price' unless instance.respond_to?(:price)
-        raise 'must respond_to purchased_order_id' unless instance.respond_to?(:purchased_order_id)
-
-        if defined?(EffectiveQbSync)
-          raise 'must respond to qb_item_name' unless instance.respond_to?(:qb_item_name)
-        end
-      end
+      # if table_exists?
+      #   instance = new()
+      #   raise 'must respond_to price' unless instance.respond_to?(:price)
+      #   raise 'must respond_to purchased_order_id' unless instance.respond_to?(:purchased_order_id)
+
+      #   if defined?(EffectiveQbSync)
+      #     raise 'must respond to qb_item_name' unless instance.respond_to?(:qb_item_name)
+      #   end
+      # end
 
       include ::ActsAsPurchasable
     end

data/app/models/concerns/acts_as_subscribable.rb

@@ -7,9 +7,11 @@ module ActsAsSubscribable
     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)
+      # if table_exists?
+      #   instance = new()
+      #   raise 'must respond to trialing_until' unless instance.respond_to?(:trialing_until) || !EffectiveOrders.trial?
+      #   raise 'must respond to subscription_status' unless instance.respond_to?(:subscription_status)
+      # end
 
       include ::ActsAsSubscribable
       (ActsAsSubscribable.descendants ||= []) << self
@@ -20,7 +22,7 @@ module ActsAsSubscribable
     has_one :subscription, as: :subscribable, class_name: 'Effective::Subscription', inverse_of: :subscribable
     has_one :customer, through: :subscription, class_name: 'Effective::Customer'
 
-    before_validation(if: -> { trialing_until.blank? && EffectiveOrders.trial? }) do
+    before_validation(if: -> { EffectiveOrders.trial? && trialing_until.blank? }) do
       self.trialing_until = (Time.zone.now + EffectiveOrders.trial.fetch(:length)).beginning_of_day
     end
 
@@ -28,7 +30,10 @@ module ActsAsSubscribable
       raise :abort unless (subscripter.destroy! rescue false)
     end
 
-    validates :trialing_until, presence: true, if: -> { EffectiveOrders.trial? }
+    if EffectiveOrders.trial?
+      validates :trialing_until, presence: true
+    end
+
     validates :subscription_status, inclusion: { allow_nil: true, in: EffectiveOrders::STATUSES.keys }
 
     scope :trialing, -> { where(subscription_status: nil).where('trialing_until > ?', Time.zone.now) }
@@ -62,6 +67,12 @@ module ActsAsSubscribable
     subscribed? && subscription_status == EffectiveOrders::PAST_DUE
   end
 
+  # If we do use stripe
+  def subscription_trialing?
+    subscribed? && subscription_status == EffectiveOrders::TRIALING
+  end
+
+  # If we don't use stripe
   def trialing?
     subscription_status.blank?
   end

data/app/models/effective/customer.rb

@@ -51,6 +51,13 @@ module Effective
       end
     end
 
+    def invoices
+      @invoices ||= if stripe_customer_id.present?
+        Rails.logger.info "[STRIPE] list invoices: #{stripe_customer_id}"
+        ::Stripe::Invoice.list(customer: stripe_customer_id) rescue nil
+      end
+    end
+
     def upcoming_invoice
       @upcoming_invoice ||= if stripe_customer_id.present?
         Rails.logger.info "[STRIPE] get upcoming invoice: #{stripe_customer_id}"

data/app/models/effective/order.rb

@@ -28,6 +28,9 @@ module Effective
     attr_accessor :send_mark_as_paid_email_to_buyer  # Set by Admin::Orders#mark_as_paid
     attr_accessor :skip_buyer_validations # Set by Admin::Orders#create
 
+    # If we want to use orders in a has_many way
+    belongs_to :parent, polymorphic: true, optional: true
+
     belongs_to :user, validate: false  # This is the buyer/user of the order. We validate it below.
     has_many :order_items, -> { order(:id) }, inverse_of: :order, class_name: 'Effective::OrderItem', dependent: :delete_all
 
@@ -222,6 +225,24 @@ module Effective
       retval.size == 1 ? retval.first : retval
     end
 
+
+    def update_prices!
+      raise('already purchased') if purchased?
+      raise('must be pending') unless pending?
+
+      order_items.each do |item|
+        purchasable = item.purchasable
+
+        if purchasable.blank? || purchasable.marked_for_destruction?
+          item.mark_for_destruction 
+        else
+          item.price = purchasable.price
+        end
+      end
+
+      save!
+    end
+
     def to_s
       if refund?
         "Refund ##{to_param}"

data/app/models/effective/subscripter.rb

@@ -126,7 +126,13 @@ module Effective
       return false unless subscription.stripe_subscription.blank?
 
       Rails.logger.info "[STRIPE] create subscription: #{items}"
-      stripe_subscription = Stripe::Subscription.create(customer: customer.stripe_customer_id, items: items, metadata: metadata)
+
+      stripe_subscription = Stripe::Subscription.create(
+        customer: customer.stripe_customer_id,
+        items: items,
+        metadata: metadata,
+        trial_from_plan: true
+      )
 
       subscription.update!(
         stripe_subscription: stripe_subscription,

data/app/models/effective/subscription.rb

@@ -56,6 +56,10 @@ module Effective
 
     validates :status, inclusion: { in: EffectiveOrders::STATUSES.keys }
 
+    before_validation do
+      self.name ||= EffectiveOrders.stripe_plans.find { |plan| plan[:id] == stripe_plan_id }&[:name] || 'Subscribed Plan'
+    end
+
     def to_s
       name || 'New Subscription'
     end
@@ -75,6 +79,10 @@ module Effective
       name.to_s <=> other&.name.to_s
     end
 
+    def trialing?
+      status == 'trialing'
+    end
+
     def active?
       status == 'active'
     end

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

@@ -15,7 +15,7 @@
               %td= sub.quantity
               %td= sub.interval
 
-- if customer.stripe_customer.invoices.present?
+- if customer.invoices.present?
   .card.my-4
     .card-header Invoices
     .card-body
@@ -26,7 +26,7 @@
             %th Invoice
             %th Total
         %tbody
-          - customer.stripe_customer.invoices.each do |invoice|
+          - customer.invoices.each do |invoice|
             - date_method = [(:date if invoice.respond_to?(:date)), (:period_start if invoice.respond_to?(:period_start)), :created].compact.first
             %tr
               %td= link_to Time.zone.at(invoice.public_send(date_method)).strftime('%F'), invoice.invoice_pdf

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

@@ -2,6 +2,10 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
   def self.up
     create_table <%= @orders_table_name %> do |t|
       t.integer   :user_id
+
+      t.integer   :parent_id
+      t.string    :parent_type
+
       t.string    :state
       t.datetime  :purchased_at
 

data/lib/effective_orders.rb

@@ -14,9 +14,10 @@ module EffectiveOrders
   # Subscription statuses (as per stripe)
   ACTIVE = 'active'.freeze
   PAST_DUE = 'past_due'.freeze
+  TRIALING = 'trialing'.freeze
   CANCELED = 'canceled'.freeze
 
-  STATUSES = { ACTIVE => ACTIVE, PAST_DUE => PAST_DUE, CANCELED => CANCELED }
+  STATUSES = { ACTIVE => ACTIVE, PAST_DUE => PAST_DUE, CANCELED => CANCELED, TRIALING => TRIALING }
 
   # The following are all valid config keys
   mattr_accessor :orders_table_name
@@ -183,7 +184,7 @@ module EffectiveOrders
       Rails.logger.info '[STRIPE] index plans'
 
       plans = begin
-        Stripe::Plan.all
+        Stripe::Plan.respond_to?(:all) ? Stripe::Plan.all : Stripe::Plan.list
       rescue => e
         raise e if Rails.env.production?
         Rails.logger.info "[STRIPE ERROR]: #{e.message}"
@@ -192,15 +193,18 @@ module EffectiveOrders
       end
 
       plans = plans.map do |plan|
+        description = ("$#{'%0.2f' % (plan.amount / 100.0)}" + ' ' + plan.currency.upcase + '/' +  plan.interval.to_s)
+
         {
           id: plan.id,
           product_id: plan.product,
-          name: plan.nickname,
+          name: plan.nickname || description,
+          description: description,
           amount: plan.amount,
           currency: plan.currency,
-          description: ("$#{'%0.2f' % (plan.amount / 100.0)}" + ' ' + plan.currency.upcase + '/' +  plan.interval.to_s),
           interval: plan.interval,
-          interval_count: plan.interval_count
+          interval_count: plan.interval_count,
+          trial_period_days: plan.trial_period_days
         }
       end.sort do |x, y|
         val ||= (x[:interval] <=> y[:interval])

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.4.9'.freeze
+  VERSION = '4.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.9
+  version: 4.5.3
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -253,7 +253,7 @@ homepage: https://github.com/code-and-effect/effective_orders
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -268,8 +268,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.