diff --git a/config/routes.rb b/config/routes.rb
index 9e9ee17700..b6f5eed019 100644
--- a/config/routes.rb
+++ b/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
diff --git a/db/migrate/20250129154820_add_active_to_vendors.rb b/db/migrate/20250129154820_add_active_to_vendors.rb
new file mode 100644
index 0000000000..715d8ea460
--- /dev/null
+++ b/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
diff --git a/db/migrate/20250201151720_set_existing_vendors_active.rb b/db/migrate/20250201151720_set_existing_vendors_active.rb
new file mode 100644
index 0000000000..53380319cb
--- /dev/null
+++ b/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
diff --git a/db/schema.rb b/db/schema.rb
index a2106ab259..a1bcbe308f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,8 +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"
@@ -856,6 +855,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
diff --git a/spec/models/vendor_spec.rb b/spec/models/vendor_spec.rb
index 7eef7f7abf..1512193214 100644
--- a/spec/models/vendor_spec.rb
+++ b/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
diff --git a/spec/requests/purchases_requests_spec.rb b/spec/requests/purchases_requests_spec.rb
index 0988a79647..bd68d5ce18 100644
--- a/spec/requests/purchases_requests_spec.rb
+++ b/spec/requests/purchases_requests_spec.rb
@@ -122,6 +122,11 @@
it "should include the storage location name" do
expect(subject.body).to include("Pawane Location")
end
+
+ it 'does not show inactive vendors in the vendor dropdown' do
+ deactivated_vendor = create(:vendor, business_name: 'Deactivated Vendor', organization: organization, active: false)
+ expect(subject.body).not_to include(deactivated_vendor.business_name)
+ end
end
describe "POST#create" do
diff --git a/spec/requests/vendors_requests_spec.rb b/spec/requests/vendors_requests_spec.rb
index 7625ee7766..aa26b549d2 100644
--- a/spec/requests/vendors_requests_spec.rb
+++ b/spec/requests/vendors_requests_spec.rb
@@ -16,9 +16,22 @@
before { create(:vendor) }
context "html" do
+ let!(:first_vendor) { create(:vendor, business_name: "Abc", organization: organization) }
+ let!(:deactivated_vendor) { create(:vendor, business_name: "Deactivated", organization: organization, active: false) }
+
let(:response_format) { 'html' }
it { is_expected.to be_successful }
+
+ it "should have only activated vendor names" do
+ subject
+ expect(response.body).to include(first_vendor.business_name)
+ expect(response.body).not_to include(deactivated_vendor.business_name)
+ end
+
+ it "should have a deactivate button for each active vendor" do
+ expect(subject.body.scan("Deactivate").count).to eq(2)
+ end
end
context "csv" do
diff --git a/spec/system/vendor_system_spec.rb b/spec/system/vendor_system_spec.rb
index 7e35802fbc..1112b2983f 100644
--- a/spec/system/vendor_system_spec.rb
+++ b/spec/system/vendor_system_spec.rb
@@ -13,11 +13,41 @@
@third = create(:vendor, business_name: "Cde")
visit vendors_path
end
+
it "should have the vendor names in alphabetical order" do
expect(page).to have_xpath("//table//tr", count: 4)
expect(page.find(:xpath, "//table/tbody/tr[1]/td[1]")).to have_content(@first.business_name)
expect(page.find(:xpath, "//table/tbody/tr[3]/td[1]")).to have_content(@third.business_name)
end
+
+ it "should deactivate a vendor when the deactivate button is clicked" do
+ expect { click_link "Deactivate", match: :first }.to change { @first.reload.active }.to(false)
+ end
+
+ it "should reactivate a vendor when the reactivate button is clicked" do
+ expect { click_link "Deactivate", match: :first }.to change { @first.reload.active }.to(false)
+
+ check "include_inactive_vendors"
+ click_button "Filter"
+
+ expect { click_link "Reactivate", match: :first }.to change { @first.reload.active }.to(true)
+ end
+
+ context "When using the include_inactive_vendors filter" do
+ before(:each) do
+ @active_vendor = create(:vendor, business_name: "Active Vendor", active: true)
+ @inactive_vendor = create(:vendor, business_name: "Inactive Vendor", active: false)
+ visit vendors_path
+ end
+
+ it "shows inactive vendors when the filter is applied" do
+ check "include_inactive_vendors"
+ click_button "Filter"
+
+ expect(page).to have_content(@active_vendor.business_name)
+ expect(page).to have_content(@inactive_vendor.business_name)
+ end
+ end
end
context "when creating a new vendor" do