Merge pull request #3 from justbetter/feature/fieldtype-optimisation

Changed field type data
justbetter · Jun 16, 2023 · a32a116 · a32a116
2 parents d6565b3 + ea09aa4
commit a32a116
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Fieldtypes/Postcodeservice.php b/src/Fieldtypes/Postcodeservice.php
@@ -20,8 +20,15 @@ class Postcodeservice extends Text
     protected function configFieldItems(): array
     {
         $config = parent::configFieldItems();
-        $config['input_type']['default'] = $this->postcodeserviceDefaultFieldType;
-        $config['input_type']['options'] = $this->postcodeserviceFieldTypes;
+
+        $config['postcodeservice_type'] = [
+            'display' => __('Field type'),
+            'instructions' => __('Select the Postcodeservice field type'),
+            'type' => 'select',
+            'default' => $this->postcodeserviceDefaultFieldType,
+            'width' => 50,
+            'options' => $this->postcodeserviceFieldTypes
+        ];
 
         return $config;
     }

diff --git a/src/Tags/PostcodeserviceTag.php b/src/Tags/PostcodeserviceTag.php
@@ -32,11 +32,11 @@ public function getPostcodeserviceFields(array $form): array
         }
 
         foreach ($form['fields'] as $field) {
-            if (!isset($field['input_type']) || !isset($field['handle']) || ($field['type'] ?? '') !== 'postcodeservice') {
+            if (!isset($field['input_type']) || !isset($field['handle']) || ($field['type'] ?? '') !== 'postcodeservice' || !isset($field['postcodeservice_type'])) {
                 continue;
             }
 
-            $postcodeserviceFields[$field['input_type']] = $field['handle'];
+            $postcodeserviceFields[$field['postcodeservice_type']] = $field['handle'];
         }
 
         return $postcodeserviceFields;