Merge branch 'main' into mxg-invite-links

Author: manuthecoder

Gemfile

@@ -6,7 +6,7 @@ ruby file: ".ruby-version"
 
 gem "dotenv-rails", groups: [:development, :test]
 
-gem "rails", "~> 7.2"
+gem "rails", "~> 8.0"
 
 gem "puma", "~> 6.6" # app server
 

Gemfile.lock

@@ -18,46 +18,45 @@ GEM
   specs:
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
-    actioncable (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actioncable (8.0.4)
+      actionpack (= 8.0.4)
+      activesupport (= 8.0.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailbox (8.0.4)
+      actionpack (= 8.0.4)
+      activejob (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailer (8.0.4)
+      actionpack (= 8.0.4)
+      actionview (= 8.0.4)
+      activejob (= 8.0.4)
+      activesupport (= 8.0.4)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.2)
-      actionview (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionpack (8.0.4)
+      actionview (= 8.0.4)
+      activesupport (= 8.0.4)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actiontext (8.0.4)
+      actionpack (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionview (8.0.4)
+      activesupport (= 8.0.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -68,26 +67,26 @@ GEM
       activestorage (>= 6.1.4)
       activesupport (>= 6.1.4)
       marcel (>= 1.0.3)
-    activejob (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activejob (8.0.4)
+      activesupport (= 8.0.4)
       globalid (>= 0.3.6)
     activejob-traffic_control (0.1.3)
       activejob (>= 4.2)
       activesupport (>= 4.2)
       suo
-    activemodel (7.2.2.2)
-      activesupport (= 7.2.2.2)
-    activerecord (7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activemodel (8.0.4)
+      activesupport (= 8.0.4)
+    activerecord (8.0.4)
+      activemodel (= 8.0.4)
+      activesupport (= 8.0.4)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activestorage (8.0.4)
+      actionpack (= 8.0.4)
+      activejob (= 8.0.4)
+      activerecord (= 8.0.4)
+      activesupport (= 8.0.4)
       marcel (~> 1.0)
-    activesupport (7.2.2.2)
+    activesupport (8.0.4)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -99,6 +98,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     acts_as_paranoid (0.10.3)
       activerecord (>= 6.1, < 8.1)
       activesupport (>= 6.1, < 8.1)
@@ -635,34 +635,35 @@ GEM
     rack-timeout (0.7.0)
     rackup (2.2.1)
       rack (>= 3)
-    rails (7.2.2.2)
-      actioncable (= 7.2.2.2)
-      actionmailbox (= 7.2.2.2)
-      actionmailer (= 7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actiontext (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    rails (8.0.4)
+      actioncable (= 8.0.4)
+      actionmailbox (= 8.0.4)
+      actionmailer (= 8.0.4)
+      actionpack (= 8.0.4)
+      actiontext (= 8.0.4)
+      actionview (= 8.0.4)
+      activejob (= 8.0.4)
+      activemodel (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.2)
+      railties (= 8.0.4)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    railties (8.0.4)
+      actionpack (= 8.0.4)
+      activesupport (= 8.0.4)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.3.0)
@@ -836,6 +837,7 @@ GEM
       openssl (> 2.0)
       openssl-signature_algorithm (~> 1.0)
     trailblazer-option (0.1.2)
+    tsort (0.2.0)
     turbo-rails (2.0.17)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
@@ -854,6 +856,7 @@ GEM
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uniform_notifier (1.17.0)
+    uri (1.0.4)
     useragent (0.16.11)
     validates_email_format_of (1.8.2)
       i18n (>= 0.8.0)
@@ -883,7 +886,7 @@ GEM
       event_emitter
       mutex_m
       websocket
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -1001,7 +1004,7 @@ DEPENDENCIES
   rack-cors
   rack-mini-profiler (~> 3.3)
   rack-timeout
-  rails (~> 7.2)
+  rails (~> 8.0)
   react-rails
   redcarpet
   redis (~> 5.4)

app/controllers/ach_transfers_controller.rb

@@ -3,7 +3,7 @@
 class AchTransfersController < ApplicationController
   include SetEvent
 
-  before_action :set_ach_transfer, except: [:new, :create, :index, :validate_routing_number]
+  before_action :set_ach_transfer, except: [:new, :create, :validate_routing_number]
   before_action :set_event, only: [:new, :create]
   skip_before_action :signed_in_user, except: [:validate_routing_number]
   skip_after_action :verify_authorized, only: [:validate_routing_number]

app/controllers/api/v4/stripe_cards_controller.rb

@@ -156,6 +156,20 @@ def ephemeral_keys
 
       end
 
+      def card_designs
+        if params[:event_id].present?
+          set_api_event
+          authorize @event, :create_stripe_card?, policy_class: EventPolicy
+
+          @designs = [@event.stripe_card_personalization_designs&.available, StripeCard::PersonalizationDesign.common.available].flatten.compact
+        else
+          skip_authorization
+          @designs = StripeCard::PersonalizationDesign.common.available
+        end
+
+        @designs += StripeCard::PersonalizationDesign.unlisted.available if current_user.auditor?
+      end
+
     end
   end
 end

app/controllers/events_controller.rb

@@ -7,7 +7,7 @@ class EventsController < ApplicationController
   include SetEvent
 
   include Rails::Pagination
-  before_action :set_event, except: [:index, :new, :create]
+  before_action :set_event, except: [:index]
   before_action :set_transaction_filters, only: [:transactions, :ledger]
   before_action except: [:show, :index] do
     render_back_to_tour @organizer_position, :welcome, event_path(@event)
@@ -1344,20 +1344,21 @@ def show_running_balance?
   end
 
   def set_cacheable
-    return false unless params[:q].blank? &&
-                        params[:page].blank? &&
-                        params[:per].blank? &&
-                        @user.nil? &&
-                        @tag.blank? &&
-                        @type.blank? &&
-                        @start_date.blank? &&
-                        @end_date.blank? &&
-                        @minimum_amount.nil? &&
-                        @maximum_amount.nil? &&
-                        !@missing_receipts
-    return false if organizer_signed_in?
-
-    true
+    has_filters = !(
+      params[:q].blank? &&
+        params[:page].blank? &&
+        params[:per].blank? &&
+        @user.nil? &&
+        @tag.blank? &&
+        @type.blank? &&
+        @start_date.blank? &&
+        @end_date.blank? &&
+        @minimum_amount.nil? &&
+        @maximum_amount.nil? &&
+        !@missing_receipts
+    )
+
+    @cacheable = !(organizer_signed_in? || has_filters)
   end
 
   def set_mock_data

app/controllers/reimbursement/reports_controller.rb

@@ -88,9 +88,15 @@ def wise_transfer_quote
     def wise_transfer_breakdown
       authorize @report
 
-      @with_fees_quote_amount = @report.wise_transfer_quote_amount
-      @without_fees_quote_amount = @report.wise_transfer_quote_without_fees_amount
-      @fees_amount = @with_fees_quote_amount - @without_fees_quote_amount
+      if @report.payout_holding.present?
+        @with_fees_quote_amount = Money.from_cents(@report.payout_holding.amount_cents)
+        @fees_amount = Money.from_cents(@report.fees_charged_cents)
+        @without_fees_quote_amount = @with_fees_quote_amount - @fees_amount
+      else
+        @with_fees_quote_amount = @report.wise_transfer_quote_amount
+        @without_fees_quote_amount = @report.wise_transfer_quote_without_fees_amount
+        @fees_amount = @with_fees_quote_amount - @without_fees_quote_amount
+      end
 
       render :wise_transfer_breakdown, layout: false
     end

app/jobs/one_time_jobs/enable_monthly_announcements.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module OneTimeJobs
+  class EnableMonthlyAnnouncements < ApplicationJob
+    def perform(exclude_ids:)
+      eligible_events = Event.transparent.organized_by_teenagers.where.not(id: exclude_ids).includes(:config).where(config: { generate_monthly_announcement: false }, id: OrganizerPosition.pluck(:event_id))
+
+      eligible_events.each do |event|
+        event.config.update!(generate_monthly_announcement: true)
+
+        # A callback on Event::Configuration will automatically create a new monthly announcement when the column is updated
+        monthly_announcement = event.announcements.monthly.last
+
+        AnnouncementMailer.with(event:, monthly_announcement:).notice.deliver_later
+      end
+    end
+
+  end
+
+end

app/jobs/one_time_jobs/send_announcement_notice.rb

@@ -28,17 +28,9 @@ def notice
 
     @monthly_announcement = params[:monthly_announcement]
     @scheduled_for = Date.today.next_month.beginning_of_month
+    @warning_date = @scheduled_for - 7.days
 
-    @cancellation_email = Ahoy::Message.where(sent_at: Date.today.beginning_of_month.., subject: "[#{@event.name}] Your scheduled monthly announcement has been canceled").first
-
-    if @cancellation_email.present?
-      email = Mail.read_from_string(@cancellation_email.content)
-      message_id = email.message_id
-
-      mail to: @emails, subject: "[#{@event.name}] Explaining monthly announcements", in_reply_to: message_id, references: message_id
-    else
-      mail to: @emails, subject: "[#{@event.name}] Monthly announcements are enabled for your organization"
-    end
+    mail to: @emails, subject: "[#{@event.name}] Monthly announcements have been enabled for your organization"
   end
 
   def set_warning_variables

app/mailers/announcement_mailer.rb

@@ -214,6 +214,7 @@ def descendants
   scope :demo_mode, -> { where(demo_mode: true) }
   scope :not_demo_mode, -> { where(demo_mode: false) }
   scope :filter_demo_mode, ->(demo_mode) { demo_mode.nil? ? all : where(demo_mode:) }
+  scope :financially_frozen, -> { where(financially_frozen: true) }
 
   before_validation :enforce_transparency_eligibility