effective_events 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693ebfea7f2f896f7d1960dcba08a2a4b3057108fe9816e3a5c4e3647f5301ee
-  data.tar.gz: bab7f27800d2cc50db4ab207a9515a6e25bdeed149306fefdd18119e5cd08cfc
+  metadata.gz: 7063f05a8ffe654c6c82cc43b25a1d2b4acb8bd2bbda1482c22e5eb639b2d889
+  data.tar.gz: 1f576d8e142a8514bf071660fa56acd1f8b9232a959c77e1547f644105bfa1d7
 SHA512:
-  metadata.gz: 657e9c1dc9ce2d09b414513a885ae903f8dec5a820620d9b47001ccdd5118baa3b8e72d62cc01bac1e0fa14f8dae68e44832dc861a13585370e1325cd4c5fd4d
-  data.tar.gz: ce8e327577ad40abcb00ee7c06ca45d7eaab27adb28f07853b224dd042334d7ba2ef0d4478e9386ffab2841e0b4983b70e260688e6249a639fa39f9cdf3c33d2
+  metadata.gz: 59636ebc5f7c4a5f374889f6bd91f536bd39c7e63bd393cfdeb2d9c4a84a8ac27ca9ff1b543634fbb0ba5ab513a8efd244e99cdc211a2dd68663ca97c0502f7a
+  data.tar.gz: '023123603742236658cb6a609b6811ff5188b9705e5df44c95dae8b75e0724b9bb04756100632112579a3ca9db010b664d17153c51db67acaaea3bb8a9f65fdc'

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -24,7 +24,10 @@ module Admin
         end
       end
 
-      col :purchased_event_registrants_count, label: 'Registered'
+      col :purchased_event_registrants_count, label: 'Registered' do |event|
+        event.event_registrants.purchased.unarchived.count
+      end
+
       col :capacity, visible: false
       col :capacity_available, visible: false
 

data/app/models/effective/event_product.rb

@@ -64,7 +64,7 @@ module Effective
     end
 
     def purchased_event_addons_count
-      purchased_event_addons.length
+      purchased_event_addons.reject(&:archived?).length
     end
 
   end

data/app/models/effective/event_ticket.rb

@@ -70,7 +70,7 @@ module Effective
     end
 
     def purchased_event_registrants_count
-      purchased_event_registrants.length
+      purchased_event_registrants.reject(&:archived?).length
     end
 
   end

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

@@ -23,6 +23,9 @@
 
     = tab 'Registrants & Addons' do
       %h2 Registrants
+      .mb-4
+        %small.text-muted Please refresh the page after archiving/unarchiving here to display an accurate Registered count on the Tickets & Products tab
+
       - datatable = Admin::EffectiveEventRegistrantsDatatable.new(event_id: event.id)
       .mb-4= render_inline_datatable(datatable)
 

data/app/views/simple_calendar/_month_calendar.html.haml

@@ -21,4 +21,4 @@
       - date_range.each_slice(7) do |week|
         %tr
           - week.each do |day|
-            - instance_exec(day, calendar.sorted_events_for(day), &passed_block)
+            = capture_haml(day, sorted_events.fetch(day, []), &passed_block)

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
   name: simple_calendar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement