effective_events 0.10.2 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e0eded3c712c018bb91f9c90eebe522030fa7d02d5d73b9de4001bda7c5dbcf
-  data.tar.gz: 3dc20c280ef92ebc93dad4cfe57df506e6a283bd4433a4792f07a236b3fb5ebc
+  metadata.gz: 908edb48306e3813893671ea9ba33cc3d1988258a47451edecfeee86197136a7
+  data.tar.gz: 7bb18df7c58fd2fa7e08b17710a1b5eefe22574690f1532243aab1e559cc44ec
 SHA512:
-  metadata.gz: 43fcaa469c42cf91dcb5ac3f6c52509372a4d8983c91cac727d350f4c9a3a797f04d4cd1f4ee6793502a5eb868dbc1c660e51862b3a0ad299f1ad416a69c7220
-  data.tar.gz: e7fe84b88841792c065bd307a80656ab4248b60306c2cfecaeb007ba09aa3b2bc782ee13512a91640e02c5b39156bb923bcd6683e889d51b36f99b2bd349bc67
+  metadata.gz: 5f9e45f483664485e43509d46bb0209a7567bd66b5bf27f425cfbe03ee6a3b0f171362db99d6faf7c2070074be3210239d59140f0989260c2b1fd18aa5b820ca
+  data.tar.gz: ac11a1ab1e15d1e58f5ab7e6db346906fcf6836caedbb6c45f94fbf57c177334b379da57ae8e91658b23d017fb8d62f790f740c82c0d2c2ab55662edcba6084d

data/app/controllers/effective/event_registrations_controller.rb

@@ -13,26 +13,13 @@ module Effective
       EffectiveEvents.EventRegistration.deep.where(owner: current_user, event: event)
     }
 
-    # Override ready_checkout to also check for any currently sold out tickets or addons
-    # Prevents people from coming back and purchasing them
-    def ready_checkout
-      return unless step == :checkout
-      return unless resource.class.try(:acts_as_purchasable_wizard?)
-
-      if resource.sold_out_event_registrants.present? || resource.sold_out_event_addons.present?
-        flash[:danger] = "Your selected event tickets are sold out. This event registration is no longer available."
-        return redirect_to('/dashboard')
-      end
-
-      resource.ready!
-    end
-
     # If the event is no longer registerable, do not let them continue
     def redirect_unless_registerable
       return if resource.blank?
+      return if resource.submitted?
       return if resource.event.blank?
       return if resource.event.registerable?
-      return if resource.submitted?
+      return if resource.submit_order&.deferred?
 
       flash[:danger] = "Your selected event is no longer available for registration. This event registration is no longer available."
       return redirect_to('/dashboard')

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -23,8 +23,8 @@ module Admin
         col :event_product, search: :string
       end
 
-      col :purchased_order
-      col :owner
+      col :purchased_order, visible: false
+      col :owner, visible: false
 
       col :first_name
       col :last_name

data/app/datatables/admin/effective_event_products_datatable.rb

@@ -24,13 +24,21 @@ module Admin
         end
       end
 
-      col :purchased_event_addons_count, label: 'Purchased'
+      col :registered_event_addons_count, label: 'Registered'
+      col :purchased_event_addons_count, label: 'Purchased', visible: false
+
       col :capacity, visible: false
       col :capacity_available, visible: false
 
-      col :purchased_event_addons, label: 'Name' do |product|
-        product.purchased_event_addons.reject(&:archived?).sort_by(&:to_s).map do |purchase|
-          content_tag(:div, purchase.owner.to_s, class: 'col-resource_item')
+      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.owner.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.owner.to_s, class: 'col-resource_item')
         end.join.html_safe
       end
 

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -25,7 +25,11 @@ module Admin
         end
       end
 
-      col :purchased_event_registrants_count, label: 'Registered' do |event|
+      col :registered_event_registrants_count, label: 'Registered' do |event|
+        event.event_registrants.registered.unarchived.count
+      end
+
+      col :purchased_event_registrants_count, label: 'Purchased', visible: false do |event|
         event.event_registrants.purchased.unarchived.count
       end
 

data/app/helpers/effective_events_helper.rb

@@ -20,7 +20,7 @@ module EffectiveEventsHelper
       remaining = (ticket.capacity.present? ? "#{ticket.capacity_available} remaining" : nil)
 
       label = [title, price, remaining].compact.join(' - ')
-      disabled = { disabled: :disabled } unless (authorized || ticket.available?)
+      disabled = { disabled: :disabled } unless (authorized || event.event_ticket_available?(ticket, quantity: 1))
 
       [label, ticket.to_param, disabled].compact
     end
@@ -39,7 +39,7 @@ module EffectiveEventsHelper
       remaining = (product.capacity.present? ? "#{product.capacity_available} remaining" : nil)
 
       label = [title, price, remaining].compact.join(' - ')
-      disabled = { disabled: :disabled } unless (authorized || product.available?)
+      disabled = { disabled: :disabled } unless (authorized || event.event_product_available?(product, quantity: 1))
 
       [label, product.to_param, disabled].compact
     end

data/app/models/concerns/effective_events_event_registration.rb

@@ -105,16 +105,17 @@ module EffectiveEventsEventRegistration
       self.errors.add(:event_registrants, "can't be blank") unless present_event_registrants.present?
     end
 
-    # Validate all items are available
-    validate(unless: -> { current_step == :checkout || done? }) do
-      sold_out_event_registrants.each do |item|
-        errors.add(:base, "The #{item.event_ticket} ticket is sold out and no longer available for purchase")
-        item.errors.add(:event_ticket_id, "#{item.event_ticket} is unavailable for purchase")
+    # Validate all tickets are available for registration
+    validate(if: -> { current_step == :tickets }) do
+      unavailable_event_tickets.each do |event_ticket|
+        errors.add(:base, "The requested number of #{event_ticket} tickets are not available")
       end
+    end
 
-      sold_out_event_addons.each do |item|
-        errors.add(:base, "The #{item.event_product} product is sold out and no longer available for purchase")
-        item.errors.add(:event_product_id, "#{item.event_product} is unavailable for purchase")
+    # Validate all products are available for registration
+    validate(if: -> { current_step == :addons }) do
+      unavailable_event_products.each do |event_product|
+        errors.add(:base, "The requested number of #{event_product} add-ons are not available")
       end
     end
 
@@ -126,27 +127,24 @@ module EffectiveEventsEventRegistration
     # All Fees and Orders
     def submit_fees
       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!
-      notifications = event.event_notifications.select(&:registrant_purchased?)
-      notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }
-    end
+    def apply_outstanding_coupon_fees
+      return unless owner.respond_to?(:outstanding_coupon_fees)
 
-    def sold_out_event_registrants
-      event_registrants.reject { |er| er.purchased? || er.event_ticket&.available? }
-    end
+      Array(owner.outstanding_coupon_fees).each { |fee| fees << fee unless fees.include?(fee) }
 
-    def sold_out_event_addons
-      event_addons.reject { |ep| ep.purchased? || ep.event_product&.available? }
+      fees.select { |fee| fee.try(:coupon_fee?) }
     end
 
+    def after_submit_purchased!
+      notifications = event.event_notifications.select(&:registrant_purchased?)
+      notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }
+    end
   end
 
   # Instance Methods
@@ -206,10 +204,34 @@ module EffectiveEventsEventRegistration
     event_addons
   end
 
+  def unavailable_event_tickets
+    unavailable = []
+
+    present_event_registrants.map(&:event_ticket).group_by { |t| t }.each do |event_ticket, event_tickets|
+      unavailable << event_ticket unless event.event_ticket_available?(event_ticket, quantity: event_tickets.length)
+    end
+
+    unavailable
+  end
+
+  def unavailable_event_products
+    unavailable = []
+
+    present_event_addons.map(&:event_product).group_by { |p| p }.each do |event_product, event_products|
+      unavailable << event_product unless event.event_product_available?(event_product, quantity: event_products.length)
+    end
+
+    unavailable
+  end
+
   private
 
   def present_event_registrants
-    event_registrants.reject(&:marked_for_destruction?)
+    event_registrants.reject(&:marked_for_destruction?).reject(&:archived?)
+  end
+
+  def present_event_addons
+    event_addons.reject(&:marked_for_destruction?).reject(&:archived?)
   end
 
 end

data/app/models/effective/event.rb

@@ -24,6 +24,10 @@ module Effective
     has_many :event_notifications, -> { order(:id) }, inverse_of: :event, dependent: :destroy
     accepts_nested_attributes_for :event_notifications, allow_destroy: true
 
+    # Used by the registration_available checks
+    has_many :registered_event_registrants, -> { EventRegistrant.registered }, class_name: 'Effective::EventRegistrant', inverse_of: :event
+    has_many :registered_event_addons, -> { EventAddon.registered }, class_name: 'Effective::EventAddon', inverse_of: :event
+
     # rich_text_body - Used by the select step
     has_many_rich_texts
 
@@ -186,7 +190,8 @@ module Effective
     end
 
     def sold_out?
-      false
+      return false unless event_tickets.present?
+      event_tickets.none? { |event_ticket| event_ticket_available?(event_ticket, quantity: 1) }
     end
 
     def early_bird?
@@ -229,5 +234,35 @@ module Effective
       start_at
     end
 
+    # Can I register/purchase this many new event tickets?
+    def event_ticket_available?(event_ticket, quantity:)
+      raise('expected an EventTicket') unless event_ticket.kind_of?(Effective::EventTicket)
+      raise('expected quantity to be greater than 0') unless quantity.to_i > 0
+
+      return false if event_ticket.archived?
+      return true if event_ticket.capacity.blank?   # No capacity enforced for this ticket
+
+      # Total number already sold
+      registered = registered_event_registrants.count { |r| r.event_ticket_id == event_ticket.id }
+
+      # If there's capacity for this many more
+      (registered + quantity) <= event_ticket.capacity
+    end
+
+    # Can I register/purchase this many new event products?
+    def event_product_available?(event_product, quantity:)
+      raise('expected an EventProduct') unless event_product.kind_of?(Effective::EventProduct)
+      raise('expected quantity to be greater than 0') unless quantity.to_i > 0
+
+      return false if event_product.archived?
+      return true if event_product.capacity.blank?   # No capacity enforced for this product
+
+      # Total number already sold
+      registered = registered_event_addons.count { |r| r.event_product_id == event_product.id }
+
+      # If there's capacity for this many more
+      (registered + quantity) <= event_product.capacity
+    end
+
   end
 end

data/app/models/effective/event_addon.rb

@@ -42,6 +42,7 @@ module Effective
 
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:event, :event_product) }
+    scope :registered, -> { purchased_or_deferred.unarchived }
 
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event

data/app/models/effective/event_product.rb

@@ -9,7 +9,8 @@ module Effective
     belongs_to :event
 
     has_many :event_addons
-    has_many :purchased_event_addons, -> { EventAddon.purchased }, class_name: 'Effective::EventAddon'
+    has_many :purchased_event_addons, -> { EventAddon.purchased.unarchived }, class_name: 'Effective::EventAddon'
+    has_many :registered_event_addons, -> { EventAddon.registered.unarchived }, class_name: 'Effective::EventAddon'
 
     log_changes(to: :event) if respond_to?(:log_changes)
 
@@ -45,23 +46,17 @@ module Effective
       title.presence || 'New Event Product'
     end
 
-    # Available for purchase
-    def available?
-      return false if archived?
-      capacity_available?
-    end
-
-    def capacity_available?
-      capacity.blank? || (capacity_available > 0)
-    end
-
     def capacity_available
       return nil if capacity.blank?
-      [(capacity - purchased_event_addons_count), 0].max
+      [(capacity - registered_event_addons_count), 0].max
+    end
+
+    def registered_event_addons_count
+      registered_event_addons.length
     end
 
     def purchased_event_addons_count
-      purchased_event_addons.reject(&:archived?).length
+      purchased_event_addons.length
     end
 
   end

data/app/models/effective/event_registrant.rb

@@ -41,6 +41,7 @@ module Effective
 
     scope :sorted, -> { order(:last_name) }
     scope :deep, -> { includes(:event, :event_ticket) }
+    scope :registered, -> { purchased_or_deferred.unarchived }
 
     validates :first_name, presence: true
     validates :last_name, presence: true

data/app/models/effective/event_ticket.rb

@@ -9,7 +9,8 @@ module Effective
     belongs_to :event
 
     has_many :event_registrants
-    has_many :purchased_event_registrants, -> { EventRegistrant.purchased }, class_name: 'Effective::EventRegistrant'
+    has_many :purchased_event_registrants, -> { EventRegistrant.purchased.unarchived }, class_name: 'Effective::EventRegistrant'
+    has_many :registered_event_registrants, -> { EventRegistrant.registered.unarchived }, class_name: 'Effective::EventRegistrant'
 
     log_changes(to: :event) if respond_to?(:log_changes)
 
@@ -51,23 +52,17 @@ module Effective
       event.early_bird? ? early_bird_price : regular_price
     end
 
-    # Available for purchase
-    def available?
-      return false if archived?
-      capacity_available?
-    end
-
-    def capacity_available?
-      capacity.blank? || (capacity_available > 0)
-    end
-
     def capacity_available
       return nil if capacity.blank?
-      [(capacity - purchased_event_registrants_count), 0].max
+      [(capacity - registered_event_registrants_count), 0].max
+    end
+
+    def registered_event_registrants_count
+      registered_event_registrants.length
     end
 
     def purchased_event_registrants_count
-      purchased_event_registrants.reject(&:archived?).length
+      purchased_event_registrants.length
     end
 
   end

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

@@ -1,6 +1,18 @@
 = render 'layout' do
   = render 'effective/event_registrations/content', resource: resource
 
-  .card
-    .card-body
-      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout))
+  - if resource.submit_order.deferred?
+    .card
+      .card-body
+        = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout))
+  - elsif resource.event.registerable? == false
+    .alert.alert-danger Your selected event is no longer available for registration.
+  - elsif resource.unavailable_event_tickets.present?
+    .alert.alert-danger Your selected number of event tickets are no longer available.
+  - elsif resource.unavailable_event_products.present?
+    .alert.alert-danger Your selected number of event add-ons are no longer available.
+  - else
+    .card
+      .card-body
+        = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:submitted), deferred_url: wizard_path(:checkout), declined_url: wizard_path(:checkout))
+

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.10.2'.freeze
+  VERSION = '0.11.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2024-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_roles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement