effective_classifieds 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02458792301648b01098c825a54d2fa92267599f520340ac347f6ab7417cbcfb'
-  data.tar.gz: 92dbdd7f35880a95007e71827d3245ba97855ce4b1ee96cb5cb444a7710d8d5c
+  metadata.gz: bb0cfd942db297b12029c3482f9640b4016070b23293a8920f09cf7308b9f511
+  data.tar.gz: 5677c6e19346e790344bf5dfaca5d411a06ec089e660a6fb0c13f19481b3393e
 SHA512:
-  metadata.gz: 53f7ffcdfbf0b0213249c8d5ac4dc8ce3a519702776706e5e4bfeb09cb50e73d0ecba3c55057db19ce392fe44a51864adb02079ab8d4e295ba03e2d0e69fa08f
-  data.tar.gz: f70627b5a9963d3e5cd0832448441c2e6288c8c0fc591f414b77bc5c0790cd425d1cfc38d2436d184ac909800289f7a17829e5f24cbf550bc2ba95a61f58b673
+  metadata.gz: 2af2f02865c7961f045b3f259e6ba238b5b8f1485a72645771f278806a929887256971e8ca71e5d220e1e5f41cd04abd0354325ac72b380956d6e9b4e755b10d
+  data.tar.gz: 0c80ae59bf92b7777cc0924a08c950a8687aee561ebe4901d4fe7023d8023f10ad03897eb68e29edcafac462fbc405911e9eccd8055a86b4c0b08e31bbe54017

data/app/mailers/effective/classifieds_mailer.rb

@@ -1,21 +1,16 @@
 module Effective
   class ClassifiedsMailer < EffectiveClassifieds.parent_mailer_class
 
-    default from: -> { EffectiveClassifieds.mailer_sender }
-    layout -> { EffectiveClassifieds.mailer_layout }
+    include EffectiveMailer
 
     def classified_submitted(resource, opts = {})
-      raise('expected an Effective::Classification') unless resource.kind_of?(Effective::Classified)
+      raise('expected an Effective::Classified') unless resource.kind_of?(Effective::Classified)
 
       @classified = resource
+      subject = subject_for(__method__, 'Classified Submitted', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: EffectiveClassifieds.mailer_admin, **headers_for(resource, opts))
-    end
-
-    protected
-
-    def headers_for(resource, opts = {})
-      resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
   end

data/app/views/effective/classifieds/_fields.html.haml

@@ -21,8 +21,10 @@
 - if f.object.persisted? && !f.object.draft?
   = f.check_box :archived, label: 'Yes, this classified is archived and will not be displayed'
 
-= f.rich_text_area :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
-
+- if defined?(EffectiveArticleEditor)
+  = f.article_editor :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
+- else
+  = f.rich_text_area :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
 
 %h2.mt-5.mb-0 Contact Information
 %p

data/app/views/effective/classifieds_mailer/classified_submitted.html.haml

@@ -12,7 +12,7 @@
 
 %hr
 
-- if !@classified.published?
+- unless @classified.approved?
   %p= link_to('Approve Classified Ad', effective_classifieds.edit_admin_classified_path(@classified))
 
 %p= link_to('View Classified Ad', effective_classifieds.classified_path(@classified))

data/config/effective_classifieds.rb

@@ -37,5 +37,5 @@ EffectiveClassifieds.setup do |config|
   # config.mailer_layout = nil      # Default mailer layout
   # config.mailer_sender = nil      # Default From value
   # config.mailer_admin = nil       # Default To value for Admin correspondence
-
+  # config.mailer_subject = nil     # Proc.new method used to customize Subject
 end

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/effective_classifieds.rb

@@ -8,9 +8,9 @@ module EffectiveClassifieds
   def self.config_keys
     [
       :classifieds_table_name, :classified_wizards_table_name,
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :layout, :categories, :per_page, :use_effective_roles, :max_duration, :auto_approve,
-      :classified_wizard_class_name,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin
+      :classified_wizard_class_name
     ]
   end
 
@@ -24,22 +24,4 @@ module EffectiveClassifieds
     mailer&.constantize || Effective::ClassifiedsMailer
   end
 
-  def self.parent_mailer_class
-    return parent_mailer.constantize if parent_mailer.present?
-    ActionMailer::Base
-  end
-
-  def self.send_email(email, *args)
-    raise('expected args to be an Array') unless args.kind_of?(Array)
-
-    if defined?(Tenant)
-      tenant = Tenant.current || raise('expected a current tenant')
-      args.last.kind_of?(Hash) ? args.last.merge!(tenant: tenant) : args << { tenant: tenant }
-    end
-
-    deliver_method = EffectiveClassifieds.deliver_method || EffectiveResources.deliver_method
-
-    EffectiveClassifieds.mailer_class.send(email, *args).send(deliver_method)
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails