effective_email_templates 1.4.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f761daef6975677ea045c02bec4fe35c12613428d7a471ea96090d9ff4f8ee
-  data.tar.gz: 643bb762e01e5f086d90fe91465dc150033f27e2cd913f3295b02c1d35e0cff0
+  metadata.gz: 1522926c50dd2f6874bc8cb41b906b4c8c2d31b8f0952ae1dc7482b647dc184c
+  data.tar.gz: 3cab7ba180c3eadfeb74e6c6806ed24b46b74408073eb94f04598b23776bdfce
 SHA512:
-  metadata.gz: d516cd29cdbf67641658d726e3d6ac3c670d25f1a563827516e05f8bb78aeb31c316f3270c4cdf981d74cd5d0efb8f980bb4035b6bdca61738000f4a344b7d20
-  data.tar.gz: 1e10e8b93b994cbbb3a8b715a97d039648655cd2f307fbbdf5cf3caafae73fd4c735ead6a8461e9e5c209a00ddb5dc4dc9d773919192d92a29d1b5a1d3cfe8d1
+  metadata.gz: 93d50932390ea0c38b202196451c58623f433a78d8d131b0568da75a1e44b0029653285934a1d311db7c7a658a2c78c969bbbabf78144e2335d4454ccd0fbfdb
+  data.tar.gz: 9b5fe215d1dd3bb1f2e05d1a5417536eb4a38f3a29c0369e0346562347c308b88a21fe9d96a4c1e6f017d926b01429aed989e9e8f0310d7f4754b4ed7c152675

data/app/datatables/effective_email_templates_datatable.rb

@@ -9,23 +9,11 @@ class EffectiveEmailTemplatesDatatable < Effective::Datatable
 
     col :template_name, label: 'Name'
 
-    col :from do |email_template|
-      sanitize(email_template.from)
-    end
-
-    col :cc do |email_template|
-      sanitize(email_template.cc)
-    end
-
-    col :bcc do |email_template|
-      sanitize(email_template.bcc)
-    end
-
+    col :from, search: EffectiveEmailTemplates.mailer_froms
+    col :cc
+    col :bcc
     col :subject
-
-    col :body do |email_template|
-      simple_format(email_template.body)
-    end
+    col :body
 
     col :content_type, visible: false
 

data/app/views/admin/email_templates/_form.html.haml

@@ -4,7 +4,7 @@
   - if EffectiveEmailTemplates.select_content_type
     = f.select :content_type, Effective::EmailTemplate::CONTENT_TYPES
 
-  = f.text_field :from, hint: 'Whom the email will be sent from'
+  = f.select :from, EffectiveEmailTemplates.mailer_froms, hint: 'Please contact us to add additional sender addresses.'
   = f.text_field :cc
   = f.text_field :bcc
 
@@ -19,6 +19,8 @@
         - Array(f.object.template_variables).each do |variable|
           %li {{ #{variable} }}
 
-      %small.text-muted Only a developer can add additional variables
+      %small.text-muted Please contact us to add additional variables
 
-  = f.submit
+  = f.submit do
+    = f.save 'Save'
+    = f.save 'Continue'

data/lib/effective_email_templates/importer.rb

@@ -9,8 +9,9 @@ module EffectiveEmailTemplates
     end
 
     def execute(overwrite:, paths: nil, quiet: false)
-      return false unless ActiveRecord::Base.connection.table_exists?(EffectiveEmailTemplates.email_templates_table_name)
+      return false unless ActiveRecord::Base.connection.table_exists?(EffectiveEmailTemplates.email_templates_table_name || :email_templates)
       return false if defined?(Tenant) && Tenant.current.blank?
+      return false if EffectiveEmailTemplates.mailer_froms.blank?
 
       paths ||= if defined?(Tenant)
         ActionController::Base.view_paths.reject { |view| view.path.include?('/apps/') }.map(&:path) + Tenant.view_paths.map(&:to_s)
@@ -38,6 +39,9 @@ module EffectiveEmailTemplates
     def save(email_template, filepath, quiet:)
       file = File.new(filepath, 'r')
 
+      froms = EffectiveEmailTemplates.mailer_froms
+      raise('expected an Array of mailer froms') unless froms.kind_of?(Array)
+
       attributes = begin
         content = YAML.load(file)
         content.kind_of?(Hash) ? content : {}
@@ -49,7 +53,11 @@ module EffectiveEmailTemplates
         content.gsub(match[1], '').strip if match
       end
 
+      from = froms.find { |from| from.include?(attributes['from']) } if attributes['from'].present?
+      from ||= froms.first
+
       email_template.assign_attributes(attributes)
+      email_template.assign_attributes(from: from)
       email_template.assign_attributes(body: body)
 
       if email_template.save

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails