effective_events 0.12.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ea3b86b0a1ca6c11ee6a2a9ee5fba8dec34473c435299bed967cf129912b0dc
-  data.tar.gz: 1164dce2a11f7a65e95c113d2ef9f3f0c254da666c206dbba67b7729e441953f
+  metadata.gz: 489d11bf3227576141f53363ed941b1b606915b64a8d7ce234fd084d8497eafb
+  data.tar.gz: c2e8a39859a284a609f8d6fb2e6a54ccbacf2191a0cecf3ea3407442e14865e3
 SHA512:
-  metadata.gz: f9c4899dfc735f56d2b34889f8905b4315dcbf59ab9a9967154ac1f8eb9a0d210982cf21d551a7d0076eeac4ec4ca6ddbaf5d1ba384257e542a5b6d6d32d22e3
-  data.tar.gz: ec2ed614931b908976b4abb959e9f69d4c16de58b8cafc1cc22223d1a2061fb847500e254a391dba162b5a6065b1faf00065a1be569789c8a344be6bbcaf9c29
+  metadata.gz: 91b44a32a36e0d1ba81c1addb51978dddafa5e64fa5c13c927f96a8ebb753f8deb17c11e581af64976f8e9cac31612f7ec2558b5c49741cd5d441b18131c7ecf
+  data.tar.gz: 1c389debc53eb354b4e8734ce257bfb4d4f18a8e162e0c2f90c397bbd425318adc849cd4ba8e4e35708b61de8126ce800ca055dffb7960f4e05d5eb338b41e9d

data/app/controllers/effective/event_registrations_controller.rb

@@ -16,7 +16,7 @@ module Effective
     # If the event is no longer registerable, do not let them continue
     def redirect_unless_registerable
       return if resource.blank?
-      return if resource.submitted?
+      return if resource.was_submitted?
       return if resource.event.blank?
       return if resource.event.registerable?
       return if resource.submit_order&.deferred?

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -26,7 +26,7 @@ module Admin
 
       col :purchased_order, visible: false
 
-      col :user
+      col :user, label: 'Member'
       col :first_name
       col :last_name
       col :email

data/app/datatables/effective_event_registrants_datatable.rb

@@ -20,7 +20,7 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
       ].compact.join('<br>').html_safe
     end
 
-    col :user, visible: false
+    col :user, label: 'Member', visible: false
     col :first_name, visible: false
     col :last_name, visible: false
     col :email, visible: false

data/app/datatables/effective_event_registrations_datatable.rb

@@ -24,7 +24,9 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
       if er.draft?
         dropdown_link_to('Continue', effective_events.event_event_registration_build_path(er.event, er, er.next_step), 'data-turbolinks' => false)
         dropdown_link_to('Delete', effective_events.event_event_registration_path(er.event, er), 'data-confirm': "Really delete #{er}?", 'data-method': :delete)
-      else
+      elsif er.submitted?
+        dropdown_link_to('Continue', effective_events.event_event_registration_build_path(er.event, er, er.next_step), 'data-turbolinks' => false)
+      elsif er.completed?
         dropdown_link_to('Show', effective_events.event_event_registration_path(er.event, er))
 
         # Register Again
@@ -32,7 +34,6 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
           url = er.event.external_registration_url.presence || effective_events.new_event_event_registration_path(er.event)
           dropdown_link_to('Register Again', url)
         end
-
       end
     end
   end

data/app/models/concerns/effective_events_event_registration.rb

@@ -125,6 +125,10 @@ module EffectiveEventsEventRegistration
     # If we're submitted. Try to move to completed.
     before_save(if: -> { submitted? }) { try_completed! }
 
+    def payment_date_in_future?
+      false
+    end
+
     def can_visit_step?(step)
       return false if step == :complete && !completed?
       return true if step == :complete && completed?
@@ -216,7 +220,7 @@ module EffectiveEventsEventRegistration
         first_name: owner.try(:first_name),
         last_name: owner.try(:last_name),
         email: owner.try(:email),
-        company: owner.try(:company),
+        company: owner.try(:company)
       )
     end
 
@@ -241,9 +245,7 @@ module EffectiveEventsEventRegistration
   def unavailable_event_tickets
     unavailable = []
 
-    changed_event_registrants = present_event_registrants.select { |er| er.new_record? || er.event_ticket_id_changed? }
-
-    changed_event_registrants.map(&:event_ticket).group_by { |t| t }.each do |event_ticket, event_tickets|
+    present_event_registrants.map(&:event_ticket).group_by { |t| t }.each do |event_ticket, event_tickets|
       unavailable << event_ticket unless event.event_ticket_available?(event_ticket, quantity: event_tickets.length)
     end
 
@@ -253,9 +255,7 @@ module EffectiveEventsEventRegistration
   def unavailable_event_products
     unavailable = []
 
-    changed_event_products = present_event_addons.select { |er| er.new_record? || er.event_product_id_changed? }
-
-    changed_event_products.map(&:event_product).group_by { |p| p }.each do |event_product, event_products|
+    present_event_addons.map(&:event_product).group_by { |p| p }.each do |event_product, event_products|
       unavailable << event_product unless event.event_product_available?(event_product, quantity: event_products.length)
     end
 

data/app/models/effective/event_registrant.rb

@@ -44,7 +44,7 @@ module Effective
       qb_item_name          :string
       tax_exempt            :boolean
 
-      # Historical. Not used anymore.
+      # Historical. Not used anymore. TO BE DELETED.
       number                :string
       notes                 :text
 

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

@@ -1,5 +1,5 @@
 - if ticket.questions.present?
-  %p Please answer the following questions:
+  %p Please answer the following questions (optional):
 
   - if ticket.question1.present?
     = f.text_field :response1, label: ticket.question1

data/app/views/effective/events/show.html.haml

@@ -40,7 +40,7 @@
               %br
               = @event.registration_end_at.strftime("%b %d, %Y %I:%M%P")
 
-        - if @event.event_tickets.present? #|| @event.event_products.present?
+        - if @event.event_tickets.present?
           %ul.list-unstyled
             - if @event.event_tickets.present?
               %li
@@ -50,14 +50,6 @@
                   - @event.event_tickets.each do |ticket|
                     %li= "#{ticket} (#{effective_events_ticket_price(@event, ticket)})"
 
-            -# - if @event.event_products.present?
-            -#   %li
-            -#     %label Add-ons
-            -#     %br
-            -#     %ul
-            -#       - @event.event_products.each do |product|
-            -#         %li= "#{product} (#{price_to_currency(product.price)})"
-
         %hr
 
         %label.mb-2 Upcoming Events

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.12.2'.freeze
 end

metadata

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