effective_orders 4.5.2 → 4.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b254eb8e99a4c04b3b63135b2b1caa15f5a8d7803bcad0fff8323b0aab957a
-  data.tar.gz: 699ccd522afef972528e9dcee5b5eae8abad124cf11e0002f84e5c7a06bf0e8b
+  metadata.gz: 7af8313072b9cd7b4ab2fdac74aa083b29a0c8dbcc9e23b215aa96a771478884
+  data.tar.gz: 9a472569b70bcc8d2b2aec76e5922bc96f946df57cebd1f6a3dba055f85a1284
 SHA512:
-  metadata.gz: 784ec95030d906ab226f26d7f50651062979a3e50fdf286135fc81e3907d6bc23a93c77e1504433012ea59e49bcb4613702723b69a9fe58b858fd36a15ae1590
-  data.tar.gz: 7f1cf4534c235f84a025a040b2988fcfa8664046d7026de8665f4c14b139afdbd570a4491ffb46ade0d5ba40f80bd6403064f6de6aa5fa4e3ace5e1032331f83
+  metadata.gz: 5c82f040bd36057c9919a11378f6fd2c0fc4fb552c06237f6d27f4f96f20f38c43ffb5e71b2cb61c03da91f47162ff62c15458cc486e2eb6523f15941915375c
+  data.tar.gz: 8095e12ec205f3d259290058ec9650a8e8b532c2ff1dec4220354baeecf374cc875fcc7b6797d171f8dd3b3b4d32da6bbf8cb618fc0a08df557023df4beaf4ea

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

@@ -8,7 +8,7 @@ this.StripeForm ||= class StripeForm
     @card = null
 
   initialize: ->
-    @form = $('form[data-stripe-form]').first()
+    @form = $('form[data-stripe-form]:not(.initialized)').first()
     return false unless @form.length > 0
 
     @paymentIntent = @form.find("input[name$='[payment_intent_id]']").first()
@@ -17,6 +17,7 @@ this.StripeForm ||= class StripeForm
     @card = @stripe.elements().create('card', @style())
 
     @mount()
+    @form.addClass('initialized')
 
   style: ->
     style: {

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/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

@@ -228,13 +228,13 @@ module Effective
 
     def update_prices!
       raise('already purchased') if purchased?
-      raise('must be pending') unless pending?
+      raise('must be pending or confirmed') unless pending? || confirmed?
 
       order_items.each do |item|
         purchasable = item.purchasable
 
         if purchasable.blank? || purchasable.marked_for_destruction?
-          item.mark_for_destruction 
+          item.mark_for_destruction
         else
           item.price = purchasable.price
         end
@@ -382,11 +382,11 @@ module Effective
 
       raise "Failed to purchase order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
+      run_purchasable_callbacks(:after_purchase)
+
       send_refund_notification! if email && refund?
       send_order_receipts! if email
 
-      run_purchasable_callbacks(:after_purchase)
-
       true
     end
 
@@ -487,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)
@@ -534,7 +538,11 @@ module Effective
     end
 
     def send_email(email, *mailer_args)
-      Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
+      begin
+        Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
+      rescue => e
+        raise if Rails.env.development? || Rails.env.test?
+      end
     end
 
     def truthy?(value)

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.2'.freeze
+  VERSION = '4.5.7'.freeze
 end

metadata

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