Fix/server request failures (#168)

Author: bgiamarino

app/code/Meta/Conversion/Helper/MagentoDataHelper.php

@@ -347,13 +347,8 @@ public function getCartContents(): array
         foreach ($items as $item) {
             $product = $item->getProduct();
             $contents[] = [
-                'id' => $this->getContentId($product),
-                'quantity' => $item->getQty(),
-                'item_price' => $this->pricingHelper->currency(
-                    $product->getFinalPrice(),
-                    false,
-                    false
-                )
+                'product_id' => $this->getContentId($product),
+                'quantity' => (int) $item->getQty(),
             ];
         }
         return $contents;
@@ -415,13 +410,8 @@ public function getOrderContents(): array
         foreach ($items as $item) {
             $product = $item->getProduct();
             $contents[] = [
-                'id' => $this->getContentId($product),
-                'quantity' => (int)$item->getQtyOrdered(),
-                'item_price' => $this->pricingHelper->currency(
-                    $product->getFinalPrice(),
-                    false,
-                    false
-                )
+                'product_id' => $this->getContentId($product),
+                'quantity' => (int)$item->getQtyOrdered()
             ];
         }
         return $contents;
@@ -488,7 +478,7 @@ public function getUserDataFromOrder(): array
         $userData[AAMSettingsFields::EMAIL] = $this->hashValue($order->getCustomerEmail());
         $userData[AAMSettingsFields::FIRST_NAME] = $this->hashValue($order->getCustomerFirstname());
         $userData[AAMSettingsFields::LAST_NAME] = $this->hashValue($order->getCustomerLastname());
-        $userData[AAMSettingsFields::DATE_OF_BIRTH] = $this->hashValue($order->getCustomerDob());
+        $userData[AAMSettingsFields::DATE_OF_BIRTH] = $this->hashValue($order->getCustomerDob() ?? '');
         if ($order->getCustomerGender()) {
             $genderId = $order->getCustomerGender();
             $userData[AAMSettingsFields::GENDER] =

app/code/Meta/Conversion/Helper/ServerSideHelper.php

@@ -17,6 +17,7 @@
 
 namespace Meta\Conversion\Helper;
 
+use Magento\Store\Model\ScopeInterface;
 use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 use FacebookAds\Api;
@@ -58,7 +59,7 @@ class ServerSideHelper
     public function __construct(
         FBEHelper $fbeHelper,
         AAMFieldsExtractorHelper $aamFieldsExtractorHelper,
-        SystemConfig $systemConfig
+        SystemConfig $systemConfig,
     ) {
         $this->fbeHelper = $fbeHelper;
         $this->aamFieldsExtractorHelper = $aamFieldsExtractorHelper;
@@ -86,8 +87,8 @@ public function sendEvent($event, $userDataArray = null)
                 ->setPartnerAgent($this->fbeHelper->getPartnerAgent(true));
 
             // Set server test code to the event
-            if ($this->systemConfig->isServerTestModeEnabled()) {
-                $serverTestCode = $this->systemConfig->getServerTestCode();
+            if ($this->systemConfig->isServerTestModeEnabled(null, ScopeInterface::SCOPE_STORES)) {
+                $serverTestCode = $this->systemConfig->getServerTestCode(null, ScopeInterface::SCOPE_STORES);
                 if ($serverTestCode) {
                     $request->setTestEventCode($serverTestCode);
                     $this->fbeHelper->log('test code '.$serverTestCode.' attached to event request');

app/code/Meta/Conversion/Model/Tracker/ViewContent.php

@@ -69,7 +69,8 @@ public function getPayload(array $params): array
                 'content_name' => $this->escaper->escapeUrl($product->getName()),
                 'contents' => [
                     [
-                        'id' => $contentId,
+                        'product_id' => $contentId,
+                        'quantity' => 1,
                         'item_price' => $this->magentoDataHelper->getValueForProduct($product)
                     ]
                 ],

app/code/Meta/Conversion/Test/Unit/Helper/ServerSideHelperTest.php

@@ -17,6 +17,7 @@
 
 namespace Meta\Conversion\Test\Unit\Helper;
 
+use Magento\Store\Model\StoreManagerInterface;
 use Meta\Conversion\Helper\AAMFieldsExtractorHelper;
 use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
@@ -71,7 +72,7 @@ public function setUp(): void
         $this->serverSideHelper = new ServerSideHelper(
             $this->fbeHelper,
             $this->aamFieldsExtractorHelper,
-            $this->systemConfig
+            $this->systemConfig,
         );
     }