Merge branch 'main' into 5372AlignmentNudges2

awwaiid · web-flow · commit db314233d4e3 · 2025-09-14T09:02:11.000-04:00
diff --git a/app/controllers/kits_controller.rb b/app/controllers/kits_controller.rb
@@ -1,4 +1,8 @@
 class KitsController < ApplicationController
+  def show
+    redirect_to allocations_kit_path
+  end
+
   def index
     @kits = current_organization.kits.includes(:item, line_items: :item).class_filter(filter_params)
     @inventory = View::Inventory.new(current_organization.id)
diff --git a/app/javascript/controllers/deadline_day_controller.js b/app/javascript/controllers/deadline_day_controller.js
@@ -47,7 +47,7 @@ export default class extends Controller {
 
     if (this.byDayOfMonthTarget.checked && this.dayOfMonthTarget.value) {
       const rule = new RRule({
-        dtstart: today,
+        dtstart: new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate(), 12)),
         freq: RRule.MONTHLY,
         interval: monthlyInterval,
         bymonthday: parseInt(this.dayOfMonthTarget.value),
@@ -57,7 +57,7 @@ export default class extends Controller {
     }
     if (this.byDayOfWeekTarget.checked && this.everyNthDayTarget.value && (this.dayOfWeekTarget.value)) {
       const rule = new RRule({
-        dtstart: today,
+        dtstart: new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate(), 12)),
         freq: RRule.MONTHLY,
         interval: monthlyInterval,
         byweekday: WEEKDAY_NUM_TO_OBJ[ parseInt(this.dayOfWeekTarget.value) ].nth( parseInt(this.everyNthDayTarget.value) ),
diff --git a/app/jobs/backup_db_rds.rb b/app/jobs/backup_db_rds.rb
@@ -18,5 +18,9 @@ def self.run
     client.put_object(key: "backups/#{backup_filename}",
       body: File.read(backup_filename),
       bucket: "human-essentials-backups")
+
+    Rails.root.glob("*.rds.dump").each do |file|
+      File.delete(file)
+    end
   end
 end
diff --git a/app/models/storage_location.rb b/app/models/storage_location.rb
@@ -159,7 +159,7 @@ def validate_empty_inventory
   end
 
   def self.csv_export_headers
-    ["Name", "Address", "Square Footage", "Warehouse Type", "Total Inventory"]
+    ["Name", "Address", "Square Footage", "Warehouse Type", "Total Inventory", "Fair Market Value"]
   end
 
   # @param storage_locations [Array<StorageLocation>]
@@ -171,7 +171,7 @@ def self.generate_csv_from_inventory(storage_locations, inventory)
     CSV.generate(headers: true) do |csv|
       csv_data = storage_locations.map do |sl|
         total_quantity = inventory.quantity_for(storage_location: sl.id)
-        attributes = [sl.name, sl.address, sl.square_footage, sl.warehouse_type, total_quantity] +
+        attributes = [sl.name, sl.address, sl.square_footage, sl.warehouse_type, total_quantity, sl.inventory_total_value_in_dollars] +
           all_items.map { |i| inventory.quantity_for(storage_location: sl.id, item_id: i.item_id) }
         attributes.map { |attr| normalize_csv_attribute(attr) }
       end
diff --git a/app/views/admin/base_items/index.html.erb b/app/views/admin/base_items/index.html.erb
@@ -33,6 +33,7 @@
               <tr>
                 <th>Name</th>
                 <th class="text-right">Child Items</th>
+                <th>Child Items</th>
                 <th class="text-right">Actions</th>
               </tr>
               </thead>
diff --git a/app/views/distributions/_distribution_row.html.erb b/app/views/distributions/_distribution_row.html.erb
@@ -4,17 +4,18 @@
   <td class="date text-left"><%= distribution_row.created_at.strftime("%m/%d/%Y") %></td>
   <td class="date text-left"><%= (distribution_row.issued_at.presence || distribution_row.created_at).strftime("%m/%d/%Y") %></td>
   <td><%= distribution_row.storage_location.name %></td>
-
   <td class="numeric"><%= @distribution_totals[distribution_row.id].quantity %></td>
   <td class="numeric"><%= dollar_value(@distribution_totals[distribution_row.id].value) %></td>
   <td><%= distribution_row.delivery_method.humanize %></td>
   <td class="text-right"><%= distribution_shipping_cost(distribution_row.shipping_cost) %></td>
   <td><%= distribution_row.comment %></td>
   <td><%= distribution_row.state&.humanize %></td>
-
   <% distribution_has_inactive_item = @distributions_with_inactive_items.include?(distribution_row.id) %>
   <td class="text-right">
     <%= view_button_to distribution_path(distribution_row) %>
+    <% if distribution_row.request %>
+      <%= view_button_to request_path(distribution_row.request), {icon: "eye", type: "secondary", text: "View Request"} %>
+    <% end %>
     <% if (!distribution_row.complete? && !distribution_row.future?) || current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
       <%= edit_button_to edit_distribution_path(distribution_row), enabled: !distribution_has_inactive_item %>
     <% end %>
diff --git a/app/views/partner_mailer/recertification_request.text.erb b/app/views/partner_mailer/recertification_request.text.erb
@@ -2,11 +2,16 @@ Hi <%= @partner.name %>
 
 It's time to update your agency information!
 
-Please log in to your account at <%= new_user_session_url %>
+Please log in to your account at <%= new_user_session_url %>, and click "My Profile"
 
-If no information has changed, please click Update.
-If any information has changed, please amend it on the form and then click Update.
+If no information has changed, please click 'Submit For Approval'.
 
-If you have any questions please contact <%= @organization.name %> at <%= @organization.email %>
+If any information has changed, please:
+
+- Click 'Update Information'
+- Change the information
+- Click 'Save and Review'
+- Confirm that the information is correct
+- Finally, click 'Submit For Approval'
 
-Thank you and have a great day!
+If you have any questions please contact <%= @organization.name %> at <%= @organization.email %>
diff --git a/app/views/storage_locations/show.html.erb b/app/views/storage_locations/show.html.erb
@@ -36,6 +36,7 @@
                 <th>Address</th>
                 <th>Square Footage</th>
                 <th>Warehouse Type</th>
+                <th>Fair Market Value</th>
               </tr>
               </thead>
               <tbody>
@@ -44,6 +45,7 @@
                 <td><%= @storage_location.address %></td>
                 <td><%= @storage_location.square_footage %></td>
                 <td><%= @storage_location.warehouse_type %></td>
+                <td><%= number_to_currency @storage_location.inventory_total_value_in_dollars %></td>
               </tr>
               </tbody>
             </table>
diff --git a/docs/user_guide/bank/exports.md b/docs/user_guide/bank/exports.md
@@ -413,7 +413,8 @@ For each Storage Location in the filtered list:
 - Address,
 - Square Footage,
 - Warehouse Type,
-- Total Inventory, and
+- Total Inventory,
+- Fair Market Value,
 - Quantity for each of the organization's Items.
 
 ## Transfers
diff --git a/spec/requests/kit_requests_spec.rb b/spec/requests/kit_requests_spec.rb
@@ -12,6 +12,13 @@
       sign_in(user)
     end
 
+    describe "GET #show" do
+      it "should redirect to the allocations page" do
+        get kit_url(kit)
+        expect(response).to redirect_to allocations_kit_path(kit.id)
+      end
+    end
+
     describe "GET #index" do
       before do
         # this shouldn't be shown
diff --git a/spec/requests/storage_locations_requests_spec.rb b/spec/requests/storage_locations_requests_spec.rb
@@ -1,4 +1,6 @@
 RSpec.describe "StorageLocations", type: :request do
+  include ActionView::Helpers::NumberHelper
+
   let(:organization) { create(:organization) }
   let(:user) { create(:user, organization: organization) }
   let(:organization_admin) { create(:organization_admin, organization: organization) }
@@ -170,12 +172,12 @@
           get storage_locations_path(format: response_format)
           # The first address below is quoted since it contains commas
           csv = <<~CSV
-            Name,Address,Square Footage,Warehouse Type,Total Inventory,A,B,C,D
-            Storage Location with Duplicate Items,"1500 Remount Road, Front Royal, VA 22630",100,Residential space used,1,0,0,1,0
-            Storage Location with Items,123 Donation Site Way,100,Residential space used,3,1,1,1,0
-            Storage Location with Unique Items,Smithsonian Conservation Center new,100,Residential space used,5,0,0,0,5
-            Test Storage Location,123 Donation Site Way,100,Residential space used,0,0,0,0,0
-            Test Storage Location 1,123 Donation Site Way,100,Residential space used,0,0,0,0,0
+            Name,Address,Square Footage,Warehouse Type,Total Inventory,Fair Market Value,A,B,C,D
+            Storage Location with Duplicate Items,"1500 Remount Road, Front Royal, VA 22630",100,Residential space used,1,0.0,0,0,1,0
+            Storage Location with Items,123 Donation Site Way,100,Residential space used,3,0.0,1,1,1,0
+            Storage Location with Unique Items,Smithsonian Conservation Center new,100,Residential space used,5,0.0,0,0,0,5
+            Test Storage Location,123 Donation Site Way,100,Residential space used,0,0.0,0,0,0,0
+            Test Storage Location 1,123 Donation Site Way,100,Residential space used,0,0.0,0,0,0,0
           CSV
           expect(response.body).to eq(csv)
         end
@@ -208,13 +210,13 @@
             get storage_locations_path(include_inactive_storage_locations: "1", format: response_format)
 
             csv = <<~CSV
-              Name,Address,Square Footage,Warehouse Type,Total Inventory,A,B,C,D
-              Inactive Storage Location,123 Donation Site Way,100,Residential space used,3,1,1,1,0
-              Storage Location with Duplicate Items,"1500 Remount Road, Front Royal, VA 22630",100,Residential space used,1,0,0,1,0
-              Storage Location with Items,123 Donation Site Way,100,Residential space used,3,1,1,1,0
-              Storage Location with Unique Items,Smithsonian Conservation Center new,100,Residential space used,5,0,0,0,5
-              Test Storage Location,123 Donation Site Way,100,Residential space used,0,0,0,0,0
-              Test Storage Location 1,123 Donation Site Way,100,Residential space used,0,0,0,0,0
+              Name,Address,Square Footage,Warehouse Type,Total Inventory,Fair Market Value,A,B,C,D
+              Inactive Storage Location,123 Donation Site Way,100,Residential space used,3,0.0,1,1,1,0
+              Storage Location with Duplicate Items,"1500 Remount Road, Front Royal, VA 22630",100,Residential space used,1,0.0,0,0,1,0
+              Storage Location with Items,123 Donation Site Way,100,Residential space used,3,0.0,1,1,1,0
+              Storage Location with Unique Items,Smithsonian Conservation Center new,100,Residential space used,5,0.0,0,0,0,5
+              Test Storage Location,123 Donation Site Way,100,Residential space used,0,0.0,0,0,0,0
+              Test Storage Location 1,123 Donation Site Way,100,Residential space used,0,0.0,0,0,0,0
             CSV
 
             expect(response.body).to eq(csv)
@@ -414,6 +416,12 @@
             end
           end
         end
+
+        it "should include the inventory total market value" do
+          get storage_location_path(storage_location, format: response_format)
+          expect(response).to be_successful
+          expect(response.body).to include(number_to_currency(storage_location.inventory_total_value_in_dollars))
+        end
       end
 
       context "csv" do
diff --git a/spec/support/deadline_day_fields_shared_example.rb b/spec/support/deadline_day_fields_shared_example.rb
@@ -74,6 +74,11 @@ def safe_subtract_days(date, num)
     expect(page).to have_content("Deadline day must be between 1 and 28")
   end
 
+  # These tests make assertions about the dates calculated by the javascript in deadline_day_controller.js
+  # Because we currently don't have a great way of spoofing the date the headless browser sees during tests, they
+  # cannot effectively set the date for the tests (like with travel_to) and have to make due with the actual datetime
+  # of whenever the test is run. To the best of my knowledge, the tests are sound but be aware that they could
+  # pass or fail based on when they are run!
   describe "reported reminder and deadline dates" do
     context "when the reminder is a day of the month" do
       before do
diff --git a/spec/system/distribution_system_spec.rb b/spec/system/distribution_system_spec.rb
@@ -340,6 +340,7 @@
   context "With an existing distribution" do
     let!(:distribution) { create(:distribution, :with_items, agency_rep: "A Person", delivery_method: delivery_method, organization: user.organization, reminder_email_enabled: true) }
     let(:delivery_method) { "pick_up" }
+    let!(:request) { create(:request, distribution: distribution) }
 
     before do
       sign_in(organization_admin)
@@ -357,6 +358,12 @@
       expect(distribution.agency_rep).to eq("SOMETHING DIFFERENT")
     end
 
+    it "the user can view related request" do
+      click_on "View Request"
+
+      expect(page).to have_content "Request from #{distribution.request.partner.name}"
+    end
+
     it "sends an email if reminders are enabled" do
       job = double('fake_job')
       allow(DistributionMailer).to receive(:reminder_email).and_return(job)
