diff --git a/api/conf/settings.py b/api/conf/settings.py index bc2b03f5a..edb95d77f 100644 --- a/api/conf/settings.py +++ b/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") diff --git a/api/letter_templates/templates/letter_templates/siel.html b/api/letter_templates/templates/letter_templates/siel.html index b28cf83be..9221a0d8e 100644 --- a/api/letter_templates/templates/letter_templates/siel.html +++ b/api/letter_templates/templates/letter_templates/siel.html @@ -313,8 +313,8 @@

Standard Individual Export Licence

{{ clc }}{% if not forloop.last %},{% endif %} {% endfor %} - {{ good_item.value }} - {{ good_item.quantity }} + {{ good_item.applied_for_value }} + {{ good_item.applied_for_quantity }} {% endwith %} {% endfor %} diff --git a/api/letter_templates/tests/test_letter_templates.py b/api/letter_templates/tests/test_letter_templates.py index e35b11022..472eaafe8 100644 --- a/api/letter_templates/tests/test_letter_templates.py +++ b/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) diff --git a/lite_routing b/lite_routing index 11db0ef53..6077560f9 160000 --- a/lite_routing +++ b/lite_routing @@ -1 +1 @@ -Subproject commit 11db0ef53f335b88be9268c97393381071a8b016 +Subproject commit 6077560f9f4991b4a7b58e93dcc1d4e4ce47b694