effective_resources 1.9.17 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b69f74d07daa22a1733f0c9a9834056c614e025f70382f5c5bbae286d3bf066
-  data.tar.gz: 18517fd35b619d93f979a2536e0feed6d007306e47028beb70b21f6afcb3dfaf
+  metadata.gz: 536afe56ae331c14920c56f2eb625812127f0b0ad9f57696b8dce9cc198b6840
+  data.tar.gz: 99afc3984fd065ae8014bb031ea16a9138fce77e3ec0861b140a7d18e6f5e5fd
 SHA512:
-  metadata.gz: 8ef58e8d1d3f02d64c1a0e9f5979b22db50dc47314b945906cbc89edae6147d733d77305353ab25798f512d0f182460525fae2cfe6c4c93f919717d743670f32
-  data.tar.gz: 42b9e8c8ac3878d56d1f71f429c40cae535e23bbb43fe76b0b70deb3917779bb60c52a9122bbd5c0d057fc70778f4983c47d7ac5c3cd0024cdb0fbace2fe640f
+  metadata.gz: dd3e83bde7a2a01e86e9588d1998249c5e1f8882bceb679e4c32d4bafbb409b419125cc7bcca2ab4fe358bce0e707f79f7f1a5f1ef4628228dc897a9c74ca510
+  data.tar.gz: 659aab8c923fd9a5b33cb21335251c038f7af37e141c5312fea317bf0a2a9fbb2f673a12cec5b8170a3e57a50e27dcaec21a76af4b69bfdb0143ea7fdcced82b

data/app/helpers/effective_resources_wizard_helper.rb

@@ -14,8 +14,8 @@ module EffectiveResourcesWizardHelper
     return sidebar unless block_given?
 
     content_tag(:div, class: 'row') do
-      content_tag(:div, class: 'col-3') { sidebar } +
-      content_tag(:div, class: 'col-9') { yield }
+      content_tag(:div, class: 'col-lg-3') { sidebar } +
+      content_tag(:div, class: 'col-lg-9') { yield }
     end
   end
 
@@ -28,10 +28,10 @@ module EffectiveResourcesWizardHelper
     disabled = !resource.can_visit_step?(nav_step)
 
     label = [index, title].compact.join('. ')
-    klass = ['list-group-item', ('active' if current), ('disabled' if disabled && !current)].compact.join(' ')
+    klass = ['list-group-item', 'list-group-item-action', ('active' if current), ('disabled' if disabled && !current)].compact.join(' ')
 
     if (current || disabled)
-      content_tag(:li, label, class: klass)
+      content_tag(:a, label, class: klass)
     else
       link_to(label, wizard_path(nav_step), class: klass)
     end

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -49,15 +49,16 @@ module ActsAsPurchasableWizard
 
   def find_or_build_submit_order
     order = submit_order || orders.build(user: owner)
-    fees = submit_fees()
+    fees = submit_fees().reject { |fee| fee.marked_for_destruction? }
 
     # Adds fees, but does not overwrite any existing price.
     fees.each do |fee|
       order.add(fee) unless order.purchasables.include?(fee)
     end
 
-    order.purchasables.each do |purchasable|
-      order.remove(purchasable) unless fees.include?(purchasable)
+    order.order_items.each do |order_item|
+      fee = fees.find { |fee| fee == order_item.purchasable }
+      order.remove(order_item) unless fee.present?
     end
 
     # From Billing Step

data/app/views/layouts/effective_mailer_layout.html.haml

@@ -0,0 +1,7 @@
+!!!
+%html{style: 'background: #fff;'}
+  %head
+    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
+
+  %body{style: 'background: #fff;'}
+    = yield

data/config/effective_resources.rb

@@ -21,6 +21,8 @@ EffectiveResources.setup do |config|
   # end
   config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
 
+  # Default Submits
+  #
   # These default submit actions will be added to each controller
   # and rendered when calling effective_submit(f)
   # based on the controller, and its `submits` if any.
@@ -28,4 +30,22 @@ EffectiveResources.setup do |config|
   # Supported values: 'Save', 'Continue', and 'Add New'
   config.default_submits = ['Save', 'Continue', 'Add New']
 
+  # Email Settings
+  #
+  # The default mailer settings for all effective gems
+  #
+  # Configure the parent class responsible to send e-mails.
+  # config.parent_mailer = '::ApplicationMailer'
+
+  # Default deliver method
+  # config.deliver_method = :deliver_now
+
+  # Default layout
+  # config.mailer_layout = 'effective_mailer_layout'
+
+  # Default From
+  config.mailer_sender = "no-reply@example.com"
+
+  # Send Admin correspondence To
+  config.mailer_admin = "admin@example.com"
 end

data/lib/effective_resources/effective_gem.rb

@@ -38,6 +38,16 @@ module EffectiveGem
 
       true
     end
+
+    # This is included into every gem
+    # The gem may not have a mailer or use effective email templates
+    def send_email(email, *args)
+      raise('gem does not respond to mailer_class') unless respond_to?(:mailer_class)
+      raise('expected args to be an Array') unless args.kind_of?(Array)
+
+      mailer_class.send(email, *args).send(EffectiveResources.deliver_method)
+    end
+
   end
 
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.17'.freeze
+  VERSION = '1.10.1'.freeze
 end

data/lib/effective_resources.rb

@@ -5,7 +5,10 @@ require 'effective_resources/effective_gem'
 module EffectiveResources
 
   def self.config_keys
-    [:authorization_method, :default_submits]
+    [
+      :authorization_method, :default_submits,
+      :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :parent_mailer
+    ]
   end
 
   include EffectiveGem
@@ -31,6 +34,31 @@ module EffectiveResources
     (['Save', 'Continue', 'Add New'] & Array(config.default_submits)).inject({}) { |h, v| h[v] = true; h }
   end
 
+  # Email
+  def self.deliver_method
+    return config[:deliver_method] if config[:deliver_method].present?
+
+    rails = Rails.application.config
+    (rails.respond_to?(:active_job) && rails.active_job.queue_adapter) ? :deliver_later : :deliver_now
+  end
+
+  def self.mailer_layout
+    config[:mailer_layout] || 'effective_mailer_layout'
+  end
+
+  def self.mailer_sender
+    config[:mailer_sender] || raise('effective resources mailer_sender missing. Add it to config/initializers/effective_resources.rb')
+  end
+
+  def self.mailer_admin
+    config[:mailer_admin] || raise('effective resources mailer_admin missing. Add it to config/initializers/effective_resources.rb')
+  end
+
+  def self.parent_mailer_class
+    return config[:parent_mailer].constantize if config[:parent_mailer].present?
+    '::ApplicationMailer'.safe_constantize || 'ActionMailer::Base'.constantize
+  end
+
   # Utilities
 
   # This looks up the best class give the name
@@ -81,10 +109,6 @@ module EffectiveResources
     end
   end
 
-  def self.deliver_method
-    config = Rails.application.config
-    (config.respond_to?(:active_job) && config.active_job.queue_adapter) ? :deliver_later : :deliver_now
-  end
 
   def self.advance_date(date, business_days: 1, holidays: [:ca, :observed])
     raise('business_days must be an integer <= 365') unless business_days.kind_of?(Integer) && business_days <= 365

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.17
+  version: 1.10.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,6 +202,7 @@ files:
 - app/views/effective/resource/_actions.html.haml
 - app/views/effective/resource/_actions_dropleft.html.haml
 - app/views/effective/resource/_actions_glyphicons.html.haml
+- app/views/layouts/effective_mailer_layout.html.haml
 - config/effective_resources.rb
 - lib/effective_resources.rb
 - lib/effective_resources/effective_gem.rb