effective_events 0.9.3 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82816ca9bcbe094f896c1ed69dc9ed52e73eeb96e496c8a92b53f3b17478b183
-  data.tar.gz: a508d7f01b1a9dda0d79ba93690b129444e3acf6c1feddf1a3b0de7ad8e043fc
+  metadata.gz: cfe22059403401435f15bb3de7a04e64d5f6d66d67b5fa538e552f743bc80657
+  data.tar.gz: 9dde412444e3898074f38c5b4c8cb845bb7b22afce81b2af11d46ec9fe9f22db
 SHA512:
-  metadata.gz: bad7ad39adc838a4e65ec253261472dcae6bc4d646821e450e3d2b3023d608847a158952bbfde0b1368604fb5fb761f277cec1c608718788b591c7bdb0034de0
-  data.tar.gz: b9479522e0ef4962da64ed39ca391a23b18cf4fe1c0d8ceb2d3084d8d8c7fb7bd04c5ae68ba8cf08411fda0feed2664040fee86876315deed7a7c597bb75bc94
+  metadata.gz: 8a9b73d87d24d66c537427daf7a5f23d4be354eaaf24f34f35646bebd5527727d6236e2a7d8cd8728c9e00d96a061783ba7d772c5c4ab97662ab7bc8a96afdd2
+  data.tar.gz: 6f84878e674939ad1843be2a35ee6d4946a1dc1a4a2dd05a6c477a9453d1ac04ada9903fe31e5c65e7c60cfd1d447f30c1ad3c4f5c0b2bc6ccd83b55c19c01e4

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -37,7 +37,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventRegistrant.deep.purchased_or_deferred.includes(:purchased_order, :owner)
+      scope = Effective::EventRegistrant.deep.purchased_or_deferred
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/models/concerns/effective_events_event_registration.rb

@@ -56,6 +56,13 @@ module EffectiveEventsEventRegistration
     has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
     accepts_nested_attributes_for :orders
 
+    # Effective Namespace
+    # For coupon fees
+    if defined?(EffectiveMemberships)
+      has_many :fees, -> { order(:id) }, as: :parent, class_name: 'Effective::Fee', dependent: :nullify
+      accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
+    end
+
     effective_resource do
       # Acts as Statused
       status                 :string, permitted: false
@@ -70,7 +77,7 @@ module EffectiveEventsEventRegistration
       timestamps
     end
 
-    scope :deep, -> { includes(:owner, :event, :event_registrants) }
+    scope :deep, -> { includes(:owner, :event_registrants, :event_addons, event: [:event_products, :event_tickets]) }
     scope :sorted, -> { order(:id) }
 
     scope :in_progress, -> { where.not(status: [:submitted]) }
@@ -112,7 +119,13 @@ module EffectiveEventsEventRegistration
 
     # All Fees and Orders
     def submit_fees
-      (event_registrants + event_addons)
+      if owner.respond_to?(:outstanding_coupon_fees) # effective_memberships_owner
+        # Order item price reduction handled by reduce_order_item_coupon_fee_price in acts_as_purchasable_wizard
+        Array(owner.outstanding_coupon_fees).each { |fee| fees << fee unless fees.include?(fee) }
+        (event_registrants + event_addons + fees)
+      else
+        (event_registrants + event_addons)
+      end
     end
 
     def after_submit_purchased!

data/app/models/effective/event.rb

@@ -6,7 +6,6 @@ module Effective
 
     if defined?(PgSearch)
       include PgSearch::Model
-
       multisearchable against: [:body]
     end
 
@@ -43,7 +42,6 @@ module Effective
     acts_as_tagged if respond_to?(:acts_as_tagged)
     acts_as_role_restricted if respond_to?(:acts_as_role_restricted)
 
-
     effective_resource do
       title                  :string
 
@@ -72,7 +70,12 @@ module Effective
     end
 
     scope :sorted, -> { order(start_at: :desc) }
-    scope :deep, -> { includes(:event_registrants, :event_tickets) }
+
+    scope :deep, -> { 
+      base = includes(:event_registrants, :event_tickets, :rich_texts) 
+      base = base.includes(:pg_search_document) if defined?(PgSearch)
+      base
+    }
 
     scope :published, -> { where(draft: false).where(arel_table[:published_at].lt(Time.zone.now)) }
     scope :unpublished, -> { where(draft: true).where(arel_table[:published_at].gteq(Time.zone.now)) }

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

@@ -45,6 +45,7 @@
     = tab 'Access' do
       = render '/admin/events/form_access', event: event
 
-    - if event.respond_to?(:log_changes_datatable)
+  - if event.persisted?
+    - if event.respond_to?(:logs_datatable)
       = tab "Logs" do
-        = render_inline_datatable(event.log_changes_datatable)
+        = render_inline_datatable(event.logs_datatable)

data/app/views/admin/events/_form_access.html.haml

@@ -1,4 +1,4 @@
-= effective_form_with(model: event, url: event.persisted? ? effective_events.admin_event_path(event.id) : effective_events.admin_events_path) do |f|
+= effective_form_with(model: [:admin, event], engine: true) do |f|
   = f.check_box :authenticate_user, label: 'Yes, the user must be be signed in to view this event', hint: 'Sign up is required to register for any event'
 
   - if EffectiveEvents.use_effective_roles

data/app/views/effective/event_registrations/_dashboard.html.haml

@@ -1,5 +1,6 @@
 -# In progress registration
 - registration = EffectiveEvents.EventRegistration.in_progress.for(current_user).first
+
 - datatable = EffectiveResources.best('EffectiveEventRegistrationsDatatable').new(self, namespace: :effective)
 
 - if registration.present?

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.9.3'.freeze
+  VERSION = '0.10.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails