Merge remote-tracking branch 'origin/main' into request-limit-on-forms

Author: embarnard

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)

app/helpers/kits_helper.rb

@@ -10,7 +10,7 @@ def deactivate_kit_button(kit, inventory)
     tag.span(**span_options) do
       deactivate_button_to(deactivate_kit_path(kit),
         options.merge({text: "Deactivate",
-          confirm: confirm_deactivate_msg(kit.name), size: "m"}))
+          confirm: confirm_deactivate_msg(kit.name), size: "xs"}))
     end
   end
 end

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) ),

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

app/models/partners/profile.rb

@@ -37,7 +37,6 @@
 #  new_client_times               :string
 #  no_social_media_presence       :boolean
 #  other_agency_type              :string
-#  partner_status                 :string           default("pending")
 #  pick_up_email                  :string
 #  pick_up_name                   :string
 #  pick_up_phone                  :string

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

app/views/adjustments/index.html.erb

@@ -80,7 +80,7 @@
                 <th>Storage location</th>
                 <th>Comment</th>
                 <th>Summary</th>
-                <th>&nbsp;</th>
+                <th class="text-right">Actions</th>
               </tr>
               </thead>
               <tbody>

app/views/admin/account_requests/_open_account_request.html.erb

@@ -10,11 +10,11 @@
     <%= open_account_request.name %>
     <br><%= open_account_request.email %>
   </td>
-  <td><%= js_button(text: 'Reject',
+  <td class="text-right"><%= js_button(text: 'Reject',
                     icon: 'ban',
                     class: 'reject-button',
-                    data: { request_id: open_account_request.id, modal: 'reject' }) %></td>
-  <td><%= js_button(text: 'Close (Admin)',
+                    data: { request_id: open_account_request.id, modal: 'reject' }) %>
+  <%= js_button(text: 'Close (Admin)',
                   icon: 'times',
                   class: 'reject-button',
                   data: { request_id: open_account_request.id, modal: 'close' }) %></td>

app/views/admin/account_requests/for_rejection.html.erb

@@ -25,7 +25,7 @@
                   <th>Request details</th>
                   <th>Request status</th>
                   <th>Contact Details</th>
-                  <th>Actions</th>
+                  <th class="text-right">Actions</th>
                 </tr>
                 </thead>
                 <tbody>

app/views/admin/account_requests/index.html.erb

@@ -26,7 +26,7 @@
                 <th>Request details</th>
                 <th>Request status</th>
                 <th>Contact Details</th>
-                <th>Actions</th>
+                <th class="text-right">Actions</th>
               </tr>
               </thead>
               <tbody>