effective_events 0.12.5 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db42bb64a1639b358488381a0e7e4ca73814f98c41153cdb929063661b0e947
-  data.tar.gz: ad79f29da0313754aafc31e90a432eefbda54d631062ab9e593448540c6c4a08
+  metadata.gz: 3436a306cb79a123bec79007b2730897d0bb3566dc1c0f2dbd6a31c5eb608a74
+  data.tar.gz: 91c60cfc2122eae660a4fc5151f395bf9709bf00c0ccec0f50915e3a2c84f3a9
 SHA512:
-  metadata.gz: 0ce3f1278268630aab2aec2547f6b9d3ad100b303a42e403b0b1dd93e7be6a21f1f09385f8835147cc768a77d2a8278cf1ca48dab8afbed97df986716a6478e1
-  data.tar.gz: 15459694c87b8208ba7f6bd7feb53dc66030e5f7c0ccc858e2a90d3dbb7ebe5761ede77ba6900e86ebcc28f1e225b1b3b5f65113860e268eedcd50f2f96a2f76
+  metadata.gz: 972bffdad5a0d13913ec5ab267c82308e1808d5217d0717bd2dba5f823f086974678e32e1c93a9d5ca47165941f006e9877748c2290b681711d5527a9661bbfb
+  data.tar.gz: c268aa57f91a45d32af129d493ebf5a3dfe7dc4941e47cfb13d1efcf02353ce8c7d2fbea1ba01c073d9f1365e8284d2c00e03355deb7e1791ca997440447615c

data/app/datatables/effective_event_registrations_datatable.rb

@@ -21,13 +21,9 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
     col :orders, action: :show, visible: false, search: :string
 
     actions_col(actions: []) do |er|
-      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)
-      elsif er.submitted?
+      if er.draft? || 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?
-
         if EffectiveResources.authorized?(self, :update_blank_registrants, er)
           dropdown_link_to('Continue', effective_events.event_event_registration_path(er.event, er))
         else
@@ -40,6 +36,11 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
           dropdown_link_to('Register Again', url)
         end
       end
+
+      if EffectiveResources.authorized?(self, :destroy, er)
+        dropdown_link_to('Delete', effective_events.event_event_registration_path(er.event, er), 'data-confirm': "Really delete #{er}?", 'data-method': :delete)
+      end
+
     end
   end
 

data/app/models/concerns/effective_events_event_registration.rb

@@ -92,6 +92,9 @@ module EffectiveEventsEventRegistration
     scope :in_progress, -> { where(status: [:draft, :submitted]) }
     scope :done, -> { where(status: :completed) }
 
+    scope :delayed, -> { where(event_id: Effective::Event.delayed) }
+    scope :not_delayed, -> { where.not(event_id: Effective::Event.delayed) }
+
     scope :for, -> (user) { where(owner: user) }
 
     # All Steps validations
@@ -125,19 +128,25 @@ module EffectiveEventsEventRegistration
     # If we're submitted. Try to move to completed.
     before_save(if: -> { submitted? }) { try_completed! }
 
-    def future_payment_date?
-      false
+    def delayed_payment_date_upcoming?
+      event&.delayed_payment_date_upcoming?
     end
 
     def can_visit_step?(step)
       return false if step == :complete && !completed?
       return true if step == :complete && completed?
 
-      # If they submitted payment with a deferred processor then lock down the steps.
-      if submitted? && !future_payment_date?
+      # If submitted with a cheque/phone deferred (but not delayed) processor then lock down the steps.
+      if submitted? && !delayed_payment_date_upcoming?
         return (step == :submitted) 
       end
 
+      # Add ability to edit registrations up until payment date
+      if submitted? && delayed_payment_date_upcoming?
+        return can_revisit_completed_steps(step)
+      end
+
+      # Default
       can_revisit_completed_steps(step)
     end
 
@@ -150,6 +159,10 @@ module EffectiveEventsEventRegistration
       with_outstanding_coupon_fees(submit_fees)
     end
 
+    def delayed_payment_attributes
+      { delayed_payment: event&.delayed_payment, delayed_payment_date: event&.delayed_payment_date }
+    end
+
     # All Fees and Orders
     def submit_fees
       if defined?(EffectiveMemberships)
@@ -186,6 +199,16 @@ module EffectiveEventsEventRegistration
     completed?
   end
 
+  def tickets!
+    after_commit { update_submit_fees_and_order! } if submit_order.present?
+    save!
+  end
+
+  def addons!
+    after_commit { update_submit_fees_and_order! } if submit_order.present?
+    save!
+  end
+
   def try_completed!
     return false unless submitted?
     return false unless submit_order&.purchased?
@@ -221,12 +244,7 @@ module EffectiveEventsEventRegistration
     if event_registrants.blank?
       raise('expected owner and event to be present') unless owner && event
 
-      event_registrants.build(
-        first_name: owner.try(:first_name),
-        last_name: owner.try(:last_name),
-        email: owner.try(:email),
-        company: owner.try(:company)
-      )
+      event_registrants.build()
     end
 
     event_registrants

data/app/models/effective/event.rb

@@ -68,6 +68,10 @@ module Effective
 
       allow_blank_registrants     :boolean
 
+      # Delayed Payments feature
+      delayed_payment             :boolean
+      delayed_payment_date        :date
+
       # Access
       roles_mask             :integer
       authenticate_user      :boolean
@@ -127,14 +131,23 @@ module Effective
       scope
     }
 
+    scope :delayed, -> { where(delayed_payment: true).where.not(delayed_payment_date: nil) }
+    scope :delayed_payment_date_past, -> { delayed.where(arel_table[:delayed_payment_date].lteq(Time.zone.today)) }
+    scope :delayed_payment_date_upcoming, -> { delayed.where(arel_table[:delayed_payment_date].gt(Time.zone.today)) }
+
     validates :title, presence: true, length: { maximum: 255 }
     validates :published_at, presence: true, unless: -> { draft? }
     validates :start_at, presence: true
     validates :end_at, presence: true
+    validates :external_registration_url, url: true
 
     validates :registration_start_at, presence: true, unless: -> { external_registration? }
     validates :registration_end_at, presence: true, unless: -> { external_registration? }
 
+    validates :delayed_payment, inclusion: { in: [false], message: "cannot be used for external registration events" }, if: -> { external_registration? }
+    validates :delayed_payment_date, presence: true, if: -> { delayed_payment? }
+    validates :delayed_payment_date, absence: true, unless: -> { delayed_payment? }
+
     validate(if: -> { start_at && end_at }) do
       errors.add(:end_at, 'must be after start date') unless start_at < end_at
     end
@@ -151,6 +164,14 @@ module Effective
       errors.add(:early_bird_end_at, 'must be before start date') unless early_bird_end_at < start_at
     end
 
+    validate(if: -> { delayed_payment? }) do
+      errors.add(:delayed_payment, 'no delayed payment processor available') unless EffectiveOrders.try(:delayed?)
+    end
+
+    validate(if: -> { delayed_payment_date && registration_end_at }) do
+      errors.add(:delayed_payment_date, 'must be after registration end date') unless registration_end_at < delayed_payment_date
+    end
+
     validate(if: -> { file.attached? }) do
       errors.add(:file, 'must be an image') unless file.image?
     end
@@ -266,5 +287,14 @@ module Effective
       (registered + quantity) <= event_product.capacity
     end
 
+    def delayed?
+      delayed_payment? && delayed_payment_date.present?
+    end
+
+    def delayed_payment_date_upcoming?
+      return false unless delayed?
+      delayed_payment_date > Time.zone.now.to_date
+    end
+
   end
 end

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

@@ -16,11 +16,6 @@
       - datatable = Admin::EffectiveEventProductsDatatable.new(event_id: event.id)
       = render_inline_datatable(datatable)
 
-    -# = tab 'Registrations' do
-    -#   %h2 Registrations
-    -#   - datatable = Admin::EffectiveEventRegistrationsDatatable.new(event_id: event.id)
-    -#   .mb-4= render_inline_datatable(datatable)
-
     = tab 'Registrants & Addons' do
       %h2 Registrants
       .mb-4

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

@@ -22,19 +22,36 @@
     .col-md-6= f.datetime_field :start_at, label: "Event Start"
     .col-md-6= f.datetime_field :end_at, label: "Event End"
 
-  %h2 Registration
-  %p The online registration and purchase for this event will be available between:
-  = f.datetime_field :registration_start_at, label: "Registration Start"
-  = f.datetime_field :registration_end_at, label: "Registration End"
-  = f.datetime_field :early_bird_end_at, label: "Early Bird End",
-    hint: 'Event tickets can be purchased for early bird pricing before this date. Afterwards regular pricing applies.'
+  %hr
 
-  = f.check_box :allow_blank_registrants, label: "Yes, allow blank ticket registrations", hint: "Allow event tickets to be purchased without adding a name. The purchaser may return to add names later."
+  .row
+    .col-md-6
+      %h2 Registration
+      %p The online registration and purchase for this event will be available between:
+      = f.datetime_field :registration_start_at, label: "Registration Start"
+      = f.datetime_field :registration_end_at, label: "Registration End"
+      = f.datetime_field :early_bird_end_at, label: "Early Bird End",
+        hint: 'Event tickets can be purchased for early bird pricing before this date. Afterwards regular pricing applies.'
+
+      = f.check_box :allow_blank_registrants, label: "Yes, allow blank ticket registrations", hint: "Allow event tickets to be purchased without adding a name. The purchaser may return to add names later."
+
+      = f.check_box :external_registration, label: "Yes, the registration for this event is handled by another website"
+
+      = f.show_if(:external_registration, true) do
+        = f.url_field :external_registration_url, hint: "The url for external event registration. Must start with http(s)://"
+    
+    .col-md-6
+      - if EffectiveOrders.try(:delayed?)
+        %h2 Delayed Payments
+        %p The online payment for this event will be charged as follows:
+
+        = f.check_box :delayed_payment, label: "Yes, this is a delayed payment event", hint: "Allow registrations for this event without paying immediately.<br>A secure token representing their credit card will be saved and charged automatically on the following payment date."
 
-  = f.check_box :external_registration, label: "Yes, the registration for this event is handled by another website"
+        = f.hide_if(:delayed_payment, true) do
+          = f.hidden_field :delayed_payment_date, value: ''
 
-  = f.show_if(:external_registration, true) do
-    = f.url_field :external_registration_url, hint: "The url for external event registration. Must start with http(s)://"
+        = f.show_if(:delayed_payment, true) do
+          = f.date_field :delayed_payment_date, label: "Delayed Payment Charge Date", hint: "The date that the credit card will be charged. Expects a date in the future, after the registration end date. Changing this date will not affect previously generated event registration delayed payment orders."
 
   = f.submit do
     = f.save 'Save'

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

@@ -22,6 +22,8 @@
             = f.check_box :member_registrant, label: 'Yes, this ticket will be for a member'
 
         = f.show_if(:blank_registrant, false, nested: true) do
+          %hr
+
           - if ticket.regular?
             = render('effective/event_registrants/fields_regular', f: f)
           - elsif ticket.member_only?

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

@@ -1,6 +1,6 @@
 - # Choose member
 = f.hidden_field :user_type, value: current_user.class.name
-= f.select :user_id, effective_events_event_registrant_user_collection(f.object), required: true, hint: effective_events_event_registrant_user_hint()
+= f.select :user_id, effective_events_event_registrant_user_collection(f.object), hint: effective_events_event_registrant_user_hint()
 
 = f.show_if(:user_id, '', nested: true) do
   %p.text-center - or -

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

@@ -6,17 +6,34 @@
 - if registration.present?
   %h2 In Progress Event Registrations
 
-  %p
-    Your registration for
-    = link_to(registration.event, effective_events.event_path(registration.event))
-    is incomplete
-
-  %p
-    Please
-    = link_to("Continue registration for #{registration.event}", effective_events.event_event_registration_build_path(registration.event, registration, registration.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
-    or you can
-    = link_to('Abandon registration', effective_events.event_event_registration_path(registration.event, registration), 'data-confirm': "Really delete #{registration}?", 'data-method': :delete, class: 'btn btn-danger')
-    to register for another event.
+  - if registration.draft?
+    %p
+      Your registration for
+      = link_to(registration.event, effective_events.event_path(registration.event))
+      is incomplete
+
+    %p
+      Please
+      = link_to("Continue registration for #{registration.event}", effective_events.event_event_registration_build_path(registration.event, registration, registration.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+      or you can
+      = link_to('Abandon registration', effective_events.event_event_registration_path(registration.event, registration), 'data-confirm': "Really delete registration for #{registration.event}?", 'data-method': :delete, class: 'btn btn-danger')
+      to register for another event.
+
+  - if registration.submitted?
+    %p 
+      Your registration for
+      = link_to(registration.event, effective_events.event_path(registration.event))
+      has been submitted. You're all done!
+
+  - if registration.submitted? && registration.event.delayed_payment_date_upcoming?
+    %p= registration.submit_order.delayed_payment_info
+
+  - if registration.submitted? && registration.event.delayed_payment_date_upcoming? && registration.can_visit_step?(:tickets)
+    %p 
+      You can #{link_to('change your registration', effective_events.event_event_registration_build_path(registration.event, registration, :tickets))} until the payment date
+      or
+      = link_to('abandon registration', effective_events.event_event_registration_path(registration.event, registration), 'data-confirm': "Really delete registration for #{registration.event}?", 'data-method': :delete)
+      to cancel and register for another event.
 
   %hr
 

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

@@ -23,3 +23,8 @@
           %td
             - event_registration.orders.each do |order|
               = link_to(order, effective_orders.order_path(order))
+
+      - if event_registration.event.delayed?
+        %tr
+          %th Payment Date
+          %td= event_registration.event.delayed_payment_date.strftime('%F')

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

@@ -16,4 +16,8 @@
         = f.has_many :event_addons, f.object.build_event_addons do |fp|
           = render('effective/event_addons/fields', f: fp, event: f.object.event)
 
+        - if resource.delayed_payment_date_upcoming? && resource.submit_order.present?
+          .alert.alert-info If the price of your registration changes, your order will be automatically updated.
+
+        %hr
         = f.save 'Save and Continue'

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

@@ -2,9 +2,8 @@
   = render 'effective/event_registrations/content', resource: resource
 
   - if resource.submit_order.deferred?
-    .card
-      .card-body
-        = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
+    = card do
+      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
   - elsif resource.event.registerable? == false
     .alert.alert-danger Your selected event is no longer available for registration.
   - elsif resource.unavailable_event_tickets.present?
@@ -12,7 +11,10 @@
   - elsif resource.unavailable_event_products.present?
     .alert.alert-danger Your selected number of event add-ons are no longer available.
   - else
-    .card
-      .card-body
-        = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
+    = card do
+      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
+
+
+  - if resource.submit_order.delayed? && resource.submit_order.deferred?
+    = link_to 'Save and Continue', wizard_path(:submitted), class: 'btn btn-primary'
 

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

@@ -4,6 +4,9 @@
   - raise('expected a submitted event_registration') unless resource.submitted?
   - raise('expected a deffered event_registration submit_order') unless resource.submit_order&.deferred?
 
+  - if resource.event.delayed?
+    - raise('expected event delayed_payment_date to match order delayed_payment_date') unless resource.event.delayed_payment_date == resource.submit_order.delayed_payment_date
+
   .mb-4
     = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
 
@@ -14,6 +17,15 @@
       %h3 Incomplete Ticket Information
       = render 'effective/event_registrations/form_blank_registrants', event_registration: resource
 
+  - if resource.delayed_payment_date_upcoming? && resource.can_visit_step?(:tickets)
+    - order = resource.submit_order
+
+    = card do
+      %h3 All done
+      %p Your registration for #{resource.event} has been submitted. You're all done!
+      %p= resource.submit_order.delayed_payment_info
+      %p You can #{link_to('change your registration', wizard_path(:tickets))} until the payment date.
+
   = render 'effective/event_registrations/event_registration', event_registration: resource
   = render 'effective/event_registrations/orders', event_registration: resource
 

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

@@ -9,4 +9,8 @@
         = f.has_many :event_registrants, f.object.build_event_registrants do |fr|
           = render('effective/event_registrants/fields', f: fr, event: f.object.event, namespace: :events)
 
+        - if resource.delayed_payment_date_upcoming? && resource.submit_order.present?
+          .alert.alert-info If the price of your registration changes, your order will be automatically updated.
+
+        %hr
         = f.save 'Save and Continue'

data/db/migrate/101_create_effective_events.rb

@@ -27,6 +27,9 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :roles_mask
       t.boolean :authenticate_user, default: false
 
+      t.boolean :delayed_payment, default: false
+      t.date :delayed_payment_date
+
       t.timestamps
     end
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.12.5'.freeze
+  VERSION = '0.13.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-27 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails