-
-{% if related_markets %}
- {% for related_market in related_markets %}
- {% if related_market.name == market_name %}
-
- {% for related in related_market.related %}
- {% with related_market_data=related|get_market_widget_data %}
-
- {% endwith %}
- {% endfor %}
- {% endif %}
- {% endfor %}
-{% endif %}
-
{% endwith %}
{% endif %}
\ No newline at end of file
diff --git a/contact/templates/domestic/contact/export-support/includes/service-widget.html b/contact/templates/domestic/contact/export-support/includes/service-widget.html
index b6d2fd5ab2..ca847bebdf 100644
--- a/contact/templates/domestic/contact/export-support/includes/service-widget.html
+++ b/contact/templates/domestic/contact/export-support/includes/service-widget.html
@@ -1,26 +1,13 @@
-
-
-
+
+
Paying VAT when exporting a service
+
+
+ Place of supply rules will determine whether you pay VAT in the UK or overseas.
+
-
\ No newline at end of file
+
+
Understanding withholding tax when exporting a service
+
+ Withholding tax is sometimes levied by overseas governments on service exporters.
+
+
\ No newline at end of file
diff --git a/contact/templates/domestic/contact/export-support/includes/suggested-markets-widget.html b/contact/templates/domestic/contact/export-support/includes/suggested-markets-widget.html
new file mode 100644
index 0000000000..d93c74bd14
--- /dev/null
+++ b/contact/templates/domestic/contact/export-support/includes/suggested-markets-widget.html
@@ -0,0 +1,10 @@
+{% load get_market_widget_data from component_tags %}
+
+
Suggested markets
+{% for market in suggested_markets %}
+ {% with suggested_market_data=market|get_market_widget_data %}
+
+ Exporting guide to {{ suggested_market_data.heading }}
+
+ {% endwith %}
+{% endfor %}
\ No newline at end of file
diff --git a/core/forms.py b/core/forms.py
index b9499db86c..31d2f11b08 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -195,21 +195,20 @@ class GuidedJourneyStep3Form(forms.Form):
class GuidedJourneyStep4Form(forms.Form):
- sub_category = ChoiceField(
- label='Whats the subject of your enquiry',
+ category = ChoiceField(
+ label='Need help with a specific problem',
choices=(
- ('market-selection/events-and-trade-missions', 'Events and trade missions'),
- ('routes-to-market-and-operating-overseas/exploring-routes-to-market', 'Exploring routes to market'),
+ ('/support/market-selection', 'Market selection'),
+ ('/support/routes-to-market-and-operating-overseas', 'Routes to market and operating overseas'),
(
- 'routes-to-market-and-operating-overseas/prepare-your-business-to-operate-in-an-export-market',
- 'Prepare your business to operate in an export market',
+ '/support/funding-and-financial-considerations',
+ 'Funding and financial considerations',
),
- ('funding-and-financial-considerations/get-funding-support', 'Get funding support'),
- ('trade-restrictions-regulations-and-licensing/uk-trade-embargoes', 'UK trade embargoes'),
- ('logistics/logistics-procedures', 'Logistics procedures'),
- ('customs-taxes-and-declarations/customs-special-procedures', 'Customs special procedures'),
- ('travelling-for-work/taking-goods-overseas-for-work', 'Taking goods overseas for work'),
- ('managing-business-risk-and-corruption/get-uk-legal-advice', 'Get UK legal advice'),
+ ('/support/trade-restrictions-regulations-and-licensing', 'Trade restrictions, regulations and licensing'),
+ ('/support/logistics', 'Logistics'),
+ ('/support/customs-taxes-and-declarations', 'Customs, taxes and declarations'),
+ ('/support/travelling-for-work', 'Travelling for work'),
+ ('/support/managing-business-risk-and-corruption', 'Managing business risk and corruption'),
),
widget=contact_widgets.GreatFilteredRadioSelect,
error_messages={
diff --git a/core/views.py b/core/views.py
index cb927c7921..2bcc194f8b 100644
--- a/core/views.py
+++ b/core/views.py
@@ -871,23 +871,7 @@ def get_context_data(self, **kwargs):
return super().get_context_data(
**kwargs,
progress_position=4,
- categories=[
- {'name': 'Market selection', 'matcher': 'market-selection'},
- {
- 'name': 'Routes to market and operating overseas',
- 'matcher': 'routes-to-market-and-operating-overseas',
- },
- {'name': 'Funding and financial considerations', 'matcher': 'funding-and-financial-considerations'},
- {
- 'name': 'Trade restrictions, regulations and licensing',
- 'matcher': 'trade-restrictions-regulations-and-licensing',
- },
- {'name': 'Logistics', 'matcher': 'logistics'},
- {'name': 'Customs, taxes and declarations', 'matcher': 'customs-taxes-and-declarations'},
- {'name': 'Travelling for work', 'matcher': 'travelling-for-work'},
- {'name': 'Managing business risk and corruption', 'matcher': 'managing-business-risk-and-corruption'},
- ],
- related_markets=[{'name': 'china', 'related': ['india', 'mexico']}],
+ suggested_markets=['china', 'india', 'mexico'],
)
def get_success_url(self):
@@ -897,20 +881,20 @@ def get_success_url(self):
market = form_data['market']
is_goods = form_data['exporter_type'] == 'goods'
is_service = form_data['exporter_type'] == 'service'
- sub_category = form_data['sub_category']
+ category = form_data['category']
- sub_cat_url = f'/support/{sub_category}?is_guided_journey=True'
+ cat_url = f'{category}?is_guided_journey=True'
if market:
- sub_cat_url += f'&market={market}'
+ cat_url += f'&market={market}'
if is_goods:
- sub_cat_url += f'&is_goods={is_goods}'
+ cat_url += f'&is_goods={is_goods}'
if is_service:
- sub_cat_url += f'&is_service={is_service}'
+ cat_url += f'&is_service={is_service}'
- return sub_cat_url
+ return cat_url
return reverse_lazy('core:guided-journey-step-1')