From 6483d0a0ca2617701a3d42621b54a042609a4d5b Mon Sep 17 00:00:00 2001
From: oleghasjanov <oleg.phenomenon@gmail.com>
Date: Wed, 3 Jul 2024 10:40:35 +0300
Subject: [PATCH 1/2] fix for show action in admin controller of auction

---
 app/views/admin/auctions/show.html.erb | 26 ++++++++++++++------------
 config/routes.rb                       |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/views/admin/auctions/show.html.erb b/app/views/admin/auctions/show.html.erb
index 19c0d3365..92d93ee82 100644
--- a/app/views/admin/auctions/show.html.erb
+++ b/app/views/admin/auctions/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for :title, "#{t('.title')}: #{@auction.domain_name}" %>
 
-<div class="o-container" data-controller="auction-timezone" data-auction-timezone-end-time-value="<%= auction.ends_at&.iso8601 %>" data-auction-timezone-start-time-value="<%= auction.starts_at.iso8601 %>">
+<div class="o-container" data-controller="auction-timezone" data-auction-timezone-end-time-value="<%= @auction.ends_at&.iso8601 %>" data-auction-timezone-start-time-value="<%= @auction.starts_at.iso8601 %>">
   <div class="c-table c-table--sortable" data-controller='form--bundle-checkbox'>
     <%= component 'common/table', header_collection: [], options: { class: 'js-table-dt dataTable no-footer' } do %>
       <%= tag.tbody id: "auctions-table-body", class: 'contents' do %>
@@ -13,14 +13,14 @@
         <tr>
           <td><strong><%= t('auctions.starts_at') %></strong></td>
           <%= tag.td do %>
-            <span data-auction-timezone-target="starttime"><%= auction.starts_at %></span>
-          <% end @auction.starts_at.present? %>
+            <span data-auction-timezone-target="starttime"><%= @auction.starts_at %></span>
+          <% end if @auction.starts_at.present? %>
         </tr>
         <tr>
             <td><strong><%= t('auctions.ends_at') %></strong></td>
             <%= tag.td do %>
-              <span data-auction-timezone-target="endtime"><%= auction.ends_at %></span>
-            <% end @auction.ends_at.present? %>
+              <span data-auction-timezone-target="endtime"><%= @auction.ends_at %></span>
+            <% end if @auction.ends_at.present? %>
         </tr>
         <%- if @auction.offer_from_user(current_user).present? %>
           <tr>
@@ -45,13 +45,15 @@
       <%= component 'common/table', header_collection:, options: { class: 'js-table-dt' } do %>
         <%= tag.tbody id: "auctions-table-body", class: 'contents' do %>
           <%- if @offers.present? %>
-            <tr class="offers-table-row">
-              <td><%= t('offers.price_in_currency', price: offer.price) %></td>
-              <td><%= offer.user&.display_name || t(:deleted_user) %></td>
-              <td><%= I18n.l(offer.created_at) %></td>
-              <td><%= I18n.l(offer.updated_at) %></td>
-              <td><%= link_to t(:versions_name), admin_offer_versions_path(offer), class: "ui button primary" %></td>
-            </tr>
+            <% @offers.each do |offer| %>
+              <tr class="offers-table-row">
+                <td><%= t('offers.price_in_currency', price: offer.price) %></td>
+                <td><%= offer.user&.display_name || t(:deleted_user) %></td>
+                <td><%= I18n.l(offer.created_at) %></td>
+                <td><%= I18n.l(offer.updated_at) %></td>
+                <td><%= link_to t(:versions_name), admin_offer_versions_path(offer), class: "ui button primary" %></td>
+              </tr>
+            <% end %>
           <%- else %>
             <tr>
               <td colspan="5" style="text-align: center; font-weight: bold; font-size: 1.2rem; padding: 3rem 0 !important;"><%= t(:no_offers) %></td>
diff --git a/config/routes.rb b/config/routes.rb
index b202d82f0..12b250650 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,7 +44,7 @@
   end
 
   namespace :admin, constraints: Constraints::Administrator.new do
-    resources :auctions, concerns: %i[auditable], except: [:show] do
+    resources :auctions, concerns: %i[auditable] do
     collection do
       post 'bulk_starts_at', to: 'auctions#bulk_starts_at', as: 'bulk_starts_at'
       post 'apply_auction_participants', to: 'auctions#apply_auction_participants', as: 'apply_auction_participants'

From 857b42a223900e648d1a08de6600c35532cb4e03 Mon Sep 17 00:00:00 2001
From: oleghasjanov <oleg.phenomenon@gmail.com>
Date: Wed, 3 Jul 2024 12:25:48 +0300
Subject: [PATCH 2/2] fixed nil value for starts_at and ends_at in auciton
 admin show view

---
 app/views/admin/auctions/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/auctions/show.html.erb b/app/views/admin/auctions/show.html.erb
index 92d93ee82..8cabe2a2a 100644
--- a/app/views/admin/auctions/show.html.erb
+++ b/app/views/admin/auctions/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for :title, "#{t('.title')}: #{@auction.domain_name}" %>
 
-<div class="o-container" data-controller="auction-timezone" data-auction-timezone-end-time-value="<%= @auction.ends_at&.iso8601 %>" data-auction-timezone-start-time-value="<%= @auction.starts_at.iso8601 %>">
+<div class="o-container" data-controller="auction-timezone" data-auction-timezone-end-time-value="<%= @auction&.ends_at&.iso8601 %>" data-auction-timezone-start-time-value="<%= @auction&.starts_at&.iso8601 %>">
   <div class="c-table c-table--sortable" data-controller='form--bundle-checkbox'>
     <%= component 'common/table', header_collection: [], options: { class: 'js-table-dt dataTable no-footer' } do %>
       <%= tag.tbody id: "auctions-table-body", class: 'contents' do %>