Merge pull request #2626 from carpentries/fix2582-corporate-workshop-…

…costs Fix2582 corporate workshop costs
carpentries · Oct 7, 2024 · 7e85c16 · 7e85c16
2 parents 91d2abd + 256e32e
commit 7e85c16
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 8 deletions.
diff --git a/amy/extrequests/migrations/0034_alter_workshopinquiryrequest_administrative_fee.py b/amy/extrequests/migrations/0034_alter_workshopinquiryrequest_administrative_fee.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2024-04-03 17:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extrequests', '0033_auto_20231023_1345'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='workshopinquiryrequest',
+            name='administrative_fee',
+            field=models.CharField(choices=[('nonprofit', 'I am with a government site, university, or other nonprofit. I understand the workshop fee as listed on The Carpentries website and agree to follow through on The Carpentries invoicing process.'), ('forprofit', 'I am with a corporate or for-profit site. I understand the costs for for-profit organisations are higher than the price for not-for-profit organisations, as listed on The Carpentries website.'), ('member', 'I am with a Member organisation so the workshop fee does not apply (instructor travel costs will still apply for in-person workshops).'), ('waiver', 'I am requesting financial support for the workshop fee (instructor travel costs will still apply for in-person workshops)')], default=None, help_text="<b><a href='https://carpentries.org/workshops/#workshop-cost' target='_blank' rel='noreferrer nofollow'>The Carpentries website workshop fee listing.</a><b>", max_length=20, verbose_name='Which of the following applies to your payment for the administrative fee?'),
+        ),
+    ]
diff --git a/amy/extrequests/models.py b/amy/extrequests/models.py
@@ -235,8 +235,8 @@ class WorkshopInquiryRequest(
         (
             "forprofit",
             "I am with a corporate or for-profit site. I understand the costs for "
-            "for-profit organisations are four times the price for not-for-profit "
-            "organisations.",
+            "for-profit organisations are higher than the price for not-for-profit "
+            "organisations, as listed on The Carpentries website.",
         ),
         (
             "member",
@@ -258,8 +258,10 @@ class WorkshopInquiryRequest(
         verbose_name="Which of the following applies to your payment for the "
         "administrative fee?",
         help_text=(
-            "<a href='{}' target='_blank' rel='noreferrer nofollow'>"
-            "The Carpentries website workshop fee listing.</a>".format(FEE_DETAILS_URL)
+            "<b><a href='{}' target='_blank' rel='noreferrer nofollow'>"
+            "The Carpentries website workshop fee listing.</a><b>".format(
+                FEE_DETAILS_URL
+            )
         ),
     )
     TRAVEL_EXPENCES_MANAGEMENT_CHOICES = (

diff --git a/amy/workshops/migrations/0271_alter_workshoprequest_administrative_fee.py b/amy/workshops/migrations/0271_alter_workshoprequest_administrative_fee.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2024-04-03 17:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('workshops', '0270_alter_organization_affiliated_organizations'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='workshoprequest',
+            name='administrative_fee',
+            field=models.CharField(choices=[('nonprofit', 'I am with a government site, university, or other nonprofit. I understand the workshop fee as listed on The Carpentries website and agree to follow through on The Carpentries invoicing process.'), ('forprofit', 'I am with a corporate or for-profit site. I understand the costs for for-profit organisations are higher than the price for not-for-profit organisations, as listed on The Carpentries website.'), ('member', 'I am with a Member organisation so the workshop fee does not apply (instructor travel costs will still apply for in-person workshops).'), ('waiver', 'I am requesting financial support for the workshop fee (instructor travel costs will still apply for in-person workshops)')], default=None, help_text="<b><a href='https://carpentries.org/workshops/#workshop-cost' target='_blank' rel='noreferrer nofollow'>The Carpentries website workshop fee listing.</a></b>", max_length=20, verbose_name='Which of the following applies to your payment for the administrative fee?'),
+        ),
+    ]
diff --git a/amy/workshops/models.py b/amy/workshops/models.py
@@ -3217,8 +3217,8 @@ class WorkshopRequest(
         (
             "forprofit",
             "I am with a corporate or for-profit site. I understand the costs for "
-            "for-profit organisations are four times the price for not-for-profit "
-            "organisations.",
+            "for-profit organisations are higher than the price for not-for-profit "
+            "organisations, as listed on The Carpentries website.",
         ),
         (
             "member",
@@ -3240,8 +3240,10 @@ class WorkshopRequest(
         verbose_name="Which of the following applies to your payment for the "
         "administrative fee?",
         help_text=(
-            "<a href='{}' target='_blank' rel='noreferrer nofollow'>"
-            "The Carpentries website workshop fee listing.</a>".format(FEE_DETAILS_URL)
+            "<b><a href='{}' target='_blank' rel='noreferrer nofollow'>"
+            "The Carpentries website workshop fee listing.</a></b>".format(
+                FEE_DETAILS_URL
+            )
         ),
     )
     scholarship_circumstances = models.TextField(