wip - finishing orders

leroy-merlin-br · Jul 12, 2018 · f48f66d · f48f66d
1 parent 6638af2
commit f48f66d
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 8 deletions.
diff --git a/src/Elements/ElementBase.php b/src/Elements/ElementBase.php
@@ -80,14 +80,14 @@ public function generateXMLArray(): array
         return $element;
     }
 
-    public function generateElementXMLArray(string $name, ?string $value = '', array $attributes = []): array
+    public function generateElementXMLArray(string $name, $value = '', array $attributes = []): array
     {
         $element = [
             '#name' => $name,
         ];
 
         if ($value) {
-            $element['#value'] = htmlspecialchars($value);
+            $element['#value'] = is_string($value) ? htmlspecialchars($value) : $value;
         }
 
         if (!empty($attributes)) {

diff --git a/src/Elements/ElementInterface.php b/src/Elements/ElementInterface.php
@@ -44,7 +44,7 @@ public function generateXMLArray(): array;
    *   - #attributes : key/value array of XML attributes for element.
    *   - #children : array of child element arrays.
    */
-    public function generateElementXMLArray(string $name, ?string $value, array $attributes = []): array;
+    public function generateElementXMLArray(string $name, $value, array $attributes = []): array;
 
     /**
    * Builds array for an XML element that represents multiple values.

diff --git a/src/Elements/FeedElement.php b/src/Elements/FeedElement.php
@@ -47,6 +47,12 @@ public function addProduct(ProductElementInterface $product): FeedElementInterfa
         return $this;
     }
 
+    public function addInteraction(InteractionElement $interaction): FeedElementInterface
+    {
+        $this->interactions[] = $interaction;
+        return $this;
+    }
+
     public function addBrand(BrandElementInterface $brand): FeedElementInterface
     {
         $this->brands[$brand->getExternalId()] = $brand;
@@ -99,7 +105,7 @@ public function generateXMLArray(): array
                 'xmlns' => 'http://www.bazaarvoice.com/xs/PRR/ProductFeed/'.self::$apiVersion,
                 'name' => $this->name,
                 'incremental' => $this->incremental ? 'true' : 'false',
-                'extractDate' => date('Y-m-d').'T'.date('H:i:s'),
+                'extractDate' => date('Y-m-d\TH:i:s'),
             ],
         ];
 
@@ -115,6 +121,12 @@ public function generateXMLArray(): array
             $element['#children'][] = $products;
         }
 
+        if ($interactions = $this->generateInteractionsXMLArray()) {
+            $element['#children'][] = $interactions;
+        }
+
+
+
         return $element;
     }
 
@@ -146,7 +158,7 @@ private function generateCategoriesXMLArray(): array
         return $element;
     }
 
-    private function generateProductsXMLArray(): array
+    public function generateProductsXMLArray(): array
     {
         if (!count($this->products)) {
             return [];
@@ -159,4 +171,18 @@ private function generateProductsXMLArray(): array
 
         return $element;
     }
+
+    private function generateInteractionsXMLArray(): array
+    {
+        if (!count($this->interactions)) {
+            return [];
+  }
+
+//        $element = $this->generateElementXMLArray('Interactions');
+        foreach ($this->interactions as $interaction) {
+            $element['#children'][] = $interaction->generateXMLArray();
+        }
+
+        return $element;
+    }
 }
diff --git a/src/Elements/InteractionElement.php b/src/Elements/InteractionElement.php
@@ -73,9 +73,23 @@ public function generateXMLArray(): array
             $this->generateElementXMLArray('UserName', $this->userName),
             $this->generateElementXMLArray('UserID', $this->userId),
             $this->generateElementXMLArray('Locale', $this->locale),
-            $this->generateMultipleElementsXMLArray('Products', $this->products),
+            $this->generateProductsXMLArray(),
         ];
 
         return $element;
     }
+
+    private function generateProductsXMLArray(): array
+    {
+        if (!count($this->products)) {
+            return [];
+        }
+
+        $element = parent::generateElementXMLArray('Products');
+        foreach ($this->products as $product) {
+            $element['#children'][] = $product->generateXMLArray();
+        }
+
+        return $element;
+    }
 }
diff --git a/src/Order/Feed.php b/src/Order/Feed.php
@@ -9,15 +9,15 @@
 class Feed extends AbstractFeed implements FeedInterface
 {
     public function newOrder(
-        string $transationDate,
+        string $transactionDate,
         string $emailAddress,
         string $userName,
         string $userId,
         string $locale,
         array $products
     ): InteractionElement {
         return new InteractionElement(
-            $transationDate,
+            $transactionDate,
             $emailAddress,
             $userName,
             $userId,