effective_events 0.20.2 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28f5c7415e3b84908b2656bbd58cf74e202b924086f0c735b640063ab2bfca2d
-  data.tar.gz: c8cd136cfdfba553ddaf73c63d977d883486e72a775630fbcd85778baa38a4c7
+  metadata.gz: 0e12380e8bc5f8d3cb7c8aca29a41195601e80d5254679a416883ac4978f9ce3
+  data.tar.gz: 2640f55717703f890452ebd971978a639bcc72a344ec05d3c67466e8aa94ab85
 SHA512:
-  metadata.gz: 6d515ddf50f3e622c92af47f17cb69cd4315da25001e7c236c0f98bb05b068ad3a19db2611ab66e58f461982a691ca7601cc473ad98a596fc41d07bab73ac198
-  data.tar.gz: 7481e857dbc9bd01a2b1b192b3115cb0e8385e93ad4e011f060311d7432ff6cd7804f788657b0525550bc4200367a1e14e31321a95aaca3b15b6028505bc8d23
+  metadata.gz: 80f0a6730bf416ad9b51850487a7f0702d4b3c4a0e4fa07e923163a86384ee6958d423261fc63f98cb664faccd26dfb60166d240ec3879d9c3809a9e1db07a8a
+  data.tar.gz: 680987d30c84a812b21b11f4c50555ae2a79881f8e80023a14c53052037c2e8c4722d5f269442acbd216f9c65b0e18af514f6c3204945fbe8bbd490fd23066e6

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -21,7 +21,7 @@ module Admin
 
       col :event
 
-      col :owner, visible: false
+      col :owner
       col :event_registration, visible: false
 
       if attributes[:event_id]
@@ -56,7 +56,7 @@ module Admin
         end
       end
       
-      col :user, label: 'Member', visible: false
+      col :user, visible: false
       col :organization, visible: false
 
       col :orders, visible: false
@@ -81,6 +81,10 @@ module Admin
         scope = scope.where(event: event)
       end
 
+      if (user_id = attributes[:for_id]).present? && (user_type = attributes[:for_type]).present?
+        scope = scope.where(user_id: user_id, user_type: user_type).or(scope.where(owner_id: user_id, owner_type: user_type))
+      end
+
       scope
     end
 

data/app/models/effective/event_addon.rb

@@ -94,8 +94,10 @@ module Effective
 
       save!
 
-      order = Effective::Order.new(items: self, user: owner)
-      order.purchase!(skip_buyer_validations: true, email: false)
+      unless registered?
+        order = Effective::Order.new(items: self, user: owner)
+        order.purchase!(skip_buyer_validations: true, email: false)
+      end
 
       true
     end

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

@@ -23,4 +23,7 @@
 
   = f.check_box :archived, label: "Archive this addon. It will be displayed as archived on the owner's event registration"
 
-  = f.submit 'Save'
+  - if f.object.new_record?
+    = f.submit 'Save and Mark Registered'
+  - else
+    = f.submit 'Save'

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.20.2'.freeze
+  VERSION = '0.20.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.20.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails