Add warning notice to Dashboard page and Partner Request page when pa…

…rtner is deactivated
rubyforgood · Sep 2, 2020 · f7dce4f · f7dce4f
1 parent 8a48376
commit f7dce4f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -29,7 +29,6 @@ def current_partner
   def verify_status_in_diaper_base
     if current_partner.status_in_diaper_base == "deactivated"
       flash[:alert] = 'Your account has been disabled, contact the organization via their email to reactivate'
-      redirect_to partner_requests_path
     end
   end
 

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
@@ -1,5 +1,6 @@
 # Prepares data to be shown to the users for their dashboard.
 class DashboardController < ApplicationController
+  before_action :verify_status_in_diaper_base
   respond_to :html, :js
 
   def index

diff --git a/app/controllers/family_requests_controller.rb b/app/controllers/family_requests_controller.rb
@@ -1,8 +1,8 @@
 class FamilyRequestsController < ApplicationController
   before_action :authenticate_user!
+  before_action :verify_status_in_diaper_base
 
   def new
-    verify_status_in_diaper_base
     @filterrific = initialize_filterrific(
       current_partner.children
           .order(last_name: :asc)
@@ -13,7 +13,6 @@ def new
   end
 
   def create
-    verify_status_in_diaper_base
     children = current_partner.children.active
     children_grouped_by_diaperid = children.group_by(&:item_needed_diaperid)
     api_response = DiaperBankClient.send_family_request(

diff --git a/app/controllers/partner_requests_controller.rb b/app/controllers/partner_requests_controller.rb
@@ -1,13 +1,13 @@
 class PartnerRequestsController < ApplicationController
   before_action :authenticate_user!
+  before_action :verify_status_in_diaper_base
 
   def index
     @partner = current_partner
     @partner_requests = current_partner.partner_requests.order(created_at: :desc) # PartnerRequest.where(partner_id: current_partner.id)
   end
 
   def new
-    verify_status_in_diaper_base
     if current_partner.partner_status.casecmp("verified").zero?
       @partner_request = PartnerRequest.new
       @partner_request.item_requests.build # required to render the empty items form
@@ -17,7 +17,6 @@ def new
   end
 
   def create
-    verify_status_in_diaper_base
     @partner_request = PartnerRequest.new(partner_request_params.merge(partner_id: current_partner.id))
     @partner_request.item_requests << create_item_requests
     respond_to do |format|

diff --git a/spec/features/family_requests_feature_spec.rb b/spec/features/family_requests_feature_spec.rb
@@ -112,9 +112,7 @@
     scenario "it don't create because partner status in diaper base is deactivated" do
       partner.update(status_in_diaper_base: "deactivated")
       visit partner_requests_path
-      find_link("Create New Family Diaper Request").click
       expect(page).to have_text("Your account has been disabled, contact the organization via their email to reactivate")
-      expect(current_path).to eq(partner_requests_path)
     end
   end
 end