Merge branch 'main' into 5231-cancel-requests-deactivated-partners

Author: cielf

Gemfile

@@ -51,7 +51,7 @@ gem "turbo-rails"
 # Sprinkle a little JS to add interactivity
 gem "stimulus-rails"
 # Use JS import maps to manage JS without transpiling or bundling.
-gem "importmap-rails", "~> 2.1"
+gem "importmap-rails", "~> 2.2"
 
 ##### VIEWS/CONTROLLERS #####
 
@@ -61,6 +61,8 @@ gem "filterrific"
 gem "jbuilder"
 # Pagination of models for use in views.
 gem "kaminari"
+# Prevents cookie overflow errors when storing large flash messages.
+gem 'memflash'
 # Web-based authorization framework.
 gem "omniauth"
 # Required to avoid authentication issues with Rails.
@@ -156,7 +158,7 @@ group :development, :test do
   # More concise test ("should") matchers
   gem "shoulda-matchers", "~> 6.5"
   # Default rules for Rubocop.
-  gem "standard", "~> 1.40"
+  gem "standard", "~> 1.50"
   gem "standard-rails"
   gem "standard-performance"
   # Erb linter.

Gemfile.lock

@@ -133,9 +133,9 @@ GEM
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.6, < 3)
       sassc-rails (>= 2.0.0)
-    brakeman (7.0.2)
+    brakeman (7.1.0)
       racc
-    bugsnag (6.27.1)
+    bugsnag (6.28.0)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
     bullet (8.0.8)
@@ -174,7 +174,7 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
-    debug (1.9.2)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.2.0)
@@ -194,7 +194,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_invitable (2.0.10)
+    devise_invitable (2.0.11)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.6.2)
@@ -228,7 +228,7 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erb (5.0.1)
+    erb (5.0.2)
     erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
@@ -292,7 +292,8 @@ GEM
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
       sanitize (< 8)
-    foreman (0.88.1)
+    foreman (0.90.0)
+      thor (~> 1.4)
     formatador (1.1.0)
     geocoder (1.8.5)
       base64 (>= 0.1.0)
@@ -323,11 +324,11 @@ GEM
       ostruct
     ice_cube (0.17.0)
     ice_nine (0.11.2)
-    importmap-rails (2.1.0)
+    importmap-rails (2.2.2)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
-    io-console (0.8.0)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
@@ -336,7 +337,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.11.3)
+    json (2.12.2)
     jwt (3.1.2)
       base64
     kaminari (1.2.2)
@@ -353,7 +354,7 @@ GEM
     kaminari-core (1.2.2)
     knapsack_pro (8.3.0)
       rake
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.5)
     launchy (3.0.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
@@ -385,10 +386,11 @@ GEM
       net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
+    memflash (2.6.0)
+      actionpack (>= 7.0)
     memory_profiler (1.1.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
     minitest (5.25.5)
     monetize (1.12.0)
       money (~> 6.12)
@@ -408,7 +410,7 @@ GEM
     nenv (0.3.0)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.5.8)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -417,16 +419,13 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    newrelic_rpm (9.16.0)
+    newrelic_rpm (9.20.0)
     nio4r (2.7.4)
-    nokogiri (1.18.8)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -512,8 +511,8 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.16)
-    rack-mini-profiler (4.0.0)
+    rack (3.2.0)
+    rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
@@ -569,12 +568,12 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.14.1)
+    rdoc (6.14.2)
       erb
       psych (>= 4.0.0)
-    recaptcha (5.19.0)
+    recaptcha (5.20.1)
     regexp_parser (2.10.0)
-    reline (0.6.1)
+    reline (0.6.2)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
@@ -605,7 +604,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.4)
-    rubocop (1.75.4)
+    rubocop (1.75.8)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -616,7 +615,7 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.25.0)
@@ -684,10 +683,10 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stackprof (0.2.27)
-    standard (1.49.0)
+    standard (1.50.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.2)
+      rubocop (~> 1.75.5)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
@@ -706,7 +705,7 @@ GEM
       activerecord (>= 7)
     terser (1.2.5)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.2)
+    thor (1.4.0)
     tilt (2.2.0)
     timeout (0.4.3)
     ttfunk (1.7.0)
@@ -745,7 +744,6 @@ GEM
 
 PLATFORMS
   arm64-darwin
-  ruby
   x86_64-darwin
   x86_64-linux
   x86_64-linux-gnu
@@ -786,7 +784,7 @@ DEPENDENCIES
   geocoder
   guard-rspec
   icalendar
-  importmap-rails (~> 2.1)
+  importmap-rails (~> 2.2)
   jbuilder
   jwt
   kaminari
@@ -796,6 +794,7 @@ DEPENDENCIES
   lograge
   magic_test
   matrix
+  memflash
   memory_profiler
   money-rails
   newrelic_rpm
@@ -831,7 +830,7 @@ DEPENDENCIES
   solid_cache (~> 1.0)
   sprockets (~> 4.2.2)
   stackprof
-  standard (~> 1.40)
+  standard (~> 1.50)
   standard-performance
   standard-rails
   stimulus-rails
@@ -843,4 +842,4 @@ DEPENDENCIES
   webmock (~> 3.25)
 
 BUNDLED WITH
-   2.6.9
+   2.7.0

app/assets/stylesheets/resources/partners.scss

@@ -49,6 +49,10 @@ div#partner-notes {
   padding: 0px 20px;
 }
 
+div#info-for-partner {
+  padding: 0px 20px;
+}
+
 div#approve-application-button {
   position: fixed;
 

app/controllers/admin/organizations_controller.rb

@@ -71,7 +71,7 @@ def destroy
 
   def organization_params
     params.require(:organization)
-          .permit(:name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location, :default_email_text, :account_request_id, :reminder_day, :deadline_day,
+          .permit(:name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location, :default_email_text, :account_request_id, :reminder_day, :deadline_day, :bank_is_set_up,
                   users_attributes: %i(name email organization_admin), account_request_attributes: %i(ndbn_member_id id))
   end
 

app/controllers/audits_controller.rb

@@ -21,9 +21,6 @@ def edit
   end
 
   def finalize
-    @audit.adjustment = Adjustment.new(organization_id: @audit.organization_id, storage_location_id: @audit.storage_location_id, user_id: current_user.id, comment: 'Created Automatically through the Auditing Process')
-    @audit.save
-
     AuditEvent.publish(@audit)
     @audit.finalized!
     redirect_to audit_path(@audit), notice: "Audit is Finalized."

app/controllers/dashboard_controller.rb

@@ -3,7 +3,7 @@ class DashboardController < ApplicationController
   respond_to :html, :js
 
   def index
-    @org_stats = OrganizationStats.new(current_organization, inventory)
+    @org_is_set_up = current_organization.bank_is_set_up
     @partners_awaiting_review = current_organization.partners.awaiting_review
     @outstanding_requests = current_organization
       .ordered_requests

app/controllers/donations_controller.rb

@@ -127,11 +127,12 @@ def destroy
 
   def load_form_collections
     @storage_locations = current_organization.storage_locations.active.alphabetized
-    @donation_sites = current_organization.donation_sites.active.alphabetized
     @product_drives = current_organization.product_drives.alphabetized
     @product_drive_participants = current_organization.product_drive_participants.alphabetized
     @manufacturers = current_organization.manufacturers.alphabetized
     @items = current_organization.items.active.alphabetized
+    # Return all active donation sites, or the donation site that was selected for the donation if it's inactive
+    @donation_sites = current_organization.donation_sites.active.or(DonationSite.where(id: @donation.donation_site_id)).alphabetized
   end
 
   def clean_donation_money_raised

app/controllers/organizations_controller.rb

@@ -19,7 +19,7 @@ def update
     @organization = current_organization
 
     if OrganizationUpdateService.update(@organization, organization_params)
-      redirect_to organization_path, notice: "Updated your organization!"
+      redirect_back(fallback_location: organization_path, notice: "Updated your organization!")
     else
       flash.now[:error] = @organization.errors.full_messages.join("\n")
       render :edit
@@ -102,6 +102,7 @@ def organization_params
       :ytd_on_distribution_printout, :one_step_partner_invite,
       :hide_value_columns_on_receipt, :hide_package_column_on_receipt,
       :signature_for_distribution_pdf, :receive_email_on_requests,
+      :bank_is_set_up,
       :include_in_kind_values_in_exported_files,
       partner_form_fields: [],
       request_unit_names: []

app/controllers/partners_controller.rb

@@ -182,7 +182,7 @@ def validate_user_role
 
   def partner_params
     params.require(:partner).permit(:name, :email, :send_reminders, :quota,
-      :notes, :partner_group_id, :default_storage_location_id, documents: [])
+      :notes, :partner_group_id, :default_storage_location_id, :info_for_partner, documents: [])
   end
 
   helper_method \

app/controllers/product_drives_controller.rb

@@ -88,10 +88,18 @@ def update
   end
 
   def destroy
-    current_organization.product_drives.find(params[:id]).destroy
+    product_drive = current_organization.product_drives.find(params[:id])
+    success = product_drive.destroy
+
     respond_to do |format|
-      format.html { redirect_to product_drives_url, notice: 'Product drive was successfully destroyed.' }
-      format.json { head :no_content }
+      if success
+        format.html { redirect_to product_drives_url, notice: 'Product drive was successfully destroyed.' }
+        format.json { head :no_content }
+      else
+        error_message = product_drive.errors.full_messages.to_sentence
+        format.html { redirect_to product_drive_path(product_drive), error: error_message }
+        format.json { render json: {error: error_message}, status: :unprocessable_entity }
+      end
     end
   end