effective_events 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908edb48306e3813893671ea9ba33cc3d1988258a47451edecfeee86197136a7
-  data.tar.gz: 7bb18df7c58fd2fa7e08b17710a1b5eefe22574690f1532243aab1e559cc44ec
+  metadata.gz: 12812ed11c2f839cd66a8efd68bd2fe954285ef3ada26fa169082d2c97279359
+  data.tar.gz: ce5e83f092b9373ea720cb03e7524aecae7093a9561a831c68f2088cb7a4a332
 SHA512:
-  metadata.gz: 5f9e45f483664485e43509d46bb0209a7567bd66b5bf27f425cfbe03ee6a3b0f171362db99d6faf7c2070074be3210239d59140f0989260c2b1fd18aa5b820ca
-  data.tar.gz: ac11a1ab1e15d1e58f5ab7e6db346906fcf6836caedbb6c45f94fbf57c177334b379da57ae8e91658b23d017fb8d62f790f740c82c0d2c2ab55662edcba6084d
+  metadata.gz: 3840af3be1d4ded9d04dccbf66fbee23f196aa251dfcc68d76f6cedd5534f2dfea6e19b8d4da1e3c00e4eae94633e4a2ca09a8ccc1ed4b459e3cbf607b9ebf8a
+  data.tar.gz: d8ab4acd7c5bf18b5a17bc2098bcaca247457ea2705cff91b9da1a2b5f3257f1c392d1d57db6ea1b0436301ec2c2a15811a3004c1953fd5d13d63429bfe29c42

data/app/models/concerns/effective_events_event_registration.rb

@@ -124,23 +124,19 @@ module EffectiveEventsEventRegistration
       event&.event_products.present? ? wizard_step_keys : (wizard_step_keys - [:addons])
     end
 
+    def find_or_build_submit_fees
+      with_outstanding_coupon_fees(submit_fees)
+    end
+
     # All Fees and Orders
     def submit_fees
-      if owner.respond_to?(:outstanding_coupon_fees) # effective_memberships_owner
+      if defined?(EffectiveMemberships)
         (event_registrants + event_addons + fees)
       else
         (event_registrants + event_addons)
       end
     end
 
-    def apply_outstanding_coupon_fees
-      return unless owner.respond_to?(:outstanding_coupon_fees)
-
-      Array(owner.outstanding_coupon_fees).each { |fee| fees << fee unless fees.include?(fee) }
-
-      fees.select { |fee| fee.try(:coupon_fee?) }
-    end
-
     def after_submit_purchased!
       notifications = event.event_notifications.select(&:registrant_purchased?)
       notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }

data/app/models/effective/event_addon.rb

@@ -50,7 +50,7 @@ module Effective
     end
 
     before_validation(if: -> { event_product.present? }) do
-      self.price ||= event_product.price
+      assign_attributes(price: event_product.price) unless purchased?
     end
 
     with_options(if: -> { new_record? }) do

data/app/models/effective/event_registrant.rb

@@ -53,7 +53,7 @@ module Effective
     end
 
     before_validation(if: -> { event_ticket.present? }) do
-      self.price ||= event_ticket.price
+      assign_attributes(price: event_ticket.price) unless purchased?
     end
 
     def to_s

data/app/views/admin/event_addons/_fields.html.haml

@@ -0,0 +1,16 @@
+.card.mb-4
+  .card-body
+    - if f.object.purchased?
+      = f.static_field :event_product, label: 'Purchased event add-ons'
+    - else
+      - # Admin form includes archived event products
+      = f.select :event_product_id, effective_events_event_products_collection(event, :admin), label: 'Add-on'
+
+    .row
+      .col-lg= f.text_field :first_name, required: true
+      .col-lg= f.text_field :last_name, required: true
+
+    .row
+      .col-lg= f.email_field :email, required: true
+
+    = f.text_area :notes, label: 'Notes'

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

@@ -11,7 +11,7 @@
   - else
     = f.static_field :owner
 
-  = render 'effective/event_addons/fields', f: f, event: event_addon.event
+  = render 'admin/event_addons/fields', f: f, event: event_addon.event
 
   = f.check_box :archived, label: "Archive this addon. It will be displayed as archived on the owner's event registration"
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.11.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-02 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -253,6 +253,7 @@ files:
 - app/models/effective/event_registration.rb
 - app/models/effective/event_search.rb
 - app/models/effective/event_ticket.rb
+- app/views/admin/event_addons/_fields.html.haml
 - app/views/admin/event_addons/_form.html.haml
 - app/views/admin/event_notifications/_form.html.haml
 - app/views/admin/event_notifications/_form_event_registrant_purchased.html.haml