Merge branch 'main' into allow-the-superuser-to-reinvite-users

Author: rrg1459

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)
@@ -509,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)
@@ -566,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,15 +710,15 @@ GEM
     tilt (2.2.0)
     timeout (0.4.3)
     ttfunk (1.7.0)
-    turbo-rails (2.0.13)
+    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)

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/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/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/views/items/_item_categories.html.erb

@@ -27,9 +27,10 @@
               <% end %>
             </ul>
           </td>
-          <td>
+          <td class="text-right">
             <%= view_button_to item_category_path(item_category) %>
             <%= edit_button_to edit_item_category_path(item_category.id) %>
+            <%= delete_button_to(item_category_path(item_category.id), { confirm: confirm_delete_msg(item_category.name) }) if (item_category.items.count <= 0) %>
           </td>
         </tr>
       <% end %>

db/schema.rb

@@ -324,7 +324,7 @@
     t.bigint "old_partner_id"
     t.boolean "archived", default: false
     t.index ["partner_id"], name: "index_families_on_partner_id"
-  end
+  end 
 
   create_table "flipper_features", force: :cascade do |t|
     t.string "key", null: false

docs/user_guide/bank/images/essentials/requests/essentials_requests_picklist.png

@@ -28,4 +28,24 @@
   describe "versioning" do
     it { is_expected.to be_versioned }
   end
+
+  describe "delete" do
+    let(:item_category) { create(:item_category) }
+    let(:partner_group) { create(:partner_group, item_categories: [item_category]) }
+
+    before do
+      partner_group
+    end
+
+    it "should not delete if associated with partner groups" do
+      expect(item_category.partner_groups).not_to be_empty
+      expect { item_category.destroy }.not_to change(ItemCategory, :count)
+      expect(item_category.errors.full_messages).to include("Cannot delete item category with associated partner groups")
+    end
+
+    it "should delete if not associated with partner groups" do
+      item_category.partner_groups.destroy_all
+      expect { item_category.destroy }.to change(ItemCategory, :count).by(-1)
+    end
+  end
 end

spec/models/item_category_spec.rb

@@ -67,6 +67,43 @@
         expect(pdf_test.page(1).text).to include(request.partner.profile.pick_up_phone)
       end
     end
+
+    context "when partner has a quota" do
+      it "renders the quota information when quota is set" do
+        partner = create(:partner)
+        partner.update(quota: 100)
+        request = create(:request, :pending, organization: organization, partner: partner)
+        create(:item_request, request: request, item: item1, name: "Item 1")
+
+        pdf = described_class.new(organization, [request])
+        pdf_test = PDF::Reader.new(StringIO.new(pdf.compute_and_render))
+
+        expect(pdf_test.page(1).text).to include("Quota:")
+        expect(pdf_test.page(1).text).to include("100")
+      end
+
+      it "does not render quota information when quota is not set" do
+        partner = create(:partner, quota: nil)
+        request = create(:request, :pending, organization: organization, partner: partner)
+        create(:item_request, request: request, item: item1, name: "Item 1")
+
+        pdf = described_class.new(organization, [request])
+        pdf_test = PDF::Reader.new(StringIO.new(pdf.compute_and_render))
+
+        expect(pdf_test.page(1).text).not_to include("Quota:")
+      end
+
+      it "does not render quota information when quota is zero" do
+        partner = create(:partner, quota: 0)
+        request = create(:request, :pending, organization: organization, partner: partner)
+        create(:item_request, request: request, item: item1, name: "Item 1")
+
+        pdf = described_class.new(organization, [request])
+        pdf_test = PDF::Reader.new(StringIO.new(pdf.compute_and_render))
+
+        expect(pdf_test.page(1).text).not_to include("Quota:")
+      end
+    end
   end
 
   context "When packs are not enabled" do

spec/pdfs/picklists_pdf_spec.rb

@@ -93,4 +93,29 @@
       end
     end
   end
+
+  describe "DELETE #destroy" do
+    let!(:item_category) { create(:item_category, organization: organization) }
+
+    context "when the item category has no associated items" do
+      it "destroys the requested item category" do
+        expect {
+          delete item_category_url(id: item_category.id)
+        }.to change(ItemCategory, :count).by(-1)
+        expect(response).to redirect_to(items_path)
+      end
+    end
+
+    context "when the item category has associated items" do
+      let!(:item) { create(:item, item_category: item_category) }
+
+      it "does not destroy the item category and shows an error" do
+        expect {
+          delete item_category_url(id: item_category.id)
+        }.not_to change(ItemCategory, :count)
+        expect(response).to redirect_to(items_path)
+        expect(flash[:alert]).to eq("Cannot delete item category because it has associated items.")
+      end
+    end
+  end
 end