Merge branch 'develop' into staging

OS2web · Dec 1, 2021 · e83f9a1 · e83f9a1
2 parents bdc8af6 + ff47507
commit e83f9a1
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -93,6 +93,7 @@
         "drupal/core-composer-scaffold": "^9.0.0",
         "drupal/core-project-message": "^9.0.0",
         "drupal/core-recommended": "^9.1",
+        "drupal/csv_importer": "^1.12",
         "drupal/editor_file": "^1.6",
         "drupal/entity_clone": "^1.0@beta",
         "drupal/fancy_file_delete": "^2.0",
@@ -211,6 +212,9 @@
             },
             "drupal/scheduler_content_moderation_integration" : {
                 "Widget error when field is overridden - undefined offset 0 in $form['publish_state']" : "https://www.drupal.org/files/issues/2020-06-30/3077147-28.patch"
+            },
+            "drupal/csv_importer" : {
+                "Custom patch to get anonymous subscription support on csv_import" : "./patches/anonymous_subscriptions_csv_import.patch"
             }
         }
     }

diff --git a/composer.lock b/composer.lock
diff --git a/patches/anonymous_subscriptions_csv_import.patch b/patches/anonymous_subscriptions_csv_import.patch
@@ -0,0 +1,22 @@
+diff --git a/src/Plugin/Importer/SubscriptionsImporter.php b/src/Plugin/Importer/SubscriptionsImporter.php
+new file mode 100644
+index 0000000..5283cd7
+--- /dev/null
++++ b/src/Plugin/Importer/SubscriptionsImporter.php
+@@ -0,0 +1,16 @@
++<?php
++
++namespace Drupal\csv_importer\Plugin\Importer;
++
++use Drupal\csv_importer\Plugin\ImporterBase;
++
++/**
++ * Class SubscriptionsImporter.
++ *
++ * @Importer(
++ *   id = "anonymous_subscriptions_importer",
++ *   entity_type = "anonymous_subscription",
++ *   label = @Translation("Anonymous subscription importer")
++ * )
++ */
++class SubscriptionsImporter extends ImporterBase {}