version 1.4.5

Summary: releasing version 1.4.5 Reviewed By: fbisaso Differential Revision: D34894906 fbshipit-source-id: 7c3eb1a843e30faf8354d4de34e0c1fc205ee9b8
facebookarchive · Mar 15, 2022 · a39db7e · a39db7e
1 parent d3bd7f3
commit a39db7e
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 14 deletions.
diff --git a/Helper/FBEHelper.php b/Helper/FBEHelper.php
@@ -152,12 +152,12 @@ public function getSource()
     /**
      * @return string
      */
-    public function getPartnerAgent()
+    public function getPartnerAgent($with_magento_version = false)
     {
         return sprintf(
             '%s-%s-%s',
             $this->getSource(),
-            $this->getMagentoVersion(),
+            $with_magento_version ? $this->getMagentoVersion() : '0.0.0',
             $this->getPluginVersion()
         );
     }

diff --git a/Helper/ServerSideHelper.php b/Helper/ServerSideHelper.php
@@ -65,7 +65,7 @@ public function sendEvent($event, $userDataArray = null)
 
             $request = (new EventRequestAsync($this->fbeHelper->getPixelID()))
                 ->setEvents($events)
-                ->setPartnerAgent($this->fbeHelper->getPartnerAgent());
+                ->setPartnerAgent($this->fbeHelper->getPartnerAgent(true));
 
             $this->fbeHelper->log('Sending event ' . $event->getEventId());
 

diff --git a/Test/Mftf/Data/PluginInfoData.xml b/Test/Mftf/Data/PluginInfoData.xml
@@ -4,6 +4,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_pluginInfo" type="PluginInfo">
         <data key="source">magento2</data>
-        <data key="pluginVersion">1.4.4</data>
+        <data key="pluginVersion">1.4.5</data>
     </entity>
 </entities>
diff --git a/Test/Unit/Helper/FBEHelperTest.php b/Test/Unit/Helper/FBEHelperTest.php
@@ -194,7 +194,7 @@ public function testCorrectPartnerAgent()
         $this->objectManagerInterface->method('get')->willReturn($productMetadata);
         $this->assertEquals(
             sprintf('%s-%s-%s', $source, $magentoVersion, $pluginVersion),
-            $this->fbeHelper->getPartnerAgent()
+            $this->fbeHelper->getPartnerAgent(true)
         );
     }
 }
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "Facebook Business Extension for Magento 2",
   "type": "magento2-module",
   "license": "GPL-1.0-or-later",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "require": {
     "facebook/php-business-sdk": "9.0.3"
   },

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Facebook_BusinessExtension" setup_version="1.4.4">
+  <module name="Facebook_BusinessExtension" setup_version="1.4.5">
   </module>
 </config>
diff --git a/view/frontend/templates/pixel/add_to_cart.phtml b/view/frontend/templates/pixel/add_to_cart.phtml
@@ -9,7 +9,6 @@
                 fbq('set', 'agent', '<?= $block->getFacebookAgentVersion() ?>', '<?= $block->getFacebookPixelID() ?>');
                 fbq('track', 'AddToCart', {
                         source: "<?= $block->getSource() ?>",
-                        version: "<?= $block->getMagentoVersion() ?>",
                         pluginVersion: "<?= $block->getPluginVersion() ?>",
                         content_type: "<?= $block->getContentType() ?>",
                         currency: "<?= $block->getCurrency() ?>",

diff --git a/view/frontend/templates/pixel/head.phtml b/view/frontend/templates/pixel/head.phtml
@@ -22,7 +22,6 @@ fbq(
 );
 fbq('track', 'PageView', {
   source: "<?= $block->getSource() ?>",
-  version: "<?= $block->getMagentoVersion() ?>",
   pluginVersion: "<?= $block->getPluginVersion() ?>"
 });
 </script>

diff --git a/view/frontend/templates/pixel/initiate_checkout.phtml b/view/frontend/templates/pixel/initiate_checkout.phtml
@@ -8,7 +8,6 @@ if ($block->getFacebookPixelID()) {
         fbq('set', 'agent', '<?= $block->getFacebookAgentVersion() ?>', '<?= $block->getFacebookPixelID() ?>');
         fbq('track', 'InitiateCheckout', {
                 source: "<?= $block->getSource() ?>",
-                version: "<?= $block->getMagentoVersion() ?>",
                 pluginVersion: "<?= $block->getPluginVersion() ?>",
                 content_type: "<?= $block->getContentType() ?>",
                 content_ids: [<?= $block->getContentIDs() ?>],

diff --git a/view/frontend/templates/pixel/purchase.phtml b/view/frontend/templates/pixel/purchase.phtml
@@ -8,7 +8,6 @@ if ($block->getFacebookPixelID()) {
         fbq('set', 'agent', '<?= $block->getFacebookAgentVersion() ?>', '<?= $block->getFacebookPixelID() ?>');
         fbq('track', 'Purchase', {
                 source: "<?= $block->getSource() ?>",
-                version: "<?= $block->getMagentoVersion() ?>",
                 pluginVersion: "<?= $block->getPluginVersion() ?>",
                 content_type: "<?= $block->getContentType() ?>",
                 content_ids: [<?= $block->getContentIDs() ?>],

diff --git a/view/frontend/templates/pixel/search.phtml b/view/frontend/templates/pixel/search.phtml
@@ -8,7 +8,6 @@ if ($block->getFacebookPixelID()) {
         fbq('set', 'agent', '<?= $block->getFacebookAgentVersion() ?>', '<?= $block->getFacebookPixelID() ?>');
         fbq('track', 'Search', {
                 source: "<?= $block->getSource() ?>",
-                version: "<?= $block->getMagentoVersion() ?>",
                 pluginVersion: "<?= $block->getPluginVersion() ?>",
                 search_string: "<?= $block->getSearchQuery() ?>"
             }

diff --git a/view/frontend/templates/pixel/view_category.phtml b/view/frontend/templates/pixel/view_category.phtml
@@ -8,7 +8,6 @@ if ($block->getFacebookPixelID()) {
         fbq('set', 'agent', '<?= $block->getFacebookAgentVersion() ?>', '<?= $block->getFacebookPixelID() ?>');
         fbq('trackCustom', 'ViewCategory', {
                 source: "<?= $block->getSource() ?>",
-                version: "<?= $block->getMagentoVersion() ?>",
                 pluginVersion: "<?= $block->getPluginVersion() ?>"
                 <?php if ($block->getCategory()) { ?>
                 , content_category: "<?= $block->getCategory() ?>"

diff --git a/view/frontend/templates/pixel/view_content.phtml b/view/frontend/templates/pixel/view_content.phtml
@@ -8,7 +8,6 @@ if ($block->getFacebookPixelID()) {
         fbq('set', 'agent', '<?= $block->getFacebookAgentVersion() ?>', '<?= $block->getFacebookPixelID() ?>');
         fbq('track', 'ViewContent', {
                 source: "<?= $block->getSource() ?>",
-                version: "<?= $block->getMagentoVersion() ?>",
                 pluginVersion: "<?= $block->getPluginVersion() ?>",
                 content_type: "<?= $block->getContentType() ?>",
                 content_ids: [<?= $block->getContentIDs() ?>]