Merge pull request #2269 from uktrade/uat

Production Release

api/conf/settings.py

@@ -614,3 +614,5 @@ def _build_redis_url(base_url, db_number, **query_args):
     LOGGING.update({"formatters": {"simple": {"format": "{asctime} {levelname} {message}", "style": "{"}}})
     LOGGING["handlers"].update({"stdout": {"class": "logging.StreamHandler", "formatter": "simple"}})
     LOGGING.update({"root": {"handlers": ["stdout"], "level": env("LOG_LEVEL").upper()}})
+
+ROUTING_DOCS_DIRECTORY = os.path.join(BASE_DIR, "..", "lite_routing", "docs")

api/letter_templates/templates/letter_templates/siel.html

@@ -313,8 +313,8 @@ <h1>Standard Individual Export Licence</h1>
                         {{ clc }}{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </td>
-                <td id="row-{{ forloop.counter}}-value" class="border-black" colspan="2">{{ good_item.value }}</td>
-                <td id="row-{{ forloop.counter}}-quantity" class="border-black" colspan="2">{{ good_item.quantity }}</td>
+                <td id="row-{{ forloop.counter}}-value" class="border-black" colspan="2">{{ good_item.applied_for_value }}</td>
+                <td id="row-{{ forloop.counter}}-quantity" class="border-black" colspan="2">{{ good_item.applied_for_quantity }}</td>
             </tr>
           {% endwith %}
         {% endfor %}

api/letter_templates/tests/test_letter_templates.py

@@ -60,7 +60,7 @@ def test_siel_template_uses_correct_quantity_and_value(self):
         )
 
         self.assertIn("Test Good 2\n Another line", rendered_template)
-        self.assertNotIn("999111", rendered_template)
-        self.assertNotIn("999222", rendered_template)
-        self.assertIn("555111", rendered_template)
-        self.assertIn("555222", rendered_template)
+        self.assertIn("999111", rendered_template)
+        self.assertIn("999222", rendered_template)
+        self.assertNotIn("555111", rendered_template)
+        self.assertNotIn("555222", rendered_template)