effective_resources 1.9.13 → 1.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed166aa8aeaf93b66de29429230623cad83d1b55f61b550f0b6e028d619c7362
-  data.tar.gz: 2843fd945c1c9dde784387b7db0d8b38187542f54aeaadee71876a1933c2c46f
+  metadata.gz: 9b69f74d07daa22a1733f0c9a9834056c614e025f70382f5c5bbae286d3bf066
+  data.tar.gz: 18517fd35b619d93f979a2536e0feed6d007306e47028beb70b21f6afcb3dfaf
 SHA512:
-  metadata.gz: 144e3041a712292e4a7becf6ff9e71c4092c50bff7ebbb06d13fc8f14f92c3ff9a1dcf3aaf20f4c5e5b06a1b6d52745930ab3fe877c88ca5f4c8c9d6a8ee16e3
-  data.tar.gz: e69d047183677c0176e6ffd941983a73bedf40040e49d413f1ea738766193eb686b52bfdb0063c7ca2f1bd637b753264708a99d41d254479689d2c52cc042fcf
+  metadata.gz: 8ef58e8d1d3f02d64c1a0e9f5979b22db50dc47314b945906cbc89edae6147d733d77305353ab25798f512d0f182460525fae2cfe6c4c93f919717d743670f32
+  data.tar.gz: 42b9e8c8ac3878d56d1f71f429c40cae535e23bbb43fe76b0b70deb3917779bb60c52a9122bbd5c0d057fc70778f4983c47d7ac5c3cd0024cdb0fbace2fe640f

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

@@ -17,6 +17,7 @@ module Effective
       def show
         Rails.logger.info 'Processed by Effective::WizardController#show'
 
+        run_callbacks(:resource_render)
         render_wizard
       end
 

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

@@ -69,6 +69,13 @@ module Effective
         @page_title ||= resource_wizard_step_title(resource, step)
       end
 
+      def ready_checkout
+        return unless step == :checkout
+        return unless resource.class.try(:acts_as_purchasable_wizard?)
+
+        resource.ready!
+      end
+
     end
   end
 end

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

@@ -25,6 +25,8 @@ module Effective
 
         before_action :assign_current_step
         before_action :assign_page_title
+
+        before_action :ready_checkout
       end
 
       helper_method :resource

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -0,0 +1,128 @@
+# ActsAsPurchasableWizard
+#
+
+module ActsAsPurchasableWizard
+  extend ActiveSupport::Concern
+
+  module Base
+    def acts_as_purchasable_wizard
+      raise('please declare acts_as_wizard first') unless respond_to?(:acts_as_wizard?)
+      raise('please declare acts_as_purchasable_parent first') unless respond_to?(:acts_as_purchasable_parent?)
+
+      unless (const_get(:WIZARD_STEPS).keys & [:billing, :checkout, :submitted]).length == 3
+        raise('please include a :billing, :checkout and :submitted step')
+      end
+
+      include ::ActsAsPurchasableWizard
+    end
+  end
+
+  included do
+    validates :owner, presence: true
+
+    # Billing Step
+    validate(if: -> { current_step == :billing && owner.present? }) do
+      self.errors.add(:base, "must have a billing address") unless owner.billing_address.present?
+      self.errors.add(:base, "must have an email") unless owner.email.present?
+    end
+
+    after_purchase do |_|
+      raise('expected submit_order to be purchased') unless submit_order&.purchased?
+      before_submit_purchased!
+      submit_purchased!
+      after_submit_purchased!
+    end
+  end
+
+  # All Fees and Orders
+  def submit_fees
+    raise('to be implemented by caller')
+  end
+
+  def submit_order
+    orders.first
+  end
+
+  def find_or_build_submit_fees
+    submit_fees
+  end
+
+  def find_or_build_submit_order
+    order = submit_order || orders.build(user: owner)
+    fees = submit_fees()
+
+    # Adds fees, but does not overwrite any existing price.
+    fees.each do |fee|
+      order.add(fee) unless order.purchasables.include?(fee)
+    end
+
+    order.purchasables.each do |purchasable|
+      order.remove(purchasable) unless fees.include?(purchasable)
+    end
+
+    # From Billing Step
+    order.billing_address = owner.billing_address if owner.billing_address.present?
+
+    # Important to add/remove anything
+    order.save!
+
+    order
+  end
+
+  # Should be indempotent.
+  def build_submit_fees_and_order
+    return false if was_submitted?
+
+    fees = find_or_build_submit_fees()
+    raise('already has purchased submit fees') if fees.any?(&:purchased?)
+
+    order = find_or_build_submit_order()
+    raise('already has purchased submit order') if order.purchased?
+
+    true
+  end
+
+  # Owner clicks on the Billing step. Next step is Checkout
+  def billing!
+    ready! && save!
+  end
+
+  # Ready to check out
+  # This is called by the "ready_checkout" before_action in wizard_controller/before_actions.rb
+  def ready!
+    without_current_step do
+      build_submit_fees_and_order
+      save!
+    end
+  end
+
+  # Called automatically via after_purchase hook above
+  def submit_purchased!
+    return false if was_submitted?
+
+    wizard_steps[:checkout] = Time.zone.now
+    submit!
+  end
+
+  # A hook to extend
+  def before_submit_purchased!
+  end
+
+  def after_submit_purchased!
+  end
+
+  # Draft -> Submitted requirements
+  def submit!
+    raise('already submitted') if was_submitted?
+    raise('expected a purchased order') unless submit_order&.purchased?
+
+    wizard_steps[:checkout] ||= Time.zone.now
+    wizard_steps[:submitted] = Time.zone.now
+    submitted!
+  end
+
+  module ClassMethods
+    def acts_as_purchasable_wizard?; true; end
+  end
+
+end

data/app/models/concerns/acts_as_tokened.rb

@@ -40,6 +40,7 @@ module ActsAsTokened
   end
 
   def to_global_id(**params)
+    params[:tenant] = Tenant.current if defined?(Tenant)
     GlobalID.new(URI::GID.build(app: Rails.application.config.global_id.app, model_name: model_name, model_id: to_param, params: params))
   end
 

data/app/models/concerns/acts_as_wizard.rb

@@ -50,9 +50,13 @@ module ActsAsWizard
       can_revisit_completed_steps(step)
     end
 
+    def wizard_step_keys
+      self.class.const_get(:WIZARD_STEPS).keys
+    end
+
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
-      self.class.const_get(:WIZARD_STEPS).keys
+      wizard_step_keys()
     end
 
     def wizard_step_title(step)
@@ -104,6 +108,16 @@ module ActsAsWizard
       has_completed_step?(required_steps.last)
     end
 
+    def without_current_step(&block)
+      existing = current_step
+
+      begin
+        self.current_step = nil; yield
+      ensure
+        self.current_step = existing
+      end
+    end
+
     private
 
     def can_revisit_completed_steps(step)

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

@@ -100,7 +100,9 @@ module Effective
           else # Maybe from a string field
             collection = relation.none
 
-            relation.distinct("#{name}_type").pluck("#{name}_type").each do |klass_name|
+            relation.unscoped.distinct("#{name}_type").pluck("#{name}_type").each do |klass_name|
+              next if klass_name.nil?
+
               resource = Effective::Resource.new(klass_name)
               next unless resource.klass.present?
 

data/lib/effective_resources/engine.rb

@@ -28,6 +28,7 @@ module EffectiveResources
         ActiveRecord::Base.extend(ActsAsSlugged::Base)
         ActiveRecord::Base.extend(ActsAsStatused::Base)
         ActiveRecord::Base.extend(ActsAsWizard::Base)
+        ActiveRecord::Base.extend(ActsAsPurchasableWizard::Base)
         ActiveRecord::Base.extend(HasManyRichTexts::Base)
 
         ActiveRecord::Base.extend(EffectiveDeviseUser::Base)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.13'.freeze
+  VERSION = '1.9.17'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.13
+  version: 1.9.17
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,6 +153,7 @@ files:
 - app/helpers/effective_resources_wizard_helper.rb
 - app/models/concerns/acts_as_archived.rb
 - app/models/concerns/acts_as_email_form.rb
+- app/models/concerns/acts_as_purchasable_wizard.rb
 - app/models/concerns/acts_as_slugged.rb
 - app/models/concerns/acts_as_statused.rb
 - app/models/concerns/acts_as_tokened.rb