effective_resources 2.22.0 → 2.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf772c98b5fdf940a4fabb5138b37d2d34244f62bd6ee35b44e9d5bc2b6980d6
-  data.tar.gz: fc4cd66e588ccb8cc6aebe24bbb5b9101c67d1a7a667a0e8f38d2f4c83cc90ab
+  metadata.gz: 155b88e4f6e0f28971593f6c25da4f9c787a0da62ef6f7f851cec0496def856e
+  data.tar.gz: 1ad5f683874982e47be3186363354adf0460bfb4af7ed4c4c2e922341a34de66
 SHA512:
-  metadata.gz: 45b9292be198f62c61313e7762930c8d5752f36223aeea93702069a5189b1c2c02b93fe8ce0061683784beddc936bf903e47cd850f25fb617c8d2e52ec938333
-  data.tar.gz: 24f95b7eceeb74f84b0bda8275e4a3dccd29858cee58dd2bceb8728ff215a1603705a3083d4b0d080559692f6834318f0576b279196571af74364fb4599e642c
+  metadata.gz: 3dca56a7285c363e1bdbb79f775c53d3e645788ecf783caaa72ade6824b191998824548069b6b52ab6d1d78b37828ce5a730c51d92a74810f80cfd1cae44f668
+  data.tar.gz: baa235bfd2a657daae89b7ae1e5103f10ae9c41e47c4d2fd3e1d18160f7f9eb399d494c614927fa089991209830c50c2c85573c83be0e81751ce4c78d23f9ff3

data/app/helpers/effective_resources_wizard_helper.rb

@@ -38,7 +38,7 @@ module EffectiveResourcesWizardHelper
     if (current || disabled)
       content_tag(:a, label, class: klass)
     else
-      link_to(label, path || wizard_path(nav_step), class: klass)
+      link_to(label, path || wizard_path(nav_step), class: klass, 'data-turbolinks': false)
     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
@@ -165,9 +165,14 @@ module ActsAsPurchasableWizard
     order
   end
 
+  def update_submit_fees_and_order!
+    build_submit_fees_and_order(force: true) 
+    save!
+  end
+
   # Should be indempotent.
-  def build_submit_fees_and_order
-    return false if was_submitted?
+  def build_submit_fees_and_order(force: false)
+    return false if was_submitted? && !force
 
     fees = find_or_build_submit_fees()
     raise('already has purchased submit fees') if Array(fees).any?(&:purchased?)

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/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.22.0'.freeze
+  VERSION = '2.22.2'.freeze
 end

metadata

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