341609 Add delivery block to Site

app/controllers/sites_controller.rb

@@ -63,6 +63,11 @@ def set_site
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def site_params
-    params.require(:site).permit(:name, :position, :street, :country, :city, :latitude, :longitude)
+    params.require(:site).permit(
+      :name,
+      :position,
+      :street, :country, :city, :latitude, :longitude,
+      :delivery_address, :delivery_times, :delivery_map
+    )
   end
 end

app/models/site.rb

@@ -7,6 +7,8 @@ class Site < ApplicationRecord
   has_many :rooms, dependent: :restrict_with_error
   has_many :frames, through: :rooms, dependent: :restrict_with_error
 
+  has_one_attached :delivery_map
+
   after_validation :geocode
 
   scope :sorted, -> { order(:position) }

app/views/sites/_form.html.erb

@@ -51,6 +51,24 @@
         <%= f.text_field :longitude, class: "form-control" %>
       </fieldset>
     </div>
+
+    <fieldset class="col-12 mt-4">
+      <%= f.label :delivery_address, class: "form-label" %>
+      <%= f.text_area :delivery_address, class: "form-control" %>
+    </fieldset>
+
+    <fieldset class="col-12 mt-4">
+      <%= f.label :delivery_times, class: "form-label" %>
+      <%= f.text_area :delivery_times, class: "form-control" %>
+    </fieldset>
+
+    <fieldset class="col-12 mt-4">
+      <%= f.label :delivery_map, class: "form-label" %>
+      <%= f.file_field :delivery_map, class: "form-control" %>
+      <% if @site.delivery_map.attached? %>
+        <%= image_tag @site.delivery_map.variant(resize_to_limit: [200, 200]), class: "ms-0 mt-2" %>
+      <% end %>
+    </fieldset>
   <% end %>
 
   <div class="col-12 py-4 mt-4 text-end sticky-bottom bg-body-tertiary border-top">

app/views/sites/show.html.erb

@@ -3,9 +3,7 @@
   breadcrumb_steps = { Site.model_name.human.pluralize => sites_path, @site.name => "" }
 %>
 
-<%= render Page::HeadingShowComponent.new(
-  resource: @site, title: t(".title", site_id: @site.id, site_name: @site.name), breadcrumb_steps:
-) %>
+<%= render Page::HeadingShowComponent.new(resource: @site, title: @site.name, breadcrumb_steps:) %>
 <div class="col-12 p-4 border-top">
   <div class="d-flex flex-row flex-wrap">
     <div class="col-12 col-lg-6 pe-lg-4">
@@ -42,6 +40,22 @@
             <dd class="mb-0 pb-2 ps-3"><%= @site.public_send(attribute_name) %></dd>
           <% end %>
         </dl>
+
+        <dl class="show-page_dl d-grid row-gap-2 pt-3 border-top mb-0">
+          <% %i[delivery_address delivery_times].each do |attribute_name| %>
+            <dt class="pb-2"><%= Site.human_attribute_name(attribute_name) %></dt>
+            <dd class="mb-0 pb-2 ps-3"><%= @site.public_send(attribute_name) %></dd>
+          <% end %>
+
+          <dt class="pb-2"><%= Site.human_attribute_name(:delivery_map) %></dt>
+          <dd class="mb-0 pb-2 ps-3">
+            <% if @site.delivery_map.attached? %>
+              <%= link_to @site.delivery_map, rel: :noopener, target: :_blank do %>
+                <%= image_tag @site.delivery_map, class: "w-100" %>
+              <% end %>
+            <% end %>
+          </dd>
+        </dl>
       <% end %>
     </div>
   </div>

config/locales/activerecord.fr.yml

@@ -112,6 +112,9 @@ fr:
         country: Pays
         latitude: Latitude
         longitude: Longitude
+        delivery_address: Adresse livraison
+        delivery_times: Horaires de livraison
+        delivery_map: Plan de livraison
         rooms_count:
           zero: 0 salle
           one: 1 salle

config/locales/fr.yml

@@ -113,8 +113,6 @@ fr:
       title: Sites
       new_site: Ajouter un site
       delete_confirmation: Ce site ne pourra pas être supprimé tant qu'il sera associé à au moins une salle. Voulez-vous continuer ?
-    show:
-      title: 'Site #%{site_id} - %{site_name}'
     new:
       title: Nouveau site
     create:

db/migrate/20241017155157_add_delivery_related_attributes_to_site.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddDeliveryRelatedAttributesToSite < ActiveRecord::Migration[7.2]
+  def change
+    change_table :sites, bulk: true do |t|
+      t.text :delivery_address
+      t.text :delivery_times
+    end
+  end
+end