rubyforgood · neenu-chacko · Apr 18, 2025 · Apr 18, 2025 · Apr 19, 2025 · Apr 19, 2025
diff --git a/app/controllers/donation_sites_controller.rb b/app/controllers/donation_sites_controller.rb
@@ -22,17 +22,23 @@ def create
           redirect_to donation_sites_path,
                       notice: "Donation site #{@donation_site.name} added!"
         end
+        format.js
       else
         format.html do
           flash.now[:error] = "Something didn't work quite right -- try again?"
           render action: :new
         end
+        format.js { render template: "donation_sites/new_modal" }
       end
     end
   end
 
   def new
     @donation_site = current_organization.donation_sites.new
+    respond_to do |format|
+      format.html
+      format.js { render template: "donation_sites/new_modal" }
+    end
   end
 
   def edit

diff --git a/app/javascript/utils/donations.js b/app/javascript/utils/donations.js
@@ -5,6 +5,7 @@ $(function() {
   const product_drive_participant_id = "#donation_product_drive_participant_id";
   const product_drive_id = "#donation_product_drive_id"
   const manufacturer_id = "#donation_manufacturer_id";
+  const donation_site_id="#donation_donation_site_id"
 
   const donation_site_container_id = "div.donation_donation_site";
   const product_drive_container_id = "div.donation_product_drive";
@@ -17,8 +18,8 @@ $(function() {
 
   const create_new_product_drive_text = "---Create new Product Drive---";
   const create_new_product_drive_participant_text = "---Create new Participant---";
-
   const create_new_manufacturer_text = "---Create new Manufacturer---";
+  const create_new_donation_site_text = "---Create New Donation Site---";
 
   $(product_drive_id).append(
 
@@ -32,6 +33,10 @@ $(function() {
     `<option value="">${create_new_manufacturer_text}</option>`
   );
 
+  $(donation_site_id).append(
+    `<option value="">${create_new_donation_site_text}</option>`
+  )
+
   $(document).on("change", product_drive_id, function(evt) {
     const selection = $(product_drive_id + " option")
       .filter(":selected")
@@ -61,6 +66,17 @@ $(function() {
     }
   });
 
+  $(document).on("change", donation_site_id, function(evt) {
+    const selection = $(donation_site_id + " option")
+      .filter(":selected")
+      .text();
+
+    if (selection === create_new_donation_site_text) {
+      document.getElementById("new_donation_site").click()
+    }
+  });
+
+
   function handleSourceSelection() {
     const selection = $(control_id + " option")
       .filter(":selected")

diff --git a/app/views/donation_sites/_form.html.erb b/app/views/donation_sites/_form.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for form, html: {role: "form"} do |f| %>
+<%= simple_form_for form, remote: request.xhr?, html: {role: "form"} do |f| %>
   <section class="content">
     <div class="container-fluid">
       <div class="row">
@@ -37,7 +37,7 @@
                 </div>
                 <!-- /.card-body -->
                 <div class="card-footer">
-                  <%= submit_button %>
+                  <%= submit_button({id: "donation-site-submit"}) %>
                 </div>
               <% end %>
               </div>

diff --git a/app/views/donation_sites/_new_modal.html.erb b/app/views/donation_sites/_new_modal.html.erb
@@ -0,0 +1,27 @@
+<div class="modal-dialog">
+
+  <!-- Modal content-->
+  <div class="modal-content">
+    <div class="modal-header">
+      <h4 class="modal-title" id="mainModalLabel">
+        New Donation Site
+      </h4>
+      <button type="button" class="close" data-bs-dismiss="modal">&times;</button>
+    </div>
+    <div class="modal-body">
+      <% flash.each do |key, value| %>
+        <div class="<%= flash_class(key) %> alert-dismissible">
+          <a href="#" class="close btn-close" data-bs-dismiss="alert" aria-label="close" style="text-decoration: none;"><%= fa_icon('times') %></a>
+          <%= value %>
+        </div>
+      <% end %>
+
+      <%= render partial: "form", object: @donation_site %>
+
+    </div>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
+    </div>
+  </div>
+
+</div>
diff --git a/app/views/donation_sites/create.js.erb b/app/views/donation_sites/create.js.erb
@@ -0,0 +1,6 @@
+<% flash.discard %>
+$("#modal_new").modal("hide");
+$("#donation_donation_site_id").empty();
+$("#donation_donation_site_id").html('<%= j options_from_collection_for_select(current_organization.donation_sites, :id, :name) %>');
+$("#donation_donation_site_id").append('<option value="">---Create New Donation Site---</option>');
+$("#donation_donation_site_id").val('<%= @donation_site[:id] %>');
diff --git a/app/views/donation_sites/new_modal.js.erb b/app/views/donation_sites/new_modal.js.erb
@@ -0,0 +1,2 @@
+$("#modal_new").html("<%= j (render "donation_sites/new_modal") %>");
+$("#modal_new").modal("show");
diff --git a/app/views/donations/new.html.erb b/app/views/donations/new.html.erb
@@ -37,6 +37,7 @@
             <%= link_to "Add product drive", new_product_drive_path, {:remote => true, "data-bs-target" => "#modal-window", id: "new_product_drive", "style" => "display: none;"} %>
             <%= link_to "Add product drive participant", new_product_drive_participant_path, {:remote => true, "data-bs-target" => "#modal-window", id: "new_participant", "style" => "display: none;"} %>
             <%= link_to "Add manufacturer", new_manufacturer_path, {:remote => true, "data-bs-target" => "#modal-window", id: "new_manufacturer", "style" => "display: none;"} %>
+            <%= link_to "Add donation site", new_donation_site_path, {:remote => true, "data-bs-target" => "#modal-window", id: "new_donation_site", "style" => "display: none;"} %>
           </div><!-- /.box -->
         </div>
       </div>

diff --git a/app/views/manufacturers/_new_modal.html.erb b/app/views/manufacturers/_new_modal.html.erb
@@ -3,10 +3,10 @@
   <!-- Modal content-->
   <div class="modal-content">
     <div class="modal-header">
-      <button type="button" class="close" data-bs-dismiss="modal">&times;</button>
       <h4 class="modal-title" id="mainModalLabel">
         New Manufacturer
       </h4>
+      <button type="button" class="close" data-bs-dismiss="modal">&times;</button>
     </div>
     <div class="modal-body">
       <% flash.each do |key, value| %>

diff --git a/app/views/product_drives/_new_modal.html.erb b/app/views/product_drives/_new_modal.html.erb
@@ -3,10 +3,10 @@
   <!-- Modal content-->
   <div class="modal-content">
     <div class="modal-header">
-      <button type="button" class="close" data-bs-dismiss="modal">&times;</button>
       <h4 class="modal-title" id="mainModalLabel">
         New Product Drive
       </h4>
+      <button type="button" class="close" data-bs-dismiss="modal">&times;</button>
     </div>
     <div class="modal-body">
       <% flash.each do |key, value| %>

diff --git a/docs/user_guide/bank/essentials_donations.md b/docs/user_guide/bank/essentials_donations.md
@@ -67,7 +67,7 @@ For Product Drive, Manufacturer, or Donation Site, you will further specify the
 If  you specify Product drive,  you'll also need to specify the particular drive and participant for the Donation -- but you can enter them "on the fly", here. You can view summaries for the Product Drives in [Product Drives](product_drives.md), and manage the contact info for a Product Drive Participant under [Community -- Product Drive Participants](community_product_drive_participants.md).
 ##### *Donation Site
 Donation Site is meant to capture the concept of any place you have a more-or-less permanent place people can drop off donations at, such as your main office, or community locations such as fire halls, etc.
-You can see the Donations for each Donation Site and manage their contact information under [Community -- Donation Sites](community_donation_sites.md).  Unlike Product Drives, you can't create a new Donation Site 'on the fly' through the fields here
+You can see the Donations for each Donation Site and manage their contact information under [Community -- Donation Sites](community_donation_sites.md).  Like Product Drives, you can create a new Donation Site 'on the fly' through the fields here too.
 ##### *Manufacturer
 This is for the donations that come straight from a Manufacturer.  You can view a breakdown of the Donations for each Manufacturer under [Community --  Manufacturers](community_manufacturers.md)
 ##### *Misc. Donation

diff --git a/spec/system/donation_system_spec.rb b/spec/system/donation_system_spec.rb
@@ -268,6 +268,19 @@
           select "drivenametest", from: "donation_product_drive_id"
         end
 
+        it "Allows User to create a Donation Site from donation" do
+          select Donation::SOURCES[:donation_site], from: "donation_source"
+          select "---Create New Donation Site---", from: "donation_donation_site_id"
+
+          find(".modal-content")
+          expect(page).to have_content("New Donation Site")
+
+          fill_in "donation_site_name", with: "donationsitetest"
+          fill_in "donation_site_address", with: "1500 Remount Road, Front Royal, VA 22630"
+          click_on "donation-site-submit"
+          select "donationsitetest", from: "donation_donation_site_id"
+        end
+
         it "Allows User to create a Product Drive Participant from donation" do
           select Donation::SOURCES[:product_drive], from: "donation_source"
           select "---Create new Participant---", from: "donation_product_drive_participant_id"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		$("#modal_new").html("<%= j (render "donation_sites/new_modal") %>");
		$("#modal_new").modal("show");