effective_orders 4.4.10 → 4.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92ae430fbce8f9ee7692d921653fffda8419a6d76eb2a4b43f3efcc932b7902
-  data.tar.gz: 9ce838e457cb9a3d365641b1d6d975f55fa118eed1df7be6d8071044a845fc38
+  metadata.gz: 0144e9b8480285f5329cdb80f310ae893afc715ef1515a9d466d19075e5f0795
+  data.tar.gz: c4f7848248c853fc25f8123113cb863087ed92b0cfc01b78f85892ea09bb24ea
 SHA512:
-  metadata.gz: 4f2999ad4d947a2f3623d4dfa82aa6f9a31daabef750715bc2d4671dae7f64e3dee7076e26dd6e678b4e1ecc394ea96f4a37f241fc258eea53f533e7040a1216
-  data.tar.gz: 825f4065b65081552b68d6228c5c7d72e96d60cc6967e1789485df31366aa9f6ce5e09c2508604e697180ef7ccd7b9c5e5b75bc94ee9c954cb7dce091c885a5d
+  metadata.gz: 06ed32afc06143accff761edb35b4018196558a9f3a76e6817be18e772f746acc84ec7ddc202f13713fc66316c64040518748116b2c68011d5d2358e5ad6be74
+  data.tar.gz: 11ffb123b02a984def655fae15a9c35a3f7f6266f7245faea219169090839683b7c17509295c99450443faa0cbb66ceb1b01a742008cab9b7e641ccb01990579

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_subscribable.rb

@@ -67,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/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}"
@@ -466,13 +487,17 @@ module Effective
 
     def get_tax
       return nil unless tax_rate.present?
-      order_items.reject { |oi| oi.tax_exempt? }.map { |oi| (oi.subtotal * (tax_rate / 100.0)).round(0).to_i }.sum
+      present_order_items.reject { |oi| oi.tax_exempt? }.map { |oi| (oi.subtotal * (tax_rate / 100.0)).round(0).to_i }.sum
     end
 
     private
 
+    def present_order_items
+      order_items.reject { |oi| oi.marked_for_destruction? }
+    end
+
     def assign_order_totals
-      self.subtotal = order_items.map { |oi| oi.subtotal }.sum
+      self.subtotal = present_order_items.map { |oi| oi.subtotal }.sum
       self.tax_rate = get_tax_rate() unless (tax_rate || 0) > 0
       self.tax = get_tax()
       self.total = subtotal + (tax || 0)

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

@@ -79,6 +79,10 @@ module Effective
       name.to_s <=> other&.name.to_s
     end
 
+    def trialing?
+      status == 'trialing'
+    end
+
     def active?
       status == 'active'
     end

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

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.4.10'.freeze
+  VERSION = '4.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.10
+  version: 4.5.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails