effective_events 3.0.9 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb941a4d2f674462d040e0b05bf52347917044b3fd770e97401f7fbde823db5
-  data.tar.gz: 6824262cb6e8dca0fcddfb19615da17a2ac15b394d5bfaf74dd466d3c4615b15
+  metadata.gz: 4e37bb52cbe39fa76dbb40c45b4364abbab706a4a872125e11de75a1432c7b62
+  data.tar.gz: 484e50eafc049ea811ba446638a600ca8d49e17004da1e7a88d4635afe73f30e
 SHA512:
-  metadata.gz: 68af9844bec221bbadb86095975c930cd408108294c4491c38ed9943da0f867ddfa4c60ad62f02a158251647322ff22cc817c6064454bf14c612b3ec84b3274d
-  data.tar.gz: 15d8a426770fe83299ffb414ca6a39bf69a50bff002dc04373afad3744e38ebac8c3841e97051b3bf10126b09137b762cc967ac46c5457781fdb635e2d4ffc8b
+  metadata.gz: 84b97ecbbad1998e51a2ccbe93a2d5bd015e9a6dfa9f5e267db7a9f2aaf8a1668aaa1822c4ba6482f8cc539ae76846a4b2a0128e7654d0923040b662bc1590a6
+  data.tar.gz: f8ca6e7b250819032b81a8b8459cf7179e9ff0b8ba782902755fae7d3f1c1a9c247edb0bc12b4ea0f45d883828b8b82bc05cc4fb0160a27271966f1fe179480d

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -80,6 +80,10 @@ module Admin
       col :question2, visible: false
       col :question3, visible: false
 
+      col :question1_required, visible: false
+      col :question2_required, visible: false
+      col :question3_required, visible: false
+
       actions_col
     end
 

data/app/models/effective/event_registrant.rb

@@ -135,11 +135,16 @@ module Effective
     validates :last_name, presence: true, if: -> { registrant_validations_enabled? }
     validates :email, presence: true, if: -> { registrant_validations_enabled? }
 
-    # User, company and organization conditionall required
+    # User, company and organization conditionally required
     validates :user, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.create_users }
     validates :company, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.company_or_organization_required }
     validates :organization, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.company_or_organization_required && EffectiveEvents.organization_enabled? }
 
+    # Responses may or may not be required depending on the event ticket
+    validates :response1, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question1_required? }
+    validates :response2, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question2_required? }
+    validates :response3, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question3_required? }
+
     # Copy any user errors from build_user_and_organization() into the registrant
     after_validation(if: -> { user && user.new_record? && user.errors.present? }) do
       errors.add(:first_name, user.errors[:first_name].join(', ')) if user.errors[:first_name].present?

data/app/models/effective/event_ticket.rb

@@ -35,6 +35,10 @@ module Effective
       question2                   :text
       question3                   :text
 
+      question1_required          :boolean
+      question2_required          :boolean
+      question3_required          :boolean
+
       # Pricing
       early_bird_price            :integer
 
@@ -164,5 +168,17 @@ module Effective
       category == 'Members'
     end
 
+    def question1_required?
+      question1.present? && question1_required
+    end
+
+    def question2_required?
+      question2.present? && question2_required
+    end
+
+    def question3_required?
+      question3.present? && question3_required
+    end
+
   end
 end

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

@@ -49,7 +49,12 @@
       %small.text-muted Please add up to 3 questions to ask during registration. Each ticket will have their own unique answers. Leave a question blank to skip.
 
     = f.text_field :question1, label: 'Question 1'
+    = f.check_box :question1_required, label: 'Question 1 Required'
+
     = f.text_field :question2, label: 'Question 2'
+    = f.check_box :question2_required, label: 'Question 2 Required'
+
     = f.text_field :question3, label: 'Question 3'
+    = f.check_box :question3_required, label: 'Question 3 Required'
 
   = effective_submit(f)

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

@@ -41,11 +41,11 @@
 
   - if event_ticket.present?
     - if event_ticket.question1.present?
-      = f.text_field :response1, label: event_ticket.question1
+      = f.text_field :response1, label: event_ticket.question1, required: event_ticket.question1_required?
 
     - if event_ticket.question2.present?
-      = f.text_field :response2, label: event_ticket.question2
+      = f.text_field :response2, label: event_ticket.question2, required: event_ticket.question2_required?
 
     - if event_ticket.question3.present?
-      = f.text_field :response3, label: event_ticket.question3
+      = f.text_field :response3, label: event_ticket.question3, required: event_ticket.question3_required?
 

data/db/migrate/101_create_effective_events.rb

@@ -58,6 +58,10 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.text :question2
       t.text :question3
 
+      t.boolean :question1_required, default: false
+      t.boolean :question2_required, default: false
+      t.boolean :question3_required, default: false
+
       t.string :qb_item_name
       t.boolean :tax_exempt, default: false
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.0.9'.freeze
+  VERSION = '3.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.1.0
 platform: ruby
 authors:
 - Code and Effect