effective_resources 2.22.1 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f1b13829195775799805a0687e93edf636a0212ba8605121c0f2b71664bbe4b
-  data.tar.gz: 6c13fd710c92f283595aebd9ed7553c8b06baef6e91f6bc71719558069ff0748
+  metadata.gz: b5203021d6f8cd741603bcf0459f4277f6227c56fde16fd21fb99cae45564667
+  data.tar.gz: 505149510d60183e7b0935a043f6be30d96dbb79099225a89c6fdc136ad1100d
 SHA512:
-  metadata.gz: 77aed690165d729baaacc3bb62fab2d556ec19f88c0da70e0108a61a1aac6dc8572ca1ed3af96c871b59383846403cd76684723e1d2b1ac8dabe66f2612f455e
-  data.tar.gz: 1da231ac069c526ff2d4f1e77ef7a9d5f7bea5e005c72bf08bb879854b4761cca71e185b6882919d4fc5b6d8e342d9a5d07cdd70460fe222e7fd921b064e3fb7
+  metadata.gz: 5efcc14c75d711551ae84574fd1bb64970273a170c7135a645af656b55be45ea8b71520827950933b13d636a32c51c5b0a4a58326666bbcf8722394ae086b6ad
+  data.tar.gz: ca89163745a47fe5be4342149df505800565cf6afc6991a9d765de4099d8b2efe17f570f27026eadaa5f7c6629edcd6d7f25c4f0ba5e6a13ea6b840f52c49f15

data/app/helpers/effective_acts_as_email_form_helper.rb

@@ -20,12 +20,20 @@ module EffectiveActsAsEmailFormHelper
     # These defaults are only used when there is no email_template
     email_defaults = form.object.email_form_defaults(action) unless email_template.present?
 
+    from = email_template&.from || email_defaults[:from] || EffectiveResources.mailer_froms.first
+    subject = email_template&.subject || email_defaults[:subject] || ''
+    body = email_template&.body || email_defaults[:body] || ''
+    content_type = email_template&.content_type || email_defaults[:content_type] || ''
+
     locals = {
       form: form,
       email_to: to,
+      email_from: from,
+      email_subject: subject,
+      email_body: body,
+      email_content_type: content_type,
       email_skip: skip,
       email_action: (action || true),
-      email_defaults: email_defaults,
       email_template: email_template,
       email_variables: variables
     }

data/app/models/concerns/acts_as_email_form.rb

@@ -41,7 +41,7 @@ module ActsAsEmailForm
       validates :email_form_body, presence: true
 
       validate(unless: -> { email_form_from.blank? }) do
-        self.errors.add(:email_form_from, 'must be a valid email address') unless email_form_from.include?('@')
+        errors.add(:email_form_from, 'must be a valid email address') unless email_form_from.include?('@')
       end
     end
 
@@ -60,7 +60,7 @@ module ActsAsEmailForm
 
     # Only considered when not using an effective email template
     def email_form_defaults(action)
-      { from: nil, subject: nil, body: nil }
+      { from: nil, subject: nil, body: nil, content_type: 'text/plain' }
     end
 
   end

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -96,7 +96,7 @@ module ActsAsPurchasableWizard
     # From Billing Step
     order.billing_address = owner.billing_address if owner.try(:billing_address).present?
 
-    # This will update all order items to match the prices from their purchasable
+    # This will assign all order items to match the prices from their purchasable
     order.try(:update_purchasable_attributes)
 
     # Handle effective_memberships coupon fees price reduction

data/app/models/concerns/effective_devise_user.rb

@@ -45,25 +45,6 @@ module EffectiveDeviseUser
       avatar_url              :string
     end
 
-    # Devise invitable ignores model validations, so we manually check for duplicate email addresses.
-    before_save(if: -> { new_record? && try(:invitation_sent_at).present? }) do
-      if email.blank?
-        errors.add(:email, "can't be blank")
-        raise("email can't be blank")
-      end
-
-      value = email.strip.downcase
-
-      if self.class.where(email: value).present?
-        errors.add(:email, 'has already been taken')
-        raise("email has already been taken")
-      end
-
-      if respond_to?(:alternate_email) && self.class.where(alternate_email: value).present?
-        errors.add(:email, 'has already been taken')
-        raise("email has already been taken")
-      end
-    end
 
     # Clear the provider if an oauth signed in user resets password
     before_save(if: -> { persisted? && encrypted_password_changed? }) do
@@ -245,6 +226,30 @@ module EffectiveDeviseUser
     super(value.to_s.strip.downcase.presence)
   end
 
+  # Devise invitable ignores model validations, so we manually check for duplicate email addresses.
+  def invite!(invited_by = nil, options = {})
+    if new_record?
+      value = email.to_s.strip.downcase
+
+      if value.blank?
+        errors.add(:email, "can't be blank")
+        return false
+      end
+
+      if self.class.where(email: value).present?
+        errors.add(:email, 'has already been taken')
+        return false
+      end
+
+      if respond_to?(:alternate_email) && self.class.where(alternate_email: value).present?
+        errors.add(:email, 'has already been taken')
+        return false
+      end
+    end
+
+    super
+  end
+
   def reinvite!
     invite!
   end
@@ -258,6 +263,13 @@ module EffectiveDeviseUser
     false
   end
 
+  # This allows the Sign Up form to work for existing users with a pending invitation
+  # It assigns the attributes from the sign_up_params, saves the user, accepts the invitation
+  # Note that this action skips the invitation_token validation and is therefore insecure.
+  def allow_sign_up_from_invitation?
+    true
+  end
+
   def inactive_message
     (respond_to?(:archived?) && archived?) ? :archived : super
   end

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

@@ -4,26 +4,18 @@
   = form.check_box :email_form_skip, label: 'Do not send email'
 
 = form.hide_if :email_form_skip, true do
+  - errors = form.object.errors.present?
+
   - if email_to.present?
     = form.static_field :email_form_to, label: 'To', value: (email_to.try(:email) || email_to)
 
-  - if form.object.errors.present?
-    = form.select :email_form_from, mailer_froms_collection(), label: 'From'
-    = form.text_field :email_form_subject, label: 'Subject'
-    = form.text_area :email_form_body, label: 'Body', rows: 10
-
-  - elsif email_template.present?
-    -# email_template is an Effective::EmailTemplate
-    - from_value = email_template.from || EffectiveResources.mailer_froms.first
-    = form.select :email_form_from, mailer_froms_collection(), label: 'From', value: from_value
-    = form.text_field :email_form_subject, label: 'Subject', value: email_template.subject
-    = form.text_area :email_form_body, label: 'Body', value: email_template.body, rows: 10
+  = form.select :email_form_from, mailer_froms_collection(), label: 'From', value: (email_from unless errors)
+  = form.text_field :email_form_subject, label: 'Subject', value: (email_subject unless errors)
 
+  - if email_content_type == 'text/html'
+    = form.article_editor :email_form_body, label: 'Body', mode: :email, value: (email_body unless errors)
   - else
-    - from_value = email_defaults[:from] || EffectiveResources.mailer_froms.first
-    = form.select :email_form_from, mailer_froms_collection(), label: 'From', value: from_value
-    = form.text_field :email_form_subject, label: 'Subject', value: (email_defaults[:subject] || '')
-    = form.text_area :email_form_body, label: 'Body', rows: 10, value: (email_defaults[:body] || '')
+    = form.text_area :email_form_body, label: 'Body', rows: 10, value: (email_body unless errors)
 
   - if email_variables.present?
     %p The available variables are:

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.22.1'.freeze
+  VERSION = '2.23.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.22.1
+  version: 2.23.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails