effective_events 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3981616ffe297dac3c511f6317788d9f93ea1ca9f6334f0420fa02a8fd18b479
-  data.tar.gz: 4a7e53e16612ca919b8de54f8c324bfa01599a5e78dd62404d640f06b3a6eec2
+  metadata.gz: c3cc18563f533b13a758addad2e5c979d07dc0cc5ac600470bac421be24bd749
+  data.tar.gz: 4ba14bd70df819232c3866ffd42afe7b78e02b2283da9db24f73408392fc0bdb
 SHA512:
-  metadata.gz: 53146964ab70af09e1be3db68248e01423c185b87d8e000d6a6d3fdd65c61b723de95208ac48174496533cd0055fbe6eab98538c3f3fcea657f7089b87c3a500
-  data.tar.gz: e858348a4e867ca08aa954f157992528c80c16bd3618270b88f53279040fc65dc0c3440843f4dcfcbb6974ec5162c63472b7504441a2da585b88dca2585cce8e
+  metadata.gz: 9820e104abbb83b4ad4e628e837458d2ca6364e078b3590abe49cf605d99cf7fe2eaf2e760ce97e19e3395621b59177503577a1e7f21c071524417e12031746a
+  data.tar.gz: 9fbf56791b01f83864adf08828a366998c70f2e6db1c3396bc80a2c5d9bfda8d25ee3aa7d7276f96bff80fda85e2c7ae160bb9b7295080f69c36f175d1481589

data/app/models/effective/event.rb

@@ -82,7 +82,7 @@ module Effective
     scope :events, -> (user: nil, unpublished: false) {
       scope = all.deep.sorted
 
-      if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
+      if defined?(EffectiveRoles) && EffectiveEvents.use_effective_roles
         scope = scope.for_role(user&.roles)
       end
 

data/app/models/effective/event_registrant.rb

@@ -84,7 +84,7 @@ module Effective
       save!
 
       order = Effective::Order.new(items: self, user: owner)
-      order.purchase!(skip_buyer_validations: true, email: false)
+      order.mark_as_purchased!
 
       true
     end

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

@@ -1,5 +1,9 @@
 = effective_form_with(model: [:admin, event], engine: true) do |f|
-  = f.rich_text_area :rich_text_excerpt, hint: 'Will be used for the events excerpt on index pages.'
-  = f.rich_text_area :rich_text_body, hint: 'The main body of your event'
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :rich_text_excerpt, hint: 'Will be used for the events excerpt on index pages.'
+    = f.article_editor :rich_text_body, hint: 'The main body of your event'
+  - else
+    = f.rich_text_area :rich_text_excerpt, hint: 'Will be used for the events excerpt on index pages.'
+    = f.rich_text_area :rich_text_body, hint: 'The main body of your event'
 
   = f.submit

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

@@ -2,8 +2,10 @@
 
 = effective_form_with(model: [:admin, event], engine: true) do |f|
   = card("All Steps") do
-    = f.rich_text_area "rich_text_all_steps_content", label: false,
-      hint: "displayed on all steps"
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_all_steps_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_all_steps_content", label: false, hint: "displayed on all steps"
 
   %hr
 
@@ -13,7 +15,9 @@
     - next unless enabled.include?(step)
 
     = card("#{title}") do
-      = f.rich_text_area "rich_text_#{step}_content", label: false,
-        hint: "displayed on the event registration #{step} wizard step only"
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_#{step}_content", label: false, hint: "displayed on the event registration #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_#{step}_content", label: false, hint: "displayed on the event registration #{step} wizard step only"
 
   = f.submit

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

@@ -3,8 +3,8 @@
 
 - if all_steps_content.present?
   .card.mb-4
-    .card-body= all_steps_content
+    .card-body= all_steps_content.to_s
 
 - if step_content.present?
   .card.mb-4
-    .card-body= step_content
+    .card-body= step_content.to_s

data/lib/effective_events/engine.rb

@@ -9,8 +9,10 @@ module EffectiveEvents
 
     # Include concern and allow any ActiveRecord object to call it
     initializer 'effective_events.active_record' do |app|
-      ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(EffectiveEventsEventRegistration::Base)
+      app.config.to_prepare do
+        ActiveSupport.on_load :active_record do
+          ActiveRecord::Base.extend(EffectiveEventsEventRegistration::Base)
+        end
       end
     end
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails