effective_events 0.19.0 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6686682576e78118943bd94a91c7d199249ecf048aa5816a8f64cd4bc909bb3b
-  data.tar.gz: 8b05cb3220da6ebb866380e4eeb4fad4dcbe0ca7b489c33c80d0bfb21e10847c
+  metadata.gz: 8e67fe64e6e9affe8d6961f6bd8d6feea7f2795ee0f11087af84f896fe53457e
+  data.tar.gz: e43145e482ec697303b2aa0b6e0224f588339134b24259e8ee8c49f1c664e8a4
 SHA512:
-  metadata.gz: 54aaff80f4cccc27e000660b96943a16b7e5cb7fbd88070427e1f462a3bf0554ebafb801023e3e8875f6ea29fce82c9432625f30e5efc0f1cd513bc31059d905
-  data.tar.gz: 15d25d2f33735b41143678ecbb9321614ef6cfdbb5914cb8d3bac28e4c7714ed2da1bc60d3e1c287306312249c8efae445db925c9a7e315017cec94e29bc38da
+  metadata.gz: b6cd3b5b07d8215f1e29ce434bfa19210d6ab8aa0ebfe8df4cf8a749b7732f76d97d1fb8863aa62a97853888c5915e7c76780624f4a2589edcc2efbe55858ea3
+  data.tar.gz: 84e7ba3b6ebc7dda5da0d751142acce2cc7dc95e93cf994a01dd427608d43516be81d5debac947b7fc975f8369ec6970e0982adbfa6d6661f2a6ce5bc3cd72af

data/app/models/concerns/effective_events_event_registration.rb

@@ -164,7 +164,7 @@ module EffectiveEventsEventRegistration
 
     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 - [:addons])
+      event&.event_products.unarchived.present? ? wizard_step_keys : (wizard_step_keys - [:addons])
     end
 
     def find_or_build_submit_fees

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

@@ -6,15 +6,16 @@
 - any_member_only_tickets = tickets.any? { |ticket| ticket.member_only? }
 
 = card do
-  %p This event has the following tickets available for purchase:
+  - if resource.event.early_bird?
+    .alert.alert-warning.mb-3
+      Early Bird rates end on
+      = resource.event.early_bird_end_at.strftime("%A, %B %d, %Y at %l:%M%P.")
 
   %table.table.table-sm.table-striped
     %thead
       %tr
         %th Ticket
-        - if member_column
-          %th Member Price
-        %th #{'Regular ' if member_column}Price
+        %th Price
 
     %tbody
       - tickets.each do |ticket|
@@ -28,17 +29,34 @@
                 - if ticket.waitlist?
                   before waitlist
 
-          - if member_column
-            %td
-              - if ticket.member_price.present?
-                = price_to_currency(ticket.member_price)
-              - else
-                = '-'
           %td
-            - if ticket.regular_price.present?
-              = price_to_currency(ticket.regular_price)
-            - else
-              = '-'
+            %ul.list-unstyled.mb-0
+              - if resource.event.early_bird? && ticket.early_bird_price.present? && ticket.early_bird_price != 0 && ticket.early_bird_price != ticket.member_price && ticket.early_bird_price != ticket.regular_price
+                %li
+                  - if ticket.regular_price.present? && ticket.regular_price != 0
+                    %div
+                      %s.text-muted
+                        = price_to_currency(ticket.regular_price)
+
+                  - if ticket.member_price.present? && ticket.member_price != 0
+                    %div
+                      %s.text-muted
+                        = price_to_currency(ticket.member_price)
+                      .badge.badge-secondary.mr-2 Members
+
+                  %div
+                    = price_to_currency(ticket.early_bird_price)
+                    .badge.badge-warning Early Bird
+
+              - else
+                - if ticket.regular_price.present?
+                  %li
+                    = price_to_currency(ticket.regular_price)
+
+                - if ticket.member_price.present?
+                  %li
+                    = price_to_currency(ticket.member_price)
+                    .badge.badge-secondary Members
 
   - if waitlist
     %p If the ticket capacity has been reached you will be added to the waitlist.

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

@@ -1,9 +1,9 @@
 = render 'layout' do
 
-  = render 'effective/event_registrations/event_tickets', resource: resource
-
   = render 'effective/event_registrations/content', resource: resource
 
+  = render 'effective/event_registrations/event_tickets', resource: resource
+
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.19.0'.freeze
+  VERSION = '0.19.2'.freeze
 end

metadata

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