effective_events 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4ffee3a1a64a15a48d9e7ff3ce8eecd6b8f5759fccb0c886e9f943fd42f919
-  data.tar.gz: c184b3851caea22f826b685c4fc2a0db174f1b99a218f59deeb1edaad7a90694
+  metadata.gz: b35f3042e9e99875c91066ad1c6cd8c70e601dfc4abc72e0b32632c683523371
+  data.tar.gz: db5f82e191ab087d2b052fb2426c0204a2d8ef0e19b2f4a6f4720aed2d6f1d91
 SHA512:
-  metadata.gz: 729e826bfdbe9b0287a87b00f2168791c7b861feb2cbd10e678706ea83876d1bdd638f6e6e18c90b8795bf9058b65c8c2396dda7e47901bfe5962e4071678fe7
-  data.tar.gz: acf5fc1714ad5b37e9ebf9b0aa56dc3eaf83129059d54a5a9cf16da2edb4f2127cb35ca317d521e14fb171717ba2d95851fb7ea7b17aa1df6c81ec041dbf0caf
+  metadata.gz: b00e8a6173d55548bbc2b72048b7bab6f724f7655cd6d78dd40eb9bbaa336eba428918b5961882f0d9af1ce688d60aeb2530657bbb1fac24733e43ba0c64552c
+  data.tar.gz: 79d0a3ec08ce158f5d65115f4d1f5d516eb2992f384e3b63c25e6026410b8f43134b9605bb811e15c7afae075adf58c73138159754f0e060f012e1a46dff5557

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -1,11 +1,12 @@
 module Admin
   class EffectiveEventAddonsDatatable < Effective::Datatable
     filters do
-      scope :unarchived, label: "All"
-      scope :purchased
+      scope :registered
+      scope :purchased_or_created_by_admin, label: 'Purchased'
       scope :deferred
-      scope :not_purchased
+      scope :not_purchased_not_created_by_admin, label: 'Not Purchased'
       scope :archived
+      scope :all
     end
 
     datatable do
@@ -36,7 +37,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventAddon.deep.registered.includes(:purchased_order, :owner)
+      scope = Effective::EventAddon.deep.includes(:purchased_order, :owner)
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/datatables/admin/effective_event_products_datatable.rb

@@ -30,17 +30,17 @@ module Admin
       col :capacity, visible: false
       col :capacity_available, visible: false
 
-      col :registered_event_addons, label: 'Registered Names' do |product|
-        product.registered_event_addons.reject(&:archived?).sort_by(&:to_s).map do |addon|
-          content_tag(:div, addon.name.to_s, class: 'col-resource_item')
-        end.join.html_safe
-      end
-
-      col :purchased_event_addons, label: 'Purchased Names', visible: false do |product|
-        product.purchased_event_addons.reject(&:archived?).sort_by(&:to_s).map do |addon|
-          content_tag(:div, addon.name.to_s, class: 'col-resource_item')
-        end.join.html_safe
-      end
+      # col :registered_event_addons, label: 'Registered Names' do |product|
+      #   product.registered_event_addons.reject(&:archived?).sort_by(&:to_s).map do |addon|
+      #     content_tag(:div, addon.name.to_s, class: 'col-resource_item')
+      #   end.join.html_safe
+      # end
+
+      # col :purchased_event_addons, label: 'Purchased Names', visible: false do |product|
+      #   product.purchased_event_addons.reject(&:archived?).sort_by(&:to_s).map do |addon|
+      #     content_tag(:div, addon.name.to_s, class: 'col-resource_item')
+      #   end.join.html_safe
+      # end
 
       actions_col
     end

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -1,12 +1,12 @@
 module Admin
   class EffectiveEventRegistrantsDatatable < Effective::Datatable
     filters do
-      scope :unarchived, label: "All"
       scope :registered
-      scope :purchased
+      scope :purchased_or_created_by_admin, label: 'Purchased'
       scope :deferred
-      scope :not_purchased
+      scope :not_purchased_not_created_by_admin, label: 'Not Purchased'
       scope :archived
+      scope :all
     end
 
     datatable do
@@ -60,7 +60,15 @@ module Admin
       col :organization, visible: false
 
       col :orders, visible: false
-      col :price, as: :price
+
+      col(:price, as: :price) do |registrant|
+        [
+          (badge('ADMIN') if registrant.created_by_admin?),
+          price_to_currency(registrant.price)
+        ].compact.join(' ').html_safe
+      end
+
+      col :created_by_admin, visible: false
 
       col :first_name, visible: false
       col :last_name, visible: false

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -37,15 +37,15 @@ module Admin
       col :category, visible: false
 
       col :registered_event_registrants_count, label: 'Registered' do |event|
-        event.event_registrants.registered.unarchived.count
+        event.event_registrants.registered.count
       end
 
       col :purchased_event_registrants_count, label: 'Deferred', visible: false do |event|
-        event.event_registrants.deferred.unarchived.count
+        event.event_registrants.deferred.count
       end
 
       col :purchased_event_registrants_count, label: 'Purchased', visible: false do |event|
-        event.event_registrants.purchased.unarchived.count
+        event.event_registrants.purchased.count
       end
 
 

data/app/models/concerns/effective_events_event_registration.rb

@@ -141,6 +141,18 @@ module EffectiveEventsEventRegistration
       end
     end
 
+    # Validate the same registrant user isn't registered on another registration
+    validate(if: -> { current_step == :details }) do
+      present_event_registrants.select { |er| er.user.present? }.each do |er|
+        existing = Effective::EventRegistrant.unarchived.registered.where(event_ticket: er.event_ticket, user: er.user).where.not(id: er)
+
+        if existing.present?
+          errors.add(:base, "Unable to register #{er.user} for #{er.event_ticket}. They've already been registered")
+          er.errors.add(:user_id, "Unable to register #{er.user} for #{er.event_ticket}. They've already been registered")
+        end
+      end
+    end
+
     # Validate all products are available for registration
     validate(if: -> { current_step == :addons }) do
       unavailable_event_products.each do |event_product|

data/app/models/effective/event_addon.rb

@@ -32,6 +32,8 @@ module Effective
 
       archived          :boolean
 
+      created_by_admin  :boolean
+
       # Acts as Purchasable
       price             :integer
       qb_item_name      :string
@@ -42,7 +44,9 @@ module Effective
 
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:event, :event_product) }
-    scope :registered, -> { purchased_or_deferred }
+    scope :registered, -> { purchased_or_deferred.or(where(created_by_admin: true)) }
+    scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }
+    scope :not_purchased_not_created_by_admin, -> { not_purchased.where(created_by_admin: false) }
 
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event

data/app/models/effective/event_registrant.rb

@@ -55,6 +55,8 @@ module Effective
 
       archived              :boolean
 
+      created_by_admin      :boolean
+
       # Acts as Purchasable
       price                 :integer
       qb_item_name          :string
@@ -69,7 +71,9 @@ module Effective
 
     scope :sorted, -> { order(:event_ticket_id, :id) }
     scope :deep, -> { includes(:event, :event_ticket, :owner) }
-    scope :registered, -> { where.not(registered_at: nil) }
+    scope :registered, -> { unarchived.where.not(registered_at: nil) }
+    scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }
+    scope :not_purchased_not_created_by_admin, -> { not_purchased.where(created_by_admin: false) }
 
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event
@@ -114,9 +118,6 @@ module Effective
     validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
     validates :email, email: true
 
-    # This works for persisted and adding a new one. But not adding two at same time in a registration
-    validates :user_id, uniqueness: { scope: [:event_ticket_id], allow_blank: true, message: 'is already registered for this event ticket' }
-
     # First name, last name and email are always required fields on details
     validates :first_name, presence: true, if: -> { registrant_validations_enabled? }
     validates :last_name, presence: true, if: -> { registrant_validations_enabled? }

data/app/models/effective/event_ticket.rb

@@ -95,7 +95,7 @@ module Effective
       raise('expected except to be an EventRegistration') if except && !except.class.try(:effective_events_event_registration?)
 
       event_registrants.select do |er| 
-        (er.registered? || er.selected_not_expired?) && (except.blank? || er.event_registration_id != except.id)
+        (er.registered? || er.selected_not_expired?) && (except.blank? || er.event_registration_id != except.id) && !er.archived?
       end
     end
 

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

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

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

@@ -37,4 +37,7 @@
 
   = f.check_box :archived, label: "Archive this registrant. It will be displayed as archived on the owner's event registration"
 
+  - if f.object.new_record?
+    = f.hidden_field :created_by_admin, value: true
+
   = f.submit 'Save'

data/db/migrate/101_create_effective_events.rb

@@ -105,6 +105,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :price
 
       t.boolean :archived, default: false
+      t.boolean :created_by_admin, default: false
 
       t.timestamps
     end
@@ -146,6 +147,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :price
 
       t.boolean :archived, default: false
+      t.boolean :created_by_admin, default: false
 
       t.timestamps
     end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.22.1'.freeze
+  VERSION = '0.23.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails