Fixed segments in Craft 3.7.0 and above

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Campaign
 
+## 1.20.2 - 2021-08-05
+### Fixed
+- Fixed a bug in which segments were not working with fields created in Craft 3.7.0 and above ([#241](https://github.com/putyourlightson/craft-campaign/issues/241)).
+
 ## 1.20.1 - 2021-07-27
 ### Fixed
 - Fixed a bug in which the mime type of a CSV file was not recognised in PHP 8.0 when importing ([#240](https://github.com/putyourlightson/craft-campaign/issues/240)).

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "putyourlightson/craft-campaign",
     "description": "Send and manage email campaigns, contacts and mailing lists.",
-    "version": "1.20.1",
+    "version": "1.20.2",
     "type": "craft-plugin",
     "homepage": "https://putyourlightson.com/plugins/campaign",
     "license": "proprietary",

src/helpers/SegmentHelper.php

@@ -18,6 +18,7 @@
 use craft\fields\PlainText;
 use craft\fields\RadioButtons;
 use craft\fields\Url;
+use craft\helpers\ElementHelper;
 use putyourlightson\campaign\Campaign;
 use putyourlightson\campaign\events\RegisterSegmentAvailableFieldsEvent;
 use putyourlightson\campaign\events\RegisterSegmentFieldOperatorsEvent;
@@ -139,9 +140,16 @@ public static function getAvailableFields(): array
                 $fieldType = get_class($field);
 
                 if (!empty($supportedFields[$fieldType])) {
+                    $fieldColumnPrefix = $field->columnPrefix ?? Craft::$app->getContent()->fieldColumnPrefix;
+                    $fieldColumn = $fieldColumnPrefix.$field->handle;
+
+                    if (version_compare(Craft::$app->version, '3.7.0', '>=')) {
+                        $fieldColumn = ElementHelper::fieldColumnFromField($field);
+                    }
+
                     $availableFields[] = [
                         'type' => $fieldType,
-                        'handle' => 'field_'.$field->handle,
+                        'handle' => $fieldColumn,
                         'name' => $field->name,
                         'options' => ($field instanceof BaseOptionsField ? $field->options : null),
                     ];