From 9f17e4fd8fb79c71ef69bb0b7151010bff930e50 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Mon, 28 Sep 2020 18:51:07 +0100
Subject: [PATCH] Add upload timestamp to TCs upload form in enterprise
 business details

---
 app/serializers/api/admin/enterprise_serializer.rb    | 11 ++++++++---
 .../enterprises/form/_business_details.html.haml      |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/serializers/api/admin/enterprise_serializer.rb b/app/serializers/api/admin/enterprise_serializer.rb
index 2385d996d6..399284d132 100644
--- a/app/serializers/api/admin/enterprise_serializer.rb
+++ b/app/serializers/api/admin/enterprise_serializer.rb
@@ -6,7 +6,8 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
              :preferred_product_selection_from_inventory_only,
              :preferred_show_customer_names_to_suppliers, :owner, :contact, :users, :tag_groups,
              :default_tag_group, :require_login, :allow_guest_orders, :allow_order_changes,
-             :logo, :promo_image, :terms_and_conditions, :terms_and_conditions_file_name
+             :logo, :promo_image, :terms_and_conditions,
+             :terms_and_conditions_file_name, :terms_and_conditions_updated_at
 
   has_one :owner, serializer: Api::Admin::UserSerializer
   has_many :users, serializer: Api::Admin::UserSerializer
@@ -21,9 +22,13 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
   end
 
   def terms_and_conditions
-    return unless @object.terms_and_conditions.file?
+    return unless object.terms_and_conditions.file?
 
-    @object.terms_and_conditions.url
+    object.terms_and_conditions.url
+  end
+
+  def terms_and_conditions_updated_at
+    object.terms_and_conditions_updated_at&.to_s
   end
 
   def tag_groups
diff --git a/app/views/admin/enterprises/form/_business_details.html.haml b/app/views/admin/enterprises/form/_business_details.html.haml
index f215dc9a68..48be57a8ef 100644
--- a/app/views/admin/enterprises/form/_business_details.html.haml
+++ b/app/views/admin/enterprises/form/_business_details.html.haml
@@ -37,8 +37,8 @@
     = f.label :terms_and_conditions, t('.terms_and_conditions')
 
   .omega.eight.columns
-    %a{ href: '{{ Enterprise.terms_and_conditions }}', target: "_blank", ng: { if: 'Enterprise.terms_and_conditions' } }
-      = '{{ Enterprise.terms_and_conditions_file_name }}'
+    %a{ href: '{{ Enterprise.terms_and_conditions }}', target: '_blank', ng: { if: 'Enterprise.terms_and_conditions' } }
+      = '{{ Enterprise.terms_and_conditions_file_name }}' " uploaded on " '{{ Enterprise.terms_and_conditions_updated_at }}'
     .pad-top
       = f.file_field :terms_and_conditions
     .pad-top