Skip to content

Commit

Permalink
Merge pull request #3412 from uktrade/develop
Browse files Browse the repository at this point in the history 
Release PR
  • Loading branch information
@lewis-coulson-dit
lewis-coulson-dit authored Sep 23, 2024
2 parents 2e08826 + 68cf8b7 commit dbcaea9
Show file tree
Hide file tree
Showing 71 changed files with 7,502 additions and 6,436 deletions.
1 change: 0 additions & 1 deletion config/env/test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ FEATURE_SHOW_EU_CTA=True
FEATURE_SHOW_MARKET_GUIDE_SECTOR_SPOTLIGHT_CHINA=True
FEATURE_SHOW_MARKET_GUIDE_SECTOR_SPOTLIGHT_GERMANY=True
FEATURE_SHOW_MARKET_GUIDE_SECTOR_SPOTLIGHT_USA=True
FEATURE_SHOW_CUSTOMS_AND_TAXES_DROPWDOWN=True
COMPANIES_HOUSE_API_KEY=debug
COMPANIES_HOUSE_CLIENT_ID=debug
COMPANIES_HOUSE_CLIENT_SECRET=debug
Expand Down
1 change: 0 additions & 1 deletion config/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,6 @@
'FEATURE_SHOW_MARKET_GUIDE_SECTOR_SPOTLIGHT_GERMANY', False
)
FEATURE_SHOW_MARKET_GUIDE_SECTOR_SPOTLIGHT_USA = env.bool('FEATURE_SHOW_MARKET_GUIDE_SECTOR_SPOTLIGHT_USA', False)
FEATURE_SHOW_CUSTOMS_AND_TAXES_DROPWDOWN = env.bool('FEATURE_SHOW_CUSTOMS_AND_TAXES_DROPWDOWN', False)
FEATURE_UKEA_SECTOR_FILTER = env.bool('FEATURE_UKEA_SECTOR_FILTER', False)
FEATURE_UKEA_REGION_FILTER = env.bool('FEATURE_UKEA_REGION_FILTER', False)
FEATURE_UKEA_MARKET_FILTER = env.bool('FEATURE_UKEA_MARKET_FILTER', False)
Expand Down
215 changes: 0 additions & 215 deletions contact/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,221 +339,6 @@ def clean(self):


class DomesticExportSupportStep6Form(forms.Form):
enquiry_subject = forms.ChoiceField(
label='Select a subject for your enquiry',
widget=django_widgets.Select(attrs={'class': 'govuk-select great-select'}),
choices=(
('', 'Please select'),
('market_selection_ess_dep_testing', 'Market selection'),
('routes_to_market_ess_dep_testing', 'Routes to market'),
('funding_and_financial_considerations_ess_dep_testing', 'Funding and financial considerations'),
(
'trade_restrictions_regulations_and_licensing_ess_dep_testing',
'Trade restrictions, regulations and licensing',
),
('logistics_ess_dep_testing', 'Logistics'),
('customs_taxes_and_declarations_ess_dep_testing', 'Customs, taxes and declarations'),
(
'travelling_for_work_and_hiring_people_overseas_ess_dep_testing',
'Travelling for work and hiring people overseas',
),
('operating_overseas_ess_dep_testing', 'Operating overseas'),
('managing_business_risk_and_corruption_ess_dep_testing', 'Managing business risk and corruption'),
('other_ess_dep_testing', 'Not listed above'),
('dont_know_ess_dep_testing', "Don't know"),
),
error_messages={
'required': 'You must select a subject for your enquiry',
},
)
enquiry_subject_level_2 = forms.ChoiceField(
label='Select a topic from Customs, taxes and declarations',
widget=django_widgets.Select(attrs={'class': 'govuk-select great-select'}),
choices=(
('', 'Please select'),
('product_classification_ess_dep_testing', 'Product classification'),
('tax_and_duty_liabilities_ess_dep_testing', 'Tax and duty liabilities'),
('rules_of_origin_ess_dep_testing', 'Rules of origin'),
('place_of_supply_for_service_providers_ess_dep_testing', 'Place of Supply for service providers'),
('customs_declarations_ess_dep_testing', 'Customs declarations'),
('uk_and_overseas_customs_ess_dep_testing', 'UK and overseas customs'),
(
'conduct_declarations_on_your_behalf_ess_dep_testing',
'Hiring someone to conduct declarations on your behalf',
),
('moving_goods_through_a_third_country_ess_dep_testing', 'Moving goods through a third country'),
('taking_goods_temporarily_out_of_the_uk_ess_dep_testing', 'Taking goods temporarily out of the UK'),
('exporting_samples_ess_dep_testing', 'Exporting samples'),
('special_procedures_ess_dep_testing', 'Special procedures'),
('other_1_ess_dep_testing', 'Not listed above'),
('dont_know_1_ess_dep_testing', "Don't know"),
),
required=False,
)
enquiry_subject_level_3 = forms.MultipleChoiceField(
label='Pick the situation/s that matches yours',
widget=contact_widgets.GreatCheckboxes,
choices=[
('product_classification_ess_dep_testing__classify_your_products', 'How to classify your products'),
('product_classification_ess_dep_testing__advance_tariff_ruling', 'Apply for an Advance Tariff Ruling'),
('product_classification_ess_dep_testing__not_listed_above', 'Not listed above'),
('product_classification_ess_dep_testing__do_not_know', "Don't know"),
(
'tax_and_duty_liabilities_ess_dep_testing__tax_and_duty_liabilities',
'Understand tax and duty liabilities',
),
(
'tax_and_duty_liabilities_ess_dep_testing__vat_and_taxation_rules',
'Understand VAT and taxation rules in your destination country',
),
(
'tax_and_duty_liabilities_ess_dep_testing__calculate_taxes_and_duties',
'Calculate relevant taxes and duties',
),
('tax_and_duty_liabilities_ess_dep_testing__pay_relevant_taxes', 'Pay relevant taxes'),
(
'tax_and_duty_liabilities_ess_dep_testing__withholding_taxes',
'Withholding taxes when exporting services',
),
('tax_and_duty_liabilities_ess_dep_testing__not_listed_above', 'Not listed above'),
('tax_and_duty_liabilities_ess_dep_testing__do_not_know', "Don't know"),
('rules_of_origin_ess_dep_testing__understand_rules_of_origin', 'Understand rules of origin'),
(
'rules_of_origin_ess_dep_testing__determine_goods_country_of_origin',
'Understand how to determine a goods country of origin',
),
(
'rules_of_origin_ess_dep_testing__complete_certificates_of_origin',
'Complete necessary certificates of origin',
),
('rules_of_origin_ess_dep_testing__binding_origin_decision', 'Apply for a Binding Origin decision'),
('rules_of_origin_ess_dep_testing__not_listed_above', 'Not listed above'),
('rules_of_origin_ess_dep_testing__do_not_know', "Don't know"),
(
'place_of_supply_for_service_providers_ess_dep_testing__what_a_service_export_is',
'Understand what a service export is',
),
(
'place_of_supply_for_service_providers_ess_dep_testing__vat_and_taxation_rules',
'Understand VAT and taxation rules in the destination country',
),
(
'place_of_supply_for_service_providers_ess_dep_testing__relevant_duties_taxes_for_services',
'Pay relevant duties taxes for services',
),
(
'place_of_supply_for_service_providers_ess_dep_testing__vat_considerations_for_services',
'UK VAT considerations for service providers',
),
('place_of_supply_for_service_providers_ess_dep_testing__not_listed_above', 'Not listed above'),
('place_of_supply_for_service_providers_ess_dep_testing__do_not_know', "Don't know"),
(
'customs_declarations_ess_dep_testing__make_a_customs_declaration',
'Check if you need to make a customs declaration',
),
('customs_declarations_ess_dep_testing__right_commodity_code', 'Get the right commodity code'),
(
'customs_declarations_ess_dep_testing__products_meet_the_rules_of_origin',
'Check your products meet the rules of origin',
),
(
'customs_declarations_ess_dep_testing__calculate_relevant_taxes__and_duties',
'Calculate relevant taxes and duties',
),
(
'customs_declarations_ess_dep_testing__necessary_certificates_of_origin',
'Complete necessary certificates of origin',
),
(
'customs_declarations_ess_dep_testing__different_types_of_declarations',
'Understand the different types of declarations',
),
('customs_declarations_ess_dep_testing__submit_declarations', 'Submit your declarations'),
('customs_declarations_ess_dep_testing__not_listed_above', 'Not listed above'),
('customs_declarations_ess_dep_testing__do_not_know', "Don't know"),
(
'uk_and_overseas_customs_ess_dep_testing__interact_overseas_customs',
'Understand how to interact with overseas customs',
),
('uk_and_overseas_customs_ess_dep_testing__merchandise_in_baggage', 'Merchandise in baggage'),
('uk_and_overseas_customs_ess_dep_testing__shipping_with_royal_mail', 'Shipping with Royal Mail'),
('uk_and_overseas_customs_ess_dep_testing__zero_rating_for_uk_vat', 'Zero rating for UK VAT'),
('uk_and_overseas_customs_ess_dep_testing__not_listed_above', 'Not listed above'),
('uk_and_overseas_customs_ess_dep_testing__do_not_know', "Don't know"),
(
'conduct_declarations_on_your_behalf_ess_dep_testing__understand_how_to_hire_someone',
'Understand how to hire someone to conduct declarations on your behalf',
),
(
'conduct_declarations_on_your_behalf_ess_dep_testing__custom_ agent_or_fast_parcel_operator',
'Find a customs agent or fast parcel operator',
),
(
'conduct_declarations_on_your_behalf_ess_dep_testing__learn_about_freight_forwarding',
'Learn about freight forwarding: moving goods',
),
('conduct_declarations_on_your_behalf_ess_dep_testing__not_listed_above', 'Not listed above'),
('conduct_declarations_on_your_behalf_ess_dep_testing__do_not_know', "Don't know"),
(
'moving_goods_through_a_third_country_ess_dep_testing__understand_how_to_move_goods',
'Understand how to move goods through a third country',
),
(
'moving_goods_through_a_third_country_ess_dep_testing__register_for_gvms',
'Register for the Goods Vehicle Movement Service (GVMS)',
),
(
'moving_goods_through_a_third_country_ess_dep_testing__using_transit_to_move_goods',
'Using transit to move goods out of, into and through the UK',
),
('moving_goods_through_a_third_country_ess_dep_testing__not_listed_above', 'Not listed above'),
('moving_goods_through_a_third_country_ess_dep_testing__do_not_know', "Don't know"),
(
'taking_goods_temporarily_out_of_the_uk_ess_dep_testing__understand_how_to_take_goods',
'Understand how to take goods temporarily out of the UK',
),
('taking_goods_temporarily_out_of_the_uk_ess_dep_testing__ata_carnet', 'Apply for an ATA Carnet'),
(
'taking_goods_temporarily_out_of_the_uk_ess_dep_testing__claim_with_duplicate_list',
'Claim with a Duplicate List',
),
(
'taking_goods_temporarily_out_of_the_uk_ess_dep_testing__claim_with_rgr',
'Claim with Returned Goods Relief (RGR)',
),
('taking_goods_temporarily_out_of_the_uk_ess_dep_testing__not_listed_above', 'Not listed above'),
('taking_goods_temporarily_out_of_the_uk_ess_dep_testing__do_not_know', "Don't know"),
(
'exporting_samples_ess_dep_testing__understand_customs_declaration_when_exporting_samples',
'Understand customs declaration when exporting samples',
),
('exporting_samples_ess_dep_testing__not_listed_above', 'Not listed above'),
('exporting_samples_ess_dep_testing__do_not_know', "Don't know"),
(
'special_procedures_ess_dep_testing__use_a_customs_special_procedure',
'Understand if you can use a customs special procedure',
),
(
'special_procedures_ess_dep_testing__inward_processing',
'Using inward processing to process or repair your goods',
),
(
'special_procedures_ess_dep_testing__outward_processing',
'Using outward processing to process or repair your goods',
),
(
'special_procedures_ess_dep_testing__apply_for_temporary_admission',
'Apply for Temporary Admission to import goods to or from the UK',
),
(
'special_procedures_ess_dep_testing__eligible__goods_and_authorised_uses',
'Eligible goods and authorised uses',
),
('special_procedures_ess_dep_testing__not_listed_above', 'Not listed above'),
('special_procedures_ess_dep_testing__do_not_know', "Don't know"),
],
required=False,
)
enquiry = forms.CharField(
label='Tell us more about your enquiry',
help_text="""Provide as much information as possible to help us better understand your enquiry.
Expand Down
34 changes: 18 additions & 16 deletions contact/templates/domestic/contact/export-support/guided-journey/step-1.html
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
{% extends 'domestic/contact/export-support/base.html' %}
{% load static %}
{% block head_title %}Export support{% endblock %}
{% block head_title %}Export support for UK businesses{% endblock %}
{% block head_css %}
{{ block.super }}
<link href="{% static 'core/css/accessible-autocomplete.min.css' %}"
rel="stylesheet"
type="text/css">
{% endblock %}
{% block content %}
<div class="great great-bg-white">
<div class="great">
<div class="great-container govuk-!-padding-top-4">
<div class="govuk-grid-row">
<div class="govuk-grid-column-full great-grid-column-seven-twelfths">
<h1 class="govuk-heading-xl govuk-!-margin-bottom-9">Export support</h1>
<form method="post" autocomplete="off" class="great-min-height-500">
<h1 class="govuk-heading-xl govuk-!-margin-bottom-5">Export support for UK businesses</h1>
<form method="post" autocomplete="off" class="great-min-height-500 ">
{% csrf_token %}
<input type="hidden" id="sector" name="sector" />
<input type="hidden" id="make_or_do_keyword" name="make_or_do_keyword" />
<input type="hidden" id="exporter_type" name="exporter_type" />

<div class="govuk-!-margin-bottom-6">
<h2 class="govuk-label-wrapper">
<label class="govuk-label govuk-label--l" for="sic_description">
What does your company make or do?
</label>
</h2>
<div class="govuk-hint govuk-!-margin-bottom-3">
Enter a keyword to search a list of business activities
<div class="govuk-!-padding-6 great-bg-white">
<div class="govuk-!-margin-bottom-6">
<h2 class="govuk-label-wrapper">
<label class="govuk-label govuk-label--l" for="sic_description">
What does your company make or do?
</label>
</h2>
<div class="govuk-hint govuk-!-margin-bottom-3">
Enter a keyword to search a list of business activities
</div>
<input type="text" id="sic_description" name="sic_description" class="govuk-input great-text-input govuk-!-width-one-half" />
<div id="sic_description-container"></div>
</div>
<input type="text" id="sic_description" name="sic_description" class="govuk-input great-text-input govuk-!-width-one-half" />
<div id="sic_description-container"></div>
</div>

<button type="submit" class="govuk-button great-min-width-250-desktop">{{ button_text }}</button>
<button type="submit" class="govuk-button great-min-width-250-desktop">{{ button_text }}</button>
</div>
</form>
</div>
</div>
Expand Down
16 changes: 10 additions & 6 deletions contact/templates/domestic/contact/export-support/guided-journey/step-2.html
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
{% extends 'domestic/contact/export-support/base.html' %}
{% load static %}
{% block head_title %}Export support{% endblock %}
{% block head_title %}Export support for UK businesses{% endblock %}
{% block content %}
<div class="great great-bg-white">
<div class="great">
<div class="great-container govuk-!-padding-top-4">
<div class="govuk-grid-row">
<div class="govuk-grid-column-full great-grid-column-seven-twelfths">
<h1 class="govuk-heading-xl govuk-!-margin-bottom-9">Export support</h1>
<h1 class="govuk-heading-xl govuk-!-margin-bottom-5">Export support for UK businesses</h1>
{% if session_data.sic_description %}
<p class="govuk-body">Your business activity: {{ session_data.sic_description }} <a href="{% url 'core:guided-journey-step-1' %}" class="govuk-link">(Change)</a></p>
<div class="govuk-!-margin-bottom-6 govuk-!-padding-6 great-bg-white">
<h2 class="govuk-heading-s">What does your company make or do?</h2>
<p class="govuk-body">{{ session_data.sic_description }} <a href="{% url 'core:guided-journey-step-1' %}" class="govuk-link">(Change)</a></p>
<p class="govuk-body govuk-!-margin-bottom-0">Your sector is <strong class="great-font-bold">{{ session_data.sector }}</strong></p>
</div>
{% endif %}
<form method="post" autocomplete="off" class="great-min-height-500">
{% csrf_token %}
<div class="govuk-!-margin-bottom-6">
<div class="govuk-!-padding-6 great-bg-white govuk-!-margin-bottom-6">
<h2 class="govuk-label-wrapper">
<label class="govuk-label govuk-label--l" for="sic_description">
Select the best commodity match for '<strong>{% if session_data.make_or_do_keyword %}{{ session_data.make_or_do_keyword }}{% else %}{{ session_data.sic_description }}{% endif %}</strong>'
Select the best commodity match
</label>
</h2>
<div class="great-text-select--arrow">
Expand Down
Loading

0 comments on commit dbcaea9

Please sign in to comment.