Add pull request WapplerSystems#28 (WapplerSystems#28) to pass global…

… attributes marked in the form configuration by 'cleverreachAttributeLocalization: global'
GOWESTCommunications · Sep 11, 2019 · f448e21 · f448e21
1 parent 8bafc8c
commit f448e21
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Classes/CleverReach/Api.php b/Classes/CleverReach/Api.php
@@ -38,6 +38,8 @@ class Api
     const MODE_OPTIN = 'optin';
 
     const MODE_OPTOUT = 'optout';
+
+    const ATTRIBUTES_GLOBAL = 'global';
 
 
     public function __construct()

diff --git a/Classes/Domain/Model/Receiver.php b/Classes/Domain/Model/Receiver.php
@@ -67,11 +67,13 @@ class Receiver
      * Receiver constructor.
      * @param string $email
      * @param array $attributes
+     * @param array $globalAttributes
      */
-    public function __construct($email, $attributes = null)
+    public function __construct($email, $attributes = [], $globalAttributes = [])
     {
         $this->email = $email;
         $this->attributes = $attributes;
+        $this->globalAttributes = $globalAttributes;
         $this->registered = time();
     }
 

diff --git a/Classes/Form/Finishers/CleverreachFinisher.php b/Classes/Form/Finishers/CleverreachFinisher.php
@@ -64,6 +64,7 @@ protected function executeInternal()
         $connectToAPI = false;
         $hasActivatorField = false;
         $attributes = [];
+        $globalAttributes = [];
 
 
         foreach ($formValues as $identifier => $value) {
@@ -75,7 +76,11 @@ protected function executeInternal()
                     if ($properties['cleverreachField'] === 'email') {
                         $email = $value;
                     } else {
-                        $attributes[$properties['cleverreachField']] = $value;
+                        if(API::ATTRIBUTES_GLOBAL === strtolower($properties['cleverreachAttributeLocalization'] ?? '')) {
+                            $globalAttributes[$properties['cleverreachField']] = $value;
+                        } else {
+                            $attributes[$properties['cleverreachField']] = $value;
+                        }
                     }
                 }
 
@@ -97,7 +102,7 @@ protected function executeInternal()
 
             if (\strtolower($this->options['mode']) === Api::MODE_OPTIN) {
 
-                $receiver = new Receiver($email, $attributes);
+                $receiver = new Receiver($email, $attributes, $globalAttributes);
                 $this->api->addReceiversToGroup($receiver, $groupId);
                 $this->api->sendSubscribeMail($email, $formId, $groupId);
 

diff --git a/Configuration/Yaml/Demo/Optin.form.yaml b/Configuration/Yaml/Demo/Optin.form.yaml
@@ -31,6 +31,7 @@ renderables:
             placeholder: Name
             required: required
           cleverreachField: name
+          cleverreachAttributeLocalization: global
         validators:
           -
             identifier: NotEmpty