Merge branch 'main' into 5372AlignmentNudges

Author: Tyler-Fanuele

app/controllers/purchases_controller.rb

@@ -65,7 +65,7 @@ def edit
     @purchase.line_items.build
     @audit_performed_and_finalized = Audit.finalized_since?(@purchase, @purchase.storage_location_id)
 
-    load_form_collections
+    load_form_collections(@purchase)
   end
 
   def show
@@ -78,9 +78,11 @@ def update
     ItemizableUpdateService.call(itemizable: @purchase,
       params: purchase_params,
       event_class: PurchaseEvent)
+
+    flash[:success] = "Purchase updated successfully"
     redirect_to purchases_path
   rescue => e
-    load_form_collections
+    load_form_collections(@purchase)
     flash.now[:alert] = "Error updating purchase: #{e.message}"
     render "edit"
   end
@@ -100,10 +102,13 @@ def destroy
 
   private
 
-  def load_form_collections
+  def load_form_collections(purchase = nil)
     @storage_locations = current_organization.storage_locations.active.alphabetized
     @items = current_organization.items.active.alphabetized
-    @vendors = current_organization.vendors.active.alphabetized
+
+    @vendors = current_organization.vendors.active
+    @vendors = @vendors.or(Vendor.where(id: purchase.vendor_id)) if purchase
+    @vendors = @vendors.alphabetized
   end
 
   def purchase_params

app/views/items/_form.html.erb

@@ -44,7 +44,7 @@
                 <%= f.input_field :package_size, class: "form-control", min: 0 %>
               <% end %>
 
-              <% if Flipper.enabled?(:enable_packs) %>
+              <% if Flipper.enabled?(:enable_packs) && current_organization.request_units.present? %>
                 <%= f.input :request_units, label: "Additional Custom Request Units" do %>
                   <%= f.association :request_units, as: :check_boxes, collection: current_organization.request_units, checked: selected_item_request_units(@item), label_method: :name, value_method: :id, class: "form-check-input" %>
                 <% end %>

db/seeds.rb

@@ -42,6 +42,7 @@ def random_record_for_org(org, klass)
   organization.state = "IN"
   organization.zipcode = "12345"
   organization.email = "[email protected]"
+  organization.bank_is_set_up = true
 end
 Organization.seed_items(pdx_org)
 
@@ -51,6 +52,7 @@ def random_record_for_org(org, klass)
   organization.state = "CA"
   organization.zipcode = "90210"
   organization.email = "[email protected]"
+  organization.bank_is_set_up = false  #sf_org represents a brand new bank
 end
 Organization.seed_items(sf_org)
 
@@ -60,6 +62,7 @@ def random_record_for_org(org, klass)
   organization.state = Faker::Address.state_abbr
   organization.zipcode = Faker::Address.zip_code
   organization.email = "[email protected]"
+  organization.bank_is_set_up = true
 end
 Organization.seed_items(sc_org)
 

spec/requests/items_requests_spec.rb

@@ -111,6 +111,16 @@
         end
       end
 
+      context "when the organization has no request_units" do
+        let(:item) { create(:item, organization: organization) }
+        before { organization.request_units.destroy_all }
+
+        it "does not show the Additional Custom Request Units section" do
+          get edit_item_path(item)
+          expect(response.body).to_not match "Additional Custom Request Units"
+        end
+      end
+
       context "when item is housing a kit" do
         let(:kit) { create(:kit, organization:) }
         let(:item) { create(:item, organization: organization, kit:) }

spec/system/purchase_system_spec.rb

@@ -218,16 +218,66 @@
       # Bug fix -- Issue #378
       # A user can view another organizations purchase
       context "Editing purchase" do
-        it "A user can see purchased_from value" do
-          purchase = create(:purchase, purchased_from: "Old Vendor", organization: organization)
-          visit edit_purchase_path(purchase)
-          expect(page).to have_content("Vendor (Old Vendor)")
+        context "with an eligible purchase" do
+          let(:purchase) { create(:purchase, purchased_from: "Old Vendor", organization: organization) }
+
+          it "can view the edit page and vendor is present" do
+            visit edit_purchase_path(purchase)
+
+            expect(page).to have_content("Vendor (Old Vendor)")
+          end
+
+          it "can save the purchase" do
+            visit edit_purchase_path(purchase)
+            click_button "Save"
+
+            expect(page).to have_content("Purchase updated successfully")
+            expect(page.current_path).to eq(purchases_path)
+          end
+
+          context "with an error saving the purchase" do
+            it "can save the purchase from the update page " do
+              visit edit_purchase_path(purchase)
+
+              fill_in "purchase[amount_spent]", with: nil
+
+              click_button "Save"
+
+              expect(page).to have_content("Error updating purchase")
+              expect(page.current_path).to eq(purchase_path(purchase))
+
+              fill_in "purchase[amount_spent]", with: "10"
+
+              click_button "Save"
+
+              expect(page).to have_content("Purchase updated successfully")
+              expect(page.current_path).to eq(purchases_path)
+            end
+          end
+
+          context "with a deactivated vendor" do
+            let(:deactivated_vendor) { create(:vendor, active: false) }
+            let(:purchase) { create(:purchase, vendor: deactivated_vendor) }
+
+            it "can save the purchase" do
+              visit edit_purchase_path(purchase)
+              click_button "Save"
+
+              expect(page).to have_content("Purchase updated successfully")
+              expect(page.current_path).to eq(purchases_path)
+            end
+          end
         end
 
-        it "A user can view another organizations purchase" do
-          purchase = create(:purchase, organization: create(:organization))
-          visit edit_purchase_path(purchase)
-          expect(page).to have_content("Still haven't found what you're looking for")
+        context "with another organization's purchase" do
+          let(:another_organization) { create(:organization) }
+          let(:purchase) { create(:purchase, organization: another_organization) }
+
+          it "cannot view the edit page" do
+            visit edit_purchase_path(purchase)
+
+            expect(page).to have_content("Still haven't found what you're looking for")
+          end
         end
       end