From 7740dcd5c055babaa8f021073c9c38c99fad4dec Mon Sep 17 00:00:00 2001
From: Arunmozhi <arunmozhi@opencraft.com>
Date: Tue, 4 Jul 2023 13:44:14 +0530
Subject: [PATCH 01/10] feat: adds attribute to hide course prices when zero

This adds a new attribute `hide_course_price_when_zero` to the
EnterpriseCustomer model, which will hide the pricing information
from the enrollment page when the final price of a premium course
mode is Zero.
---
 enterprise/admin/forms.py                     |  1 +
 .../migrations/0175_auto_20230704_0740.py     | 23 +++++++++++++++
 enterprise/models.py                          |  5 ++++
 .../enterprise_course_enrollment_page.html    | 24 ++++++++--------
 .../enterprise/templatetags/course_modal.html |  2 +-
 enterprise/utils.py                           | 26 +++++++++++++++++
 enterprise/views.py                           |  7 ++++-
 tests/test_enterprise/test_utils.py           | 28 +++++++++++++++++++
 8 files changed, 103 insertions(+), 13 deletions(-)
 create mode 100644 enterprise/migrations/0175_auto_20230704_0740.py

diff --git a/enterprise/admin/forms.py b/enterprise/admin/forms.py
index fd076aa4d4..ffa6b16136 100644
--- a/enterprise/admin/forms.py
+++ b/enterprise/admin/forms.py
@@ -395,6 +395,7 @@ class Meta:
             "enable_audit_data_reporting",
             "replace_sensitive_sso_username",
             "hide_course_original_price",
+            "hide_course_price_when_zero",
             "enable_portal_code_management_screen",
             "enable_portal_subscription_management_screen",
             "enable_learner_portal",
diff --git a/enterprise/migrations/0175_auto_20230704_0740.py b/enterprise/migrations/0175_auto_20230704_0740.py
new file mode 100644
index 0000000000..dc84c483f0
--- /dev/null
+++ b/enterprise/migrations/0175_auto_20230704_0740.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.19 on 2023-07-04 07:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise', '0174_auto_20230608_2041'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enterprisecustomer',
+            name='hide_course_price_when_zero',
+            field=models.BooleanField(default=False, help_text="Hides the course's price from the enrollment page when it is Zero, either by itself or due to a discount."),
+        ),
+        migrations.AddField(
+            model_name='historicalenterprisecustomer',
+            name='hide_course_price_when_zero',
+            field=models.BooleanField(default=False, help_text="Hides the course's price from the enrollment page when it is Zero, either by itself or due to a discount."),
+        ),
+    ]
diff --git a/enterprise/models.py b/enterprise/models.py
index 4ad711cee8..8180e033fb 100644
--- a/enterprise/models.py
+++ b/enterprise/models.py
@@ -472,6 +472,11 @@ class Meta:
         help_text=_("Email address that will receive learner replies to automated edX emails.")
     )
 
+    hide_course_price_when_zero = models.BooleanField(
+        default=False,
+        help_text=_("Specify whether course cost should be hidden in the landing page when the final price is zero.")
+    )
+
     enable_generation_of_api_credentials = models.BooleanField(
         verbose_name="Allow generation of API credentials",
         default=False,
diff --git a/enterprise/templates/enterprise/enterprise_course_enrollment_page.html b/enterprise/templates/enterprise/enterprise_course_enrollment_page.html
index 1d4a777bdf..efb644a519 100644
--- a/enterprise/templates/enterprise/enterprise_course_enrollment_page.html
+++ b/enterprise/templates/enterprise/enterprise_course_enrollment_page.html
@@ -77,19 +77,21 @@ <h2>{{ confirmation_text }}</h2>
 
                 <label for="radio{{ forloop.counter0 }}">
                   <strong class="title">{{ course_mode.title }}</strong>
-                  <span class="price">
-                    {{ price_text }}:
-                    {% if course_mode.final_price and course_mode.original_price != course_mode.final_price %}
-                      {% if hide_course_original_price %}
-                        {{ course_mode.final_price }}
+                  {% if not course_mode.hide_price %}
+                    <span class="price">
+                      {{ price_text }}:
+                      {% if course_mode.final_price and course_mode.original_price != course_mode.final_price %}
+                        {% if hide_course_original_price %}
+                          {{ course_mode.final_price }}
+                        {% else %}
+                          <strike>{{ course_mode.original_price }}</strike> {{ course_mode.final_price }}
+                          <div>{{discount_text|safe }}</div>
+                        {% endif %}
                       {% else %}
-                        <strike>{{ course_mode.original_price }}</strike> {{ course_mode.final_price }}
-                        <div>{{discount_text|safe }}</div>
+                        {{ course_mode.original_price }}
                       {% endif %}
-                    {% else %}
-                      {{ course_mode.original_price }}
-                    {% endif %}
-                  </span>
+                    </span>
+                  {% endif %}
                   <span class="description">{{ course_mode.description }}</span>
                 </label>
               </div>
diff --git a/enterprise/templates/enterprise/templatetags/course_modal.html b/enterprise/templates/enterprise/templatetags/course_modal.html
index 41e6f694e0..bc7965b9f3 100644
--- a/enterprise/templates/enterprise/templatetags/course_modal.html
+++ b/enterprise/templates/enterprise/templatetags/course_modal.html
@@ -25,7 +25,7 @@ <h1 id="modal-header-text-{{ index }}" class="modal-header-text">{{ course_title
           <ul class="details-list">
             {% if premium_modes|length > 0 %}
               {% with course_mode=premium_modes.0 %}
-                {% if course_mode.original_price %}
+                {% if course_mode.original_price and not course_mode.hide_price %}
                   <li>
                     <div class="detail-container">
                       <div class="detail-title-container">
diff --git a/enterprise/utils.py b/enterprise/utils.py
index 291f7d139b..4a60875437 100644
--- a/enterprise/utils.py
+++ b/enterprise/utils.py
@@ -2382,3 +2382,29 @@ def truncate_string(string, max_length=MAX_ALLOWED_TEXT_LENGTH):
         was_truncated = True
         return (truncated_string, was_truncated)
     return (string, was_truncated)
+
+
+def hide_price_when_zero(enterprise_customer, course_modes):
+    """
+    Adds a "hide_price" flag to the course modes if price is zero and "Hide course price when zero" flag is set.
+
+    Arguments:
+        enterprise_customer: The EnterpriseCustomer that the enrollemnt is being done.
+        course_modes: iterable with dictionaries containing a required 'final_price' key
+    """
+    if not enterprise_customer.hide_course_price_when_zero:
+        return course_modes
+
+    for mode in course_modes:
+        mode['hide_price'] = False
+        try:
+            numbers = re.findall(r'\d+', mode['final_price'])
+            mode['hide_price'] = int(''.join(numbers)) == 0
+        except ValueError:
+            LOGGER.warn(
+                'hide_price_when_zero: Could not convert price of course mode "%s" to int.',
+                mode['title']
+            )
+    return course_modes
+
+    
\ No newline at end of file
diff --git a/enterprise/views.py b/enterprise/views.py
index 7c93bbb224..743e8ee5ca 100644
--- a/enterprise/views.py
+++ b/enterprise/views.py
@@ -76,6 +76,7 @@
     get_enterprise_customer_user,
     get_platform_logo_url,
     get_program_type_description,
+    hide_price_when_zero,
     is_course_run_enrollable,
     localized_utcnow,
     track_enrollment,
@@ -1542,6 +1543,9 @@ def get_enterprise_course_enrollment_page(
             # Filter audit course modes.
             course_modes = filter_audit_course_modes(enterprise_customer, course_modes)
 
+            # Set a flag to hide the $0 when the customer doesn't want it to be shown
+            course_modes = hide_price_when_zero(enterprise_customer, course_modes)
+
             # Allows automatic assignment to a cohort upon enrollment.
             cohort = request.GET.get('cohort')
             # Add a message to the message display queue if the learner
@@ -1594,7 +1598,8 @@ def get_enterprise_course_enrollment_page(
                     'course_modes': course_modes,
                     'premium_modes': premium_modes,
                     'catalog': enterprise_catalog_uuid,
-                    'hide_course_original_price': enterprise_customer.hide_course_original_price
+                    'hide_course_original_price': enterprise_customer.hide_course_original_price,
+                    'hide_course_price_when_zero': enterprise_customer.hide_course_price_when_zero
                 }
             )
 
diff --git a/tests/test_enterprise/test_utils.py b/tests/test_enterprise/test_utils.py
index 9dc3cac117..72d331325b 100644
--- a/tests/test_enterprise/test_utils.py
+++ b/tests/test_enterprise/test_utils.py
@@ -19,6 +19,7 @@
     get_default_invite_key_expiration_date,
     get_idiff_list,
     get_platform_logo_url,
+    hide_price_when_zero,
     is_pending_user,
     localized_utcnow,
     parse_lms_api_datetime,
@@ -536,3 +537,30 @@ def test_truncate_string(self):
         (truncated_string, was_truncated) = truncate_string(test_string_2)
         self.assertTrue(was_truncated)
         self.assertEqual(len(truncated_string), MAX_ALLOWED_TEXT_LENGTH)
+
+    @ddt.data(True, False)
+    def test_hide_course_price_when_zero(self, hide_price):
+        customer = factories.EnterpriseCustomerFactory()
+        zero_modes = [
+            {"final_price": "$0"},
+            {"final_price": "$0.000"},
+            {"final_price": "Rs. 0.00"},
+            {"final_price": "0.00 EURO"},
+        ]
+        non_zero_modes = [
+            {"final_price": "$100"},
+            {"final_price": "$73.50"},
+            {"final_price": "Rs.8000.00"},
+            {"final_price": "4000 Euros"},
+        ]
+        customer.hide_course_price_when_zero = hide_price
+
+        processed_zero_modes = hide_price_when_zero(customer, zero_modes)
+        processed_non_zero_modes = hide_price_when_zero(customer, non_zero_modes)
+
+        if hide_price:
+            self.assertTrue(all(mode["hide_price"] for mode in processed_zero_modes))
+            self.assertFalse(all(mode["hide_price"] for mode in processed_non_zero_modes))
+        else:
+            self.assertEqual(zero_modes, processed_zero_modes)
+            self.assertEqual(non_zero_modes, processed_non_zero_modes)

From 4f37ab13cac41a9ee96663d047dea33a1412aa08 Mon Sep 17 00:00:00 2001
From: Arunmozhi <arunmozhi@opencraft.com>
Date: Tue, 4 Jul 2023 18:44:59 +0530
Subject: [PATCH 02/10] fix: removed unused variable from template context

---
 enterprise/views.py                 | 3 +--
 tests/test_enterprise/test_utils.py | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/enterprise/views.py b/enterprise/views.py
index 743e8ee5ca..8d1129104b 100644
--- a/enterprise/views.py
+++ b/enterprise/views.py
@@ -1598,8 +1598,7 @@ def get_enterprise_course_enrollment_page(
                     'course_modes': course_modes,
                     'premium_modes': premium_modes,
                     'catalog': enterprise_catalog_uuid,
-                    'hide_course_original_price': enterprise_customer.hide_course_original_price,
-                    'hide_course_price_when_zero': enterprise_customer.hide_course_price_when_zero
+                    'hide_course_original_price': enterprise_customer.hide_course_original_price
                 }
             )
 
diff --git a/tests/test_enterprise/test_utils.py b/tests/test_enterprise/test_utils.py
index 72d331325b..434d7d0aa0 100644
--- a/tests/test_enterprise/test_utils.py
+++ b/tests/test_enterprise/test_utils.py
@@ -537,7 +537,6 @@ def test_truncate_string(self):
         (truncated_string, was_truncated) = truncate_string(test_string_2)
         self.assertTrue(was_truncated)
         self.assertEqual(len(truncated_string), MAX_ALLOWED_TEXT_LENGTH)
-
     @ddt.data(True, False)
     def test_hide_course_price_when_zero(self, hide_price):
         customer = factories.EnterpriseCustomerFactory()

From 5f2f7fb66f0e799608ec63943adb1ddf82d75654 Mon Sep 17 00:00:00 2001
From: Arunmozhi <arunmozhi@opencraft.com>
Date: Thu, 6 Jul 2023 16:36:55 +0530
Subject: [PATCH 03/10] fix: quality issue and add the new attribute to test

---
 enterprise/utils.py     | 2 +-
 tests/test_utilities.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/enterprise/utils.py b/enterprise/utils.py
index 4a60875437..7918329f4b 100644
--- a/enterprise/utils.py
+++ b/enterprise/utils.py
@@ -2401,7 +2401,7 @@ def hide_price_when_zero(enterprise_customer, course_modes):
             numbers = re.findall(r'\d+', mode['final_price'])
             mode['hide_price'] = int(''.join(numbers)) == 0
         except ValueError:
-            LOGGER.warn(
+            LOGGER.warning(
                 'hide_price_when_zero: Could not convert price of course mode "%s" to int.',
                 mode['title']
             )
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
index 070a1e817a..614ee7f796 100644
--- a/tests/test_utilities.py
+++ b/tests/test_utilities.py
@@ -169,6 +169,7 @@ def setUp(self):
                 "system_wide_role_assignments",
                 "reply_to",
                 "hide_labor_market_data",
+                "hide_course_original_price",
                 "chat_gpt_prompts",
                 "enable_generation_of_api_credentials",
                 "career_engagement_network_message",

From f8caa06a3730184bdae786b7670afd9838e4e57e Mon Sep 17 00:00:00 2001
From: Arunmozhi <arunmozhi@opencraft.com>
Date: Thu, 6 Jul 2023 16:46:34 +0530
Subject: [PATCH 04/10] fix: update the help text in the db migration

---
 enterprise/migrations/0175_auto_20230704_0740.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/enterprise/migrations/0175_auto_20230704_0740.py b/enterprise/migrations/0175_auto_20230704_0740.py
index dc84c483f0..ef0b3d8272 100644
--- a/enterprise/migrations/0175_auto_20230704_0740.py
+++ b/enterprise/migrations/0175_auto_20230704_0740.py
@@ -13,11 +13,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='enterprisecustomer',
             name='hide_course_price_when_zero',
-            field=models.BooleanField(default=False, help_text="Hides the course's price from the enrollment page when it is Zero, either by itself or due to a discount."),
+            field=models.BooleanField(default=False, help_text='Specify whether course cost should be hidden in the landing page when the final price is zero.'),
         ),
         migrations.AddField(
             model_name='historicalenterprisecustomer',
             name='hide_course_price_when_zero',
-            field=models.BooleanField(default=False, help_text="Hides the course's price from the enrollment page when it is Zero, either by itself or due to a discount."),
+            field=models.BooleanField(default=False, help_text='Specify whether course cost should be hidden in the landing page when the final price is zero.'),
         ),
     ]

From 9a650e2183e39e8d2e43a0bb1e4899714acc5674 Mon Sep 17 00:00:00 2001
From: Arunmozhi <arun@arunmozhi.in>
Date: Fri, 14 Jul 2023 11:50:39 +0530
Subject: [PATCH 05/10] feat: adds final price to logging

---
 enterprise/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/enterprise/utils.py b/enterprise/utils.py
index 7918329f4b..f0bf1d3043 100644
--- a/enterprise/utils.py
+++ b/enterprise/utils.py
@@ -2402,7 +2402,8 @@ def hide_price_when_zero(enterprise_customer, course_modes):
             mode['hide_price'] = int(''.join(numbers)) == 0
         except ValueError:
             LOGGER.warning(
-                'hide_price_when_zero: Could not convert price of course mode "%s" to int.',
+                'hide_price_when_zero: Could not convert price "%s" of course mode "%s" to int.',
+                mode['final_price'],
                 mode['title']
             )
     return course_modes

From 8413dfe12b9bcea99e5727145fdad7b44028cd8c Mon Sep 17 00:00:00 2001
From: Arunmozhi <arun@arunmozhi.in>
Date: Fri, 21 Jul 2023 20:34:11 +0530
Subject: [PATCH 06/10] fix: change the attribute in the utils test causing
 test failure

---
 tests/test_utilities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_utilities.py b/tests/test_utilities.py
index 614ee7f796..dd998dddfc 100644
--- a/tests/test_utilities.py
+++ b/tests/test_utilities.py
@@ -169,7 +169,7 @@ def setUp(self):
                 "system_wide_role_assignments",
                 "reply_to",
                 "hide_labor_market_data",
-                "hide_course_original_price",
+                "hide_course_price_when_zero",
                 "chat_gpt_prompts",
                 "enable_generation_of_api_credentials",
                 "career_engagement_network_message",

From d4b04a3b5f038fc2913bf4ad3670e2ea45944382 Mon Sep 17 00:00:00 2001
From: Arunmozhi <arun@arunmozhi.in>
Date: Mon, 7 Aug 2023 23:07:25 +0530
Subject: [PATCH 07/10] refactor: renamed the migration file

---
 .../{0175_auto_20230704_0740.py => 0175_auto_20230706_0810.py}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename enterprise/migrations/{0175_auto_20230704_0740.py => 0175_auto_20230706_0810.py} (100%)

diff --git a/enterprise/migrations/0175_auto_20230704_0740.py b/enterprise/migrations/0175_auto_20230706_0810.py
similarity index 100%
rename from enterprise/migrations/0175_auto_20230704_0740.py
rename to enterprise/migrations/0175_auto_20230706_0810.py

From f4a10ca08e687befab881957b0148d5127724f4e Mon Sep 17 00:00:00 2001
From: Arunmozhi <arun@arunmozhi.in>
Date: Fri, 8 Dec 2023 11:10:48 +0530
Subject: [PATCH 08/10] chore: rebase on master and update db migration

---
 ...o_20230706_0810.py => 0198_hide_course_price_when_zero.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename enterprise/migrations/{0175_auto_20230706_0810.py => 0198_hide_course_price_when_zero.py} (88%)

diff --git a/enterprise/migrations/0175_auto_20230706_0810.py b/enterprise/migrations/0198_hide_course_price_when_zero.py
similarity index 88%
rename from enterprise/migrations/0175_auto_20230706_0810.py
rename to enterprise/migrations/0198_hide_course_price_when_zero.py
index ef0b3d8272..d1162bd27d 100644
--- a/enterprise/migrations/0175_auto_20230706_0810.py
+++ b/enterprise/migrations/0198_hide_course_price_when_zero.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.19 on 2023-07-04 07:40
+# Generated by Django 3.2.23 on 2023-12-08 05:36
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('enterprise', '0174_auto_20230608_2041'),
+        ('enterprise', '0197_auto_20231130_2239'),
     ]
 
     operations = [

From d4ac14de8b9d26e098dbf9ed0b16dac1e47225f6 Mon Sep 17 00:00:00 2001
From: Arunmozhi <arun@arunmozhi.in>
Date: Fri, 8 Dec 2023 11:21:25 +0530
Subject: [PATCH 09/10] fix: remove empty lines causing linting failure

---
 enterprise/utils.py                 | 2 --
 tests/test_enterprise/test_utils.py | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/enterprise/utils.py b/enterprise/utils.py
index f0bf1d3043..b310b82c6d 100644
--- a/enterprise/utils.py
+++ b/enterprise/utils.py
@@ -2407,5 +2407,3 @@ def hide_price_when_zero(enterprise_customer, course_modes):
                 mode['title']
             )
     return course_modes
-
-    
\ No newline at end of file
diff --git a/tests/test_enterprise/test_utils.py b/tests/test_enterprise/test_utils.py
index 434d7d0aa0..109b62fe94 100644
--- a/tests/test_enterprise/test_utils.py
+++ b/tests/test_enterprise/test_utils.py
@@ -537,6 +537,7 @@ def test_truncate_string(self):
         (truncated_string, was_truncated) = truncate_string(test_string_2)
         self.assertTrue(was_truncated)
         self.assertEqual(len(truncated_string), MAX_ALLOWED_TEXT_LENGTH)
+
     @ddt.data(True, False)
     def test_hide_course_price_when_zero(self, hide_price):
         customer = factories.EnterpriseCustomerFactory()
@@ -563,3 +564,4 @@ def test_hide_course_price_when_zero(self, hide_price):
         else:
             self.assertEqual(zero_modes, processed_zero_modes)
             self.assertEqual(non_zero_modes, processed_non_zero_modes)
+

From 219e3f104347e324da0be042a781a6743e32b24a Mon Sep 17 00:00:00 2001
From: Arunmozhi <arun@arunmozhi.in>
Date: Fri, 8 Dec 2023 15:15:28 +0530
Subject: [PATCH 10/10] fix: remove the empty line in tests file

---
 tests/test_enterprise/test_utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_enterprise/test_utils.py b/tests/test_enterprise/test_utils.py
index 109b62fe94..72d331325b 100644
--- a/tests/test_enterprise/test_utils.py
+++ b/tests/test_enterprise/test_utils.py
@@ -564,4 +564,3 @@ def test_hide_course_price_when_zero(self, hide_price):
         else:
             self.assertEqual(zero_modes, processed_zero_modes)
             self.assertEqual(non_zero_modes, processed_non_zero_modes)
-