effective_events 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46897bd3260153bd17103b73716d32aca3b46d77335c9c8ac80b033ac881041b
-  data.tar.gz: 7da214c575b80246b79edc8c8c0467352e7629dea228a809db80a4c8fc53f14a
+  metadata.gz: 25070167849b6086995bc9e6e31bcdf0f8d9a36353ce8bb98c32a46d07c50318
+  data.tar.gz: 91f62a8a03323a83c7aaa2f54c39e2aeb3b2e1c89824de9be544d1e5cf955081
 SHA512:
-  metadata.gz: cd8c3c426638f64c649408ea2da9ce57a5965c33c33aafde8255327b8c2eecf01ff0e8077b73d772575045e38e86f4648cdf79661f0b44d2d083e3ebab92a3e8
-  data.tar.gz: 4331ea43140b17dce1a0c0850688cf7b57627df10dbefde960d64fdf7cba63d63f3a285f79141a4c73a23f0941dc3f94632f5e1445201fbf0a97eac24c7c26f7
+  metadata.gz: 3c3d87e21be01edf5b1395ad4a94a828cac98141b000d5ac43e7fc4af61e638399e620c17c9e0e137901aaed5c672fcc75deec074ef83b6cb3db2c7fc498ffde
+  data.tar.gz: 57626a1e76dc8ffdc26c687746de28f217b98fc6ce4fceefd8e13f4c59afc98519290184b49750cfeb4a04d86f494d6b4c8914a53cd2e437f28d7770f1e73baf

data/app/datatables/admin/effective_event_products_datatable.rb

@@ -12,8 +12,17 @@ module Admin
       col :title
       col :price, as: :price
 
-      #col :capacity
+      col :archived
+
+      col :capacity_to_s, label: 'Capacity' do |ticket|
+        if ticket.capacity.present?
+          "#{ticket.capacity_available} remaining / #{ticket.capacity} total"
+        end
+      end
+
       col :purchased_event_purchases_count, label: 'Purchased'
+      col :capacity, visible: false
+      col :capacity_available, visible: false
 
       col :purchased_event_purchases, label: 'Purchased by' do |product|
         product.purchased_event_purchases.sort_by(&:to_s).map do |purchase|

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -13,8 +13,17 @@ module Admin
       col :regular_price, as: :price
       col :early_bird_price, as: :price
 
-      #col :capacity
+      col :archived
+
+      col :capacity_to_s, label: 'Capacity' do |ticket|
+        if ticket.capacity.present?
+          "#{ticket.capacity_available} remaining / #{ticket.capacity} total"
+        end
+      end
+
       col :purchased_event_registrants_count, label: 'Registered'
+      col :capacity, visible: false
+      col :capacity_available, visible: false
 
       col :purchased_event_registrants, label: 'Registrants' do |ticket|
         ticket.purchased_event_registrants.sort_by(&:last_name).map do |registrant|

data/app/helpers/effective_events_helper.rb

@@ -3,22 +3,30 @@ module EffectiveEventsHelper
   def effective_events_event_tickets_collection(event)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
 
-    event.event_tickets.map do |ticket|
-      label = ticket.to_s
+    event.event_tickets.reject(&:archived?).map do |ticket|
+      title = ticket.to_s
       price = (ticket.price == 0 ? '$0' : price_to_currency(ticket.price))
+      remaining = (ticket.capacity.present? ? "#{ticket.capacity_available} remaining" : nil)
 
-      ["#{label} - #{price}", ticket.to_param]
+      label = [title, price, remaining].compact.join(' - ')
+      disabled = { disabled: :disabled } unless ticket.available?
+
+      [label, ticket.to_param, disabled].compact
     end
   end
 
   def effective_events_event_products_collection(event)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
 
-    event.event_products.map do |product|
-      label = product.to_s
+    event.event_products.reject(&:archived?).map do |product|
+      title = product.to_s
       price = (product.price == 0 ? '$0' : price_to_currency(product.price))
+      remaining = (product.capacity.present? ? "#{product.capacity_available} remaining" : nil)
+
+      label = [title, price, remaining].compact.join(' - ')
+      disabled = { disabled: :disabled } unless product.available?
 
-      ["#{label} - #{price}", product.to_param]
+      [label, product.to_param, disabled].compact
     end
   end
 

data/app/models/concerns/effective_events_event_registration.rb

@@ -95,6 +95,19 @@ 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
+      event_registrants.reject { |er| er.purchased? || er.event_ticket&.available? }.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")
+      end
+
+      event_purchases.reject { |ep| ep.purchased? || ep.event_product&.available? }.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")
+      end
+    end
+
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
       event&.event_products.present? ? wizard_step_keys : (wizard_step_keys - [:purchases])
@@ -121,9 +134,15 @@ module EffectiveEventsEventRegistration
   end
 
   # Find or build
-  def event_registrant(first_name:, last_name:, email:)
-    registrant = event_registrants.find { |er| er.first_name == first_name && er.last_name == last_name && er.email == email }
-    registrant || event_registrants.build(event: event, owner: owner, first_name: first_name, last_name: last_name, email: email)
+  def event_registrant(event_ticket:, first_name:, last_name:, email:)
+    registrant = event_registrants.find { |er| er.event_ticket == event_ticket && er.first_name == first_name && er.last_name == last_name && er.email == email }
+    registrant || event_registrants.build(event: event, event_ticket: event_ticket, owner: owner, first_name: first_name, last_name: last_name, email: email)
+  end
+
+  # Find or build. But it's not gonna work with more than 1. This is for testing only really.
+  def event_purchase(event_product:)
+    purchase = event_purchases.find { |ep| ep.event_product == event_product }
+    purchase || event_purchases.build(event_product: event_product, owner: owner)
   end
 
   # This builds the default event registrants used by the wizard form

data/app/models/effective/event_product.rb

@@ -22,6 +22,7 @@ module Effective
       tax_exempt            :boolean
 
       position              :integer
+      archived              :boolean
 
       timestamps
     end
@@ -29,6 +30,9 @@ module Effective
     scope :sorted, -> { order(:position) }
     scope :deep, -> { with_rich_text_body.includes(:purchased_event_purchases) }
 
+    scope :archived, -> { where(archived: true) }
+    scope :unarchived, -> { where(archived: false) }
+
     before_validation(if: -> { event.present? }) do
       self.position ||= (event.event_products.map(&:position).compact.max || -1) + 1
     end
@@ -40,13 +44,23 @@ module Effective
       title.presence || 'New Event Product'
     end
 
+    # Available for purchase
+    def available?
+      return false if archived?
+      capacity_available?
+    end
+
     def capacity_available?
-      return true if capacity.blank?
-      capacity <= purchased_event_purchases.count
+      capacity.blank? || (capacity_available > 0)
+    end
+
+    def capacity_available
+      return nil if capacity.blank?
+      [(capacity - purchased_event_purchases_count), 0].max
     end
 
     def purchased_event_purchases_count
-      purchased_event_purchases.count
+      purchased_event_purchases.length
     end
 
   end

data/app/models/effective/event_ticket.rb

@@ -23,6 +23,7 @@ module Effective
       tax_exempt            :boolean
 
       position              :integer
+      archived              :boolean
 
       timestamps
     end
@@ -30,6 +31,9 @@ module Effective
     scope :sorted, -> { order(:position) }
     scope :deep, -> { with_rich_text_body.includes(:purchased_event_registrants) }
 
+    scope :archived, -> { where(archived: true) }
+    scope :unarchived, -> { where(archived: false) }
+
     before_validation(if: -> { event.present? }) do
       self.position ||= (event.event_tickets.map(&:position).compact.max || -1) + 1
     end
@@ -46,13 +50,23 @@ 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?
-      return true if capacity.blank?
-      capacity <= purchased_event_registrants.count
+      capacity.blank? || (capacity_available > 0)
+    end
+
+    def capacity_available
+      return nil if capacity.blank?
+      [(capacity - purchased_event_registrants_count), 0].max
     end
 
     def purchased_event_registrants_count
-      purchased_event_registrants.count
+      purchased_event_registrants.length
     end
 
   end

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

@@ -2,8 +2,11 @@
   = f.hidden_field :event_id
 
   = f.text_field :title
+  = f.number_field :capacity, hint: 'The number of online purchases will be limited to capacity.'
+  = f.check_box :archived, label: 'Yes, archive this product and make it unavailable for purchase'
+
   = f.price_field :price
-  = f.text_field :qb_item_name
+  = f.text_field :qb_item_name, label: 'Quickbooks item name'
   = f.check_box :tax_exempt
 
   = effective_submit(f)

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

@@ -2,10 +2,13 @@
   = f.hidden_field :event_id
 
   = f.text_field :title
+  = f.number_field :capacity, hint: 'The number of online purchases will be limited to capacity.'
+  = f.check_box :archived, label: 'Yes, archive this ticket and make it unavailable for purchase'
+
   = f.price_field :regular_price
   = f.price_field :early_bird_price
-  = f.text_field :qb_item_name
+  = f.text_field :qb_item_name, label: 'Quickbooks item name'
   = f.check_box :tax_exempt
-  /= f.number_field :capacity, hint: 'The number of online purchases will be loosely limited to capacity.'
+
 
   = effective_submit(f)

data/db/migrate/01_create_effective_events.rb.erb

@@ -38,6 +38,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.boolean :tax_exempt, default: false
 
       t.integer :position
+      t.boolean :archived, default: false
 
       t.timestamps
     end
@@ -78,6 +79,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.boolean :tax_exempt, default: false
 
       t.integer :position
+      t.boolean :archived, default: false
 
       t.timestamps
     end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails