effective_orders 4.5.0 → 4.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0bcae4f96f01459844e667c3c9c426a2eac78084e2cfcccb3dc630874554bf8
-  data.tar.gz: ca5cc298e9277e80c080d743045f6ff469b50d0ba54ed6c0183d5905f7b10b0e
+  metadata.gz: e4a671a96fc25bfd1d0bb8f45b5df4e4f764a68fc22b8d0e9fe30d762d899676
+  data.tar.gz: 1dd069a7a189dd813649db7cde82b5d6aea048a711d4282a02577587f22cbcac
 SHA512:
-  metadata.gz: 315a63864050c7dacfe06ac17dfd098bfb4d698490cb214a9293b7446b6f35061dfa1e5919b63ce1684588977ecb1258ad07d8e7d4c056b61cb457de0ac13ec2
-  data.tar.gz: 910d703ac1b4c71a4f0ae00666ea16511578c7a39f31b56348bdd34069aa82d0c07978db26d7586c3b3a545f0aa2fa242bedd8ee25d7a02ca4baff2756537162
+  metadata.gz: f4c244b0f027f500a7a2a4619529498b6b64fc24d6578f2a16dc5c4471ec70c92867b8aa9ea3a7d7a073db07b47c29e262fd90f19f4cbafe6e32496fea9d04d3
+  data.tar.gz: fbf13d0a45dca91251c2b027baaed9cf8e30f406c09cc8ab3c7920045d4bb2f48335ce07b6ce71bebcce86b60e39cb1b05daa8a4d32312f57aa1baebadb197c0

data/app/controllers/effective/carts_controller.rb

@@ -2,6 +2,8 @@ module Effective
   class CartsController < ApplicationController
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:carts] : EffectiveOrders.layout)
 
+    before_action :authenticate_user!
+
     def show
       @cart = current_cart
       @pending_orders = Effective::Order.pending.where(user: current_user) if current_user.present?

data/app/controllers/effective/customers_controller.rb

@@ -4,6 +4,8 @@ module Effective
 
     include Effective::CrudController
 
+    before_action :authenticate_user!
+
     submit :save, 'Save', success: -> { 'Successfully updated card.' }
     page_title 'Customer Settings'
 

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

@@ -225,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}"
@@ -469,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/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.5.0'.freeze
+  VERSION = '4.5.5'.freeze
 end

metadata

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