From d727039b5fb26ed0050b9dd6c187820a60a38c53 Mon Sep 17 00:00:00 2001
From: Matthew McKenzie <97194636+mattjamc@users.noreply.github.com>
Date: Thu, 2 Jan 2025 14:32:49 +0000
Subject: [PATCH 1/8] Update conditions_list (#1366)

---
 measures/jinja2/includes/measures/conditions.jinja          | 4 ++--
 measures/jinja2/includes/measures/list.jinja                | 2 +-
 measures/jinja2/includes/measures/workbasket-measures.jinja | 4 ++--
 measures/views/search.py                                    | 1 +
 workbaskets/jinja2/workbaskets/compare.jinja                | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/measures/jinja2/includes/measures/conditions.jinja b/measures/jinja2/includes/measures/conditions.jinja
index a56791c4d..83e1616f3 100644
--- a/measures/jinja2/includes/measures/conditions.jinja
+++ b/measures/jinja2/includes/measures/conditions.jinja
@@ -1,6 +1,6 @@
-{% macro conditions_list(measure) -%}
+{% macro conditions_list(measure, workbasket) -%}
   <ol class="govuk-list">
-    {% for condition in measure.conditions.current().with_reference_price_string() -%}
+    {% for condition in measure.conditions.approved_up_to_transaction(workbasket.transactions.last()).with_reference_price_string() -%}
       <li title="{{ condition.description }}">
 
         <span class="condition_code">
diff --git a/measures/jinja2/includes/measures/list.jinja b/measures/jinja2/includes/measures/list.jinja
index 51e4fad86..bbb3a31e4 100644
--- a/measures/jinja2/includes/measures/list.jinja
+++ b/measures/jinja2/includes/measures/list.jinja
@@ -68,7 +68,7 @@
                 {"text": create_link(measure.order_number.get_url(), measure.order_number.order_number) if measure.order_number else '-'},
                 {"text": footnotes_display(measure.footnoteassociationmeasure_set.current())},
                 {"text": create_link(url("regulation-ui-detail", kwargs={"role_type": measure.generating_regulation.role_type,"regulation_id": measure.generating_regulation.regulation_id}), measure.generating_regulation.regulation_id) if measure.generating_regulation.regulation_id else '-'},
-                {"text": conditions_list(measure) if measure.conditions.current() else "-", "classes": "govuk-!-width-one-quarter"},
+                {"text": conditions_list(measure, workbasket) if measure.conditions.current() else "-", "classes": "govuk-!-width-one-quarter"},
               ]) or "" }} 
           {% endfor %}
         {{ govukTable({
diff --git a/measures/jinja2/includes/measures/workbasket-measures.jinja b/measures/jinja2/includes/measures/workbasket-measures.jinja
index c9f2e8811..337575e2c 100644
--- a/measures/jinja2/includes/measures/workbasket-measures.jinja
+++ b/measures/jinja2/includes/measures/workbasket-measures.jinja
@@ -17,8 +17,8 @@
     {"html": create_link(url("additional_code-ui-detail", kwargs={"sid": measure.additional_code.sid}), measure.additional_code.type.sid ~ measure.additional_code.code) if measure.additional_code else '-'},
     {"html": create_link(url("geo_area-ui-detail", kwargs={"sid": measure.geographical_area.sid}), measure.geographical_area.area_id ~ " - " ~ measure.geographical_area.get_description().description) if measure.geographical_area else '-'},
     {"text": create_link(measure.order_number.get_url(), measure.order_number.order_number) if measure.order_number else '-'},
-    {"text": footnotes_display(measure.footnoteassociationmeasure_set.current())},
-    {"text": conditions_list(measure) if measure.conditions.current() else "-"},
+    {"text": footnotes_display(measure.footnoteassociationmeasure_set.approved_up_to_transaction(workbasket.transactions.last()))},
+    {"text": conditions_list(measure, workbasket) if measure.conditions.approved_up_to_transaction(workbasket.transactions.last()) else "-"},
   ]) or "" }}
 {% endfor %}
 
diff --git a/measures/views/search.py b/measures/views/search.py
index 3815b8c62..dec0f6ba2 100644
--- a/measures/views/search.py
+++ b/measures/views/search.py
@@ -241,6 +241,7 @@ def get_context_data(self, **kwargs):
                     page.paginator.num_pages,
                 ),
                 "selected_filter_lists": self.selected_filter_formatter(),
+                "workbasket": self.workbasket,
             },
         )
         if context["has_previous_page"]:
diff --git a/workbaskets/jinja2/workbaskets/compare.jinja b/workbaskets/jinja2/workbaskets/compare.jinja
index d852903be..20d6fa525 100644
--- a/workbaskets/jinja2/workbaskets/compare.jinja
+++ b/workbaskets/jinja2/workbaskets/compare.jinja
@@ -92,7 +92,7 @@
         {"html": create_link(url("geo_area-ui-detail", kwargs={"sid": measure.geographical_area.sid}), measure.geographical_area.area_id ~ " - " ~ measure.geographical_area.get_description().description) if measure.geographical_area else '-'},
         {"text": create_link(measure.order_number.get_url(), measure.order_number.order_number) if measure.order_number else '-'},
         {"text": footnotes_display(measure.footnoteassociationmeasure_set.current())},
-        {"text": conditions_list(measure) if measure.conditions.current() else "-"},
+        {"text": conditions_list(measure, workbasket) if measure.conditions.current() else "-"},
       ]) or "" }}
     {% endfor %}
 

From 01a53a11ca51d3940baaa2399987cb6f44eb5e21 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Fri, 3 Jan 2025 14:43:07 +0000
Subject: [PATCH 2/8] TP2000-1636 Fix date-related failing unit tests (#1372)

* Replace hardcoded dates in failing unit tests

* Use start date from TaricDateRange object
---
 measures/forms/mixins.py                             |  2 +-
 measures/tests/conftest.py                           |  6 +++---
 .../tests/test_ref_quota_definition_range_forms.py   | 12 ++++++------
 .../tests/test_ref_quota_definition_ranges_model.py  |  3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/measures/forms/mixins.py b/measures/forms/mixins.py
index 08c6b6e33..6bf3a2acc 100644
--- a/measures/forms/mixins.py
+++ b/measures/forms/mixins.py
@@ -247,7 +247,7 @@ def conditions_clean(
             )
 
         if price:
-            date = measure_start_date or make_aware(datetime.now())
+            date = measure_start_date or make_aware(datetime.datetime.now())
             parser = LarkDutySentenceParser(compound_duties=False, date=date)
             try:
                 components = parser.transform(price)
diff --git a/measures/tests/conftest.py b/measures/tests/conftest.py
index df5d8e12c..0c836188a 100644
--- a/measures/tests/conftest.py
+++ b/measures/tests/conftest.py
@@ -425,7 +425,7 @@ def measure_conditions_form_data(
         },
         "kwargs": {
             "form_kwargs": {
-                "measure_start_date": datetime.date(2025, 1, 1),
+                "measure_start_date": date_ranges.normal.lower,
                 "measure_type": factories.MeasureTypeFactory.create(
                     valid_between=date_ranges.normal,
                 ),
@@ -451,7 +451,7 @@ def measure_footnotes_form_data():
 
 
 @pytest.fixture()
-def measure_commodities_and_duties_form_data():
+def measure_commodities_and_duties_form_data(date_ranges):
     commodity_1 = factories.GoodsNomenclatureFactory.create()
     commodity_2 = factories.GoodsNomenclatureFactory.create()
 
@@ -464,7 +464,7 @@ def measure_commodities_and_duties_form_data():
         },
         "kwargs": {
             "min_commodity_count": 1,
-            "measure_start_date": datetime.date(2025, 1, 1),
+            "measure_start_date": date_ranges.normal.lower,
             "form_kwargs": {
                 "measure_type": None,
             },
diff --git a/reference_documents/tests/test_ref_quota_definition_range_forms.py b/reference_documents/tests/test_ref_quota_definition_range_forms.py
index edd4b3330..0ff5dca7e 100644
--- a/reference_documents/tests/test_ref_quota_definition_range_forms.py
+++ b/reference_documents/tests/test_ref_quota_definition_range_forms.py
@@ -67,16 +67,16 @@ def test_clean_duty_rate(self):
             ("zz", "Enter a whole number."),
             (
                 0,
-                "Start year is not valid, it must be a 4 digit year greater than 2010 and less than 2124",
+                f"Start year is not valid, it must be a 4 digit year greater than 2010 and less than {date.today().year + 100}",
             ),
             (
                 1980,
-                "Start year is not valid, it must be a 4 digit year greater than 2010 and less than 2124",
+                f"Start year is not valid, it must be a 4 digit year greater than 2010 and less than {date.today().year + 100}",
             ),
             (date.today().year + 2, None),
             (
                 date.today().year + 101,
-                "Start year is not valid, it must be a 4 digit year greater than 2010 and less than 2124",
+                f"Start year is not valid, it must be a 4 digit year greater than 2010 and less than {date.today().year + 100}",
             ),
         ],
     )
@@ -139,17 +139,17 @@ def test_clean_start_year(self, value, expected_message):
             (
                 0,
                 "start_year",
-                "Start year is not valid, it must be a 4 digit year greater than 2010 and less than 2124",
+                f"Start year is not valid, it must be a 4 digit year greater than 2010 and less than {date.today().year + 100}",
             ),
             (
                 1980,
                 "start_year",
-                "Start year is not valid, it must be a 4 digit year greater than 2010 and less than 2124",
+                f"Start year is not valid, it must be a 4 digit year greater than 2010 and less than {date.today().year + 100}",
             ),
             (
                 date.today().year + 101,
                 "start_year",
-                "Start year is not valid, it must be a 4 digit year greater than 2010 and less than 2124",
+                f"Start year is not valid, it must be a 4 digit year greater than 2010 and less than {date.today().year + 100}",
             ),
             (date.today().year + 2, "start_year", None),
             # end year
diff --git a/reference_documents/tests/test_ref_quota_definition_ranges_model.py b/reference_documents/tests/test_ref_quota_definition_ranges_model.py
index 2bee8f4b6..7c7f02d91 100644
--- a/reference_documents/tests/test_ref_quota_definition_ranges_model.py
+++ b/reference_documents/tests/test_ref_quota_definition_ranges_model.py
@@ -92,7 +92,8 @@ def test_date_ranges_no_end_date(self):
 
         rqdr_date_ranges = target.date_ranges()
 
-        assert len(rqdr_date_ranges) == 8
+        # date_ranges() adds three years to the current date to calculate target.end_year if None
+        assert len(rqdr_date_ranges) == (date.today().year + 4) - target.start_year
         assert rqdr_date_ranges[0] == TaricDateRange(
             date(2020, 1, 1),
             date(2020, 12, 31),

From 5a1d02dc6901df44ee24c59ce3f323f6e11bc10f Mon Sep 17 00:00:00 2001
From: Charlie Prichard <46421052+CPrich905@users.noreply.github.com>
Date: Wed, 8 Jan 2025 08:59:06 +0000
Subject: [PATCH 3/8] TP2000-1537 Bulk create QuotaDefinitionPeriods (#1320)

---
 .../common/scss/_quota-definitions.scss       |   6 +
 .../common/widgets/decimal_suffix.html        |  16 +
 common/widgets.py                             |  20 +
 quotas/forms/definitions.py                   | 128 +++--
 quotas/forms/wizards.py                       | 457 ++++++++++++++----
 quotas/jinja2/includes/quotas/actions.jinja   |   8 +-
 .../bulk-create-definition-edit.jinja         |  19 +
 .../bulk-create-definition-info.jinja         |  26 +
 .../quota-definitions/bulk-create-done.jinja  |  43 ++
 .../bulk-create-review.jinja                  | 102 ++++
 .../quota-definitions/bulk-create-start.jinja |  23 +
 .../quota-definitions/bulk-create-step.jinja  |  17 +
 quotas/jinja2/quota-definitions/create.jinja  |  22 +-
 quotas/serializers.py                         |  72 ++-
 quotas/tests/test_forms.py                    | 356 +++++++++++++-
 quotas/tests/test_views.py                    | 243 +++++++++-
 quotas/urls.py                                |  26 +
 quotas/views/definitions.py                   |  37 +-
 quotas/views/wizards.py                       | 145 +++++-
 quotas/wizard.py                              |   4 +
 .../jinja2/workbaskets/edit-workbasket.jinja  |   1 +
 21 files changed, 1624 insertions(+), 147 deletions(-)
 create mode 100644 common/templates/common/widgets/decimal_suffix.html
 create mode 100644 quotas/jinja2/quota-definitions/bulk-create-definition-edit.jinja
 create mode 100644 quotas/jinja2/quota-definitions/bulk-create-definition-info.jinja
 create mode 100644 quotas/jinja2/quota-definitions/bulk-create-done.jinja
 create mode 100644 quotas/jinja2/quota-definitions/bulk-create-review.jinja
 create mode 100644 quotas/jinja2/quota-definitions/bulk-create-start.jinja
 create mode 100644 quotas/jinja2/quota-definitions/bulk-create-step.jinja

diff --git a/common/static/common/scss/_quota-definitions.scss b/common/static/common/scss/_quota-definitions.scss
index 4a81d0996..70786d1d6 100644
--- a/common/static/common/scss/_quota-definitions.scss
+++ b/common/static/common/scss/_quota-definitions.scss
@@ -28,4 +28,10 @@
 
 .definition-original {
     color: $govuk-secondary-text-colour;
+}
+
+.bulk-create-review {
+    details.govuk-details[open] {
+        height: 420px !important;
+    }
 }
\ No newline at end of file
diff --git a/common/templates/common/widgets/decimal_suffix.html b/common/templates/common/widgets/decimal_suffix.html
new file mode 100644
index 000000000..aff4b4ce7
--- /dev/null
+++ b/common/templates/common/widgets/decimal_suffix.html
@@ -0,0 +1,16 @@
+<div class="govuk-input__wrapper">
+	<input 
+        class="numberinput govuk-input govuk-input govuk-input--width-2" 
+        type="{{ widget.type }}" 
+        name="{{ widget.name }}"
+        {% if widget.value != None %} 
+            value="{{ widget.value|stringformat:'s' }}"
+        {% endif %}
+        {% include "django/forms/widgets/attrs.html" %}>
+    {% if widget.suffix %}
+        <div class="govuk-input__suffix" aria-hidden="true">{{widget.suffix}}</div>
+    {% endif %}
+	<label{% if widget.attrs.id %} id="{{ widget.attrs.id }}-label" for="{{ widget.attrs.id }}"{% endif %} class="govuk-label">
+		{{ widget.label }}
+	</label>
+</div>
diff --git a/common/widgets.py b/common/widgets.py
index f64a100ea..05be8f890 100644
--- a/common/widgets.py
+++ b/common/widgets.py
@@ -71,3 +71,23 @@ class MultipleFileInput(FileInput):
     """Enable multiple files to be selected using FileInput widget."""
 
     allow_multiple_selected = True
+
+
+class DecimalSuffix(widgets.NumberInput):
+    """Identical to the Decimal widget but allows the addition of a suffix."""
+
+    template_name = "common/widgets/decimal_suffix.html"
+
+    def __init__(self, attrs=None, suffix="", **kwargs):
+        self.suffix = suffix
+        super().__init__(attrs, **kwargs)
+
+    def render(self, name, value, attrs=None, renderer=None):
+        if attrs is None:
+            attrs = {}
+        context = self.get_context(name, value, attrs)
+        if self.suffix:
+            context["widget"]["suffix"] = self.suffix
+
+        template = loader.get_template(self.template_name).render(context)
+        return mark_safe(template)
diff --git a/quotas/forms/definitions.py b/quotas/forms/definitions.py
index 66a0f552e..8a03b880b 100644
--- a/quotas/forms/definitions.py
+++ b/quotas/forms/definitions.py
@@ -2,8 +2,6 @@
 
 from crispy_forms_gds.helper import FormHelper
 from crispy_forms_gds.layout import HTML
-from crispy_forms_gds.layout import Accordion
-from crispy_forms_gds.layout import AccordionSection
 from crispy_forms_gds.layout import Div
 from crispy_forms_gds.layout import Field
 from crispy_forms_gds.layout import Layout
@@ -14,6 +12,7 @@
 
 from common.forms import ValidityPeriodForm
 from common.serializers import deserialize_date
+from common.widgets import DecimalSuffix
 from measures.models import MeasurementUnit
 from quotas import business_rules
 from quotas import models
@@ -145,6 +144,7 @@ class QuotaDefinitionCreateForm(
     class Meta:
         model = models.QuotaDefinition
         fields = [
+            "order_number",
             "valid_between",
             "description",
             "volume",
@@ -156,9 +156,14 @@ class Meta:
             "maximum_precision",
         ]
 
+    order_number = forms.ModelChoiceField(
+        queryset=models.QuotaOrderNumber.objects.current(),
+        widget=forms.HiddenInput(),
+    )
     description = forms.CharField(label="", widget=forms.Textarea(), required=False)
     volume = forms.DecimalField(
         label="Current volume",
+        help_text="The current volume is the starting balance for the quota",
         widget=forms.TextInput(),
         error_messages={
             "invalid": "Volume must be a number",
@@ -167,6 +172,7 @@ class Meta:
     )
     initial_volume = forms.DecimalField(
         widget=forms.TextInput(),
+        help_text="The initial volume is the legal balance applied to the definition period",
         error_messages={
             "invalid": "Initial volume must be a number",
             "required": "Enter the initial volume",
@@ -174,13 +180,14 @@ class Meta:
     )
     measurement_unit = forms.ModelChoiceField(
         queryset=MeasurementUnit.objects.current(),
+        empty_label="Choose measurement unit",
         error_messages={"required": "Select the measurement unit"},
     )
 
     quota_critical_threshold = forms.DecimalField(
         label="Threshold",
+        widget=DecimalSuffix(suffix="%"),
         help_text="The point at which this quota definition period becomes critical, as a percentage of the total volume.",
-        widget=forms.TextInput(),
         error_messages={
             "invalid": "Critical threshold must be a number",
             "required": "Enter the critical threshold",
@@ -199,13 +206,21 @@ class Meta:
     )
 
     def __init__(self, *args, **kwargs):
+        self.buttons = kwargs.pop("buttons", None)
+        self.order_number = kwargs.pop("order_number", None)
         super().__init__(*args, **kwargs)
         self.init_layout()
         self.init_fields()
 
     def clean(self):
+        cleaned_data = super().clean()
+        """The "order_number" field is hidden, but is not correctly populated by
+        .initial when creating a single QuotaDefinitionPeriod."""
+        if "order_number" in self.errors:
+            self.cleaned_data["order_number"] = self.order_number
+            self.errors.pop("order_number")
         validators.validate_quota_volume(self.cleaned_data)
-        return super().clean()
+        return cleaned_data
 
     def init_fields(self):
         # This is always set to 3 for current definitions
@@ -230,50 +245,87 @@ def init_fields(self):
             lambda obj: f"{obj.code} - {obj.description}"
         )
 
-    def init_layout(self):
+        self.fields["end_date"].help_text = ""
+        self.fields["end_date"].required = True
+        self.fields["measurement_unit_qualifier"].help_text = (
+            "A measurement unit qualifier is not always required."
+        )
+        self.fields["measurement_unit_qualifier"].empty_label = (
+            "Choose measurement unit qualifier."
+        )
+
+    def init_layout(self, *args, **kwargs):
         self.helper = FormHelper(self)
         self.helper.label_size = Size.SMALL
         self.helper.legend_size = Size.SMALL
-
+        link_text = self.buttons["link_text"]
+        link = self.buttons["link"]
         self.helper.layout = Layout(
-            Accordion(
-                AccordionSection(
-                    "Description",
-                    HTML.p("Adding a description is optional."),
-                    "description",
-                    "order_number",
+            Div(
+                HTML(
+                    '<h3 class="govuk-heading">Validity period</h3>',
                 ),
-                AccordionSection(
-                    "Validity period",
-                    "start_date",
-                    "end_date",
+                "start_date",
+                "end_date",
+            ),
+            HTML(
+                "<br />",
+            ),
+            Div(
+                HTML(
+                    '<h3 class="govuk-heading">Measurements</h3>',
                 ),
-                AccordionSection(
-                    "Measurements",
-                    HTML.p("A measurement unit qualifier is not always required."),
-                    Field("measurement_unit", css_class="govuk-!-width-full"),
-                    Field("measurement_unit_qualifier", css_class="govuk-!-width-full"),
+                Field("measurement_unit", css_class="govuk-!-width-two-thirds"),
+                Field(
+                    "measurement_unit_qualifier",
+                    css_class="govuk-!-width-two-thirds",
                 ),
-                AccordionSection(
-                    "Volume",
-                    HTML.p(
-                        "The initial volume is the legal balance applied to the definition period.<br><br>The current volume is the starting balance for the quota.",
-                    ),
-                    "initial_volume",
-                    "volume",
-                    "maximum_precision",
+            ),
+            HTML(
+                "<br />",
+            ),
+            Div(
+                HTML(
+                    '<h3 class="govuk-heading">Volume</h3>',
+                ),
+                Field("initial_volume", css_class="govuk-!-width-one-third"),
+                Field("volume", css_class="govuk-!-width-one-third"),
+                "maximum_precision",
+            ),
+            HTML(
+                "<br />",
+            ),
+            Div(
+                HTML(
+                    '<h3 class="govuk-heading">Criticality</h3>',
                 ),
-                AccordionSection(
-                    "Criticality",
-                    "quota_critical_threshold",
-                    "quota_critical",
+                "quota_critical_threshold",
+                "quota_critical",
+            ),
+            HTML(
+                "<br />",
+            ),
+            Div(
+                HTML(
+                    '<h3 class="govuk-heading">Description</h3>',
                 ),
+                HTML.p("Adding a description is optional."),
+                Field("description", css_class="govuk-!-width-two-thirds"),
             ),
-            Submit(
-                "submit",
-                "Save",
-                data_module="govuk-button",
-                data_prevent_double_click="true",
+            HTML(
+                "<br />",
+            ),
+            Div(
+                Submit(
+                    "submit",
+                    self.buttons["submit"],
+                    data_module="govuk-button",
+                    data_prevent_double_click="true",
+                ),
+                HTML(
+                    f'<a class="govuk-link" href={link}>{link_text}</a>',
+                ),
+                css_class="govuk-button-group",
             ),
         )
 
diff --git a/quotas/forms/wizards.py b/quotas/forms/wizards.py
index e4c17a640..77eea97e1 100644
--- a/quotas/forms/wizards.py
+++ b/quotas/forms/wizards.py
@@ -1,20 +1,26 @@
-from crispy_forms_gds.helper import FormHelper
+import decimal
 
-# from crispy_forms_gds.layout import Button
+from crispy_forms_gds.helper import FormHelper
 from crispy_forms_gds.layout import HTML
 from crispy_forms_gds.layout import Div
 from crispy_forms_gds.layout import Field
 from crispy_forms_gds.layout import Layout
 from crispy_forms_gds.layout import Size
 from crispy_forms_gds.layout import Submit
+from dateutil.relativedelta import relativedelta
 from django import forms
 from django.core.exceptions import ValidationError
 
 from common.fields import AutoCompleteField
 from common.forms import ValidityPeriodForm
+from common.serializers import deserialize_date
+from common.util import TaricDateRange
+from common.widgets import DecimalSuffix
 from measures.models import MeasurementUnit
+from measures.models import MeasurementUnitQualifier
 from quotas import models
-from quotas import validators
+from quotas.forms.definitions import QuotaDefinitionCreateForm
+from quotas.serializers import serialize_definition_data
 from quotas.serializers import serialize_duplicate_data
 from workbaskets.forms import SelectableObjectsForm
 
@@ -38,9 +44,9 @@ class QuotaOrderNumbersSelectForm(forms.Form):
     def __init__(self, *args, **kwargs):
         self.request = kwargs.pop("request", None)
         super().__init__(*args, **kwargs)
-        self.init_layout(self.request)
+        self.init_layout()
 
-    def init_layout(self, request):
+    def init_layout(self):
         self.helper = FormHelper(self)
         self.helper.label_size = Size.SMALL
         self.helper.legend_size = Size.SMALL
@@ -130,22 +136,71 @@ def clean(self):
 
 
 class BulkQuotaDefinitionCreateStartForm(forms.Form):
-    pass
+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop("request")
+        super().__init__(*args, **kwargs)
+        self.init_layout(self.request)
 
+    quota_order_number = AutoCompleteField(
+        label="Enter the quota order number",
+        queryset=models.QuotaOrderNumber.objects.all(),
+        required=True,
+    )
 
-class BulkQuotaDefinitionCreateIntroductoryPeriod(forms.Form):
-    pass
+    def save_quota_order_number_to_session(self, cleaned_data):
+        self.request.session["quota_order_number_pk"] = cleaned_data[
+            "quota_order_number"
+        ].pk
+        self.request.session["quota_order_number"] = cleaned_data[
+            "quota_order_number"
+        ].order_number
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if cleaned_data == {}:
+            raise ValidationError("A quota order number must be selected")
+
+        self.save_quota_order_number_to_session(cleaned_data)
+        return cleaned_data
 
+    def init_layout(self, request):
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+
+        self.helper.layout = Layout(
+            Div(
+                HTML(
+                    '<h2 class="govuk-heading">Enter quota order number</h2>',
+                ),
+                Div(
+                    "quota_order_number",
+                    css_class="govuk-!-width-one-third",
+                ),
+                Div(
+                    Submit(
+                        "submit",
+                        "Continue",
+                        data_module="govuk-button",
+                        data_prevent_double_click="true",
+                    ),
+                    HTML(
+                        '<a class="govuk-link" href="/workbaskets/current">Cancel</a>',
+                    ),
+                    css_class="govuk-button-group",
+                ),
+            ),
+        )
 
-class QuotaDefinitionCreateForm(
+
+class QuotaDefinitionBulkCreateDefinitionInformation(
     ValidityPeriodForm,
-    forms.ModelForm,
+    forms.Form,
 ):
     class Meta:
         model = models.QuotaDefinition
         fields = [
             "valid_between",
-            "description",
             "volume",
             "initial_volume",
             "measurement_unit",
@@ -155,31 +210,54 @@ class Meta:
             "maximum_precision",
         ]
 
-    description = forms.CharField(label="", widget=forms.Textarea(), required=False)
+    instance_count = forms.DecimalField(
+        required=True,
+        label="Total number of definitions to create",
+        help_text="You can create up to 20 definition periods at a time per quota order number",
+        error_messages={
+            "invalid": "Must be a number",
+            "required": "Enter the number of definition periods to create",
+        },
+    )
+
+    frequency = forms.ChoiceField(
+        widget=forms.RadioSelect(attrs={"required": "required"}),
+        choices=[
+            (1, "Every year"),
+            (2, "Every 6 months"),
+            (3, "Every 3 months"),
+        ],
+        help_text="For non-standard frequencies, pick the closest option and edit it on the review page",
+    )
+
     volume = forms.DecimalField(
         label="Current volume",
-        widget=forms.TextInput(),
+        widget=forms.TextInput(attrs={"required": "required"}),
+        help_text="The current volume is the starting balance for the quota",
         error_messages={
             "invalid": "Volume must be a number",
             "required": "Enter the volume",
         },
     )
     initial_volume = forms.DecimalField(
-        widget=forms.TextInput(),
+        widget=forms.TextInput(attrs={"required": "required"}),
+        help_text="The initial volume is the legal balance applied to the definition period",
         error_messages={
             "invalid": "Initial volume must be a number",
             "required": "Enter the initial volume",
         },
     )
+
     measurement_unit = forms.ModelChoiceField(
+        empty_label="Choose measurement unit",
         queryset=MeasurementUnit.objects.current(),
         error_messages={"required": "Select the measurement unit"},
     )
 
     quota_critical_threshold = forms.DecimalField(
         label="Threshold",
+        widget=DecimalSuffix(suffix="%"),
         help_text="The point at which this quota definition period becomes critical, as a percentage of the total volume.",
-        widget=forms.TextInput(),
         error_messages={
             "invalid": "Critical threshold must be a number",
             "required": "Enter the critical threshold",
@@ -196,38 +274,133 @@ class Meta:
     maximum_precision = forms.IntegerField(
         widget=forms.HiddenInput(),
     )
+    description = forms.CharField(
+        label="",
+        help_text="Adding a description is optional",
+        widget=forms.Textarea(),
+    )
 
     def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop("request")
         super().__init__(*args, **kwargs)
         self.init_layout()
         self.init_fields()
 
-    def clean(self):
-        validators.validate_quota_volume(self.cleaned_data)
-        return super().clean()
-
     def init_fields(self):
         # This is always set to 3 for current definitions
         # see https://uktrade.github.io/tariff-data-manual/documentation/data-structures/quotas.html#the-quota-definition-table
         self.fields["maximum_precision"].initial = 3
-
-        # Set these as the default values
-        self.fields["quota_critical"].initial = False
+        self.fields["end_date"].help_text = ""
+        self.fields["end_date"].required = True
+        self.fields["measurement_unit_qualifier"].help_text = (
+            "A measurement unit qualifier is not always required"
+        )
+        self.fields["measurement_unit_qualifier"].empty_label = (
+            "Choose measurement unit qualifier"
+        )
         self.fields["quota_critical_threshold"].initial = 90
+        self.fields["quota_critical"].initial = False
+        self.fields["description"].required = False
+
+    def save_definition_data_to_session(self, cleaned_data):
+        instance_count = decimal.Decimal(cleaned_data["instance_count"])
+        frequency = decimal.Decimal(cleaned_data["frequency"])
+        definition_data = {
+            "id": 1,
+            "maximum_precision": cleaned_data["maximum_precision"],
+            "initial_volume": cleaned_data["initial_volume"],
+            "volume": cleaned_data["volume"],
+            "measurement_unit": cleaned_data["measurement_unit"],
+            "quota_critical_threshold": cleaned_data["quota_critical_threshold"],
+            "quota_critical": cleaned_data["quota_critical"],
+            "valid_between": cleaned_data["valid_between"],
+        }
+        # optional fields
+        if "description" in cleaned_data:
+            definition_data["description"] = cleaned_data["description"]
+        if "measurement_unit_qualifier" in cleaned_data:
+            definition_data["measurement_unit_qualifier"] = cleaned_data[
+                "measurement_unit_qualifier"
+            ]
+
+        staged_definitions = []
+
+        serialize_first_definition = serialize_definition_data(definition_data)
+        staged_definitions.append(serialize_first_definition)
+
+        while len(staged_definitions) < instance_count:
+            id = decimal.Decimal(definition_data["id"]) + 1
+            definition_data.update(
+                {"id": id},
+            )
+            """
+            There are currently three options for the frequency with which
+            definition periods repeat, selected in
+            BulkQuotaDefinitionCreateInitialInformation
+            1. Annually
+            2. Every 6 months
+            3. Quarterly
+            """
+            if frequency == 1:
+                # Repeats annualy
+                new_start_date = definition_data["valid_between"].lower + relativedelta(
+                    years=1,
+                )
+                new_end_date = definition_data["valid_between"].upper + relativedelta(
+                    years=1,
+                )
+                new_date_range = TaricDateRange(
+                    new_start_date,
+                    new_end_date,
+                )
+                definition_data.update(
+                    {
+                        "valid_between": new_date_range,
+                    },
+                )
 
-        self.fields["measurement_unit"].queryset = self.fields[
-            "measurement_unit"
-        ].queryset.order_by("code")
-        self.fields["measurement_unit"].label_from_instance = (
-            lambda obj: f"{obj.code} - {obj.description}"
-        )
+            if frequency == 2:
+                # Repeats every 6 months
+                new_start_date = definition_data["valid_between"].upper + relativedelta(
+                    days=1,
+                )
+                new_end_date = new_start_date + relativedelta(
+                    months=6,
+                    days=-1,
+                )
+                new_date_range = TaricDateRange(
+                    new_start_date,
+                    new_end_date,
+                )
+                definition_data.update(
+                    {"valid_between": new_date_range},
+                )
+            if frequency == 3:
+                # repeats quarterly
+                new_start_date = definition_data["valid_between"].upper + relativedelta(
+                    days=1,
+                )
+                new_end_date = new_start_date + relativedelta(
+                    months=3,
+                    days=-1,
+                )
+                new_date_range = TaricDateRange(
+                    new_start_date,
+                    new_end_date,
+                )
+                definition_data.update(
+                    {"valid_between": new_date_range},
+                )
+            serialized_definition_data = serialize_definition_data(definition_data)
+            staged_definitions.append(serialized_definition_data)
 
-        self.fields["measurement_unit_qualifier"].queryset = self.fields[
-            "measurement_unit_qualifier"
-        ].queryset.order_by("code")
-        self.fields["measurement_unit_qualifier"].label_from_instance = (
-            lambda obj: f"{obj.code} - {obj.description}"
-        )
+        self.request.session["staged_definition_data"] = staged_definitions
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if self.is_valid():
+            self.save_definition_data_to_session(cleaned_data)
+        return cleaned_data
 
     def init_layout(self):
         self.helper = FormHelper(self)
@@ -237,73 +410,181 @@ def init_layout(self):
         self.helper.layout = Layout(
             Div(
                 HTML(
-                    '<h3 class="govuk-heading">Definitions count</h3>',
+                    '<h2 class="govuk-heading">First definition period</h2>',
                 ),
-            ),
-            HTML(
-                '<hr class="govuk-section-break govuk-section-break--s govuk-section-break--visible">',
-            ),
-            Div(
-                HTML(
-                    '<h3 class="govuk-heading">Description</h3>',
+                Div(
+                    HTML(
+                        '<p class="govuk-body">Enter the dates for the first definition period you are creating. Subsequent definition period dates will be calculated based on the dates entered for this first period</p>',
+                    ),
+                    "start_date",
+                    "end_date",
+                ),
+                Div(
+                    HTML(
+                        '<h2 class="govuk-heading">Subsequent definition periods</h2>',
+                    ),
+                ),
+                Div(
+                    HTML(
+                        '<p class="govuk-body">Select the frequency at which the subsequent definition periods should be duplicated</p>',
+                    ),
+                    "frequency",
+                    Field(
+                        "instance_count",
+                        css_class="govuk-input govuk-input--width-2",
+                    ),
                 ),
-                HTML.p("Adding a description is optional."),
-                "description",
-                "order_number",
-            ),
-            HTML(
-                '<hr class="govuk-section-break govuk-section-break--s govuk-section-break--visible">',
-            ),
-            Div(
                 HTML(
-                    '<h3 class="govuk-heading">Validity period</h3>',
+                    '<hr class="govuk-section-break govuk-section-break--s govuk-section-break--visible">',
+                ),
+                Div(
+                    HTML(
+                        '<h3 class="govuk-heading">Measurements</h3>',
+                    ),
+                    Field("measurement_unit", css_class="govuk-!-width-two-thirds"),
+                    Field(
+                        "measurement_unit_qualifier",
+                        css_class="govuk-!-width-two-thirds",
+                    ),
                 ),
-                "start_date",
-                "end_date",
-            ),
-            HTML(
-                '<hr class="govuk-section-break govuk-section-break--s govuk-section-break--visible">',
-            ),
-            Div(
                 HTML(
-                    '<h3 class="govuk-heading">Measurements</h3>',
+                    "<br />",
+                ),
+                Div(
+                    HTML(
+                        '<h3 class="govuk-heading">Volume</h3>',
+                    ),
+                    Field("initial_volume", css_class="govuk-!-width-one-third"),
+                    Field("volume", css_class="govuk-!-width-one-third"),
+                    "maximum_precision",
                 ),
-                HTML.p("A measurement unit qualifier is not always required."),
-                Field("measurement_unit", css_class="govuk-!-width-full"),
-                Field("measurement_unit_qualifier", css_class="govuk-!-width-full"),
-            ),
-            HTML(
-                '<hr class="govuk-section-break govuk-section-break--s govuk-section-break--visible">',
-            ),
-            Div(
                 HTML(
-                    '<h3 class="govuk-heading">Volume</h3>',
+                    "<br />",
                 ),
-                HTML.p(
-                    "The initial volume is the legal balance applied to the definition period.<br><br>The current volume is the starting balance for the quota.",
+                Div(
+                    HTML(
+                        '<h3 class="govuk-heading">Criticality</h3>',
+                    ),
+                    Field(
+                        "quota_critical_threshold",
+                        css_class="govuk-!-width-two-thirds",
+                    ),
+                    "quota_critical",
                 ),
-                "initial_volume",
-                "volume",
-                "maximum_precision",
-            ),
-            HTML(
-                '<hr class="govuk-section-break govuk-section-break--s govuk-section-break--visible">',
-            ),
-            Div(
                 HTML(
-                    '<h3 class="govuk-heading">Criticality</h3>',
+                    "<br />",
+                ),
+                Div(
+                    HTML(
+                        '<h3 class="govuk-heading">Description</h3>',
+                    ),
+                    Field("description", css_class="govuk-!-width-two-thirds"),
+                ),
+                Div(
+                    Submit(
+                        "submit",
+                        "Save and continue",
+                        data_module="govuk-button",
+                        data_prevent_double_click="true",
+                    ),
+                    HTML(
+                        f"<a class='govuk-button govuk-button--secondary' href='/quotas/quota_definitions/bulk_create/start'>Back</a>",
+                    ),
+                    css_class="govuk-button-group",
                 ),
-                "quota_critical_threshold",
-                "quota_critical",
             ),
-            Submit(
-                "submit",
-                "Save",
-                data_module="govuk-button",
-                data_prevent_double_click="true",
+            HTML(
+                '<a class="govuk-link" href="/workbaskets/current">Cancel</a>',
             ),
         )
 
 
-class BulkQuotaDefinitionCreateSummaryForm:
-    pass
+class BulkQuotaDefinitionCreateReviewForm(forms.Form):
+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop("request")
+        super().__init__(*args, **kwargs)
+
+
+class BulkDefinitionUpdateData(
+    QuotaDefinitionCreateForm,
+    forms.Form,
+):
+    """This is broadly similar to the QuotaDefinitionCreateForm."""
+
+    class Meta:
+        model = models.QuotaDefinition
+        fields = [
+            "valid_between",
+            "description",
+            "volume",
+            "initial_volume",
+            "measurement_unit",
+            "measurement_unit_qualifier",
+            "quota_critical_threshold",
+            "quota_critical",
+            "maximum_precision",
+        ]
+
+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop("request")
+        self.definition_data = self.request.session["staged_definition_data"][
+            int(kwargs.pop("pk")) - 1
+        ]
+        super().__init__(*args, **kwargs)
+        self.init_fields()
+
+    def init_fields(self):
+        fields = self.fields
+        definition_data = self.definition_data
+        # This is always set to 3 for current definitions
+        # see https://uktrade.github.io/tariff-data-manual/documentation/data-structures/quotas.html#the-quota-definition-table
+        fields["maximum_precision"].initial = 3
+        # The following populate from the data saved in session
+        fields["start_date"].initial = deserialize_date(definition_data["start_date"])
+        fields["end_date"].initial = deserialize_date(definition_data["end_date"])
+        fields["end_date"].help_text = ""
+        fields["initial_volume"].initial = decimal.Decimal(
+            definition_data["initial_volume"],
+        )
+        fields["volume"].initial = decimal.Decimal(definition_data["volume"])
+        fields["measurement_unit"].initial = MeasurementUnit.objects.get(
+            code=definition_data["measurement_unit_code"],
+        )
+        if "description" in definition_data:
+            fields["description"].initial = definition_data["description"]
+
+        if (
+            "measurement_unit_qualifier" in definition_data
+            and definition_data["measurement_unit_qualifier"] != "None"
+        ):
+            fields["measurement_unit_qualifier"].initial = (
+                MeasurementUnitQualifier.objects.get(
+                    code=definition_data["measurement_unit_qualifier"],
+                )
+            )
+        else:
+            self.fields["measurement_unit_qualifier"].empty_label = (
+                "Choose measurement unit qualifier."
+            )
+        fields["quota_critical_threshold"].initial = decimal.Decimal(
+            definition_data["threshold"],
+        )
+        fields["quota_critical"].initial = definition_data["quota_critical"]
+        self.fields["measurement_unit_qualifier"].help_text = (
+            "A measurement unit qualifier is not always required."
+        )
+
+    def update_definition_data_in_session(self, cleaned_data):
+        cleaned_data.update(
+            {
+                "id": self.definition_data["id"],
+            },
+        )
+        serialized_clean_data = serialize_definition_data(cleaned_data)
+        self.request.session["staged_definition_data"][
+            int(serialized_clean_data["id"]) - 1
+        ].update(serialized_clean_data)
+
+    def clean(self):
+        cleaned_data = super().clean()
+        self.update_definition_data_in_session(cleaned_data)
diff --git a/quotas/jinja2/includes/quotas/actions.jinja b/quotas/jinja2/includes/quotas/actions.jinja
index 88e8ee8c0..0428aca41 100644
--- a/quotas/jinja2/includes/quotas/actions.jinja
+++ b/quotas/jinja2/includes/quotas/actions.jinja
@@ -2,7 +2,7 @@
   <div class="app-related-items" role="complementary">
       <h2 class="govuk-heading-s" id="subsection-title">Actions</h2>
       <ul class="govuk-list govuk-!-font-size-16">
-          <strong class=govuk-heading-xs">Edit and delete quota</strong>
+          <strong class="govuk-heading-xs">Edit and delete quota</strong>
           {% set edit_url = object.get_url('edit') %}
           {% if edit_url %}
             <li><a class="govuk-link" href="{{ edit_url }}">Edit this {{object._meta.verbose_name}}</a></li>
@@ -12,12 +12,12 @@
             <li><a class="govuk-link" href="{{ delete_url }}">Delete this {{object._meta.verbose_name}}</a></li>
           {% endif %}
           <br>
-          <strong class=govuk-heading-xs">Create quota data</strong>
-            <li><a class="govuk-link" href="{{ url('quota_definition-ui-create', args=[object.sid]) }}">Create definition period</a></li>
+          <strong class="govuk-heading-xs">Create quota data</strong>
+            <li><a class="govuk-link" href="{{ url('quota_definition-ui-create', args=[object.sid]) }}?order_number={{object.order_number}}">Create definition period</a></li>
             <li><a class="govuk-link" href="{{ url('sub_quota_definitions-ui-create') }}">Create quota associations</a></li>
             <li><a class="govuk-link" href="{{ url('quota_suspension_or_blocking-ui-create', args=[object.sid]) }}">Create suspension or blocking period</a></li>
           <br>
-          <strong class=govuk-heading-xs">View and edit quota data</strong>
+          <strong class="govuk-heading-xs">View and edit quota data</strong>
             <li><a class="govuk-link" href="{{ url('quota_definition-ui-list', args=[object.sid]) }}">View and edit quota data</a></li>
             <li><a class="govuk-link" href="{{ measures_url }}">View all measures</a></li>
             <li><a class="govuk-link" href="{{ uk_tariff_url }}" target="_blank" noopener noreferrer>View this quota on the UK Integrated Online Tariff </a></li>
diff --git a/quotas/jinja2/quota-definitions/bulk-create-definition-edit.jinja b/quotas/jinja2/quota-definitions/bulk-create-definition-edit.jinja
new file mode 100644
index 000000000..dfee6114c
--- /dev/null
+++ b/quotas/jinja2/quota-definitions/bulk-create-definition-edit.jinja
@@ -0,0 +1,19 @@
+{% extends "layouts/form.jinja" %}
+
+{% set page_title = "Edit quota definition period" %}
+{% set page_subtitle = "Quota order number: "~request.session.quota_order_number%}
+{% block content %}
+  <h1 class="govuk-heading-xl">
+        {% block page_title_heading %}
+            {{ page_title }}
+        {% endblock %}
+        <span class="govuk-caption-xl">
+        {% block page_subtitle %}
+            {{ page_subtitle }}
+        {% endblock %}
+        </span>
+    </h1>
+  {% call django_form() %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/quotas/jinja2/quota-definitions/bulk-create-definition-info.jinja b/quotas/jinja2/quota-definitions/bulk-create-definition-info.jinja
new file mode 100644
index 000000000..5bf18eac3
--- /dev/null
+++ b/quotas/jinja2/quota-definitions/bulk-create-definition-info.jinja
@@ -0,0 +1,26 @@
+{% extends "quota-definitions/sub-quota-duplicate-definitions-step.jinja"%}
+
+{% set page_subtitle = "Quota order number "~request.session.quota_order_number %}
+
+{% block content %}
+    <h1 class="govuk-heading-xl">
+        {% block page_title_heading %}
+            {{ page_title }}
+        {% endblock %}
+        <span class="govuk-caption-xl">
+        {% block page_subtitle %}
+            {{ page_subtitle }}
+        {% endblock %}
+        </span>
+    </h1>
+    <p class="govuk-body">
+      Changes can be made to individual definition periods on the review page before submission
+    </p>
+    <br />
+
+    {% call django_form(action=view.get_step_url(wizard.steps.current)) %}
+        {{ wizard.management_form }}
+        {% block form %}{{ crispy(form) }}{% endblock %}
+    {% endcall %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-definitions/bulk-create-done.jinja b/quotas/jinja2/quota-definitions/bulk-create-done.jinja
new file mode 100644
index 000000000..8b4cf395b
--- /dev/null
+++ b/quotas/jinja2/quota-definitions/bulk-create-done.jinja
@@ -0,0 +1,43 @@
+{% extends "layouts/layout.jinja" %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+{% set page_title = "Definitions created" %}
+
+{% set definition_count = request.session['staged_definition_data']|length %}
+
+{% macro panel_title() %}
+  {{ definition_count }} quota definition periods have been created and added to quota order number {{ request.session['quota_order_number']}}
+{% endmacro %}
+
+{% block content %}
+
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      {{ govukPanel({
+        "titleText": panel_title(),
+        "classes": "govuk-!-margin-bottom-7"
+      }) }}
+      <h2>Next steps</h2>
+
+      <div class="govuk-button-group">
+        {{ govukButton({
+          "text": "Create other definition periods",
+          "href": url("quota_definition-ui-bulk-create"),
+          "classes": "govuk-button--primary"
+        }) }}
+        {{ govukButton({
+          "text": "View definition period data for this quota",
+          "href": url("quota_definition-ui-list", args=[quota_order_number.sid]),
+          "classes": "govuk-button--secondary"
+        }) }}
+      </div>
+      
+      <h2>Further actions</h2>
+      <ul class="govuk-list">
+        <li><a class="govuk-link govuk-!-font-weight-bold" href={{quota_order_number.get_url()}}>View quota order number</a></li><br/>
+        <li><a class="govuk-link govuk-!-font-weight-bold" href="{{ url("workbaskets:current-workbasket") }}">View workbasket summary</a></li><br/>
+        <li><a class="govuk-link govuk-!-font-weight-bold" href="{{ url("quota-ui-list") }}">Find and edit quotas</a></li><br/>
+      </ul>
+    </div>
+  </div>
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-definitions/bulk-create-review.jinja b/quotas/jinja2/quota-definitions/bulk-create-review.jinja
new file mode 100644
index 000000000..4b0d7c8f5
--- /dev/null
+++ b/quotas/jinja2/quota-definitions/bulk-create-review.jinja
@@ -0,0 +1,102 @@
+{% extends "quota-definitions/bulk-create-step.jinja"%}
+{% from "components/table/macro.njk" import govukTable %}
+{% from "components/details/macro.njk" import govukDetails %}
+{% from "components/summary-list/macro.njk" import govukSummaryList %}
+
+{% set page_title = "Review quota definition periods"%}
+{% set page_subtitle = "Quota order number "~request.session.quota_order_number %}
+
+{% block form %}
+
+    <h1 class="govuk-heading-xl">
+        {% block page_title_heading %}
+            {{ page_title }}
+        {% endblock %}
+        <span class="govuk-caption-xl">
+        {% block page_subtitle %}
+            {{ page_subtitle }}
+        {% endblock %}
+        </span>
+    </h1>
+    {% set data = view.get_staged_definition_data() %}
+    {% set table_rows = [] %}
+    {% for definition in data %}
+        {% set formatted_start_date = view.format_date(definition.start_date)%}
+        {% set formatted_end_date = view.format_date(definition.end_date)%}
+        {% set edit_link -%}
+            <a class="govuk-link govuk-!-font-weight-bold" href="{{ url('quota_definition-ui-bulk-create-edit', args=[definition.id]) }}">Edit</a>
+        {%- endset %}
+
+        {% set definition_details_html %}
+            {{
+                govukSummaryList({
+                    "rows": [
+                        {
+                            "key": {"text": "Description"},
+                            "value": {"text": definition.description if definition.description else "-"},
+                            "actions": {"items": []}
+                        },
+                        {
+                            "key": {"text": "Measurement unit"},
+                            "value": {"text": definition.measurement_unit_abbreviation},
+                            "actions": {"items": []}
+                        },
+                        {
+                            "key": {"text": "Critical threshold"},
+                            "value": {"text": definition.threshold ~"%"},
+                            "actions": {"items": []}
+                        },
+                        {
+                            "key": {"text": "Critical state"},
+                            "value": {"text": "Yes" if definition.quota_critical else "No"},
+                            "actions": {"items": []}
+                        },
+                    ]
+                })
+            }}
+        {% endset %}
+        {% set definition_details -%}
+        {{ govukDetails({
+            "summaryText": "Details",
+            "html": definition_details_html
+        }) }}
+        {% endset %}
+
+        {{ table_rows.append([
+            {"text": definition_details },
+            {"text": formatted_start_date },
+            {"text": formatted_end_date },
+            {"text": definition.volume },
+            {"text": definition.measurement_unit_abbreviation },
+            {"text": edit_link },
+        ]) or ""}}
+    {% endfor %}
+
+    <p class="govuk-inset-text">Each row represents a Quota definition period to be created. These can be edited before being submitted.</p>
+    <div class="bulk-create-review quota-definitions">
+        {{ govukTable({
+            "head": [
+                {"text": "Details"},
+                {"text": "Start date"},
+                {"text": "End date"},
+                {"text": "Volume"},
+                {"text": "Unit"},
+                {"text": "Edit details"},
+            ],
+            "rows": table_rows
+        }) }}
+    </div>
+    <p class="govuk-body">Selecting 'Submit' will create the new definition periods.</p>
+    <p class="govuk-body">Further edits to the definition periods can be made on the quota order number page through an additional workbasket transaction.</p>
+<div class="govuk-button-group">
+  {{ govukButton({
+    "text": "Submit",
+  }) }}
+  {{ govukButton({
+    "text": "Back",
+    "classes": "govuk-button--secondary",
+    "href": '/quotas/quota_definitions/bulk_create/definition_period_info',
+  }) }}
+  </div>
+  <a href="/workbaskets/current">Cancel</a>
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-definitions/bulk-create-start.jinja b/quotas/jinja2/quota-definitions/bulk-create-start.jinja
new file mode 100644
index 000000000..d4b1474c5
--- /dev/null
+++ b/quotas/jinja2/quota-definitions/bulk-create-start.jinja
@@ -0,0 +1,23 @@
+{% extends "quota-definitions/sub-quota-duplicate-definitions-step.jinja"%}
+
+{% block content %}
+    <h1 class="govuk-heading-xl">
+        {% block page_title_heading %}
+            {{ page_title }}
+        {% endblock %}
+    </h1>
+    <p class="govuk-body">
+      You can create up to 20 quota definition periods for the same quota order number.
+      Subsequent periods will be calculated from the first date range entered and the data will be duplicated across all definition periods.
+    </p>
+    <p>
+      Changes can be made to individual definition periods on the review page before submission
+    </p>
+    
+
+    {% call django_form(action=view.get_step_url(wizard.steps.current)) %}
+        {{ wizard.management_form }}
+        {% block form %}{{ crispy(form) }}{% endblock %}
+    {% endcall %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-definitions/bulk-create-step.jinja b/quotas/jinja2/quota-definitions/bulk-create-step.jinja
new file mode 100644
index 000000000..583a3629d
--- /dev/null
+++ b/quotas/jinja2/quota-definitions/bulk-create-step.jinja
@@ -0,0 +1,17 @@
+{% extends "layouts/form.jinja" %}
+{% from "components/details/macro.njk" import govukDetails %}
+
+{% block content %}
+    <div class="govuk-grid-uk">
+        <div class="govuk-grid-colum-two-thirds">
+           
+            {% if step_metadata[wizard.steps.current].info %}
+                <p class="govuk-body">{{ step_metadata[wizard.steps.current].info }}</p>
+            {% endif %}
+            {% call django_form(action=view.get_step_url(wizard.steps.current)) %}
+                {{ wizard.management_form }}
+                {% block form %}{{ crispy(form) }}{% endblock %}
+            {% endcall %}
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-definitions/create.jinja b/quotas/jinja2/quota-definitions/create.jinja
index cd27ed1c6..399e65998 100644
--- a/quotas/jinja2/quota-definitions/create.jinja
+++ b/quotas/jinja2/quota-definitions/create.jinja
@@ -1,12 +1,28 @@
-{% extends "layouts/create.jinja" %}
+{% extends 'layouts/form.jinja' %}
 
 {% set page_title = "Create a new quota definition period" %}
-
+{% set page_subtitle = "Quota order number: "~ quota_order_number %}
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
       {"text": "Find and edit quotas", "href": url("quota-ui-list")},
-      {"text": "Quota order number", "href": url("quota-ui-detail", args=[view.kwargs.sid]) ~ "#definitions"},
+      {"text": "Quota order number", "href": url("quota-ui-detail", args=[quota_sid]) ~ "#definition-details"},
       {"text": page_title}
     ])
   }}
 {% endblock %}
+{% block content %}
+  <h1 class="govuk-heading-xl">
+        {% block page_title_heading %}
+            {{ page_title }}
+        {% endblock %}
+        <span class="govuk-caption-xl">
+        {% block page_subtitle %}
+            {{ page_subtitle }}
+        {% endblock %}
+        </span>
+    </h1>
+  <p class="govuk-body">You can create one new quota definition period using this form. Alternatively, you can <a class="govuk-link" href="{{ url('quota_definition-ui-bulk-create') }}">create multiple quota definition periods</a> for a chosen quota order number.</p>
+  {% call django_form() %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/quotas/serializers.py b/quotas/serializers.py
index 9d03d2ed8..daebfaaee 100644
--- a/quotas/serializers.py
+++ b/quotas/serializers.py
@@ -12,6 +12,7 @@
 from common.validators import UpdateType
 from geo_areas.serializers import GeographicalAreaSerializer
 from measures.models.tracked_models import MeasurementUnit
+from measures.models.tracked_models import MeasurementUnitQualifier
 from measures.unit_serializers import MeasurementUnitQualifierSerializer
 from measures.unit_serializers import MeasurementUnitSerializer
 from measures.unit_serializers import MonetaryUnitSerializer
@@ -271,7 +272,8 @@ class Meta:
 
 
 def serialize_duplicate_data(selected_definition):
-    # returns a JSON dictionary of serialized definition data
+    # returns a JSON dictionary of serialized definition data from a
+    # QuotaDefinition object
     duplicate_data = {
         "initial_volume": str(selected_definition.initial_volume),
         "volume": str(selected_definition.volume),
@@ -307,3 +309,71 @@ def deserialize_definition_data(self, definition):
         "quota_critical_threshold": 90,
     }
     return staged_data
+
+
+def serialize_definition_data(definition):
+    """Returns a JSON dictionary of serialized definition data, that can be
+    saved to session."""
+
+    definition_data = {
+        "id": str(definition["id"]),
+        "initial_volume": str(definition["initial_volume"]),
+        "volume": str(definition["volume"]),
+        "measurement_unit_code": definition["measurement_unit"].code,
+        "measurement_unit_abbreviation": definition["measurement_unit"].abbreviation,
+        "threshold": str(definition["quota_critical_threshold"]),
+        "quota_critical": definition["quota_critical"],
+        "start_date": serialize_date(definition["valid_between"].lower),
+        "end_date": serialize_date(definition["valid_between"].upper),
+        "maximum_precision": str(definition["maximum_precision"]),
+    }
+    if (
+        "measurement_unit_qualifier" in definition
+        and definition["measurement_unit_qualifier"] is not None
+    ):
+        definition_data["measurement_unit_qualifier"] = str(
+            definition["measurement_unit_qualifier"].pk,
+        )
+
+    if "description" in definition:
+        definition_data["description"] = definition["description"]
+    return definition_data
+
+
+def deserialize_bulk_create_definition_data(definition, order_number):
+    start_date = deserialize_date(definition["start_date"])
+    end_date = deserialize_date(definition["end_date"])
+    initial_volume = Decimal(definition["initial_volume"])
+    vol = Decimal(definition["volume"])
+    measurement_unit = MeasurementUnit.objects.get(
+        code=definition["measurement_unit_code"],
+    )
+    if "description" in definition:
+        description = definition["description"]
+    if "measurement_unit_qualifier" in definition:
+        measurement_unit_qualifier_pk = Decimal(
+            definition["measurement_unit_qualifier"],
+        )
+        measurement_unit_qualifier = MeasurementUnitQualifier.objects.get(
+            pk=measurement_unit_qualifier_pk,
+        )
+    else:
+        measurement_unit_qualifier = None
+    valid_between = TaricDateRange(start_date, end_date)
+    order_number_obj = models.QuotaOrderNumber.objects.get(
+        pk=order_number,
+    )
+    maximum_precision = Decimal(definition["maximum_precision"])
+    staged_data = {
+        "volume": vol,
+        "initial_volume": initial_volume,
+        "measurement_unit": measurement_unit,
+        "measurement_unit_qualifier": measurement_unit_qualifier,
+        "order_number": order_number_obj,
+        "valid_between": valid_between,
+        "update_type": UpdateType.CREATE,
+        "maximum_precision": maximum_precision,
+        "quota_critical_threshold": 90,
+        "description": description,
+    }
+    return staged_data
diff --git a/quotas/tests/test_forms.py b/quotas/tests/test_forms.py
index fa750291f..462048fc4 100644
--- a/quotas/tests/test_forms.py
+++ b/quotas/tests/test_forms.py
@@ -1,4 +1,5 @@
 import datetime
+import decimal
 
 import pytest
 from bs4 import BeautifulSoup
@@ -130,7 +131,14 @@ def check_error_messages(form):
         check_error_messages(form)
 
     with override_current_transaction(tx):
-        form = forms.QuotaDefinitionCreateForm(data=data)
+        form = forms.QuotaDefinitionCreateForm(
+            data=data,
+            buttons={
+                "submit": "Submit",
+                "link_text": "Cancel",
+                "link": "/workbaskets/current",
+            },
+        )
         check_error_messages(form)
 
 
@@ -167,7 +175,14 @@ def test_quota_definition_volume_validation(date_ranges):
         )
 
     with override_current_transaction(tx):
-        form = forms.QuotaDefinitionCreateForm(data=data)
+        form = forms.QuotaDefinitionCreateForm(
+            data=data,
+            buttons={
+                "submit": "Submit",
+                "link_text": "Cancel",
+                "link": "/workbaskets/current",
+            },
+        )
         assert not form.is_valid()
         assert (
             form.errors["__all__"][0]
@@ -1069,3 +1084,340 @@ def test_quota_blocking_update_form_invalid(date_ranges):
             f"The start and end date must sit within the selected quota definition's start and end date ({definition.valid_between.lower} - {definition.valid_between.upper})"
             in form.errors["__all__"]
         )
+
+
+@pytest.fixture
+def quota() -> models.QuotaOrderNumber:
+    """Provides a main quota order number for use across the fixtures and
+    following tests."""
+    return factories.QuotaOrderNumberFactory()
+
+
+@pytest.fixture
+def bulk_create_start_form(
+    session_request,
+) -> forms.BulkQuotaDefinitionCreateStartForm:
+    return forms.BulkQuotaDefinitionCreateStartForm(
+        request=session_request,
+        prefix="definition_period_info",
+    )
+
+
+@pytest.fixture
+def bulk_create_definition_form(
+    session_request,
+) -> forms.QuotaDefinitionBulkCreateDefinitionInformation:
+    return forms.QuotaDefinitionBulkCreateDefinitionInformation(
+        request=session_request,
+        prefix="definition_period_info",
+    )
+
+
+def test_quota_definition_bulk_create_definition_start_form(
+    session_request,
+    quota,
+    bulk_create_start_form,
+):
+
+    initial_data = {
+        "quota_order_number": quota,
+    }
+    with override_current_transaction(Transaction.objects.last()):
+        bulk_create_start_form.save_quota_order_number_to_session(initial_data)
+
+    assert session_request.session["quota_order_number_pk"] == quota.pk
+    assert session_request.session["quota_order_number"] == quota.order_number
+
+
+def test_quota_definition_bulk_create_start_is_valid(
+    quota,
+    session_request_with_workbasket,
+):
+    initial_data = {"quota_order_number": quota}
+    form = forms.BulkQuotaDefinitionCreateStartForm(
+        data=initial_data,
+        request=session_request_with_workbasket,
+    )
+    assert form.is_valid()
+
+    initial_data = {}
+
+    form = forms.BulkQuotaDefinitionCreateStartForm(
+        data=initial_data,
+        request=session_request_with_workbasket,
+    )
+    assert not form.is_valid()
+    assert f"A quota order number must be selected" in form.errors["__all__"]
+
+
+def test_quota_definition_bulk_create_definition_info_frequencies(
+    quota,
+    session_request,
+    bulk_create_start_form,
+    bulk_create_definition_form,
+):
+    measurement_unit = factories.MeasurementUnitFactory()
+    measurement_unit_qualifier = factories.MeasurementUnitQualifierFactory.create()
+    initial_data = {
+        "quota_order_number": quota,
+    }
+    form_data = {
+        "maximum_precision": 3,
+        "valid_between": TaricDateRange(
+            datetime.date(2025, 1, 1),
+            datetime.date(2025, 12, 31),
+        ),
+        "volume": 600.000,
+        "initial_volume": 500.000,
+        "measurement_unit": measurement_unit,
+        "quota_critical_threshold": 90,
+        "quota_critical": "False",
+        "instance_count": 3,
+        "frequency": 1,
+        "description": "This is a description",
+        "measurement_unit_qualifier": measurement_unit_qualifier,
+    }
+
+    # tests with annual recurrance
+    with override_current_transaction(Transaction.objects.last()):
+        bulk_create_start_form.save_quota_order_number_to_session(initial_data)
+        bulk_create_definition_form.save_definition_data_to_session(form_data)
+        assert session_request.session["quota_order_number"] == quota.order_number
+        # check that the length staged_definitions matches the initial_info['instance_count']
+        assert (
+            len(session_request.session["staged_definition_data"])
+            == form_data["instance_count"]
+        )
+        assert (
+            session_request.session["staged_definition_data"][1]["start_date"]
+            == "2026-01-01"
+        )
+        assert (
+            session_request.session["staged_definition_data"][1]["end_date"]
+            == "2026-12-31"
+        )
+        assert (
+            session_request.session["staged_definition_data"][2]["start_date"]
+            == "2027-01-01"
+        )
+        assert (
+            session_request.session["staged_definition_data"][2]["end_date"]
+            == "2027-12-31"
+        )
+    # tests bi-annual recurrance
+    form_data["frequency"] = 2
+    with override_current_transaction(Transaction.objects.last()):
+        bulk_create_definition_form.save_definition_data_to_session(form_data)
+        # check that the length staged_definitions still matches the initial_info['instance_count']
+        assert (
+            len(session_request.session["staged_definition_data"])
+            == form_data["instance_count"]
+        )
+        # check that the frequency is now biannual
+        assert (
+            session_request.session["staged_definition_data"][1]["start_date"]
+            == "2026-01-01"
+        )
+        assert (
+            session_request.session["staged_definition_data"][1]["end_date"]
+            == "2026-06-30"
+        )
+        assert (
+            session_request.session["staged_definition_data"][2]["start_date"]
+            == "2026-07-01"
+        )
+        assert (
+            session_request.session["staged_definition_data"][2]["end_date"]
+            == "2026-12-31"
+        )
+
+    # check quarterly recurrance
+    form_data["frequency"] = 3
+    with override_current_transaction(Transaction.objects.last()):
+        bulk_create_definition_form.save_definition_data_to_session(form_data)
+        # check that the length staged_definitions still matches the initial_info['instance_count']
+        assert (
+            len(session_request.session["staged_definition_data"])
+            == form_data["instance_count"]
+        )
+        assert (
+            session_request.session["staged_definition_data"][1]["start_date"]
+            == "2026-01-01"
+        )
+        assert (
+            session_request.session["staged_definition_data"][1]["end_date"]
+            == "2026-03-31"
+        )
+        assert (
+            session_request.session["staged_definition_data"][2]["start_date"]
+            == "2026-04-01"
+        )
+        assert (
+            session_request.session["staged_definition_data"][2]["end_date"]
+            == "2026-06-30"
+        )
+
+
+def test_bulk_create_update_definition_data_populates_parent_data(
+    quota,
+    session_request,
+    bulk_create_start_form,
+):
+    definition_form = forms.QuotaDefinitionBulkCreateDefinitionInformation(
+        request=session_request,
+        prefix="review",
+    )
+    # Set up the main definition, saving additional data to session
+    measurement_unit = factories.MeasurementUnitFactory()
+    initial_data = {
+        "quota_order_number": quota,
+    }
+    form_data = {
+        "maximum_precision": 3,
+        "valid_between": TaricDateRange(
+            datetime.date(2025, 1, 1),
+            datetime.date(2025, 12, 31),
+        ),
+        "volume": "600.000",
+        "initial_volume": "500.000",
+        "measurement_unit": measurement_unit,
+        "quota_critical_threshold": "90",
+        "quota_critical": "False",
+        "description": "This is a description",
+        "instance_count": 3,
+        "frequency": 1,
+    }
+
+    bulk_create_start_form.save_quota_order_number_to_session(initial_data)
+    definition_form.save_definition_data_to_session(form_data)
+    update_form = forms.BulkDefinitionUpdateData(
+        request=session_request,
+        pk=2,
+        buttons={
+            "submit": "Save and continue",
+            "link_text": "Discard changes",
+            "link": "/quotas/quota_definitions/bulk_create/review",
+        },
+    )
+
+    assert update_form.fields["volume"].initial == decimal.Decimal(form_data["volume"])
+    assert update_form.fields["initial_volume"].initial == decimal.Decimal(
+        form_data["initial_volume"],
+    )
+    assert (
+        update_form.fields["measurement_unit"].initial == form_data["measurement_unit"]
+    )
+    assert update_form.fields["description"].initial == form_data["description"]
+
+
+def test_bulk_create_update_definition_data_updates_data(
+    quota,
+    session_request,
+    bulk_create_start_form,
+    bulk_create_definition_form,
+):
+    measurement_unit = factories.MeasurementUnitFactory()
+    initial_data = {
+        "quota_order_number": quota,
+    }
+    definition_data = {
+        "maximum_precision": 3,
+        "valid_between": TaricDateRange(
+            datetime.date(2025, 1, 1),
+            datetime.date(2025, 12, 31),
+        ),
+        "volume": 600.000,
+        "initial_volume": 500.000,
+        "measurement_unit": measurement_unit,
+        "quota_critical_threshold": 90,
+        "quota_critical": "False",
+        "instance_count": 3,
+        "frequency": 1,
+        "description": "This is a description",
+    }
+
+    bulk_create_start_form.save_quota_order_number_to_session(initial_data)
+    bulk_create_definition_form.save_definition_data_to_session(definition_data)
+
+    update_form_data = {
+        "id": 1,
+        "maximum_precision": 3,
+        "valid_between": TaricDateRange(
+            datetime.date(2025, 1, 1),
+            datetime.date(2025, 12, 31),
+        ),
+        "volume": 500,
+        "initial_volume": 400,
+        "measurement_unit": measurement_unit,
+        "quota_critical_threshold": 91,
+        "quota_critical": "False",
+        "description": "This is a new description",
+    }
+
+    update_form = forms.BulkDefinitionUpdateData(
+        request=session_request,
+        pk=2,
+        buttons={
+            "submit": "Save and continue",
+            "link_text": "Discard changes",
+            "link": "/quotas/quota_definitions/bulk_create/review",
+        },
+    )
+    update_form.update_definition_data_in_session(cleaned_data=update_form_data)
+
+    assert session_request.session["staged_definition_data"][1]["volume"] == str(
+        update_form_data["volume"],
+    )
+    assert session_request.session["staged_definition_data"][1][
+        "initial_volume"
+    ] == str(update_form_data["initial_volume"])
+    assert (
+        session_request.session["staged_definition_data"][1]["description"]
+        == update_form_data["description"]
+    )
+
+
+def test_quota_definition_bulk_create_definition_is_valid(
+    session_request_with_workbasket,
+    date_ranges,
+):
+    measurement_unit = factories.MeasurementUnitFactory()
+    measurement_unit_qualifier = factories.MeasurementUnitQualifierFactory()
+
+    form_data = {
+        "maximum_precision": 3,
+        "start_date_0": date_ranges.normal.lower.day,
+        "start_date_1": date_ranges.normal.lower.month,
+        "start_date_2": date_ranges.normal.lower.year,
+        "end_date_0": date_ranges.normal.upper.day,
+        "end_date_1": date_ranges.normal.upper.month,
+        "end_date_2": date_ranges.normal.upper.year,
+        "volume": "600.000",
+        "initial_volume": "500.000",
+        "measurement_unit": measurement_unit,
+        "measurement_unit_qualifier": measurement_unit_qualifier,
+        "quota_critical_threshold": "90",
+        "quota_critical": "False",
+        "frequency": 1,
+    }
+
+    form = forms.QuotaDefinitionBulkCreateDefinitionInformation(
+        data=form_data,
+        request=session_request_with_workbasket,
+    )
+    with override_current_transaction(Transaction.objects.last()):
+        assert not form.is_valid()
+        assert (
+            form.errors["instance_count"][0]
+            == "Enter the number of definition periods to create"
+        )
+
+    form_data["instance_count"] = 3
+
+    form = forms.QuotaDefinitionBulkCreateDefinitionInformation(
+        data=form_data,
+        request=session_request_with_workbasket,
+    )
+
+    with override_current_transaction(Transaction.objects.last()):
+        assert form.is_valid()
diff --git a/quotas/tests/test_views.py b/quotas/tests/test_views.py
index febed9102..0a79aac8d 100644
--- a/quotas/tests/test_views.py
+++ b/quotas/tests/test_views.py
@@ -25,6 +25,9 @@
 from quotas.forms.base import QuotaSuspensionType
 from quotas.views import DuplicateDefinitionsWizard
 from quotas.views import QuotaList
+from quotas.views.wizards import QuotaDefinitionBulkCreatorUpdateDefinitionData
+from quotas.views.wizards import QuotaDefinitionBulkCreatorWizard
+from quotas.wizard import QuotaDefinitionBulkCreatorSessionStorage
 from quotas.wizard import QuotaDefinitionDuplicatorSessionStorage
 
 pytestmark = pytest.mark.django_db
@@ -1293,6 +1296,9 @@ def test_create_new_quota_definition(
         "start_date_0": date_ranges.later.lower.day,
         "start_date_1": date_ranges.later.lower.month,
         "start_date_2": date_ranges.later.lower.year,
+        "end_date_0": date_ranges.later.lower.day,
+        "end_date_1": date_ranges.later.lower.month,
+        "end_date_2": date_ranges.later.lower.year,
         "description": "Lorem ipsum",
         "volume": "1000000",
         "initial_volume": "1000000",
@@ -1305,12 +1311,15 @@ def test_create_new_quota_definition(
 
     # sanity check
     assert not models.QuotaDefinition.objects.all()
-
     url = reverse("quota_definition-ui-create", kwargs={"sid": quota.sid})
-    response = client_with_current_workbasket.post(url, form_data)
-    assert response.status_code == 302
+    response = client_with_current_workbasket.post(
+        f"{url}?order_number={quota.order_number}",
+        form_data,
+    )
 
+    assert response.status_code == 302
     created_definition = models.QuotaDefinition.objects.last()
+
     assert response.url == reverse(
         "quota_definition-ui-confirm-create",
         kwargs={"sid": created_definition.sid},
@@ -1351,6 +1360,9 @@ def test_create_new_quota_definition_business_rule_violation(
         "start_date_0": date_ranges.earlier.lower.day,
         "start_date_1": date_ranges.earlier.lower.month,
         "start_date_2": date_ranges.earlier.lower.year,
+        "end_date_0": date_ranges.later.lower.day,
+        "end_date_1": date_ranges.later.lower.month,
+        "end_date_2": date_ranges.later.lower.year,
         "description": "Lorem ipsum",
         "volume": "1000000",
         "initial_volume": "1000000",
@@ -1362,7 +1374,10 @@ def test_create_new_quota_definition_business_rule_violation(
     }
 
     url = reverse("quota_definition-ui-create", kwargs={"sid": quota.sid})
-    response = client_with_current_workbasket.post(url, form_data)
+    response = client_with_current_workbasket.post(
+        f"{url}?order_number={quota.order_number}",
+        form_data,
+    )
 
     assert response.status_code == 200
 
@@ -2249,7 +2264,6 @@ def test_definition_duplicator_creates_definition_and_association(
     wizard.form_list = OrderedDict(wizard.form_list)
 
     association_table_before = models.QuotaAssociation.objects.all()
-    # assert 0
     assert len(association_table_before) == 0
     for definition in session_request_with_workbasket.session["staged_definition_data"]:
         wizard.create_definition(definition)
@@ -2723,3 +2737,222 @@ def test_quota_definition_update_updates_association(
     assert len(associations) == 2
     assert associations[0].update_type == UpdateType.CREATE
     assert associations[1].update_type == UpdateType.UPDATE
+
+
+def test_definition_bulk_create_form_wizard_start(client_with_current_workbasket):
+    url = reverse("quota_definition-ui-bulk-create", kwargs={"step": "start"})
+    response = client_with_current_workbasket.get(url)
+    assert response.status_code == 200
+
+
+@pytest.mark.parametrize(
+    ("step"),
+    [
+        ("start"),
+        ("definition_period_info"),
+        ("review"),
+    ],
+)
+def test_bulk_create_definitions_get_form_kwargs(
+    session_request,
+    step,
+):
+    quota_order_number = factories.QuotaOrderNumberFactory.create()
+    start_form_data = {
+        "quota_definition-ui-bulk-create": "start",
+        "start-quota_order_number": quota_order_number,
+    }
+
+    definition_info_data = {}
+    storage = QuotaDefinitionBulkCreatorSessionStorage(
+        request=session_request,
+        prefix="",
+    )
+    storage.set_step_data("start", start_form_data)
+    storage.set_step_data("definition_period_info", definition_info_data)
+    storage._set_current_step("review")
+
+    wizard = QuotaDefinitionBulkCreatorWizard(
+        request=session_request,
+        storage=storage,
+    )
+    wizard.form_list = OrderedDict(wizard.form_list)
+    with override_current_transaction(Transaction.objects.last()):
+        kwargs = wizard.get_form_kwargs(step)
+        assert kwargs["request"].session
+
+
+def test_bulk_create_get_staged_definition_data(
+    session_request,
+    date_ranges,
+):
+    quota_order_number = factories.QuotaOrderNumberFactory.create()
+    measurement_unit = factories.MeasurementUnitFactory()
+    start_form_data = {
+        "quota_definition-ui-bulk-create": "start",
+        "start-quota_order_number": quota_order_number,
+    }
+    storage = QuotaDefinitionBulkCreatorSessionStorage(
+        request=session_request,
+        prefix="",
+    )
+    storage.set_step_data("start", start_form_data)
+    staged_data = {
+        "start_date_0": date_ranges.normal.lower.day,
+        "start_date_1": date_ranges.normal.lower.month,
+        "start_date_2": date_ranges.normal.lower.year,
+        "end_date_0": date_ranges.normal.upper.day,
+        "end_date_1": date_ranges.normal.upper.month,
+        "end_date_2": date_ranges.normal.upper.year,
+        "description": "Lorem ipsum.",
+        "volume": "80601000.000",
+        "initial_volume": "80601000.000",
+        "measurement_unit": measurement_unit.pk,
+        "measurement_unit_qualifier": "",
+        "quota_critical_threshold": "90",
+        "quota_critical": "False",
+    }
+    session_request.session["staged_definition_data"] = staged_data
+    wizard = QuotaDefinitionBulkCreatorWizard(
+        request=session_request,
+        storage=storage,
+    )
+    wizard.form_list = OrderedDict(wizard.form_list)
+
+    assert wizard.get_staged_definition_data() == staged_data
+
+
+def test_bulk_create_format_date(session_request):
+    storage = QuotaDefinitionBulkCreatorSessionStorage(
+        request=session_request,
+        prefix="",
+    )
+    wizard = QuotaDefinitionBulkCreatorWizard(
+        request=session_request,
+        storage=storage,
+    )
+    date_str = "2021-01-01"
+    formatted_date = wizard.format_date(date_str)
+    assert formatted_date == "01 Jan 2021"
+
+
+def test_bulk_create_creates_definition(
+    session_request_with_workbasket,
+    date_ranges,
+):
+    quota_order_number = factories.QuotaOrderNumberFactory.create()
+    measurement_unit = factories.MeasurementUnitFactory.create()
+    measurement_unit_qualifier = factories.MeasurementUnitQualifierFactory.create()
+    storage = QuotaDefinitionBulkCreatorSessionStorage(
+        request=session_request_with_workbasket,
+        prefix="",
+    )
+    wizard = QuotaDefinitionBulkCreatorWizard(
+        request=session_request_with_workbasket,
+        storage=storage,
+    )
+    wizard.form_list = OrderedDict(wizard.form_list)
+    staged_data = {
+        "start_date": serialize_date(date_ranges.normal.lower),
+        "end_date": serialize_date(date_ranges.normal.upper),
+        "description": "Lorem ipsum.",
+        "volume": "80601000.000",
+        "initial_volume": "80601000.000",
+        "measurement_unit_code": measurement_unit.code,
+        "measurement_unit_qualifier": measurement_unit_qualifier.pk,
+        "quota_critical_threshold": "90",
+        "quota_critical": "False",
+        "maximum_precision": "3",
+    }
+    session_request_with_workbasket.session["staged_definition_data"] = staged_data
+    assert len(models.QuotaDefinition.objects.all()) == 0
+    with override_current_transaction(Transaction.objects.last()):
+        wizard.create_definition(
+            order_number=quota_order_number.pk,
+            definition=staged_data,
+        )
+        assert len(models.QuotaDefinition.objects.all()) == 1
+
+
+def test_bulk_create_done(
+    session_request_with_workbasket,
+    date_ranges,
+):
+    quota_order_number = factories.QuotaOrderNumberFactory.create()
+    measurement_unit = factories.MeasurementUnitFactory.create()
+    storage = QuotaDefinitionBulkCreatorSessionStorage(
+        request=session_request_with_workbasket,
+        prefix="",
+    )
+    wizard = QuotaDefinitionBulkCreatorWizard(
+        request=session_request_with_workbasket,
+        storage=storage,
+    )
+    wizard.form_list = OrderedDict(wizard.form_list)
+    staged_data = [
+        {
+            "start_date": serialize_date(date_ranges.normal.lower),
+            "end_date": serialize_date(date_ranges.normal.upper),
+            "description": "Lorem ipsum.",
+            "volume": "80601000.000",
+            "initial_volume": "80601000.000",
+            "measurement_unit_code": measurement_unit.code,
+            "quota_critical_threshold": "90",
+            "quota_critical": "False",
+            "maximum_precision": "3",
+        },
+        {
+            "start_date": serialize_date(date_ranges.normal.lower),
+            "end_date": serialize_date(date_ranges.normal.upper),
+            "description": "Lorem ipsum.",
+            "volume": "80601000.000",
+            "initial_volume": "80601000.000",
+            "measurement_unit_code": measurement_unit.code,
+            "quota_critical_threshold": "90",
+            "quota_critical": "False",
+            "maximum_precision": "3",
+        },
+        {
+            "start_date": serialize_date(date_ranges.normal.lower),
+            "end_date": serialize_date(date_ranges.normal.upper),
+            "description": "Lorem ipsum.",
+            "volume": "80601000.000",
+            "initial_volume": "80601000.000",
+            "measurement_unit_code": measurement_unit.code,
+            "quota_critical_threshold": "90",
+            "quota_critical": "False",
+            "maximum_precision": "3",
+        },
+    ]
+
+    session_request_with_workbasket.session["quota_order_number_pk"] = (
+        quota_order_number.pk
+    )
+    session_request_with_workbasket.session["staged_definition_data"] = staged_data
+    assert len(models.QuotaDefinition.objects.all()) == 0
+    with override_current_transaction(Transaction.objects.last()):
+        wizard.done(wizard.form_list)
+        assert len(models.QuotaDefinition.objects.all()) == 3
+
+
+def test_bulk_create_update_definition_get_form_kwargs(
+    session_request,
+):
+    request = session_request.post("quota_definition-ui-bulk-create-edit", args=1)
+    view = QuotaDefinitionBulkCreatorUpdateDefinitionData(
+        request=request,
+        kwargs={
+            "pk": 1,
+            "request": request,
+            "buttons": {
+                "submit": "Save and continue",
+                "link_text": "Discard changes",
+                "link": "/quotas/quota_definitions/bulk_create/review",
+            },
+        },
+    )
+    with override_current_transaction(Transaction.objects.last()):
+        kwargs = view.get_form_kwargs()
+        assert kwargs["pk"]
+        assert kwargs["request"]
+        assert kwargs["buttons"]
diff --git a/quotas/urls.py b/quotas/urls.py
index cab10fa77..48d988806 100644
--- a/quotas/urls.py
+++ b/quotas/urls.py
@@ -69,6 +69,32 @@
         views.QuotaDefinitionCreate.as_view(),
         name="quota_definition-ui-create",
     ),
+    path(
+        f"quotas/quota_definitions/bulk_create/<step>",
+        views.QuotaDefinitionBulkCreatorWizard.as_view(
+            url_name="quota_definition-ui-bulk-create",
+            done_step_name="complete",
+        ),
+        name="quota_definition-ui-bulk-create",
+    ),
+    path(
+        f"quotas/quota_definitions/bulk_create/",
+        views.QuotaDefinitionBulkCreatorWizard.as_view(
+            url_name="quota_definition-ui-bulk-create",
+            done_step_name="complete",
+        ),
+        name="quota_definition-ui-bulk-create",
+    ),
+    path(
+        f"quotas/quota_definitions/bulk_create/<pk>/edit",
+        views.QuotaDefinitionBulkCreatorUpdateDefinitionData.as_view(),
+        name="quota_definition-ui-bulk-create-edit",
+    ),
+    path(
+        f"quotas/bulk_create_success",
+        views.QuotaDefinitionBulkCreateSuccess.as_view(),
+        name="quota_definition-ui-bulk-create-success",
+    ),
     path(
         f"quotas/duplicate_quota_definitions/<step>",
         views.DuplicateDefinitionsWizard.as_view(
diff --git a/quotas/views/definitions.py b/quotas/views/definitions.py
index afdb7b7f9..162572c02 100644
--- a/quotas/views/definitions.py
+++ b/quotas/views/definitions.py
@@ -185,14 +185,41 @@ def get_result_object(self, form):
         return definition_instance
 
 
-class QuotaDefinitionCreate(QuotaDefinitionUpdateMixin, CreateTaricCreateView):
+class QuotaDefinitionCreate(CreateTaricCreateView):
     template_name = "quota-definitions/create.jinja"
     form_class = forms.QuotaDefinitionCreateForm
+    permission_required = ["common.change_trackedmodel"]
+    model = models.QuotaOrderNumber
 
-    def form_valid(self, form):
-        quota = models.QuotaOrderNumber.objects.current().get(sid=self.kwargs["sid"])
-        form.instance.order_number = quota
-        return super().form_valid(form)
+    validate_business_rules = (
+        business_rules.QD7,
+        business_rules.QD8,
+        business_rules.QD10,
+        business_rules.QD11,
+        UniqueIdentifyingFields,
+        UpdateValidity,
+    )
+
+    @property
+    def quota(self):
+        return models.QuotaOrderNumber.objects.current().get(sid=self.kwargs["sid"])
+
+    def get_context_data(self, *args, **kwargs):
+        return super().get_context_data(
+            quota_order_number=self.request.GET["order_number"],
+            quota_sid=self.kwargs["sid"],
+            **kwargs,
+        )
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["order_number"] = self.quota
+        kwargs["buttons"] = {
+            "submit": "Submit",
+            "link_text": "Cancel",
+            "link": "/workbaskets/current",
+        }
+        return kwargs
 
 
 class QuotaDefinitionConfirmCreate(
diff --git a/quotas/views/wizards.py b/quotas/views/wizards.py
index 0472cc341..8035b8566 100644
--- a/quotas/views/wizards.py
+++ b/quotas/views/wizards.py
@@ -15,6 +15,7 @@
 from common.views import BusinessRulesMixin
 from quotas import forms
 from quotas import models
+from quotas.serializers import deserialize_bulk_create_definition_data
 from quotas.serializers import deserialize_definition_data
 from settings.common import DATE_FORMAT
 from workbaskets.models import WorkBasket
@@ -228,7 +229,7 @@ def get_form_kwargs(self):
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
         context["page_title"] = "Update definition and association details"
-        context["quota_order_number"] = self.kwargs["pk"]
+        context["quota_order_number_pk"] = self.kwargs["pk"]
         return context
 
     def get_main_definition(self):
@@ -271,3 +272,145 @@ def get_context_data(self, **kwargs):
         context["sub_quota"] = success_data["sub_quota"]
         context["definition_view_url"] = success_data["definition_view_url"]
         return context
+
+
+@method_decorator(require_current_workbasket, name="dispatch")
+class QuotaDefinitionBulkCreatorWizard(
+    PermissionRequiredMixin,
+    NamedUrlSessionWizardView,
+):
+    """Multipart form wizard to bulk create QuotaDefinitions."""
+
+    storage_name = "quotas.wizard.QuotaDefinitionBulkCreatorSessionStorage"
+    permission_required = ["common.add_trackedmodel"]
+
+    START = "start"
+    DEFINITION_PERIOD_INFO = "definition_period_info"
+    REVIEW = "review"
+    COMPLETE = "complete"
+
+    form_list = [
+        (START, forms.BulkQuotaDefinitionCreateStartForm),
+        (DEFINITION_PERIOD_INFO, forms.QuotaDefinitionBulkCreateDefinitionInformation),
+        (REVIEW, forms.BulkQuotaDefinitionCreateReviewForm),
+    ]
+
+    templates = {
+        START: "quota-definitions/bulk-create-start.jinja",
+        DEFINITION_PERIOD_INFO: "quota-definitions/bulk-create-definition-info.jinja",
+        REVIEW: "quota-definitions/bulk-create-review.jinja",
+        COMPLETE: "quota-definitions/bulk-create-done.jinja",
+    }
+
+    step_metadata = {
+        START: {
+            "title": "Create multiple definition periods",
+            "link_text": "start",
+        },
+        DEFINITION_PERIOD_INFO: {
+            "title": "Enter quota definition period data",
+            "link_text": "Enter quota definition period data",
+        },
+        REVIEW: {
+            "title": "Review bulk creation information",
+            "link_text": "Review information",
+        },
+        COMPLETE: {
+            "title": "Finished",
+            "link_text": "Success",
+        },
+    }
+
+    @property
+    def workbasket(self) -> WorkBasket:
+        return WorkBasket.current(self.request)
+
+    def get_context_data(self, form, **kwargs):
+        context = super().get_context_data(form=form, **kwargs)
+        context["step_metadata"] = self.step_metadata
+        return context
+
+    def get_template_names(self):
+        template = self.templates.get(
+            self.steps.current,
+            "quota-definitions/bulk-create-step.jinja",
+        )
+        return template
+
+    def get_form_kwargs(self, step):
+        kwargs = {}
+        kwargs["request"] = self.request
+        return kwargs
+
+    def get_staged_definition_data(self):
+        return self.request.session["staged_definition_data"]
+
+    def format_date(self, date_str):
+        """Parses and converts a date string from that used for storing data to
+        the one used in the TAP UI."""
+        if date_str:
+            date_object = datetime.datetime.strptime(date_str, "%Y-%m-%d").date()
+            return date_object.strftime(DATE_FORMAT)
+        return ""
+
+    def create_definition(self, order_number, definition):
+        transaction = self.workbasket.new_transaction()
+        staged_data = deserialize_bulk_create_definition_data(
+            definition,
+            order_number,
+        )
+        models.QuotaDefinition.objects.create(
+            **staged_data,
+            transaction=transaction,
+        )
+
+    def done(self, form_list, **kwargs):
+        order_number_pk = self.request.session["quota_order_number_pk"]
+        definition_data = self.request.session["staged_definition_data"]
+        with transaction.atomic():
+            for definition in definition_data:
+                self.create_definition(order_number_pk, definition)
+
+        return redirect("quota_definition-ui-bulk-create-success")
+
+
+class QuotaDefinitionBulkCreatorUpdateDefinitionData(
+    FormView,
+):
+    template_name = "quota-definitions/bulk-create-definition-edit.jinja"
+    permission_required = ["common.change_trackedmodel"]
+    form_class = forms.BulkDefinitionUpdateData
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["pk"] = self.kwargs["pk"]
+        kwargs["request"] = self.request
+        kwargs["buttons"] = {
+            "submit": "Save and continue",
+            "link_text": "Discard changes",
+            "link": "/quotas/quota_definitions/bulk_create/review",
+        }
+        return kwargs
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        context["page_title"] = "Update definition details"
+        quota_order_number = models.QuotaOrderNumber.objects.current().get(
+            pk=self.request.session["quota_order_number_pk"],
+        )
+        context["form"].fields["order_number"].initial = quota_order_number
+        return context
+
+    def form_valid(self, form):
+        return redirect(reverse("quota_definition-ui-bulk-create"))
+
+
+class QuotaDefinitionBulkCreateSuccess(TemplateView):
+    template_name = "quota-definitions/bulk-create-done.jinja"
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        context["quota_order_number"] = models.QuotaOrderNumber.objects.current().get(
+            pk=self.request.session["quota_order_number_pk"],
+        )
+        return context
diff --git a/quotas/wizard.py b/quotas/wizard.py
index 2da160c4a..379e458dd 100644
--- a/quotas/wizard.py
+++ b/quotas/wizard.py
@@ -3,3 +3,7 @@
 
 class QuotaDefinitionDuplicatorSessionStorage(SessionStorage):
     pass
+
+
+class QuotaDefinitionBulkCreatorSessionStorage(SessionStorage):
+    pass
diff --git a/workbaskets/jinja2/workbaskets/edit-workbasket.jinja b/workbaskets/jinja2/workbaskets/edit-workbasket.jinja
index b11760b13..f51d3cb32 100644
--- a/workbaskets/jinja2/workbaskets/edit-workbasket.jinja
+++ b/workbaskets/jinja2/workbaskets/edit-workbasket.jinja
@@ -78,6 +78,7 @@
     {{ workbasket_column("Quotas", [
       {"text": "Create a new quota", "url": url('quota-ui-create')},
       {"text": "Find and edit quotas", "url": url('quota-ui-list')},
+      {"text": "Create multiple quota definition periods", "url": url('quota_definition-ui-bulk-create')},
       {"text": "Create quota associations", "url": url('sub_quota_definitions-ui-create')},
       ])
     }}

From cc2a94060e7c0f977beca04e2d9c3a2f56ec2370 Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Wed, 8 Jan 2025 11:02:13 +0000
Subject: [PATCH 4/8] TP2000-1639 new year envelope publishing failure (#1375)

* List by default, add flags for async and sync publishing

* Fix failing tests

* Correct function name. Call correct queryset filter.

* Set crontab to every two hours to publish to crown dependencies

* Correctly reference workbasket's envelope
---
 .../management/commands/publish_to_api.py     | 67 +++++++++++++------
 publishing/models/packaged_workbasket.py      | 38 ++++++-----
 publishing/tests/test_publishing_commands.py  | 10 +--
 settings/common.py                            |  2 +-
 4 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/publishing/management/commands/publish_to_api.py b/publishing/management/commands/publish_to_api.py
index 9a29a0060..02c166200 100644
--- a/publishing/management/commands/publish_to_api.py
+++ b/publishing/management/commands/publish_to_api.py
@@ -8,28 +8,40 @@
 
 
 class Command(BaseCommand):
-    help = "Upload unpublished envelopes to the Tariff API."
+    help = (
+        "Manage envelope uploads to Tariff API. Without arguments, this "
+        "management command lists unpublished envelopes."
+    )
 
     def add_arguments(self, parser):
         parser.add_argument(
-            "-l",
-            "--list",
-            dest="list",
+            "--publish-async",
             action="store_true",
-            help="List unpublished envelopes.",
+            help=(
+                "Asynchronously run (via a Celery task) the function to "
+                "upload unpublished envelopes to the tariffs-api service."
+            ),
+        )
+        parser.add_argument(
+            "--publish-now",
+            action="store_true",
+            help=(
+                "Immediately run (within the current terminal's process) the "
+                "function to upload unpublished envelopes to the tariffs-api "
+                "service."
+            ),
         )
 
     def get_incomplete_envelopes(self):
-        incomplete = CrownDependenciesEnvelope.objects.unpublished()
-        if not incomplete:
-            return None
-        return incomplete
+        return CrownDependenciesEnvelope.objects.unpublished()
 
     def get_unpublished_envelopes(self):
-        unpublished = PackagedWorkBasket.objects.get_unpublished_to_api()
-        if not unpublished:
-            return None
-        return unpublished
+        return PackagedWorkBasket.objects.get_unpublished_to_api()
+
+    def print_envelope_details(self, position, envelope):
+        self.stdout.write(
+            f"position={position}, pk={envelope.pk}, envelope_id={envelope.envelope_id}",
+        )
 
     def list_unpublished_envelopes(self):
         incomplete = self.get_incomplete_envelopes()
@@ -39,22 +51,33 @@ def list_unpublished_envelopes(self):
                 f"{incomplete.count()} envelope(s) not completed publishing:",
             )
             for i, crowndependencies in enumerate(incomplete, start=1):
-                self.stdout.write(
-                    f"{i}: {crowndependencies.packagedworkbaskets.last().envelope}",
+                self.print_envelope_details(
+                    position=i,
+                    envelope=crowndependencies.packagedworkbaskets.last().envelope,
                 )
         if unpublished:
             self.stdout.write(
                 f"{unpublished.count()} envelope(s) ready to be published in the following order:",
             )
             for i, packaged_work_basket in enumerate(unpublished, start=1):
-                self.stdout.write(f"{i}: {packaged_work_basket.envelope}")
-
-    def handle(self, *args, **options):
-        if options["list"]:
-            self.list_unpublished_envelopes()
-            return
+                self.print_envelope_details(
+                    position=i,
+                    envelope=packaged_work_basket.envelope,
+                )
 
+    def publish(self, now: bool):
         if self.get_unpublished_envelopes() or self.get_incomplete_envelopes():
-            publish_to_api.apply()
+            if now:
+                self.stdout.write(f"Calling `publish_to_api()` now.")
+                publish_to_api()
+            else:
+                self.stdout.write(f"Calling `publish_to_api()` asynchronously.")
+                publish_to_api.apply()
         else:
             sys.exit("No unpublished envelopes")
+
+    def handle(self, *args, **options):
+        if options["publish_async"] or options["publish_now"]:
+            self.publish(now=options["publish_now"])
+        else:
+            self.list_unpublished_envelopes()
diff --git a/publishing/models/packaged_workbasket.py b/publishing/models/packaged_workbasket.py
index 93b240644..cc24edfa9 100644
--- a/publishing/models/packaged_workbasket.py
+++ b/publishing/models/packaged_workbasket.py
@@ -243,12 +243,9 @@ def get_unpublished_to_api(self) -> "PackagedWorkBasketQuerySet":
         ).order_by("envelope__envelope_id")
         return unpublished
 
-    def last_unpublished_envelope_id(self) -> "publishing_models.EnvelopeId":
-        """Join PackagedWorkBasket with Envelope and CrownDependenciesEnvelope
-        model selecting objects Where an Envelope model exists and the
-        published_to_tariffs_api field is not null Or Where a
-        CrownDependenciesEnvelope is not null Then select the max value for ther
-        envelope_id field in the Envelope instance."""
+    def last_published_envelope_id(self) -> "publishing_models.EnvelopeId":
+        """Get the envelope_id of the last Envelope successfully published to
+        the Tariffs API service."""
 
         return (
             self.select_related(
@@ -409,20 +406,29 @@ def next_expected_to_api(self) -> bool:
         (this means the envelope is the first to be published to the API)
         """
 
-        previous_id = PackagedWorkBasket.objects.last_unpublished_envelope_id()
+        previous_id = PackagedWorkBasket.objects.last_published_envelope_id()
         if self.envelope.envelope_id[2:] == settings.HMRC_PACKAGING_SEED_ENVELOPE_ID:
-            year = int(self.envelope.envelope_id[:2])
-            last_envelope = publishing_models.Envelope.objects.for_year(
-                year=year - 1,
-            ).last()
-            # uses None if first envelope (no previous ones)
-            expected_previous_id = last_envelope.envelope_id if last_envelope else None
-        else:
-            expected_previous_id = str(
-                int(self.envelope.envelope_id) - 1,
+            # NOTE:
+            # Code in this conditional block, and therefore this function,
+            # wrongly assumes a new year has passed since the last envelope was
+            # successfully published to tariffs-api.
+            # See Jira ticket TP2000-1646 for details of the issue.
+
+            current_envelope_year = int(self.envelope.envelope_id[:2])
+            last_envelope_last_year = (
+                publishing_models.Envelope.objects.last_envelope_for_year(
+                    year=current_envelope_year - 1,
+                )
+            )
+            expected_previous_id = (
+                last_envelope_last_year.envelope_id if last_envelope_last_year else None
             )
+        else:
+            expected_previous_id = str(int(self.envelope.envelope_id) - 1)
+
         if previous_id and previous_id != expected_previous_id:
             return False
+
         return True
 
     # processing_state transition management.
diff --git a/publishing/tests/test_publishing_commands.py b/publishing/tests/test_publishing_commands.py
index 67c18a688..31d06039e 100644
--- a/publishing/tests/test_publishing_commands.py
+++ b/publishing/tests/test_publishing_commands.py
@@ -20,11 +20,11 @@ def test_publish_to_api_lists_unpublished_envelopes(
     packaged_work_baskets = PackagedWorkBasket.objects.get_unpublished_to_api()
 
     out = StringIO()
-    call_command("publish_to_api", "--list", stdout=out)
+    call_command("publish_to_api", stdout=out)
     output = out.getvalue()
 
     for packaged_work_basket in packaged_work_baskets:
-        assert str(packaged_work_basket.envelope) in output
+        assert f"envelope_id={packaged_work_basket.envelope.envelope_id}" in output
 
 
 def test_publish_to_api_lists_no_envelopes(
@@ -34,7 +34,7 @@ def test_publish_to_api_lists_no_envelopes(
     settings.ENABLE_PACKAGING_NOTIFICATIONS = False
 
     out = StringIO()
-    call_command("publish_to_api", "--list", stdout=out)
+    call_command("publish_to_api", stdout=out)
     output = out.getvalue()
 
     assert not output
@@ -46,7 +46,7 @@ def test_publish_to_api_exits_no_unpublished_envelopes():
     assert CrownDependenciesEnvelope.objects.unpublished().count() == 0
 
     with pytest.raises(SystemExit):
-        call_command("publish_to_api")
+        call_command("publish_to_api", "--publish-async")
 
 
 def test_publish_to_api_publishes_envelopes(successful_envelope_factory, settings):
@@ -57,6 +57,6 @@ def test_publish_to_api_publishes_envelopes(successful_envelope_factory, setting
 
     assert PackagedWorkBasket.objects.get_unpublished_to_api().count() == 1
 
-    call_command("publish_to_api")
+    call_command("publish_to_api", "--publish-async")
 
     assert PackagedWorkBasket.objects.get_unpublished_to_api().count() == 0
diff --git a/settings/common.py b/settings/common.py
index 041d45eba..614f98346 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -633,7 +633,7 @@
     CROWN_DEPENDENCIES_API_CRON = (
         crontab(os.environ.get("CROWN_DEPENDENCIES_API_CRON"))
         if os.environ.get("CROWN_DEPENDENCIES_API_CRON")
-        else crontab(minute="0", hour="8-18/2", day_of_week="mon-fri")
+        else crontab(minute="0", hour="*/2")
     )
     CELERY_BEAT_SCHEDULE["crown_dependencies_api_publish"] = {
         "task": "publishing.tasks.publish_to_api",

From a908527a14adbea4fc3180b0502a62425b820b42 Mon Sep 17 00:00:00 2001
From: Matthew McKenzie <97194636+mattjamc@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:07:19 +0000
Subject: [PATCH 5/8] Fix dropdown queryset (#1376)

---
 quotas/forms/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quotas/forms/base.py b/quotas/forms/base.py
index ca23fa4e0..5e3f6bb4c 100644
--- a/quotas/forms/base.py
+++ b/quotas/forms/base.py
@@ -251,8 +251,8 @@ def init_fields(self):
         self.fields["quota_definition"].queryset = (
             models.QuotaDefinition.objects.current()
             .as_at_today_and_beyond()
-            .filter(order_number=self.quota_order_number)
-            .order_by("-sid")
+            .filter(order_number__sid=self.quota_order_number.sid)
+            .order_by("valid_between")
         )
         self.fields["quota_definition"].label_from_instance = (
             lambda obj: f"{obj.sid} ({obj.valid_between.lower} - {obj.valid_between.upper})"

From 755fac69c5b5003dba2dad826edd63afa2fc8c08 Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Thu, 9 Jan 2025 11:17:15 +0000
Subject: [PATCH 6/8] Tp2000 1542  workflow template admin support (#1374)

* added admin support for task workflow templates and task templates

* admin support for task workflow templates and task templates

* created ReadOnlyAdminMixIn for use with both taskworkflowtemplate admin and tasktemplate admin
---
 tasks/admin.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/tasks/admin.py b/tasks/admin.py
index 790685feb..04e2cfb9d 100644
--- a/tasks/admin.py
+++ b/tasks/admin.py
@@ -7,7 +7,9 @@
 from tasks.models import Task
 from tasks.models import TaskAssignee
 from tasks.models import TaskLog
+from tasks.models import TaskTemplate
 from tasks.models import TaskWorkflow
+from tasks.models import TaskWorkflowTemplate
 
 
 class TaskAdminMixin:
@@ -115,6 +117,51 @@ class TaskLogAdmin(admin.ModelAdmin):
     ]
 
 
+class ReadOnlyAdminMixin:
+    def has_add_permission(self, request):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+
+class TaskWorkflowTemplateAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
+    list_display = (
+        "id",
+        "title",
+        "description",
+        "creator",
+    )
+
+
+class TaskTemplateAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
+    list_display = (
+        "id",
+        "title",
+        "description",
+        "taskworkflowtemplate_id",
+    )
+
+    @admin.display(description="Task Workflow Template")
+    def taskworkflowtemplate_id(self, obj):
+        if not obj.taskitemtemplate:
+            return "-"
+        return self.link_to_task_workflow_template(obj.taskitemtemplate)
+
+    def link_to_task_workflow_template(self, task_item_template):
+        workflow_template_pk = task_item_template.workflow_template.pk
+        task_workflow_template_url = reverse(
+            "admin:tasks_taskworkflowtemplate_change",
+            args=(workflow_template_pk,),
+        )
+        return mark_safe(
+            f'<a href="{task_workflow_template_url}">{workflow_template_pk}</a>',
+        )
+
+
 class TaskWorflowAdmin(admin.ModelAdmin):
     search_fields = ["summary_task__title"]
     list_display = [
@@ -135,4 +182,7 @@ class TaskWorflowAdmin(admin.ModelAdmin):
 
 admin.site.register(TaskLog, TaskLogAdmin)
 
+admin.site.register(TaskWorkflowTemplate, TaskWorkflowTemplateAdmin)
+
+admin.site.register(TaskTemplate, TaskTemplateAdmin)
 admin.site.register(TaskWorkflow, TaskWorflowAdmin)

From e608ccd0e3c0790c4b85711d3c357ad52a70ca83 Mon Sep 17 00:00:00 2001
From: Charlie Prichard <46421052+CPrich905@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:43:03 +0000
Subject: [PATCH 7/8] TP-2000 1647 UI changes to bulk create quota definitions
 (#1377)

* Follow up changes to bulk create journey

* second round changes
---
 quotas/forms/definitions.py                   | 24 ++++++----------
 quotas/forms/wizards.py                       | 28 +++++++++++--------
 .../bulk-create-definition-edit.jinja         |  2 +-
 .../bulk-create-definition-info.jinja         |  5 ++--
 .../bulk-create-review.jinja                  |  6 ++--
 .../quota-definitions/bulk-create-start.jinja |  2 +-
 6 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/quotas/forms/definitions.py b/quotas/forms/definitions.py
index 8a03b880b..8e916d3f8 100644
--- a/quotas/forms/definitions.py
+++ b/quotas/forms/definitions.py
@@ -68,12 +68,12 @@ class Meta:
         },
     )
     measurement_unit = forms.ModelChoiceField(
-        queryset=MeasurementUnit.objects.current(),
+        queryset=MeasurementUnit.objects.current().order_by("code"),
         error_messages={"required": "Select the measurement unit"},
     )
     quota_critical_threshold = forms.DecimalField(
         label="Threshold",
-        help_text="The point at which this quota definition period becomes critical, as a percentage of the total volume.",
+        help_text="The point at which this quota definition period becomes critical, as a percentage of the total volume",
         widget=forms.TextInput(),
         error_messages={
             "invalid": "Critical threshold must be a number",
@@ -82,7 +82,7 @@ class Meta:
     )
     quota_critical = forms.TypedChoiceField(
         label="Is the quota definition period in a critical state?",
-        help_text="This determines if a trader needs to pay securities when utilising the quota.",
+        help_text="This determines if a trader needs to pay securities when utilising the quota",
         coerce=lambda value: value == "True",
         choices=((True, "Yes"), (False, "No")),
         widget=forms.RadioSelect(),
@@ -99,9 +99,6 @@ def clean(self):
         return super().clean()
 
     def init_fields(self):
-        self.fields["measurement_unit"].queryset = self.fields[
-            "measurement_unit"
-        ].queryset.order_by("code")
         self.fields["measurement_unit"].label_from_instance = (
             lambda obj: f"{obj.code} - {obj.description}"
         )
@@ -179,7 +176,7 @@ class Meta:
         },
     )
     measurement_unit = forms.ModelChoiceField(
-        queryset=MeasurementUnit.objects.current(),
+        queryset=MeasurementUnit.objects.current().order_by("code"),
         empty_label="Choose measurement unit",
         error_messages={"required": "Select the measurement unit"},
     )
@@ -187,7 +184,7 @@ class Meta:
     quota_critical_threshold = forms.DecimalField(
         label="Threshold",
         widget=DecimalSuffix(suffix="%"),
-        help_text="The point at which this quota definition period becomes critical, as a percentage of the total volume.",
+        help_text="The point at which this quota definition period becomes critical, as a percentage of the total volume",
         error_messages={
             "invalid": "Critical threshold must be a number",
             "required": "Enter the critical threshold",
@@ -195,7 +192,7 @@ class Meta:
     )
     quota_critical = forms.TypedChoiceField(
         label="Is the quota definition period in a critical state?",
-        help_text="This determines if a trader needs to pay securities when utilising the quota.",
+        help_text="This determines if a trader needs to pay securities when utilising the quota",
         coerce=lambda value: value == "True",
         choices=((True, "Yes"), (False, "No")),
         widget=forms.RadioSelect(),
@@ -231,9 +228,6 @@ def init_fields(self):
         self.fields["quota_critical"].initial = False
         self.fields["quota_critical_threshold"].initial = 90
 
-        self.fields["measurement_unit"].queryset = self.fields[
-            "measurement_unit"
-        ].queryset.order_by("code")
         self.fields["measurement_unit"].label_from_instance = (
             lambda obj: f"{obj.code} - {obj.description}"
         )
@@ -248,10 +242,10 @@ def init_fields(self):
         self.fields["end_date"].help_text = ""
         self.fields["end_date"].required = True
         self.fields["measurement_unit_qualifier"].help_text = (
-            "A measurement unit qualifier is not always required."
+            "A measurement unit qualifier is not always required"
         )
         self.fields["measurement_unit_qualifier"].empty_label = (
-            "Choose measurement unit qualifier."
+            "Choose measurement unit qualifier"
         )
 
     def init_layout(self, *args, **kwargs):
@@ -309,7 +303,7 @@ def init_layout(self, *args, **kwargs):
                 HTML(
                     '<h3 class="govuk-heading">Description</h3>',
                 ),
-                HTML.p("Adding a description is optional."),
+                HTML.p("Adding a description is optional"),
                 Field("description", css_class="govuk-!-width-two-thirds"),
             ),
             HTML(
diff --git a/quotas/forms/wizards.py b/quotas/forms/wizards.py
index 77eea97e1..0efa9fa4a 100644
--- a/quotas/forms/wizards.py
+++ b/quotas/forms/wizards.py
@@ -170,9 +170,6 @@ def init_layout(self, request):
 
         self.helper.layout = Layout(
             Div(
-                HTML(
-                    '<h2 class="govuk-heading">Enter quota order number</h2>',
-                ),
                 Div(
                     "quota_order_number",
                     css_class="govuk-!-width-one-third",
@@ -250,14 +247,14 @@ class Meta:
 
     measurement_unit = forms.ModelChoiceField(
         empty_label="Choose measurement unit",
-        queryset=MeasurementUnit.objects.current(),
+        queryset=MeasurementUnit.objects.current().order_by("code"),
         error_messages={"required": "Select the measurement unit"},
     )
 
     quota_critical_threshold = forms.DecimalField(
         label="Threshold",
         widget=DecimalSuffix(suffix="%"),
-        help_text="The point at which this quota definition period becomes critical, as a percentage of the total volume.",
+        help_text="The point at which this quota definition period becomes critical, as a percentage of the total volume",
         error_messages={
             "invalid": "Critical threshold must be a number",
             "required": "Enter the critical threshold",
@@ -265,7 +262,7 @@ class Meta:
     )
     quota_critical = forms.TypedChoiceField(
         label="Is the quota definition period in a critical state?",
-        help_text="This determines if a trader needs to pay securities when utilising the quota.",
+        help_text="This determines if a trader needs to pay securities when utilising the quota",
         coerce=lambda value: value == "True",
         choices=((True, "Yes"), (False, "No")),
         widget=forms.RadioSelect(),
@@ -292,6 +289,9 @@ def init_fields(self):
         self.fields["maximum_precision"].initial = 3
         self.fields["end_date"].help_text = ""
         self.fields["end_date"].required = True
+        self.fields["measurement_unit"].label_from_instance = (
+            lambda obj: f"{obj.code} - {obj.description}"
+        )
         self.fields["measurement_unit_qualifier"].help_text = (
             "A measurement unit qualifier is not always required"
         )
@@ -413,8 +413,11 @@ def init_layout(self):
                     '<h2 class="govuk-heading">First definition period</h2>',
                 ),
                 Div(
-                    HTML(
-                        '<p class="govuk-body">Enter the dates for the first definition period you are creating. Subsequent definition period dates will be calculated based on the dates entered for this first period</p>',
+                    Div(
+                        HTML(
+                            '<p class="govuk-body">Enter the dates for the first definition period you are creating. Subsequent definition period dates will be calculated based on the dates entered for this first period.</p>',
+                        ),
+                        css_class="govuk-!-width-two-thirds",
                     ),
                     "start_date",
                     "end_date",
@@ -426,7 +429,7 @@ def init_layout(self):
                 ),
                 Div(
                     HTML(
-                        '<p class="govuk-body">Select the frequency at which the subsequent definition periods should be duplicated</p>',
+                        '<p class="govuk-body">Select the frequency at which the subsequent definition periods should be duplicated.</p>',
                     ),
                     "frequency",
                     Field(
@@ -550,6 +553,9 @@ def init_fields(self):
         fields["measurement_unit"].initial = MeasurementUnit.objects.get(
             code=definition_data["measurement_unit_code"],
         )
+        self.fields["measurement_unit"].label_from_instance = (
+            lambda obj: f"{obj.code} - {obj.description}"
+        )
         if "description" in definition_data:
             fields["description"].initial = definition_data["description"]
 
@@ -564,14 +570,14 @@ def init_fields(self):
             )
         else:
             self.fields["measurement_unit_qualifier"].empty_label = (
-                "Choose measurement unit qualifier."
+                "Choose measurement unit qualifier"
             )
         fields["quota_critical_threshold"].initial = decimal.Decimal(
             definition_data["threshold"],
         )
         fields["quota_critical"].initial = definition_data["quota_critical"]
         self.fields["measurement_unit_qualifier"].help_text = (
-            "A measurement unit qualifier is not always required."
+            "A measurement unit qualifier is not always required"
         )
 
     def update_definition_data_in_session(self, cleaned_data):
diff --git a/quotas/jinja2/quota-definitions/bulk-create-definition-edit.jinja b/quotas/jinja2/quota-definitions/bulk-create-definition-edit.jinja
index dfee6114c..435ba3c1d 100644
--- a/quotas/jinja2/quota-definitions/bulk-create-definition-edit.jinja
+++ b/quotas/jinja2/quota-definitions/bulk-create-definition-edit.jinja
@@ -7,7 +7,7 @@
         {% block page_title_heading %}
             {{ page_title }}
         {% endblock %}
-        <span class="govuk-caption-xl">
+        <span class="govuk-caption-xl govuk-!-padding-top-2">
         {% block page_subtitle %}
             {{ page_subtitle }}
         {% endblock %}
diff --git a/quotas/jinja2/quota-definitions/bulk-create-definition-info.jinja b/quotas/jinja2/quota-definitions/bulk-create-definition-info.jinja
index 5bf18eac3..170a6ebd6 100644
--- a/quotas/jinja2/quota-definitions/bulk-create-definition-info.jinja
+++ b/quotas/jinja2/quota-definitions/bulk-create-definition-info.jinja
@@ -7,14 +7,15 @@
         {% block page_title_heading %}
             {{ page_title }}
         {% endblock %}
-        <span class="govuk-caption-xl">
+        <br/>
+        <span class="govuk-caption-xl govuk-!-padding-top-2">
         {% block page_subtitle %}
             {{ page_subtitle }}
         {% endblock %}
         </span>
     </h1>
     <p class="govuk-body">
-      Changes can be made to individual definition periods on the review page before submission
+      Changes can be made to individual definition periods on the review page before submission.
     </p>
     <br />
 
diff --git a/quotas/jinja2/quota-definitions/bulk-create-review.jinja b/quotas/jinja2/quota-definitions/bulk-create-review.jinja
index 4b0d7c8f5..57a59dcae 100644
--- a/quotas/jinja2/quota-definitions/bulk-create-review.jinja
+++ b/quotas/jinja2/quota-definitions/bulk-create-review.jinja
@@ -12,7 +12,7 @@
         {% block page_title_heading %}
             {{ page_title }}
         {% endblock %}
-        <span class="govuk-caption-xl">
+        <span class="govuk-caption-xl govuk-!-padding-top-2">
         {% block page_subtitle %}
             {{ page_subtitle }}
         {% endblock %}
@@ -72,7 +72,7 @@
         ]) or ""}}
     {% endfor %}
 
-    <p class="govuk-inset-text">Each row represents a Quota definition period to be created. These can be edited before being submitted.</p>
+    <p class="govuk-inset-text">Each row represents a quota definition period to be created. These can be edited before being submitted.</p>
     <div class="bulk-create-review quota-definitions">
         {{ govukTable({
             "head": [
@@ -87,7 +87,7 @@
         }) }}
     </div>
     <p class="govuk-body">Selecting 'Submit' will create the new definition periods.</p>
-    <p class="govuk-body">Further edits to the definition periods can be made on the quota order number page through an additional workbasket transaction.</p>
+    <p class="govuk-body">Further edits to the definition periods can be made on the quota order number page.</p>
 <div class="govuk-button-group">
   {{ govukButton({
     "text": "Submit",
diff --git a/quotas/jinja2/quota-definitions/bulk-create-start.jinja b/quotas/jinja2/quota-definitions/bulk-create-start.jinja
index d4b1474c5..dfdd0f2c6 100644
--- a/quotas/jinja2/quota-definitions/bulk-create-start.jinja
+++ b/quotas/jinja2/quota-definitions/bulk-create-start.jinja
@@ -11,7 +11,7 @@
       Subsequent periods will be calculated from the first date range entered and the data will be duplicated across all definition periods.
     </p>
     <p>
-      Changes can be made to individual definition periods on the review page before submission
+      Changes can be made to individual definition periods on the review page before submission.
     </p>
     
 

From a3116a09ae213ca5df5ac462652cec5ec0570743 Mon Sep 17 00:00:00 2001
From: Matthew McKenzie <97194636+mattjamc@users.noreply.github.com>
Date: Fri, 10 Jan 2025 10:39:09 +0000
Subject: [PATCH 8/8] TP2000-1642 Missing application security header (#1378)

* Extend security middleware

* Move to middleware file rather than new folder
---
 common/middleware.py | 11 +++++++++++
 settings/common.py   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/common/middleware.py b/common/middleware.py
index 25d1b8f43..c6e132f52 100644
--- a/common/middleware.py
+++ b/common/middleware.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.middleware.security import SecurityMiddleware
 from django.shortcuts import redirect
 from django.urls import reverse
 
@@ -16,3 +17,13 @@ def __call__(self, request):
 
         response = self.get_response(request)
         return response
+
+
+class CustomSecurityMiddleware(SecurityMiddleware):
+    """Extends the security middleware to include the X-Permitted-Cross-Domain-
+    Policies HTTP response header."""
+
+    def process_response(self, request, response):
+        response = super().process_response(request, response)
+        response["X-Permitted-Cross-Domain-Policies"] = "none"
+        return response
diff --git a/settings/common.py b/settings/common.py
index 614f98346..adb62cc68 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -155,7 +155,7 @@
 ]
 
 MIDDLEWARE = [
-    "django.middleware.security.SecurityMiddleware",
+    "common.middleware.CustomSecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",