Inactivating vendors

app/controllers/purchases_controller.rb

@@ -101,7 +101,7 @@ def destroy
   def load_form_collections
     @storage_locations = current_organization.storage_locations.active.alphabetized
     @items = current_organization.items.active.alphabetized
-    @vendors = current_organization.vendors.alphabetized
+    @vendors = current_organization.vendors.active.alphabetized
   end
 
   def purchase_params

app/controllers/vendors_controller.rb

@@ -3,7 +3,14 @@ class VendorsController < ApplicationController
   include Importable
 
   def index
-    @vendors = current_organization.vendors.with_volumes.alphabetized
+    @vendors = current_organization
+      .vendors
+      .with_volumes
+      .alphabetized
+      .class_filter(filter_params)
+
+    @vendors = @vendors.active unless params[:include_inactive_vendors]
+    @include_inactive_vendors = params[:include_inactive_vendors]
 
     respond_to do |format|
       format.html
@@ -53,6 +60,36 @@ def update
     end
   end
 
+  def deactivate
+    vendor = current_organization.vendors.find(params[:id])
+
+    begin
+      vendor.deactivate!
+    rescue => e
+      flash[:error] = e.message
+      redirect_back(fallback_location: vendors_path)
+      return
+    end
+
+    flash[:notice] = "#{vendor.business_name} has been deactivated."
+    redirect_to vendors_path
+  end
+
+  def reactivate
+    vendor = current_organization.vendors.find(params[:id])
+
+    begin
+      vendor.reactivate!
+    rescue => e
+      flash[:error] = e.message
+      redirect_back(fallback_location: vendors_path)
+      return
+    end
+
+    flash[:notice] = "#{vendor.business_name} has been reactivated."
+    redirect_to vendors_path
+  end
+
   private
 
   def vendor_params
@@ -61,7 +98,9 @@ def vendor_params
   end
 
   helper_method \
-    def filter_params
-    {}
+    def filter_params(_parameters = nil)
+    return {} unless params.key?(:filters)
+
+    params.require(:filters).permit(:include_inactive_vendors)
   end
 end

app/models/vendor.rb

@@ -3,6 +3,7 @@
 # Table name: vendors
 #
 #  id              :bigint           not null, primary key
+#  active          :boolean          default(TRUE)
 #  address         :string
 #  business_name   :string
 #  comment         :string
@@ -20,16 +21,29 @@ class Vendor < ApplicationRecord
   has_paper_trail
   include Provideable
   include Geocodable
+  include Filterable
 
   has_many :purchases, inverse_of: :vendor, dependent: :destroy
 
   validates :business_name, presence: true
 
   scope :alphabetized, -> { order(:business_name) }
-
+  scope :active, -> { where(active: true) }
   scope :with_volumes, -> {
     left_joins(purchases: :line_items)
       .select("vendors.*, SUM(COALESCE(line_items.quantity, 0)) AS volume")
       .group(:id)
   }
+
+  def volume
+    purchases.map { |d| d.line_items.total }.reduce(:+)
+  end
+
+  def deactivate!
+    update!(active: false)
+  end
+
+  def reactivate!
+    update!(active: true)
+  end
 end

app/views/vendors/_vendor_row.html.erb

@@ -7,5 +7,14 @@
   <td class="text-center">
     <%= view_button_to vendor_row %>
     <%= edit_button_to edit_vendor_path(vendor_row) %>
+    <% if vendor_row.active? %>
+      <%= deactivate_button_to deactivate_vendor_path(vendor_row),
+                             text: 'Deactivate',
+                             confirm: confirm_deactivate_msg(vendor_row.business_name) %>
+    <% else %>
+      <%= reactivate_button_to reactivate_vendor_path(vendor_row),
+                             text: 'Reactivate',
+                             confirm: confirm_reactivate_msg(vendor_row.business_name) %>
+    <% end %>
   </td>
 </tr>

app/views/vendors/index.html.erb

@@ -29,20 +29,38 @@
       <div class="col-md-12">
         <!-- jquery validation -->
         <div class="card card-primary">
-          <div class="card-footer">
-            <div class="pull-right">
-              <%= modal_button_to("#csvImportModal", { icon: "upload", text: "Import Vendors", size: "md"}) if @vendors.empty? %>
-              <%= download_button_to(vendors_path(format: :csv, filters: filter_params.merge(date_range: date_range_params)), {text: "Export Vendors", size: "md"}) if @vendors.any? %>
-              <%= new_button_to new_vendor_path, text: "New Vendor" %>            </div>
+          <div class="card-header">
+            <h3 class="card-title">Vendor Filter</h3>
           </div>
-        </div>
+          <!-- /.card-header -->
+          <!-- form start -->
+          <div class="card-body">
+            <%= form_tag(vendors_path, method: :get) do |f| %>
+              <div class="row">
+                <div class="form-group col-lg-3 col-md-4 col-sm-6 col-xs-12">
+                  <%= filter_checkbox(label: "Also include inactive vendors", scope: "include_inactive_vendors", selected: @include_inactive_vendors) %>
+                </div>
+              </div>
+              </div>
+              <div class="card-footer">
+                <%= filter_button %>
+                <%= clear_filter_button %>
+                <span class="float-right">
+                  <%= download_button_to(vendors_path(format: :csv, filters: filter_params.merge(date_range: date_range_params, include_inactive_vendors: @include_inactive_vendors)), {text: "Export Vendors", size: "md"}) if @vendors.any? %>
+                  <%= modal_button_to("#csvImportModal", { icon: "upload", text: "Import Vendors", size: "md"}) if @vendors.empty? %>
+                  <%= new_button_to new_vendor_path, text: "New Vendor" %>
+                </span>
+              </div>
+            <% end # form %>
+            </div>
         <!-- /.card -->
       </div>
-      <!--/.col (left) -->
     </div>
     <!-- /.row -->
   </div><!-- /.container-fluid -->
+</section>
 
+<section class="content">
   <div class="container-fluid">
     <div class="row">
       <div class="col-12">

config/routes.rb

@@ -173,6 +173,10 @@ def set_up_flipper
     collection do
       post :import_csv
     end
+    member do
+      put :deactivate
+      put :reactivate
+    end
   end
 
   resources :kits do

db/migrate/20250129154820_add_active_to_vendors.rb

@@ -0,0 +1,11 @@
+# Add active column to vendors to make it possible to delete vendors without actually deleting them
+class AddActiveToVendors < ActiveRecord::Migration[7.2]
+  def up
+    add_column :vendors, :active, :boolean
+    change_column_default :vendors, :active, true
+  end
+
+  def down
+    remove_column :vendors, :active
+  end
+end

db/migrate/20250201151720_set_existing_vendors_active.rb

@@ -0,0 +1,6 @@
+# Add active column to vendors to make it possible to delete vendors without actually deleting them
+class SetExistingVendorsActive < ActiveRecord::Migration[7.2]
+  def change
+    Vendor.update_all(active: true)
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_01_29_015253) do
+ActiveRecord::Schema[7.2].define(version: 2025_02_01_151720) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -230,6 +230,31 @@
     t.index ["user_id"], name: "index_deprecated_feedback_messages_on_user_id"
   end
 
+  create_table "diaper_drive_participants", id: :serial, force: :cascade do |t|
+    t.string "contact_name"
+    t.string "email"
+    t.string "phone"
+    t.string "comment"
+    t.integer "organization_id"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.string "address"
+    t.string "business_name"
+    t.float "latitude"
+    t.float "longitude"
+    t.index ["latitude", "longitude"], name: "index_diaper_drive_participants_on_latitude_and_longitude"
+  end
+
+  create_table "diaper_drives", force: :cascade do |t|
+    t.string "name"
+    t.date "start_date"
+    t.date "end_date"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.bigint "organization_id"
+    t.index ["organization_id"], name: "index_diaper_drives_on_organization_id"
+  end
+
   create_table "distributions", id: :serial, force: :cascade do |t|
     t.text "comment"
     t.datetime "created_at", precision: nil, null: false
@@ -325,6 +350,16 @@
     t.index ["partner_id"], name: "index_families_on_partner_id"
   end
 
+  create_table "feedback_messages", force: :cascade do |t|
+    t.bigint "user_id"
+    t.text "message"
+    t.string "path"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.boolean "resolved"
+    t.index ["user_id"], name: "index_feedback_messages_on_user_id"
+  end
+
   create_table "flipper_features", force: :cascade do |t|
     t.string "key", null: false
     t.datetime "created_at", precision: nil, null: false
@@ -513,8 +548,8 @@
     t.integer "deadline_day"
     t.index ["name", "organization_id"], name: "index_partner_groups_on_name_and_organization_id", unique: true
     t.index ["organization_id"], name: "index_partner_groups_on_organization_id"
-    t.check_constraint "deadline_day <= 28", name: "deadline_day_of_month_check", validate: false
-    t.check_constraint "reminder_day <= 28", name: "reminder_day_of_month_check", validate: false
+    t.check_constraint "deadline_day <= 28", name: "deadline_day_of_month_check"
+    t.check_constraint "reminder_day <= 28", name: "reminder_day_of_month_check"
   end
 
   create_table "partner_profiles", force: :cascade do |t|
@@ -728,17 +763,6 @@
     t.index ["resource_type", "resource_id"], name: "index_roles_on_resource"
   end
 
-  create_table "solid_cache_entries", force: :cascade do |t|
-    t.binary "key", null: false
-    t.binary "value", null: false
-    t.datetime "created_at", null: false
-    t.bigint "key_hash", null: false
-    t.integer "byte_size", null: false
-    t.index ["byte_size"], name: "index_solid_cache_entries_on_byte_size"
-    t.index ["key_hash", "byte_size"], name: "index_solid_cache_entries_on_key_hash_and_byte_size"
-    t.index ["key_hash"], name: "index_solid_cache_entries_on_key_hash", unique: true
-  end
-
   create_table "storage_locations", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "address"
@@ -855,6 +879,7 @@
     t.float "longitude"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.boolean "active", default: true
     t.index ["latitude", "longitude"], name: "index_vendors_on_latitude_and_longitude"
   end
 
@@ -869,7 +894,7 @@
     t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
 
-  add_foreign_key "account_requests", "ndbn_members", primary_key: "ndbn_member_id", validate: false
+  add_foreign_key "account_requests", "ndbn_members", primary_key: "ndbn_member_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "adjustments", "organizations"
   add_foreign_key "adjustments", "storage_locations"
@@ -903,7 +928,7 @@
   add_foreign_key "partner_requests", "users", column: "partner_user_id"
   add_foreign_key "partner_served_areas", "counties"
   add_foreign_key "partner_served_areas", "partner_profiles"
-  add_foreign_key "partners", "storage_locations", column: "default_storage_location_id", validate: false
+  add_foreign_key "partners", "storage_locations", column: "default_storage_location_id"
   add_foreign_key "product_drives", "organizations"
   add_foreign_key "requests", "distributions"
   add_foreign_key "requests", "organizations"

spec/models/vendor_spec.rb

@@ -3,6 +3,7 @@
 # Table name: vendors
 #
 #  id              :bigint           not null, primary key
+#  active          :boolean          default(TRUE)
 #  address         :string
 #  business_name   :string
 #  comment         :string
@@ -37,6 +38,22 @@
         expect(subject.first.volume).to eq(10)
       end
     end
+
+    describe "deactivate!" do
+      it "deactivates the vendor" do
+        vendor = create(:vendor)
+        vendor.deactivate!
+        expect(vendor.active).to be(false)
+      end
+    end
+
+    describe "reactivate!" do
+      it "reactivates the vendor" do
+        vendor = create(:vendor, active: false)
+        vendor.reactivate!
+        expect(vendor.active).to be(true)
+      end
+    end
   end
 
   describe "versioning" do

spec/system/purchase_system_spec.rb

@@ -181,6 +181,12 @@
           expect(Purchase.last.line_items.first.quantity).to eq(16)
         end
 
+        it 'does not show inactive vendors in the vendor dropdown' do
+          deactivated_vendor = create(:vendor, business_name: 'Deactivated Vendor', organization: organization, active: false)
+          visit new_purchase_path
+          expect(page).to have_no_select('purchase_vendor_id', with_options: [deactivated_vendor.business_name])
+        end
+
         context 'when creating a purchase incorrectly' do
           # Bug fix -- Issue #71
           # When a user creates a purchase without it passing validation, the items