fix(settings): disallow "none" in customs country of origin

myparcelnl · Nov 27, 2023 · d5f97e8 · d5f97e8
1 parent 10130eb
commit d5f97e8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/src/Frontend/View/CustomsSettingsView.php b/src/Frontend/View/CustomsSettingsView.php
@@ -37,15 +37,11 @@ protected function createElements(): ?array
                 ['options' => $this->toSelectOptions(CustomsSettings::PACKAGE_CONTENTS_LIST)]
             ),
             new InteractiveElement(CustomsSettings::CUSTOMS_CODE, Components::INPUT_TEXT),
-
             new InteractiveElement(
                 CustomsSettings::COUNTRY_OF_ORIGIN,
                 Components::INPUT_SELECT,
                 [
-                    'options' => $this->toSelectOptions(
-                        $this->countryService->getAllTranslatable(),
-                        AbstractSettingsView::SELECT_INCLUDE_OPTION_NONE
-                    ),
+                    'options' => $this->toSelectOptions($this->countryService->getAllTranslatable()),
                     'sort'    => ElementBuilderWithOptionsInterface::SORT_ASC_VALUE,
                 ]
             ),

diff --git a/...s__/FrontendRenderServiceTest__it_renders_component_with_data_set_plugin_settings__1.json b/...s__/FrontendRenderServiceTest__it_renders_component_with_data_set_plugin_settings__1.json
@@ -468,10 +468,6 @@
           "name": "countryOfOrigin",
           "$component": "SelectInput",
           "options": [
-            {
-              "value": -1,
-              "label": "settings_none"
-            },
             {
               "value": "AD",
               "label": "country_ad"

diff --git a/...napshots__/SettingsViewTest__it_gets_settings_view_with_data_set_customs_settings__1.json b/...napshots__/SettingsViewTest__it_gets_settings_view_with_data_set_customs_settings__1.json
@@ -42,10 +42,6 @@
       "name": "countryOfOrigin",
       "$component": "SelectInput",
       "options": [
-        {
-          "value": -1,
-          "label": "settings_none"
-        },
         {
           "value": "AD",
           "label": "country_ad"