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

zanetagebka · web-flow · commit 82d878751288 · 2025-06-16T12:56:20.000+02:00
diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb
@@ -1,20 +1,5 @@
 # [Super Admin] This is for administrating organizations at a global level. We can create, view, modify, etc.
 class Admin::OrganizationsController < AdminController
-  def edit
-    @organization = Organization.find(params[:id])
-  end
-
-  def update
-    @organization = Organization.find(params[:id])
-
-    if OrganizationUpdateService.update(@organization, organization_params)
-      redirect_to admin_organizations_path, notice: "Updated organization!"
-    else
-      flash.now[:error] = @organization.errors.full_messages.join("\n")
-      render :edit
-    end
-  end
-
   def index
     @filterrific = initialize_filterrific(
       Organization.alphabetized,
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -95,6 +95,10 @@ def display_name
     name.presence || "Name Not Provided"
   end
 
+  def preferred_name
+    name.presence || email
+  end
+
   def formatted_email
     email.present? ? "#{name} <#{email}>" : ""
   end
diff --git a/app/views/adjustments/index.html.erb b/app/views/adjustments/index.html.erb
@@ -37,7 +37,7 @@
 
                 </div>
                 <div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12">
-                   <%= filter_select(scope: :by_user, collection: @users, key: :id, value: :name, selected: @selected_user) %>
+                  <%= filter_select(scope: :by_user, collection: @users, key: :id, value: :preferred_name, selected: @selected_user) %>
                 </div>
                 <div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12">
                   <%= label_tag "Date Range" %>
diff --git a/app/views/admin/organizations/_list.html.erb b/app/views/admin/organizations/_list.html.erb
@@ -19,7 +19,6 @@
         <td class="date"><%= organization.display_last_distribution_date %></td>
           <td class="text-right">
             <%= view_button_to admin_organization_path(organization.id) %>
-            <%= edit_button_to edit_admin_organization_path(organization.id) %>
             <%= delete_button_to(admin_organization_path(organization.id), { confirm: confirm_delete_msg(organization.name) }) unless (Organization.count <= 1) %>
           </td>
         </tr>
diff --git a/app/views/admin/organizations/edit.html.erb b/app/views/admin/organizations/edit.html.erb
diff --git a/app/views/distribution_mailer/partner_mailer.html.erb b/app/views/distribution_mailer/partner_mailer.html.erb
@@ -217,19 +217,6 @@
       margin-bottom: 0;
     }
 
-    .preheader {
-      color: transparent;
-      display: none;
-      height: 0;
-      max-height: 0;
-      max-width: 0;
-      opacity: 0;
-      overflow: hidden;
-      mso-hide: all;
-      visibility: hidden;
-      width: 0;
-    }
-
     .powered-by a {
       text-decoration: none;
     }
@@ -328,7 +315,6 @@
         <div class="content">
 
           <!-- START CENTERED WHITE CONTAINER -->
-        <span class="preheader">You have a new distribution from <%= @partner.organization.name %>. Please refer to the attachment for details.</span>
           <table role="presentation" class="main">
 
             <!-- START MAIN CONTENT AREA -->
@@ -339,10 +325,15 @@
                     <td>
                     From: <a href="mailto:<%= @from_email %>"><%= @from_email %></a>
                     </td>
-                </tr>
+                  </tr>
                   <tr>
                     <td>
-                    <%= @default_email_text_interpolated.html_safe %>
+                      <% if @default_email_text.present? %>
+                        <%= @default_email_text_interpolated.html_safe %>
+                      <% elsif @distribution_changes.blank? %>
+                        You have a new distribution from <%= @partner.organization.name %>.
+                        Please refer to the attachment for details.
+                      <% end %>
                     </td>
                   </tr>
                 <% if @distribution_changes.present? %>
diff --git a/app/views/reports/_distribution.html.erb b/app/views/reports/_distribution.html.erb
@@ -6,5 +6,5 @@
   <% end %>
 </div>
 <div class="pull-right">
-  <%= distance_of_time_in_words_to_now distribution.created_at %> ago
+  <%= distance_of_time_in_words_to_now distribution.issued_at %> ago
 </div>
diff --git a/app/views/reports/_donation.html.erb b/app/views/reports/_donation.html.erb
@@ -5,5 +5,5 @@
   <% end %>
 </div>
 <div class="pull-right">
-  <%= distance_of_time_in_words_to_now donation.created_at %> ago
+  <%= distance_of_time_in_words_to_now donation.issued_at %> ago
 </div>
diff --git a/app/views/reports/_purchase.html.erb b/app/views/reports/_purchase.html.erb
@@ -5,5 +5,5 @@
   <% end %>
 </div>
 <div class="pull-right">
-  <%= distance_of_time_in_words_to_now purchase.created_at %> ago
+  <%= distance_of_time_in_words_to_now purchase.issued_at %> ago
 </div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -60,7 +60,7 @@ def set_up_flipper
   namespace :admin do
     get :dashboard
     resources :base_items
-    resources :organizations
+    resources :organizations, except: %i[edit update]
     resources :partners, except: %i[new create]
     resources :users do
       delete :remove_role
diff --git a/spec/mailers/distribution_mailer_spec.rb b/spec/mailers/distribution_mailer_spec.rb
@@ -100,6 +100,41 @@
         expect(mail.body.encoded).to match(distribution_changes[:updates][0][:name])
       end
     end
+
+    context "when organization does not have custom default_email_text" do
+      before do
+        # When default_email_text is cleared through UI, it still contains whitespace/empty divs/HTML comments
+        organization.default_email_text = "<!-- comment --><div class='empty'>\n  </div>"
+        organization.save
+      end
+
+      context "without distribution changes" do
+        it "renders non-custom text" do
+          expect(mail.body.encoded).to match("You have a new distribution from #{organization.name}.")
+        end
+      end
+
+      context "with distribution changes" do
+        let(:distribution_changes) do
+          {
+            removed: [
+              { name: "Adult Diapers" }
+            ],
+            updates: [
+              {
+                name: "Kid Diapers",
+                new_quantity: 4,
+                old_quantity: 100
+              }
+            ]
+          }
+        end
+
+        it "does not render non-custom text" do
+          expect(mail.body.encoded).to_not match("You have a new distribution from #{organization.name}.")
+        end
+      end
+    end
   end
 
   describe "#reminder_email" do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -64,6 +64,35 @@
     end
   end
 
+  describe '#preferred_name' do
+    let(:user) { create(:user, name: name, email: email) }
+    let(:email) { 'john.smith@example.com' }
+
+    context 'when name is present' do
+      let(:name) { 'John Smith' }
+
+      it 'returns the name' do
+        expect(user.preferred_name).to eq('John Smith')
+      end
+    end
+
+    context 'when name is nil' do
+      let(:name) { nil }
+
+      it 'returns the email' do
+        expect(user.preferred_name).to eq('john.smith@example.com')
+      end
+    end
+
+    context 'when name is an empty string' do
+      let(:name) { '' }
+
+      it 'returns the email' do
+        expect(user.preferred_name).to eq('john.smith@example.com')
+      end
+    end
+  end
+
   describe "Scopes >" do
     describe "->alphabetized" do
       let!(:z_name_user) { create(:user, name: 'Zachary') }
diff --git a/spec/requests/adjustments_requests_spec.rb b/spec/requests/adjustments_requests_spec.rb
@@ -68,6 +68,19 @@
             end
           end
         end
+
+        context 'dropdown for user filter' do
+          let!(:another_user) { create(:user, organization: organization, name: "Alice Smith", email: "alice@example.com") }
+          let!(:user_without_name) { create(:user, organization: organization, name: nil, email: "bob@example.com") }
+
+          before { get adjustments_path } # Make the request once for this context
+
+          it "displays the preferred name of users in the dropdown" do
+            expect(response.body).to include("<option value=\"#{another_user.id}\">#{another_user.preferred_name}</option>")
+            expect(response.body).to include("<option value=\"#{user_without_name.id}\">#{user_without_name.preferred_name}</option>")
+            expect(response.body).to include("<option value=\"#{user.id}\">#{user.preferred_name}</option>")
+          end
+        end
       end
 
       context "csv" do
diff --git a/spec/requests/admin/organizations_requests_spec.rb b/spec/requests/admin/organizations_requests_spec.rb
diff --git a/spec/requests/reports/distributions_summary_requests_spec.rb b/spec/requests/reports/distributions_summary_requests_spec.rb
diff --git a/spec/requests/reports/donations_summary_spec.rb b/spec/requests/reports/donations_summary_spec.rb
diff --git a/spec/requests/reports/purchases_summary_requests_spec.rb b/spec/requests/reports/purchases_summary_requests_spec.rb
