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

Author: cielf

.github/workflows/ruby_lint.yml

@@ -27,4 +27,4 @@ jobs:
       - name: lint
         run: bundle exec rubocop
       - name: lint erb files
-        run: bundle exec erblint --lint-all
+        run: bundle exec erb_lint --lint-all

Gemfile

@@ -107,6 +107,9 @@ gem 'bootsnap', require: false
 # specific versions for compatibility reasons.
 gem "nokogiri", ">= 1.10.4"
 gem "sprockets", "~> 4.2.2"
+gem "prawn", "~> 2.4.0"
+gem "matrix" # Used by prawn
+gem "ttfunk", "~>1.7.0"
 
 group :production, :staging do
   # Reduce the noise of logs and include custom fields to it for easier access

Gemfile.lock

@@ -76,27 +76,30 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     afm (0.2.2)
-    annotaterb (4.14.0)
+    annotaterb (4.16.0)
+      activerecord (>= 6.0.0)
+      activesupport (>= 6.0.0)
     ast (2.4.3)
     autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     awesome_print (1.9.2)
-    aws-eventstream (1.3.1)
-    aws-partitions (1.1050.0)
-    aws-sdk-core (3.218.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1123.0)
+    aws-sdk-core (3.226.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.98.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+      logger
+    aws-sdk-kms (1.106.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.181.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.191.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
       azure-storage-common (~> 2.0)
@@ -120,7 +123,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.2.1)
+    bigdecimal (3.2.2)
     bindex (0.8.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -135,7 +138,7 @@ GEM
     bugsnag (6.27.1)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
-    bullet (8.0.5)
+    bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     capybara (3.40.0)
@@ -235,11 +238,11 @@ GEM
       smart_properties
     erubi (1.13.1)
     execjs (2.10.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.4)
+    factory_bot (6.5.4)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
-      railties (>= 5.0.0)
+      railties (>= 6.1.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.4)
@@ -277,11 +280,11 @@ GEM
     ffi (1.17.2-x86_64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     filterrific (5.2.7)
-    flipper (1.3.4)
+    flipper (1.3.5)
       concurrent-ruby (< 2)
-    flipper-active_record (1.3.4)
+    flipper-active_record (1.3.5)
       activerecord (>= 4.2, < 9)
-      flipper (~> 1.3.4)
+      flipper (~> 1.3.5)
     flipper-ui (1.3.4)
       erubi (>= 1.0.0, < 2.0.0)
       flipper (~> 1.3.4)
@@ -334,7 +337,7 @@ GEM
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
     json (2.11.3)
-    jwt (2.10.1)
+    jwt (3.1.2)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -463,7 +466,7 @@ GEM
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pdf-core (0.10.0)
+    pdf-core (0.9.0)
     pdf-reader (2.14.1)
       Ascii85 (>= 1.0, < 3.0, != 2.0.0)
       afm (~> 0.2.1)
@@ -474,10 +477,9 @@ GEM
     popper_js (2.11.8)
     pp (0.6.2)
       prettyprint
-    prawn (2.5.0)
-      matrix (~> 0.4)
-      pdf-core (~> 0.10.0)
-      ttfunk (~> 1.8)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
     prawn-rails (1.6.0)
       actionview (>= 3.1.0)
       activesupport (>= 3.1.0)
@@ -510,8 +512,8 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.15)
-    rack-mini-profiler (3.3.1)
+    rack (3.1.16)
+    rack-mini-profiler (4.0.0)
       rack (>= 1.2.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
@@ -567,7 +569,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.14.0)
+    rdoc (6.14.1)
       erb
       psych (>= 4.0.0)
     recaptcha (5.19.0)
@@ -707,17 +709,16 @@ GEM
     thor (1.3.2)
     tilt (2.2.0)
     timeout (0.4.3)
-    ttfunk (1.8.0)
-      bigdecimal (~> 3.1)
-    turbo-rails (2.0.13)
+    ttfunk (1.7.0)
+    turbo-rails (2.0.16)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uniform_notifier (1.16.0)
+    uniform_notifier (1.17.0)
     uri (1.0.3)
     useragent (0.16.11)
     version_gem (1.1.8)
@@ -794,6 +795,7 @@ DEPENDENCIES
   listen (~> 3.9.0)
   lograge
   magic_test
+  matrix
   memory_profiler
   money-rails
   newrelic_rpm
@@ -805,6 +807,7 @@ DEPENDENCIES
   paper_trail
   pdf-reader
   pg (~> 1.5.9)
+  prawn (~> 2.4.0)
   prawn-rails
   pry-doc
   pry-nav
@@ -834,9 +837,10 @@ DEPENDENCIES
   stimulus-rails
   strong_migrations
   terser
+  ttfunk (~> 1.7.0)
   turbo-rails
   web-console
   webmock (~> 3.25)
 
 BUNDLED WITH
-   2.6.7
+   2.6.9

app/controllers/item_categories_controller.rb

@@ -33,6 +33,17 @@ def update
     end
   end
 
+  def destroy
+    @item_category = current_organization.item_categories.find_by(id: params[:id])
+    if @item_category.items.exists?
+      flash[:alert] = "Cannot delete item category because it has associated items."
+    else
+      @item_category.destroy
+      flash[:notice] = "#{@item_category.name} has been deleted."
+    end
+    redirect_to items_path
+  end
+
   private
 
   def item_category_params

app/javascript/utils/donations.js

@@ -108,13 +108,14 @@ $(function() {
   )
 
   const large_donation_boundary = 100000;
-  $(document).on("submit", "form#new_donation", (e, _) =>
+  $(document).on("click", "form#new_donation button[type='submit']", (e, _) =>
     $(".quantity").each(function(_, q) {
       const quantity = parseInt(q.value, 10);
       if (quantity > large_donation_boundary) {
-        confirm(
+        const answer_confirm = confirm(
           `${quantity} items is a large donation! Are you sure you want to submit?`
-        );
+        )
+        answer_confirm === false && e.preventDefault();
       }
     })
   );

app/models/item.rb

@@ -6,7 +6,6 @@
 #  active                       :boolean          default(TRUE)
 #  additional_info              :text
 #  barcode_count                :integer
-#  category                     :string
 #  distribution_quantity        :integer
 #  name                         :string
 #  on_hand_minimum_quantity     :integer          default(0), not null

app/models/item_category.rb

@@ -16,5 +16,16 @@ class ItemCategory < ApplicationRecord
 
   belongs_to :organization
   has_many :items, -> { order(name: :asc) }, inverse_of: :item_category, dependent: :nullify
-  has_many :partner_groups, dependent: :nullify
+  has_and_belongs_to_many :partner_groups, dependent: :nullify
+
+  before_destroy :ensure_no_associated_partner_groups
+
+  private
+
+  def ensure_no_associated_partner_groups
+    if partner_groups.exists?
+      errors.add(:base, "Cannot delete item category with associated partner groups")
+      throw(:abort)
+    end
+  end
 end

app/models/partner.rb

@@ -146,7 +146,7 @@ def families_served_count
   end
 
   def children_served_count
-    children.count
+    children.count { |child| !child.archived? }
   end
 
   def family_zipcodes_count

app/pdfs/picklists_pdf.rb

@@ -76,6 +76,16 @@ def compute_and_render
           font_size 10
         end
 
+        # Add quota information only if quota is set and greater than 0
+        quota = request.partner.quota
+        if quota && quota > 0
+          move_down 5
+          text "Quota:", style: :bold, align: :right
+          font_size 12
+          text quota.to_s, align: :right
+          font_size 10
+        end
+
         move_down 10
         text "Comments:", style: :bold
         font_size 12

app/services/reports/diaper_report_service.rb

@@ -32,11 +32,15 @@ def report
                      "% disposable diapers purchased" => "#{percent_disposable_diapers_purchased.round}%",
                      "% cloth diapers purchased" => "#{percent_cloth_diapers_purchased.round}%",
                      "Money spent purchasing diapers" => number_to_currency(money_spent_on_diapers),
-                     "Purchased from" => purchased_from,
-                     "Vendors diapers purchased through" => vendors_purchased_from
+                     "Purchased from" => combined_purchased_from
                    }}
     end
 
+    # Helper method to combine purchased_from and vendors_purchased_from
+    def combined_purchased_from
+      [purchased_from, vendors_purchased_from].compact_blank.join(", ")
+    end
+
     # @return [Integer]
     def distributed_loose_disposable_diapers
       @distributed_loose_disposable_diapers ||= organization
@@ -53,10 +57,10 @@ def distributed_disposable_diapers_from_kits
 
       sql_query = <<-SQL
         SELECT SUM(line_items.quantity * kit_line_items.quantity)
-        FROM distributions 
-        INNER JOIN line_items ON line_items.itemizable_type = 'Distribution' AND line_items.itemizable_id = distributions.id 
-        INNER JOIN items ON items.id = line_items.item_id 
-        INNER JOIN kits ON kits.id = items.kit_id 
+        FROM distributions
+        INNER JOIN line_items ON line_items.itemizable_type = 'Distribution' AND line_items.itemizable_id = distributions.id
+        INNER JOIN items ON items.id = line_items.item_id
+        INNER JOIN kits ON kits.id = items.kit_id
         INNER JOIN line_items AS kit_line_items ON kits.id = kit_line_items.itemizable_id
         INNER JOIN items AS kit_items ON kit_items.id = kit_line_items.item_id
         WHERE distributions.organization_id = ?