effective_events 0.2.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b31d4fcbf22eb2a7a235b42b02db1b5940319f76964200e368a5fb0fe6d5d2
-  data.tar.gz: 7f157eaa6726be68a1595c4e887aa535ddda2d81936e35d3783f4d598b128aaf
+  metadata.gz: 40d63b8ec4a478d2ef2672b209b66f5df68edfc289f263739d07f33a0b756655
+  data.tar.gz: 5a98dd988e4703d3c63066a900e39f9898774a26ef8dcf142a9db5d98ee35929
 SHA512:
-  metadata.gz: 5339ff0360365f773d2d86c8040eb1ec56cf114a02714bb8189139befe666baf9289bb2ae8c3c15521db13324ba173c23bc57fc74a6973a2cd54f1f9f31a3cc1
-  data.tar.gz: 69002d95887fc84559d4a5d3de1965c3bb8f9b541ff139c760488d38d4c9c498044dd0b3bd8160cf60bce2567a6fef3bda2e973b8356b37144627c71c7f4c188
+  metadata.gz: 4a97bb5b344c9e4ae15768fc809b4838c9f3835069630941c5dad68c668add8e01eaee168ecff600344ae4840a52bb3e58693cc17bfecc65abf82b76b115aae9
+  data.tar.gz: '019b4eec4c6aeab11336b1b37b03e645c7f91336876c0937c878eb372cd0894b995d6a32dc4a0d3c8b6edf14791b726f50240431c5f0cb556cf6ee7ec7f5ecf3'

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -1,5 +1,10 @@
 module Admin
   class EffectiveEventAddonsDatatable < Effective::Datatable
+    filters do
+      scope :unarchived, label: "All"
+      scope :archived
+    end
+
     datatable do
       col :updated_at, visible: false
       col :created_at, visible: false

data/app/datatables/admin/effective_event_products_datatable.rb

@@ -1,5 +1,10 @@
 module Admin
   class EffectiveEventProductsDatatable < Effective::Datatable
+    filters do
+      scope :unarchived, label: "All"
+      scope :archived
+    end
+
     datatable do
       reorder :position
 
@@ -12,8 +17,6 @@ module Admin
       col :title
       col :price, as: :price
 
-      col :archived
-
       col :capacity_to_s, label: 'Capacity' do |ticket|
         if ticket.capacity.present?
           "#{ticket.capacity_available} remaining / #{ticket.capacity} total"

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -1,5 +1,10 @@
 module Admin
   class EffectiveEventRegistrantsDatatable < Effective::Datatable
+    filters do
+      scope :unarchived, label: "All"
+      scope :archived
+    end
+
     datatable do
       col :updated_at, visible: false
       col :created_at, visible: false

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -1,5 +1,10 @@
 module Admin
   class EffectiveEventTicketsDatatable < Effective::Datatable
+    filters do
+      scope :unarchived, label: "All"
+      scope :archived
+    end
+
     datatable do
       reorder :position
 
@@ -13,8 +18,6 @@ module Admin
       col :regular_price, as: :price
       col :early_bird_price, as: :price
 
-      col :archived
-
       col :capacity_to_s, label: 'Capacity' do |ticket|
         if ticket.capacity.present?
           "#{ticket.capacity_available} remaining / #{ticket.capacity} total"

data/app/datatables/effective_event_addons_datatable.rb

@@ -3,8 +3,17 @@
 class EffectiveEventAddonsDatatable < Effective::Datatable
   datatable do
 
-    col :event_product, search: :string, label: 'Product'
+    col :event_product, search: :string, label: 'Product' do |er|
+      [
+        er.event_product.to_s,
+        (content_tag(:span, 'Archived', class: 'badge badge-warning') if er.event_product&.archived?)
+      ].compact.join('<br>').html_safe
+    end
+
     col :price, as: :price
+
+    col :archived, visible: false
+
     # col :notes
     # no actions_col
   end

data/app/datatables/effective_event_registrants_datatable.rb

@@ -3,7 +3,12 @@
 class EffectiveEventRegistrantsDatatable < Effective::Datatable
   datatable do
 
-    col :event_ticket, search: :string, label: 'Ticket'
+    col :event_ticket, search: :string, label: 'Ticket' do |er|
+      [
+        er.event_ticket.to_s,
+        (content_tag(:span, 'Archived', class: 'badge badge-warning') if er.event_ticket&.archived?)
+      ].compact.join('<br>').html_safe
+    end
 
     col :name do |er|
       "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"
@@ -18,6 +23,8 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
     col :price, as: :price
     col :notes
 
+    col :archived, visible: false
+
     # no actions_col
   end
 

data/app/helpers/effective_events_helper.rb

@@ -1,30 +1,38 @@
 module EffectiveEventsHelper
 
-  def effective_events_event_tickets_collection(event)
+  def effective_events_event_tickets_collection(event, namespace = nil)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
 
-    event.event_tickets.reject(&:archived?).map do |ticket|
+    # Allow an admin to assign archived tickets
+    authorized = (namespace == :admin)
+    tickets = (authorized ? event.event_tickets : event.event_tickets.reject(&:archived?))
+
+    tickets.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 = [title, price, remaining].compact.join(' - ')
-      disabled = { disabled: :disabled } unless ticket.available?
+      disabled = { disabled: :disabled } unless (authorized || ticket.available?)
 
       [label, ticket.to_param, disabled].compact
     end
   end
 
-  def effective_events_event_products_collection(event)
+  def effective_events_event_products_collection(event, namespace = nil)
     raise('expected an Effective::Event') unless event.kind_of?(Effective::Event)
 
-    event.event_products.reject(&:archived?).map do |product|
+    # Allow an admin to assign archived products
+    authorized = (namespace == :admin)
+    products = (authorized ? event.event_products : event.event_products.reject(&:archived?))
+
+    products.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?
+      disabled = { disabled: :disabled } unless (authorized || product.available?)
 
       [label, product.to_param, disabled].compact
     end

data/app/models/effective/event.rb

@@ -82,7 +82,7 @@ module Effective
     scope :events, -> (user: nil, unpublished: false) {
       scope = all.deep.sorted
 
-      if defined?(EffectiveRoles) && EffectivePosts.use_effective_roles
+      if defined?(EffectiveRoles) && EffectiveEvents.use_effective_roles
         scope = scope.for_role(user&.roles)
       end
 

data/app/models/effective/event_addon.rb

@@ -6,6 +6,7 @@
 module Effective
   class EventAddon < ActiveRecord::Base
     acts_as_purchasable
+    acts_as_archived
 
     log_changes(to: :event) if respond_to?(:log_changes)
 
@@ -23,6 +24,8 @@ module Effective
     effective_resource do
       notes             :text
 
+      archived          :boolean
+
       # Acts as Purchasable
       price             :integer
       qb_item_name      :string

data/app/models/effective/event_product.rb

@@ -2,6 +2,8 @@
 
 module Effective
   class EventProduct < ActiveRecord::Base
+    acts_as_archived
+
     belongs_to :event
 
     has_many :event_addons

data/app/models/effective/event_registrant.rb

@@ -3,6 +3,7 @@
 module Effective
   class EventRegistrant < ActiveRecord::Base
     acts_as_purchasable
+    acts_as_archived
 
     log_changes(to: :event) if respond_to?(:log_changes)
 
@@ -26,6 +27,8 @@ module Effective
       number        :string
       notes         :text
 
+      archived      :boolean
+
       # Acts as Purchasable
       price             :integer
       qb_item_name      :string
@@ -81,7 +84,7 @@ module Effective
       save!
 
       order = Effective::Order.new(items: self, user: owner)
-      order.purchase!(skip_buyer_validations: true, email: false)
+      order.mark_as_purchased!
 
       true
     end

data/app/models/effective/event_ticket.rb

@@ -2,6 +2,8 @@
 
 module Effective
   class EventTicket < ActiveRecord::Base
+    acts_as_archived
+
     belongs_to :event
 
     has_many :event_registrants

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

@@ -8,6 +8,8 @@
 
   = render 'effective/event_addons/fields', f: f, event: event_addon.event
 
+  = 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.submit 'Save and Mark Paid'
   - else

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

@@ -8,6 +8,8 @@
 
   = render 'effective/event_registrants/fields', f: f, event: event_registrant.event, namespace: :admin
 
+  = 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.submit 'Save and Mark Paid'
   - else

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

@@ -1,5 +1,9 @@
 = effective_form_with(model: [:admin, event], engine: true) do |f|
-  = f.rich_text_area :rich_text_excerpt, hint: 'Will be used for the events excerpt on index pages.'
-  = f.rich_text_area :rich_text_body, hint: 'The main body of your event'
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :rich_text_excerpt, hint: 'Will be used for the events excerpt on index pages.'
+    = f.article_editor :rich_text_body, hint: 'The main body of your event'
+  - else
+    = f.rich_text_area :rich_text_excerpt, hint: 'Will be used for the events excerpt on index pages.'
+    = f.rich_text_area :rich_text_body, hint: 'The main body of your event'
 
   = f.submit

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

@@ -2,8 +2,10 @@
 
 = effective_form_with(model: [:admin, event], engine: true) do |f|
   = card("All Steps") do
-    = f.rich_text_area "rich_text_all_steps_content", label: false,
-      hint: "displayed on all steps"
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_all_steps_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_all_steps_content", label: false, hint: "displayed on all steps"
 
   %hr
 
@@ -13,7 +15,9 @@
     - next unless enabled.include?(step)
 
     = card("#{title}") do
-      = f.rich_text_area "rich_text_#{step}_content", label: false,
-        hint: "displayed on the event registration #{step} wizard step only"
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_#{step}_content", label: false, hint: "displayed on the event registration #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_#{step}_content", label: false, hint: "displayed on the event registration #{step} wizard step only"
 
   = f.submit

data/app/views/effective/event_registrants/_fields.html.haml

@@ -3,10 +3,10 @@
     - if f.object.purchased?
       = f.static_field :event_ticket, label: 'Purchased ticket'
     - else
-      = f.select :event_ticket_id, effective_events_event_tickets_collection(event), label: 'Ticket'
+      = f.select :event_ticket_id, effective_events_event_tickets_collection(event, namespace), label: 'Ticket'
 
     - if f.object.purchased? && namespace == :admin
-      = f.select :event_ticket_id, effective_events_event_tickets_collection(event), label: 'Change Ticket', hint: 'Admin only. Change the purchased ticket. This will not create charges, alter the original order, or consider ticket capacity.'
+      = f.select :event_ticket_id, effective_events_event_tickets_collection(event, namespace), label: 'Change Ticket', hint: 'Admin only. Change the purchased ticket. This will not create charges, alter the original order, or consider ticket capacity.'
 
     .row
       .col-lg= f.text_field :first_name

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

@@ -17,7 +17,6 @@
           %th Registered by
           %td= event_registration.owner
 
-
       - if event_registration.orders.present?
         %tr
           %th Order

data/config/routes.rb

@@ -16,12 +16,29 @@ EffectiveEvents::Engine.routes.draw do
 
   namespace :admin do
     resources :events, except: [:show]
-    resources :event_tickets, except: [:show]
-    resources :event_products, except: [:show]
-    resources :event_registrants, except: [:show]
-    resources :event_addons, except: [:show]
     resources :event_registrations, only: [:index, :show]
     resources :event_notifications, except: [:show]
+
+    resources :event_tickets, except: [:show] do
+      post :archive, on: :member
+      post :unarchive, on: :member
+    end
+
+    resources :event_products, except: [:show] do
+      post :archive, on: :member
+      post :unarchive, on: :member
+    end
+
+    resources :event_registrants, except: [:show] do
+      post :archive, on: :member
+      post :unarchive, on: :member
+    end
+
+    resources :event_addons, except: [:show] do
+      post :archive, on: :member
+      post :unarchive, on: :member
+    end
+
   end
 
 end

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

@@ -64,6 +64,8 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :purchased_order_id
       t.integer :price
 
+      t.boolean :archived, default: false
+
       t.timestamps
     end
 
@@ -99,6 +101,8 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :purchased_order_id
       t.integer :price
 
+      t.boolean :archived, default: false
+
       t.timestamps
     end
 

data/lib/effective_events/engine.rb

@@ -9,8 +9,10 @@ module EffectiveEvents
 
     # Include concern and allow any ActiveRecord object to call it
     initializer 'effective_events.active_record' do |app|
-      ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.extend(EffectiveEventsEventRegistration::Base)
+      app.config.to_prepare do
+        ActiveSupport.on_load :active_record do
+          ActiveRecord::Base.extend(EffectiveEventsEventRegistration::Base)
+        end
       end
     end
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails