effective_orders 4.6.3 → 5.0.4

data/lib/effective_orders/engine.rb

@@ -16,13 +16,6 @@ module EffectiveOrders
       eval File.read("#{config.root}/config/effective_orders.rb")
     end
 
-    # Set up mail delivering config option
-    initializer 'effective_orders.mailer', after: :load_config_initializers do |app|
-      EffectiveOrders.mailer[:deliver_method] ||= (
-        (Rails.application.config.respond_to?(:active_job) && Rails.application.config.active_job.queue_adapter) ? :deliver_later : :deliver_now
-      )
-    end
-
     initializer "effective_orders.append_precompiled_assets" do |app|
       Rails.application.config.assets.precompile += ['effective_orders/*']
     end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.6.3'.freeze
+  VERSION = '5.0.4'.freeze
 end

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -4,55 +4,55 @@
 
 class EffectiveOrdersMailerPreview < ActionMailer::Preview
   def order_receipt_to_admin
-    Effective::OrdersMailer.order_receipt_to_admin(build_preview_order)
+    EffectiveOrders.mailer_klass.order_receipt_to_admin(build_preview_order)
   end
 
   def order_receipt_to_buyer
-    Effective::OrdersMailer.order_receipt_to_buyer(build_preview_order)
+    EffectiveOrders.mailer_klass.order_receipt_to_buyer(build_preview_order)
   end
 
   def payment_request_to_buyer
-    Effective::OrdersMailer.payment_request_to_buyer(build_preview_order)
+    EffectiveOrders.mailer_klass.payment_request_to_buyer(build_preview_order)
   end
 
   def pending_order_invoice_to_buyer
-    Effective::OrdersMailer.pending_order_invoice_to_buyer(build_preview_order)
+    EffectiveOrders.mailer_klass.pending_order_invoice_to_buyer(build_preview_order)
   end
 
   def subscription_payment_succeeded
-    Effective::OrdersMailer.subscription_payment_succeeded(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_payment_succeeded(preview_customer)
   end
 
   def subscription_payment_failed
-    Effective::OrdersMailer.subscription_payment_failed(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_payment_failed(preview_customer)
   end
 
   def subscription_created
-    Effective::OrdersMailer.subscription_created(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_created(preview_customer)
   end
 
   def subscription_updated
-    Effective::OrdersMailer.subscription_updated(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_updated(preview_customer)
   end
 
   def subscription_canceled
-    Effective::OrdersMailer.subscription_canceled(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_canceled(preview_customer)
   end
 
   def subscription_trialing
-    Effective::OrdersMailer.subscription_trialing(preview_subscribable)
+    EffectiveOrders.mailer_klass.subscription_trialing(preview_subscribable)
   end
 
   def subscription_trial_expired
-    Effective::OrdersMailer.subscription_trial_expired(preview_subscribable)
+    EffectiveOrders.mailer_klass.subscription_trial_expired(preview_subscribable)
   end
 
   def subscription_event_to_admin
-    Effective::OrdersMailer.subscription_event_to_admin(:subscription_updated, preview_customer)
+    EffectiveOrders.mailer_klass.subscription_event_to_admin(:subscription_updated, preview_customer)
   end
 
   def order_error
-    Effective::OrdersMailer.order_error(order: build_preview_order, error: 'Something did not work out')
+    EffectiveOrders.mailer_klass.order_error(order: build_preview_order, error: 'Something did not work out')
   end
 
   protected

data/lib/tasks/effective_orders_tasks.rake

@@ -44,7 +44,7 @@ namespace :effective_orders do
         klass.trialing.find_each do |subscribable|
           if subscribable.trialing_until == today
             puts "sending trial expired to #{subscribable}"
-            Effective::OrdersMailer.subscription_trial_expired(subscribable).deliver_now
+            EffectiveOrders.mailer_klass.subscription_trial_expired(subscribable).deliver_now
           end
 
           next if subscribable.trial_past_due? # We already notified them
@@ -53,7 +53,7 @@ namespace :effective_orders do
 
           reminders.each do |remind_at|
             next unless today == (date + remind_at)
-            Effective::OrdersMailer.subscription_trialing(subscribable).deliver_now
+            EffectiveOrders.mailer_klass.subscription_trialing(subscribable).deliver_now
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,7 +156,6 @@ files:
 - app/models/concerns/acts_as_purchasable.rb
 - app/models/concerns/acts_as_subscribable.rb
 - app/models/concerns/acts_as_subscribable_buyer.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/cart.rb
 - app/models/effective/cart_item.rb
 - app/models/effective/customer.rb

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end