Merge branch 'rubyforgood:main' into 4948-fix-sort-issues-1

Author: kellis5137

app/assets/stylesheets/resources/partners.scss

@@ -49,6 +49,10 @@ div#partner-notes {
   padding: 0px 20px;
 }
 
+div#info-for-partner {
+  padding: 0px 20px;
+}
+
 div#approve-application-button {
   position: fixed;
 

app/controllers/admin/organizations_controller.rb

@@ -71,7 +71,7 @@ def destroy
 
   def organization_params
     params.require(:organization)
-          .permit(:name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location, :default_email_text, :account_request_id, :reminder_day, :deadline_day,
+          .permit(:name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location, :default_email_text, :account_request_id, :reminder_day, :deadline_day, :bank_is_set_up,
                   users_attributes: %i(name email organization_admin), account_request_attributes: %i(ndbn_member_id id))
   end
 

app/controllers/audits_controller.rb

@@ -21,9 +21,6 @@ def edit
   end
 
   def finalize
-    @audit.adjustment = Adjustment.new(organization_id: @audit.organization_id, storage_location_id: @audit.storage_location_id, user_id: current_user.id, comment: 'Created Automatically through the Auditing Process')
-    @audit.save
-
     AuditEvent.publish(@audit)
     @audit.finalized!
     redirect_to audit_path(@audit), notice: "Audit is Finalized."

app/controllers/dashboard_controller.rb

@@ -3,7 +3,7 @@ class DashboardController < ApplicationController
   respond_to :html, :js
 
   def index
-    @org_stats = OrganizationStats.new(current_organization, inventory)
+    @org_is_set_up = current_organization.bank_is_set_up
     @partners_awaiting_review = current_organization.partners.awaiting_review
     @outstanding_requests = current_organization
       .ordered_requests

app/controllers/donations_controller.rb

@@ -127,11 +127,12 @@ def destroy
 
   def load_form_collections
     @storage_locations = current_organization.storage_locations.active.alphabetized
-    @donation_sites = current_organization.donation_sites.active.alphabetized
     @product_drives = current_organization.product_drives.alphabetized
     @product_drive_participants = current_organization.product_drive_participants.alphabetized
     @manufacturers = current_organization.manufacturers.alphabetized
     @items = current_organization.items.active.alphabetized
+    # Return all active donation sites, or the donation site that was selected for the donation if it's inactive
+    @donation_sites = current_organization.donation_sites.active.or(DonationSite.where(id: @donation.donation_site_id)).alphabetized
   end
 
   def clean_donation_money_raised

app/controllers/organizations_controller.rb

@@ -19,7 +19,7 @@ def update
     @organization = current_organization
 
     if OrganizationUpdateService.update(@organization, organization_params)
-      redirect_to organization_path, notice: "Updated your organization!"
+      redirect_back(fallback_location: organization_path, notice: "Updated your organization!")
     else
       flash.now[:error] = @organization.errors.full_messages.join("\n")
       render :edit
@@ -102,6 +102,7 @@ def organization_params
       :ytd_on_distribution_printout, :one_step_partner_invite,
       :hide_value_columns_on_receipt, :hide_package_column_on_receipt,
       :signature_for_distribution_pdf, :receive_email_on_requests,
+      :bank_is_set_up,
       :include_in_kind_values_in_exported_files,
       partner_form_fields: [],
       request_unit_names: []

app/controllers/partners_controller.rb

@@ -182,7 +182,7 @@ def validate_user_role
 
   def partner_params
     params.require(:partner).permit(:name, :email, :send_reminders, :quota,
-      :notes, :partner_group_id, :default_storage_location_id, documents: [])
+      :notes, :partner_group_id, :default_storage_location_id, :info_for_partner, documents: [])
   end
 
   helper_method \

app/controllers/product_drives_controller.rb

@@ -88,10 +88,18 @@ def update
   end
 
   def destroy
-    current_organization.product_drives.find(params[:id]).destroy
+    product_drive = current_organization.product_drives.find(params[:id])
+    success = product_drive.destroy
+
     respond_to do |format|
-      format.html { redirect_to product_drives_url, notice: 'Product drive was successfully destroyed.' }
-      format.json { head :no_content }
+      if success
+        format.html { redirect_to product_drives_url, notice: 'Product drive was successfully destroyed.' }
+        format.json { head :no_content }
+      else
+        error_message = product_drive.errors.full_messages.to_sentence
+        format.html { redirect_to product_drive_path(product_drive), error: error_message }
+        format.json { render json: {error: error_message}, status: :unprocessable_entity }
+      end
     end
   end
 

app/controllers/reports_controller.rb

@@ -39,6 +39,11 @@ def activity_graph
     @distribution_data = received_distributed_data(helpers.selected_range)
   end
 
+  def itemized_requests
+    requests = current_organization.requests.during(helpers.selected_range)
+    @itemized_request_data = RequestItemizedBreakdownService.call(organization: current_organization, request_ids: requests.pluck(:id))
+  end
+
   private
 
   def total_purchased_unformatted(range = selected_range)

app/controllers/transfers_controller.rb

@@ -21,6 +21,7 @@ def index
 
   def create
     @transfer = current_organization.transfers.new(transfer_params)
+    @transfer.line_items.combine!
 
     TransferCreateService.call(@transfer)
     redirect_to transfers_path, notice: "#{@transfer.line_items.total} items have been transferred from #{@transfer.from.name} to #{@transfer.to.name}!"
@@ -57,6 +58,18 @@ def destroy
     redirect_to transfers_path
   end
 
+  def validate
+    @transfer = current_organization.transfers.new(transfer_params)
+    @transfer.line_items.combine!
+
+    if @transfer.valid?
+      body = render_to_string(partial: "transfers/validate_modal", formats: [:html], layout: false)
+      render json: {valid: true, body: body}
+    else
+      render json: {valid: false}, status: :unprocessable_entity
+    end
+  end
+
   private
 
   def load_form_collections