effective_resources 1.12.1 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db298e3e7c154dc1aa2dbec87f22bcd2fe0c20b9ab565bea13a8305f6ba04f3
-  data.tar.gz: 6b79e28b6b7f8f7335313d769725e16f9f6deb799bdfa29fb0b1de6c5b459b3c
+  metadata.gz: 78a62dc6fc911b14bbf9972a75a5a4efcb8c1be89f049c67698a8eef4d3c4c65
+  data.tar.gz: 236d6cd2e737b360d0678ca861804f7a07f841b88bf6180befef3f55e2a5194d
 SHA512:
-  metadata.gz: 82f53749182dc5a0f9b86c92171c0dc36eebf49fbeb874789a466143354fe28143c4d83e8caefae4b4e42f7157608ec58400f5ce4322b3609616ccf115d2235c
-  data.tar.gz: c388f8c66074503b1d04874419b71a5d5054ececd383d33a45087f0a17f65007fbd3f9aeb7c457c5d61ac3c36d1931a6b734756ea55ef807bd54c827e5143884
+  metadata.gz: 0f3030caa00296cc2aa2af8c33eeaf77ad6a7b3a08bd601a563c422e605f75f0d8ce8070f5c389c2267aca25d62fba94f391404ca8d6b2de9ce8182f0ce005cb
+  data.tar.gz: 0ceda0d79b3f8a0c9783c997c3ca40b05e00e046f4f22917560bf983b021a4b963fe7d8fc37ffcd8e996e671bdc67a9b31d0390a2fa6b074f221a7c3a17d500d

data/app/controllers/concerns/effective/wizard_controller/actions.rb

@@ -24,10 +24,13 @@ module Effective
       def update
         Rails.logger.info 'Processed by Effective::WizardController#update'
 
+        action = (commit_action[:action] == :save ? :update : commit_action[:action])
+        EffectiveResources.authorize!(self, action, resource)
+
         resource.assign_attributes(send(resource_params_method_name))
         assign_current_step
 
-        save_wizard_resource(resource)
+        save_wizard_resource(resource, action)
       end
 
     end

data/app/controllers/concerns/effective/wizard_controller/save.rb

@@ -4,12 +4,17 @@ module Effective
 
       def save_wizard_resource(resource, action = nil, options = {})
         was_new_record = resource.new_record?
-        action ||= resource.respond_to?("#{step}!") ? step : :save
+
+        if action.blank? || action == :update
+          action = resource.respond_to?("#{step}!") ? step : :save
+        end
 
         if save_resource(resource, action)
           flash[:success] ||= options.delete(:success) || resource_flash(:success, resource, action)
 
           @skip_to ||= skip_to_step(resource)
+
+          @redirect_to ||= resource_redirect_path(resource, action) if specific_redirect_path?(action)
           @redirect_to ||= resource_wizard_path(resource, @skip_to) if was_new_record
 
           if @redirect_to

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -62,7 +62,7 @@ module ActsAsPurchasableWizard
     end
 
     # From Billing Step
-    order.billing_address = owner.billing_address if owner.billing_address.present?
+    order.billing_address = owner.billing_address if owner.try(:billing_address).present?
 
     # Important to add/remove anything
     order.save!

data/app/models/concerns/acts_as_wizard.rb

@@ -141,6 +141,10 @@ module ActsAsWizard
   module ClassMethods
     def acts_as_wizard?; true; end
 
+    def wizard_steps_hash
+      const_get(:WIZARD_STEPS)
+    end
+
     def all_wizard_steps
       const_get(:WIZARD_STEPS).keys
     end

data/app/models/effective/resources/relation.rb

@@ -95,8 +95,6 @@ module Effective
             relation.where(is_null("#{sql_column}_id")).where(is_null("#{sql_column}_type"))
           elsif type.present? && id.present? # This was from a polymorphic select
             relation.where("#{sql_column}_id = ?", id).where("#{sql_column}_type = ?", type)
-          elsif name == :user # Polymorphic user
-            relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
           else # Maybe from a string field
             collection = relation.none
 
@@ -106,7 +104,7 @@ module Effective
               resource = Effective::Resource.new(klass_name)
               next unless resource.klass.present?
 
-              collection = collection.or(relation.where("#{name}_id": resource.search_any(term), "#{name}_type": klass_name))
+              collection = collection.or(relation.where("#{name}_id": resource.search_any(term, fuzzy: fuzzy), "#{name}_type": klass_name))
             end
 
             collection

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.12.1'.freeze
+  VERSION = '1.12.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails