Merge branch 'main' into 5000-remove-mycoworkers-from-org-user-dropdown

nolanborz · web-flow · commit 50119630cab7 · 2025-03-27T11:05:57.000+09:00
diff --git a/app/controllers/donations_controller.rb b/app/controllers/donations_controller.rb
@@ -33,6 +33,7 @@ def index
     @donations_quantity = @donations.collect(&:total_quantity).sum
     @paginated_donations_quantity = @paginated_donations.collect(&:total_quantity).sum
     @total_value_all_donations = total_value(@donations)
+    @paginated_in_kind_value = total_value(@paginated_donations)
     @total_money_raised = total_money_raised(@donations)
     @storage_locations = @donations.filter_map { |donation| donation.storage_location if !donation.storage_location.discarded_at }.compact.uniq.sort
     @selected_storage_location = filter_params[:at_storage_location]
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
@@ -94,7 +94,7 @@ def organization_params
     params.require(:organization).permit(
       :name, :short_name, :street, :city, :state,
       :zipcode, :email, :url, :logo, :intake_location,
-      :default_storage_location, :default_email_text,
+      :default_storage_location, :default_email_text, :reminder_email_text,
       :invitation_text, :reminder_day, :deadline_day,
       :repackage_essentials, :distribute_monthly,
       :ndbn_member_id, :enable_child_based_requests,
diff --git a/app/controllers/vendors_controller.rb b/app/controllers/vendors_controller.rb
@@ -88,6 +88,18 @@ def reactivate
     redirect_to vendors_path, notice: "#{vendor.business_name} has been reactivated."
   end
 
+  def destroy
+    vendor = current_organization.vendors.find(params[:id])
+    vendor.destroy
+    if vendor.errors.any?
+      errors = vendor.errors.full_messages.join("\n")
+      redirect_to vendors_path, error: "#{vendor.business_name} could not be removed. \n#{errors}"
+      return
+    end
+
+    redirect_to vendors_path, notice: "#{vendor.business_name} has been removed."
+  end
+
   private
 
   def vendor_params
diff --git a/app/mailers/reminder_deadline_mailer.rb b/app/mailers/reminder_deadline_mailer.rb
@@ -4,6 +4,10 @@ def notify_deadline(partner)
     @partner = partner
     @organization = partner.organization
     @deadline = deadline_date(partner)
+    reminder_email_text = @organization.reminder_email_text
+    @reminder_email_text_interpolated = TextInterpolatorService.new(reminder_email_text.body.to_s, {
+      partner_name: @partner.name
+    }).call
 
     mail(to: @partner.email, subject: "#{@organization.name} Deadline Reminder")
   end
diff --git a/app/models/organization.rb b/app/models/organization.rb
@@ -115,6 +115,7 @@ def flipper_id
   ].freeze
 
   has_rich_text :default_email_text
+  has_rich_text :reminder_email_text
 
   has_one_attached :logo
 
diff --git a/app/models/vendor.rb b/app/models/vendor.rb
@@ -35,6 +35,8 @@ class Vendor < ApplicationRecord
       .group(:id)
   }
 
+  before_destroy :check_for_purchases, prepend: true
+
   def volume
     LineItem.where(
       itemizable_type: "Purchase",
@@ -49,4 +51,13 @@ def deactivate!
   def reactivate!
     update!(active: true)
   end
+
+  private
+
+  def check_for_purchases
+    return if purchases.empty?
+
+    errors.add(:base, "Vendor has purchase items")
+    throw(:abort)
+  end
 end
diff --git a/app/views/distribution_mailer/partner_mailer.text.erb b/app/views/distribution_mailer/partner_mailer.text.erb
diff --git a/app/views/donations/index.html.erb b/app/views/donations/index.html.erb
@@ -111,7 +111,7 @@
                   <th>Money Raised</th>
                   <th>In Kind Value</th>
                   <th>Comments</th>
-                  <th>Actions</th>
+                  <th class="text-right">Actions</th>
                 </tr>
               </thead>
               <tbody>
@@ -125,14 +125,25 @@
                 <td></td>
                 <td class="text-left numeric">
                   <strong id="donation_quantity">
-                    <%= @donations_quantity %> (Total)
+                    <%= @donations_quantity %>
+                    <br>
+                    (Total)
                   </strong>
                   <br>
-                  <%= @paginated_donations_quantity %> (This page)
+                  <%= @paginated_donations_quantity %>
+                  <br>
+                  (This page)
                 </td>
                 <td class="text-left numeric"><strong><%= dollar_value(@total_money_raised) %></strong></td>
-                <td class="text-left numeric"><strong><%= dollar_value(@total_value_all_donations) %></strong></td>
-                <td></td>
+                <td class="text-left numeric in-kind">
+                  <strong>
+                    <%= dollar_value(@total_value_all_donations) %> (Total)
+                  </strong>
+                  <br>
+                  <%= dollar_value(@paginated_in_kind_value) %>
+                  <br>
+                   (This page)
+                </td>
               </tr>
               </tfoot>
             </table>
diff --git a/app/views/organizations/_details.html.erb b/app/views/organizations/_details.html.erb
@@ -76,6 +76,12 @@
                   <%= @organization.deadline_day.blank? ? 'Not defined' : "The #{@organization.deadline_day.ordinalize} of each month" %>
                 </p>
               </div>
+              <div class="mb-4">
+                <h3 class='font-bold'>Additional text for reminder email</h3>
+                <p>
+                  <%= @organization.reminder_email_text.presence || 'Not defined' %>
+                </p>
+              </div>
               <div class="mb-4">
                 <h3 class='font-bold'>Default Intake Location</h3>
                 <p>
diff --git a/app/views/organizations/edit.html.erb b/app/views/organizations/edit.html.erb
@@ -87,6 +87,11 @@
 
                 <%= render 'shared/deadline_day_fields', f: f %>
 
+                <% default_reminder_email_text_hint = "You can use the variable <code>%{partner_name}</code> to include the partner's name in the message." %>
+                <%= f.input :reminder_email_text, label: "Additional text for reminder email", hint: default_reminder_email_text_hint.html_safe do %>
+                  <%= f.rich_text_area :reminder_email_text, placeholder: 'Enter reminder email content...' %>
+                <% end %>
+
                 <%= f.input :intake_location, :collection => current_organization.storage_locations.active.alphabetized, :label_method => :name, :value_method => :id, :label => "Default Intake Location", :include_blank => true, wrapper: :input_group %>
 
                 <%= f.label :partner_form_fields, 'Partner Profile Sections' %>
diff --git a/app/views/reminder_deadline_mailer/notify_deadline.html.erb b/app/views/reminder_deadline_mailer/notify_deadline.html.erb
@@ -6,3 +6,4 @@ if you would like to receive a distribution next month.</p>
 before this date and submit your request if you are intending to submit an essentials request.</p>
     <p>Please contact <%= @organization.name %> at <%= @organization.email %>
 if you have any questions about this!</p>
+    <p><%= @reminder_email_text_interpolated.html_safe %></p>
diff --git a/app/views/reminder_deadline_mailer/notify_deadline.text.erb b/app/views/reminder_deadline_mailer/notify_deadline.text.erb
diff --git a/app/views/vendors/_vendor_row.html.erb b/app/views/vendors/_vendor_row.html.erb
@@ -8,9 +8,15 @@
     <%= 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) %>
+      <% if vendor_row&.purchases&.none? %>
+        <%= delete_button_to vendor_path(vendor_row),
+                          text: 'Delete',
+                          confirm: confirm_delete_msg(vendor_row.business_name) %>
+      <% else %>
+        <%= deactivate_button_to deactivate_vendor_path(vendor_row),
+                              text: 'Deactivate',
+                              confirm: confirm_deactivate_msg(vendor_row.business_name) %>
+      <% end %>
     <% else %>
       <%= reactivate_button_to reactivate_vendor_path(vendor_row),
                              text: 'Reactivate',
diff --git a/config/routes.rb b/config/routes.rb
@@ -172,7 +172,7 @@ def set_up_flipper
     end
   end
 
-  resources :vendors, except: [:destroy] do
+  resources :vendors do
     collection do
       post :import_csv
     end
diff --git a/docs/user_guide/bank/getting_started_customization.md b/docs/user_guide/bank/getting_started_customization.md
@@ -54,18 +54,23 @@ There is also a check-box on the Partner that must be checked for the Partner to
 
 The text of this email will be:  
 
+<blockquote>
 Hello [Partner's name],
-
+<br/>
+<br/>
 This is a friendly reminder that [Your bank's name] requires your human essentials requests to be submitted by [the deadline date, including month and year]
 if you would like to receive a Distribution next month.
-
+<br/>
+<br/>
 Please log into Human Essentials at https://humanessentials.app before this date and submit your request if you are intending to submit an essentials request.
-
-Please contact [Your bank's name] at <%= @organization.email %>
+<br/>
+<br/>
+Please contact [Your bank's name] at [Your bank's email]
 if you have any questions about this!
-
-
-
+<br/>
+<br/>
+[Additional text for reminder email (see below)]
+</blockquote>
 
 
 
@@ -76,6 +81,9 @@ If you do not pick a day, no reminder emails are sent.
 #### Deadline day (Final day of the month to submit Requests)
 This day will be included in the reminder email message,
 
+#### Additional text for reminder email
+If present, this text will be included in the reminder email after the default text. In the above email template, this additional message will replace `[Additional text for reminder email (see below)]`.
+
 ----------
 
 #### Default Intake Location
diff --git a/spec/mailers/reminder_deadline_mailer_spec.rb b/spec/mailers/reminder_deadline_mailer_spec.rb
@@ -6,6 +6,7 @@
     let(:partner) { create(:partner, organization: organization) }
 
     before(:each) do
+      organization.reminder_email_text = "Custom reminder message"
       organization.update!(reminder_day: today.day, deadline_day: 1)
     end
 
@@ -25,13 +26,14 @@
 
     it 'renders the body' do
       travel_to today do
-        expect(html_body(subject))
-          .to include("This is a friendly reminder that #{organization.name} requires your human essentials requests to " \
-                       "be submitted by Tue, 01 Feb 2022")
-        expect(text_body(subject))
+        expect(subject.body.encoded)
           .to include("This is a friendly reminder that #{organization.name} requires your human essentials requests to " \
                        "be submitted by Tue, 01 Feb 2022")
       end
     end
+
+    it 'renders the body with the reminder email text' do
+      expect(subject.body.encoded).to include("Custom reminder message")
+    end
   end
 end
diff --git a/spec/requests/vendors_requests_spec.rb b/spec/requests/vendors_requests_spec.rb
@@ -16,21 +16,32 @@
       before { create(:vendor) }
 
       context "html" do
-        let!(:first_vendor) { create(:vendor, business_name: "Abc", organization: organization) }
+        let!(:no_purchases_vendor) { create(:vendor, business_name: "Abc", organization: organization) }
+        let(:purchase_vendor) { create(:vendor, business_name: "Xyz", organization: organization) }
         let!(:deactivated_vendor) { create(:vendor, business_name: "Deactivated", organization: organization, active: false) }
 
         let(:response_format) { 'html' }
 
         it { is_expected.to be_successful }
 
+        before do
+          create(:purchase, :with_items, vendor: purchase_vendor)
+        end
+
         it "should have only activated vendor names" do
           subject
-          expect(response.body).to include(first_vendor.business_name)
+          expect(response.body).to include(no_purchases_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)
+        it "should have a delete button for no_purchases_vendor and a deactivate button for purchase_vendor" do
+          subject
+          parsed_body = Nokogiri::HTML(response.body)
+          no_purchases_vendor_row = parsed_body.css("tr").find { |row| row.text.include?(no_purchases_vendor.business_name) }
+          purchase_vendor_row = parsed_body.css("tr").find { |row| row.text.include?(purchase_vendor.business_name) }
+
+          expect(no_purchases_vendor_row.at_css("a", text: "Delete")).to be_present
+          expect(purchase_vendor_row.at_css("a", text: "Deactivate")).to be_present
         end
       end
 
@@ -115,10 +126,28 @@
     end
 
     describe "DELETE #destroy" do
-      subject { delete vendor_path(id: create(:vendor)) }
-      it "does not have a route for this" do
-        subject
-        expect(response.code).to eq('404')
+      let!(:vendor) { create(:vendor, organization: organization) }
+
+      subject { delete vendor_path(id: vendor.id) }
+
+      context 'when vendor does not have purchase items' do
+        it 'shoud delete the vendor' do
+          expect { subject }.to change(Vendor, :count)
+          expect(response).to redirect_to(vendors_path)
+          follow_redirect!
+          expect(response.body).to include("#{vendor.business_name} has been removed.")
+        end
+      end
+
+      context 'when vendor has purchase items' do
+        before do
+          create(:purchase, :with_items, vendor: vendor)
+        end
+
+        it 'shoud not delete the vendor' do
+          expect { subject }.not_to change(Vendor, :count)
+          expect(response).to have_error(/ could not be removed/)
+        end
       end
     end
 
diff --git a/spec/system/donation_system_spec.rb b/spec/system/donation_system_spec.rb
diff --git a/spec/system/vendor_system_spec.rb b/spec/system/vendor_system_spec.rb
