effective_events 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db42bb64a1639b358488381a0e7e4ca73814f98c41153cdb929063661b0e947
-  data.tar.gz: ad79f29da0313754aafc31e90a432eefbda54d631062ab9e593448540c6c4a08
+  metadata.gz: 26de7ee7dbc2f5ec71bac062d12c9dffa48adaa6286f82eee122e3c3f5e13a56
+  data.tar.gz: 59249f1f8d89f11f4c7c1bbea1f923db8455635167338e0d98a64b33748f6dda
 SHA512:
-  metadata.gz: 0ce3f1278268630aab2aec2547f6b9d3ad100b303a42e403b0b1dd93e7be6a21f1f09385f8835147cc768a77d2a8278cf1ca48dab8afbed97df986716a6478e1
-  data.tar.gz: 15459694c87b8208ba7f6bd7feb53dc66030e5f7c0ccc858e2a90d3dbb7ebe5761ede77ba6900e86ebcc28f1e225b1b3b5f65113860e268eedcd50f2f96a2f76
+  metadata.gz: 6f9141865746360f1831a30429017eaabb44ba31e5ed7c05763c1ced28badcdd3b9c3776a5d7eb7965a641666bec7bffe87ddb590796b013c8ee0143bbfd8bbd
+  data.tar.gz: 145136b9ac1891673542dc28eadb43498377f03320f261e779e82b0bdbdcc2986c456fcf6f1dccff17dbb434c56e1bee5ab0daeca8abc75e2a98ddf9f2d7850a

data/app/models/concerns/effective_events_event_registration.rb

@@ -150,6 +150,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)

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
@@ -131,10 +135,15 @@ module Effective
     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 +160,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

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_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,6 @@
   - 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))
 

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.0'.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.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-27 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails