From f46988ef675886da06abd23ae84ab110542c7461 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 7 Feb 2024 15:35:57 -0700
Subject: [PATCH] Add logging

---
 src/registrar/admin.py                        |  5 +-
 .../django/admin/domain_change_form.html      | 82 ++++++++++---------
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 13ecaeaab..fc3dd861b 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1162,9 +1162,11 @@ class DomainAdmin(ListHeaderAdmin):
             exp_date = date.today()
 
         desired_date = date.today() + relativedelta(years=1)
-        month_length = self._month_diff(desired_date, exp_date)
+        logger.info(f"do_extend_expiration_date -> exp {exp_date} des {desired_date}")
+        month_length = self._month_diff(exp_date, desired_date)
 
         try:
+            logger.info(f"do_extend_expiration_date -> month length: {month_length}")
             obj.renew_domain(length=month_length, unit=epp.Unit.MONTH)
         except RegistryError as err:
             if err.code:
@@ -1212,6 +1214,7 @@ class DomainAdmin(ListHeaderAdmin):
 
         # Grab the delta between the two
         rdelta = relativedelta(end_date, start_date)
+        logger.info(f"rdelta is: {rdelta}, years {rdelta.years}, months {rdelta.months}")
 
         # Calculate total months as years * 12 + months
         total_months = rdelta.years * 12 + rdelta.months
diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html
index bf8a0de2e..a07c514f3 100644
--- a/src/registrar/templates/django/admin/domain_change_form.html
+++ b/src/registrar/templates/django/admin/domain_change_form.html
@@ -13,48 +13,50 @@
         >
             Extend expiration date
         </a>
-        <div
-        class="usa-modal"
-        id="toggle-extend-expiration-alert"
-        aria-labelledby="Are you sure you want to extend this expiration date?"
-        aria-describedby="This expiration date will be extended."
-        >
-            <div class="usa-modal__content">
-                <div class="usa-modal__main">
-                    <h2 class="usa-modal__heading" id="modal-1-heading">
-                        Are you sure you want to extend this expiration date?
-                    </h2>
-                    <div class="usa-prose">
-                        <p id="modal-1-description">
-                            This action will extend the expiration date by a year.
-                        </p>
-                    </div>
-            
-                    <div class="usa-modal__footer">
-                        <ul class="usa-button-group">
-                            <li class="usa-button-group__item">
-                                <button
-                                id="extend_expiration_date_button"
-                                type="submit" 
-                                class="usa-button" 
-                                name="_extend_expiration_date"
-                                >
-                                    Confirm
-                                </button>
-                            </li>
-                            <li class="usa-button-group__item">
-                                <button
-                                type="button"
-                                class="usa-button usa-button--unstyled padding-105 text-center"
-                                data-close-modal
-                                >
-                                    Cancel
-                                </button>
-                            </li>
-                        </ul>
+        {% if original.state != original.State.DELETED %}
+            <div
+            class="usa-modal"
+            id="toggle-extend-expiration-alert"
+            aria-labelledby="Are you sure you want to extend this expiration date?"
+            aria-describedby="This expiration date will be extended."
+            >
+                <div class="usa-modal__content">
+                    <div class="usa-modal__main">
+                        <h2 class="usa-modal__heading" id="modal-1-heading">
+                            Are you sure you want to extend this expiration date?
+                        </h2>
+                        <div class="usa-prose">
+                            <p id="modal-1-description">
+                                This action will extend the expiration date by a year.
+                            </p>
+                        </div>
+                
+                        <div class="usa-modal__footer">
+                            <ul class="usa-button-group">
+                                <li class="usa-button-group__item">
+                                    <button
+                                    id="extend_expiration_date_button"
+                                    type="submit" 
+                                    class="usa-button" 
+                                    name="_extend_expiration_date"
+                                    >
+                                        Confirm
+                                    </button>
+                                </li>
+                                <li class="usa-button-group__item">
+                                    <button
+                                    type="button"
+                                    class="usa-button usa-button--unstyled padding-105 text-center"
+                                    data-close-modal
+                                    >
+                                        Cancel
+                                    </button>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                 </div>
-            </div>
+            {% endif %}
             {# {% include 'includes/modal.html' with modal_heading="Are you sure you want to extend this expiration date?" modal_button=modal_button|safe %} #}
         </div>
         <div class="spacer"></div>