Merge branch 'main' into 3845-friendly-message-on-invalid-token

Author: Benjamin-Couey

app/assets/stylesheets/landing_page.scss

@@ -1,139 +1,56 @@
-html, body {
-    background-color: white;
-    height: calc(100vw - 3em);
-    position: relative;
-}
+@import 'bootstrap';
 
 .hero {
-    &-background {
-    background: linear-gradient(135deg, #3023AE , #C86DD7);
-    width: 100%;
-    color: white;
-    height: 660px;
-        @media (max-width: 1200px) {
-            height: 590px;
-        }
-        @media (max-width: 992px) {
-            height: auto;
-        }
-        @media (max-width: 768px) {
-            height: auto;
-        }
-        @media (max-width: 576px) {
-            height: auto;
-        }
-    }
-    &-image {
-        flex-basis: 1400px;
-        @media (max-width: 576px) {
-            margin-bottom: 20px;
-        }
-        @media (max-width: 768px) {
-            margin-bottom: 20px;
-        }
-    }
-    &-copy {
-        z-index: 1;
-        @media (max-width: 768px) {
-            text-align: center;
-        }
-        @media (max-width: 576px) {
-            text-align: center;
-        }
-    }
-}
-
-.navbar-brand {
-  margin-right: none !important;
+  background: linear-gradient(135deg, #3023AE, #C86DD7);
 
-  @media (max-width: 568px) {
+  nav {
     h2 {
-      font-size: 0.8em;
+      @media (max-width: 567px) {
+        font-size: 1.125rem;
+      }
     }
-  }
-}
-
-.navbar-light .navbar-toggler {
-    border: none;
-    margin-top: 13px;
-}
-
-button:focus {
-    outline: none !important;
-    outline: none !important;
-}
-
-button:hover, button:focus, .button:hover, .button:focus {
-    background-color: rgba(255, 255, 255, 0) !important;
-}
-
-.btn-primary {
-    background-color: #55af59 !important;
-    border-color: #55af59 !important;
-}
-
-.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active {
-    background-color: #55af59 !important;
-    border-color: #55af59 !important;
-}
 
-.text {
+    button span {
+      font-size: 1.25rem;
 
-    &-header {
-        color: #454F5B;
-    }
-    &-body-color {
-        color: #919EAB !important;
-        line-height: 2em;
+      @media (max-width: 567px) {
+        font-size: 1rem;
+      }
     }
-    &-testimonials {
-        color: white;
-        line-height: 1.5em;
-        font-size: 14px;
+  }
 
-    }
+  .hero-subcontainer {
+    height:60vh; 
+    min-height: 500px
+  }
 }
 
-.description-container {
-    margin-top: 120px;
-    @media (max-width: 576px) {
-        margin-top: 80px;
-    }
+.container-fluid {
+  max-width: 1280px;
 }
 
-.bottom-cta {
-    margin-top: 80px;
-    margin-bottom: 80px;
-    @media (max-width: 576px) {
-        margin-top: 50px;
-        margin-bottom: 50px;
-    }
+.btn-success {
+  background-color: #55af59 !important;
+  border-color: #55af59 !important;
 }
 
-.app-images {
-    width: 400px;
-    height: 400px;
-    &-block {
-        flex-basis: 340px;
-    }
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active {
+  background-color: #408e44 !important;
+  border-color: #408e44 !important;
 }
 
-.green-bkg {
-    background: linear-gradient(45deg, #1AD1BD , #02A98C);
-    height: auto;
+.app-images {
+  height: 400px;
+  width: 100%;
 }
 
-.quote {
-    &-block {
-    flex-basis: 400px;
-    }
-    &-image {
-        flex-basis: 600px;
-        }
-}
+#testimonials {
+  background-color: rgb(22, 163, 74);
 
-.footer-content {
-    background-color: #C4CDD5;
-    padding-top: 150px;
-    padding-bottom: 150px;
+  .quote-image {
+    width: 300px;
+  }
 }

app/controllers/admin/partners_controller.rb

@@ -1,6 +1,6 @@
 class Admin::PartnersController < AdminController
   def index
-    @partners = Partner.all.includes(:organization)
+    @partners = Partner.all.includes(:organization).order("LOWER(name)")
   end
 
   def show

app/controllers/donation_sites_controller.rb

@@ -26,7 +26,6 @@ def create
           render action: :new
         end
       end
-      format.js { render partial: "shared/table_row_prepend", object: @donation_site }
     end
   end
 

app/controllers/items_controller.rb

@@ -44,7 +44,8 @@ def create
       @base_items = BaseItem.without_kit.alphabetized
       # Define a @item to be used in the `new` action to be rendered with
       # the provided parameters. This is required to render the page again
-      # with the error + the invalid parameters
+      # with the error + the invalid parameters.
+      @item_categories = current_organization.item_categories.order('name ASC') # Load categories here
       @item = current_organization.items.new(item_params)
       flash.now[:error] = result.error.record.errors.full_messages.to_sentence
       render action: :new

app/controllers/partners/requests_controller.rb

@@ -1,5 +1,9 @@
 module Partners
   class RequestsController < BaseController
+    skip_before_action :require_partner, only: [:new, :create, :validate]
+    before_action :require_partner_or_org_admin, only: [:new, :create, :validate]
+    layout :layout
+
     protect_from_forgery with: :exception
 
     def index
@@ -21,15 +25,20 @@ def show
     def create
       create_service = Partners::RequestCreateService.new(
         request_type: "quantity",
-        partner_user_id: current_user.id,
+        partner_id: partner.id,
+        user_id: current_user.id,
         comments: partner_request_params[:comments],
         item_requests_attributes: partner_request_params[:item_requests_attributes]&.values || []
       )
 
       create_service.call
       if create_service.errors.none?
         flash[:success] = 'Request was successfully created.'
-        redirect_to partners_request_path(create_service.partner_request.id)
+        if current_partner
+          redirect_to partners_request_path(create_service.partner_request.id)
+        else
+          redirect_to request_path(create_service.partner_request.id)
+        end
       else
         @partner_request = create_service.partner_request
         @errors = create_service.errors
@@ -45,15 +54,16 @@ def create
     def validate
       create_service = Partners::RequestCreateService.new(
         request_type: "quantity",
-        partner_user_id: current_user.id,
+        partner_id: partner.id,
+        user_id: current_user.id,
         comments: partner_request_params[:comments],
         item_requests_attributes: partner_request_params[:item_requests_attributes]&.values || []
       ).initialize_only
 
       if create_service.errors.none?
         @partner_request = create_service.partner_request
         @total_items = @partner_request.total_items
-        @quota_exceeded = current_partner.quota_exceeded?(@total_items)
+        @quota_exceeded = partner.quota_exceeded?(@total_items)
         body = render_to_string(template: 'partners/requests/validate', formats: [:html], layout: false)
         render json: {valid: true, body: body}
       else
@@ -68,13 +78,42 @@ def partner_request_params
     end
 
     def fetch_items
-      @requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.id).call
+      @requestable_items = PartnerFetchRequestableItemsService.new(partner_id: partner.id).call
       if Flipper.enabled?(:enable_packs)
         # hash of (item ID => hash of (request unit name => request unit plural name))
         @item_units = Item.where(id: @requestable_items.to_h.values).to_h do |i|
           [i.id, i.request_units.to_h { |u| [u.name, u.name.pluralize] }]
         end
       end
     end
+
+    def require_partner_or_org_admin
+      return if current_partner
+
+      partner_id = params.permit(:partner_id)[:partner_id]
+      return redirect_invalid_user if partner_id.blank?
+
+      partner = Partner.find(partner_id)
+      if current_user.has_role?(Role::ORG_ADMIN, current_organization) && current_organization == partner&.organization
+        @partner = partner
+      else
+        redirect_invalid_user
+      end
+    end
+
+    def redirect_invalid_user
+      respond_to do |format|
+        format.html { redirect_to dashboard_path, flash: {error: "Logged in user is not set up as a 'partner'."} }
+        format.json { render body: nil, status: :forbidden }
+      end
+    end
+
+    def partner
+      @partner ||= current_partner
+    end
+
+    def layout
+      @layout ||= current_partner ? "partners/application" : "application"
+    end
   end
 end

app/controllers/requests_controller.rb

@@ -12,7 +12,7 @@ def index
     @paginated_requests = @requests.includes(:partner).page(params[:page])
     @calculate_product_totals = RequestsTotalItemsService.new(requests: @requests).calculate
     @items = current_organization.items.alphabetized.select(:id, :name)
-    @partners = current_organization.partners.alphabetized.select(:id, :name)
+    @partners = current_organization.partners.alphabetized.select(:id, :name, :status)
     @statuses = Request.statuses.transform_keys(&:humanize)
     @partner_users = User.where(id: @paginated_requests.map(&:partner_user_id)).select(:id, :name, :email)
     @request_types = Request.request_types.transform_keys(&:humanize)

app/mailers/distribution_mailer.rb

@@ -11,7 +11,7 @@ def partner_mailer(current_organization, distribution, subject, distribution_cha
     @partner = distribution.partner
     @distribution = distribution
     @comment = distribution.comment
-    requestee_email = distribution.request ? distribution.request.user_email : @partner.email
+    requester_email = distribution.request ? distribution.request.requester.email : @partner.email
 
     delivery_method = @distribution.delivery? ? 'delivered' : 'picked up'
     @default_email_text = current_organization.default_email_text
@@ -35,17 +35,17 @@ def partner_mailer(current_organization, distribution, subject, distribution_cha
     cc.compact!
     cc.uniq!
 
-    mail(to: requestee_email, cc: cc, subject: "#{subject} from #{current_organization.name}")
+    mail(to: requester_email, cc: cc, subject: "#{subject} from #{current_organization.name}")
   end
 
   def reminder_email(distribution_id)
     distribution = Distribution.find(distribution_id)
     @partner = distribution.partner
     @distribution = distribution
-    requestee_email = distribution.request ? distribution.request.user_email : @partner.email
+    requester_email = distribution.request ? distribution.request.requester.email : @partner.email
 
     return if @distribution.past? || !@partner.send_reminders || @partner.deactivated?
 
-    mail(to: requestee_email, cc: @partner.email, subject: "#{@partner.name} Distribution Reminder")
+    mail(to: requester_email, cc: @partner.email, subject: "#{@partner.name} Distribution Reminder")
   end
 end

app/mailers/requests_confirmation_mailer.rb

@@ -3,17 +3,17 @@ def confirmation_email(request)
     @organization = request.organization
     @partner = request.partner
     @request_items = fetch_items(request)
-    requestee_email = request.user_email
-    # If the requestee organization has opted in to receiving an email when a
-    # request is made, CC them
+    requester = request.requester
+    @requester_user_name = requester.is_a?(User) ? requester.name : nil # Requester can be the partner, if no user is specified
+    # If the organization has opted in to receiving an email when a request is made, CC them
     cc = [@partner.email]
     if @organization.receive_email_on_requests
       cc.push(@organization.email)
     end
     cc.flatten!
     cc.compact!
     cc.uniq!
-    mail(to: requestee_email, cc: cc, subject: "#{@organization.name} - Requests Confirmation")
+    mail(to: requester.email, cc: cc, subject: "#{@organization.name} - Requests Confirmation")
   end
 
   private

app/models/adjustment.rb

@@ -22,10 +22,6 @@ class Adjustment < ApplicationRecord
   include Filterable
   scope :at_location, ->(location_id) { where(storage_location_id: location_id) }
   scope :by_user, ->(user_id) { where(user_id: user_id) }
-  scope :for_csv_export, ->(organization, *) {
-    where(organization: organization)
-      .includes(:storage_location, :line_items)
-  }
   scope :during, ->(range) { where(adjustments: { created_at: range }) }
 
   validate :storage_locations_belong_to_organization

app/models/barcode_item.rb

@@ -42,11 +42,6 @@ class BarcodeItem < ApplicationRecord
 
   scope :by_value, ->(value) { where(value: value) }
 
-  scope :for_csv_export, ->(organization, *) {
-    where(organization: organization)
-      .includes(:barcodeable)
-  }
-
   scope :global, -> { where(barcodeable_type: "BaseItem") }
 
   # aliases of barcodeable