effective_events 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44c51f928a7db75214d362f3809a5249cdebb8a22e9239f5cc74e0ea19db958b
-  data.tar.gz: '099acc31c59746278f78b679b6605430f128f40fa22bfe441c92c84cff974e15'
+  metadata.gz: 57f83ae2c7ff0c516e104fe18d4f517838bc07eec2a3d10b939946d0c9ed97d6
+  data.tar.gz: 0f5b5cca100cbfc4820940cca910c8cb07e14107227a753135ee5464eecd9611
 SHA512:
-  metadata.gz: 623603bcfb7c8ad11228d10a6526c1799c92482fb57e0b258ff43d75c39f40d014a3449946edd11d745026987d62f5da7739667bfc5b2f427acb348341edac17
-  data.tar.gz: 8eac487ea782b237e1efb89163c799a0f95224f5682d82e08ad4d16930b0e0f953ba7ab6f7f9b8f5e44ad9b82443adbdb29786145bd1ce16f0a1062b762bf1d0
+  metadata.gz: 33e99c1640263a789ff5c26653eb237110163f45d79726bd39a49412ac3e3fa43cda22ca888d02e07ce306e49393c438721c8bc704937a724146d26370870d8f
+  data.tar.gz: 3b9dedff99f782f3e88fffe9080665607c47ee8933ca0c66a58c9ef45448e5a18db05c21abf3052148dc073bba61b82907845c03982fab48942c94b34d75761f

data/app/models/concerns/effective_events_event_registration.rb

@@ -36,7 +36,7 @@ module EffectiveEventsEventRegistration
 
     acts_as_wizard(
       start: 'Start',
-      registrants: 'Registrants',
+      tickets: 'Tickets',
       addons: 'Add-ons',
       summary: 'Review',
       billing: 'Billing Address',
@@ -91,7 +91,7 @@ module EffectiveEventsEventRegistration
     validates :event, presence: true
 
     # Registrants Step
-    validate(if: -> { current_step == :registrants }) do
+    validate(if: -> { current_step == :tickets }) do
       self.errors.add(:event_registrants, "can't be blank") unless present_event_registrants.present?
     end
 

data/app/models/effective/event.rb

@@ -149,12 +149,12 @@ module Effective
 
     def early_bird?
       return false if early_bird_end_at.blank?
-      early_bird_end_at < Time.zone.now
+      early_bird_end_at > Time.zone.now
     end
 
     def early_bird_past?
       return false if early_bird_end_at.blank?
-      early_bird_end_at >= Time.zone.now
+      early_bird_end_at <= Time.zone.now
     end
 
     def early_bird_status

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

@@ -2,9 +2,9 @@
 - step_content = resource.event&.send("rich_text_#{step}_content")
 
 - if all_steps_content.present?
-  .card
+  .card.mb-4
     .card-body= all_steps_content
 
 - if step_content.present?
-  .card
+  .card.mb-4
     .card-body= step_content

data/app/views/effective/event_registrations/{_registrants.html.haml → _tickets.haml}

@@ -1,9 +1,9 @@
 = card do
   .row
     .col-sm
-      %h5.card-title= event_registration.wizard_step_title(:registrants)
+      %h5.card-title= event_registration.wizard_step_title(:tickets)
     .col-sm-auto.text-right
-      = link_to('Edit', wizard_path(:registrants)) if edit_effective_event_registrations_wizard?
+      = link_to('Edit', wizard_path(:tickets)) if edit_effective_event_registrations_wizard?
 
   - datatable = EffectiveEventRegistrantsDatatable.new(event_registration: event_registration)
   .mb-4= render_simple_datatable(datatable)

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

@@ -1,10 +1,12 @@
 = render 'layout' do
-  = render 'effective/event_registrations/content', resource: resource
+  .card.mb-4
+    .card-body
+      %p
+        Add-ons are free or paid additional items that can be included in your registration.
+        %br
+        If you are registering for multiple people, you need to include an add-on for each person.
 
-  %p
-    Add-ons are free or paid additional items that can be included in your registration.
-    %br
-    If you are registering for multiple people, you need to include an add-on for each person.
+  = render 'effective/event_registrations/content', resource: resource
 
   .card
     .card-body

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Code and Effect
@@ -222,15 +222,15 @@ files:
 - app/views/effective/event_registrations/_event_registration.html.haml
 - app/views/effective/event_registrations/_layout.html.haml
 - app/views/effective/event_registrations/_orders.html.haml
-- app/views/effective/event_registrations/_registrants.html.haml
 - app/views/effective/event_registrations/_summary.html.haml
+- app/views/effective/event_registrations/_tickets.haml
 - app/views/effective/event_registrations/addons.html.haml
 - app/views/effective/event_registrations/billing.html.haml
 - app/views/effective/event_registrations/checkout.html.haml
-- app/views/effective/event_registrations/registrants.html.haml
 - app/views/effective/event_registrations/start.html.haml
 - app/views/effective/event_registrations/submitted.html.haml
 - app/views/effective/event_registrations/summary.html.haml
+- app/views/effective/event_registrations/tickets.haml
 - app/views/effective/events/_dashboard.html.haml
 - app/views/effective/events/_event.html.haml
 - app/views/effective/events/_layout.html.haml