Merge branch 'main' into item-request

Author: awwaiid

.cloud66/manifest.yml

@@ -1,3 +1,3 @@
 rails:
    configuration:
-     ruby_version: 3.2.2
+     ruby_version: 3.4.3

.rubocop.yml

@@ -10,13 +10,15 @@ inherit_gem:
 inherit_from:
   .rubocop_todo.yml
 
-require:
-  - rubocop-rails
+plugins:
   - rubocop-performance
-  - standard
   - standard-rails
   - standard-performance
 
+require:
+  - rubocop-rails
+  - standard
+
 AllCops:
   Exclude:
     - "vendor/**/*"

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.4.3

Gemfile.lock

@@ -268,10 +268,10 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (~> 0.7)
-    ffi (1.17.0)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.2)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
     filterrific (5.2.7)
     flipper (1.3.4)
       concurrent-ruby (< 2)
@@ -329,7 +329,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.10.2)
+    json (2.11.3)
     jwt (2.10.1)
       base64
     kaminari (1.2.2)
@@ -454,8 +454,8 @@ GEM
     paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.26.3)
-    parser (3.3.7.4)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.10.0)
@@ -596,22 +596,24 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.70.0)
+    rubocop (1.75.4)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.43.0)
+    rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    rubocop-performance (1.23.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
     rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
@@ -672,18 +674,18 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stackprof (0.2.27)
-    standard (1.44.0)
+    standard (1.49.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.70.0)
+      rubocop (~> 1.75.2)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.6)
+      standard-performance (~> 1.8)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.6.0)
+    standard-performance (1.8.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.23.0)
+      rubocop-performance (~> 1.25.0)
     standard-rails (1.1.0)
       lint_roller (~> 1.0)
       rubocop-rails (~> 2.25.0)
@@ -733,16 +735,11 @@ GEM
     zeitwerk (2.7.2)
 
 PLATFORMS
-  arm64-darwin-20
-  arm64-darwin-21
-  arm64-darwin-22
-  arm64-darwin-23
+  arm64-darwin
   ruby
-  x86_64-darwin-20
-  x86_64-darwin-21
-  x86_64-darwin-22
-  x86_64-darwin-23
+  x86_64-darwin
   x86_64-linux
+  x86_64-linux-gnu
 
 DEPENDENCIES
   annotaterb
@@ -834,4 +831,4 @@ DEPENDENCIES
   webmock (~> 3.24)
 
 BUNDLED WITH
-   2.6.6
+   2.6.7

app/controllers/admin/organizations_controller.rb

@@ -86,7 +86,7 @@ def destroy
 
   def organization_params
     params.require(:organization)
-          .permit(:name, :short_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,
                   users_attributes: %i(name email organization_admin), account_request_attributes: %i(ndbn_member_id id))
   end
 

app/controllers/application_controller.rb

@@ -30,7 +30,7 @@ def current_organization
     elsif current_role.resource.is_a?(Organization)
       current_role.resource
     else
-      Organization.find_by(short_name: params[:organization_name])
+      Organization.find_by(id: params[:organization_id])
     end
   end
   helper_method :current_organization

app/controllers/donations_controller.rb

@@ -49,7 +49,7 @@ def index
     respond_to do |format|
       format.html
       format.csv do
-        send_data Exports::ExportDonationsCSVService.new(donation_ids: @donations.map(&:id)).generate_csv, filename: "Donations-#{Time.zone.today}.csv"
+        send_data Exports::ExportDonationsCSVService.new(donation_ids: @donations.map(&:id), organization: current_organization).generate_csv, filename: "Donations-#{Time.zone.today}.csv"
       end
     end
   end

app/controllers/historical_trends/base_controller.rb

@@ -1,5 +1,5 @@
 class HistoricalTrends::BaseController < ApplicationController
   def cached_series(type)
-    Rails.cache.fetch("#{current_organization.short_name}-historical-#{type}-data") { HistoricalTrendService.new(current_organization.id, type).series }
+    Rails.cache.fetch("#{current_organization.id}-historical-#{type}-data") { HistoricalTrendService.new(current_organization.id, type).series }
   end
 end

app/controllers/organizations_controller.rb

@@ -92,7 +92,7 @@ def organization_params
     request_type_formatter(params)
 
     params.require(:organization).permit(
-      :name, :short_name, :street, :city, :state,
+      :name, :street, :city, :state,
       :zipcode, :email, :url, :logo, :intake_location,
       :default_storage_location, :default_email_text, :reminder_email_text,
       :invitation_text, :reminder_day, :deadline_day,
@@ -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,
+      :include_in_kind_values_in_exported_files,
       partner_form_fields: [],
       request_unit_names: []
     )

app/controllers/requests_controller.rb

@@ -48,6 +48,23 @@ def start
     redirect_to new_distribution_path(request_id: request.id)
   end
 
+  def print_picklist
+    request = current_organization
+      .requests
+      .includes(:item_requests, partner: [:profile])
+      .find(params[:id])
+
+    respond_to do |format|
+      format.any do
+        pdf = PicklistsPdf.new(current_organization, [request])
+        send_data pdf.compute_and_render,
+          filename: format("Picklists_%s.pdf", Time.current.to_fs(:long)),
+          type: "application/pdf",
+          disposition: "inline"
+      end
+    end
+  end
+
   def print_unfulfilled
     requests = current_organization
       .requests