From 3243392cab540e3d8960cbd7c6fa8759b936ac7b Mon Sep 17 00:00:00 2001
From: kermes <kermes@gmail.com>
Date: Sun, 3 Apr 2016 09:12:25 +0200
Subject: [PATCH 1/5] setcampaign call

---
 ganalytics.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ganalytics.php b/ganalytics.php
index 36d71ea..38c8210 100755
--- a/ganalytics.php
+++ b/ganalytics.php
@@ -646,6 +646,10 @@ protected function _runJs($js_code, $backoffice = 0)
 		if (Configuration::get('GA_ACCOUNT_ID'))
 		{
 			$runjs_code = '';
+                        if($backoffice){
+                            $runjs_code .= 'MBG.setCampaign(\'backoffice-orders\',\'backoffice\',\'cms\');';
+                        }
+               
 			if (!empty($js_code))
 				$runjs_code .= '
 				<script type="text/javascript">

From 14a4269426d9dece0d5b4d7710d10ae54cd8b485 Mon Sep 17 00:00:00 2001
From: kermes <kermes@gmail.com>
Date: Sun, 3 Apr 2016 09:18:59 +0200
Subject: [PATCH 2/5] setcampaign function

---
 views/js/GoogleAnalyticActionLib.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/views/js/GoogleAnalyticActionLib.js b/views/js/GoogleAnalyticActionLib.js
index 72062aa..4d57f66 100755
--- a/views/js/GoogleAnalyticActionLib.js
+++ b/views/js/GoogleAnalyticActionLib.js
@@ -30,6 +30,12 @@ var GoogleAnalyticEnhancedECommerce = {
 	setCurrency: function(Currency) {
 		ga('set', '&cu', Currency);
 	},
+	
+        setCampaign: function(Name,Source,Medium){
+            ga('set', 'campaignName', Name);
+            ga('set', 'campaignSource', Source);
+            ga('set', 'campaignMedium', Medium);
+        },
 
 	add: function(Product, Order, Impression) {
 		var Products = {};

From 014944053c3c76714f4f1636cda99b7c93ce6767 Mon Sep 17 00:00:00 2001
From: kermes <kermes@gmail.com>
Date: Tue, 5 Apr 2016 15:37:50 +0200
Subject: [PATCH 3/5] wrong variable

---
 ganalytics.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ganalytics.php b/ganalytics.php
index 38c8210..74d36ed 100755
--- a/ganalytics.php
+++ b/ganalytics.php
@@ -647,7 +647,7 @@ protected function _runJs($js_code, $backoffice = 0)
 		{
 			$runjs_code = '';
                         if($backoffice){
-                            $runjs_code .= 'MBG.setCampaign(\'backoffice-orders\',\'backoffice\',\'cms\');';
+                            $js_code .= 'MBG.setCampaign(\'backoffice-orders\',\'backoffice\',\'cms\');';
                         }
                
 			if (!empty($js_code))

From cb0654f38316c1bb86cde81203b30ffe6562b116 Mon Sep 17 00:00:00 2001
From: kermes <kermes@gmail.com>
Date: Tue, 5 Apr 2016 15:40:39 +0200
Subject: [PATCH 4/5] set it only if something is going to be sent

---
 ganalytics.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ganalytics.php b/ganalytics.php
index 74d36ed..a86ad06 100755
--- a/ganalytics.php
+++ b/ganalytics.php
@@ -646,11 +646,12 @@ protected function _runJs($js_code, $backoffice = 0)
 		if (Configuration::get('GA_ACCOUNT_ID'))
 		{
 			$runjs_code = '';
-                        if($backoffice){
-                            $js_code .= 'MBG.setCampaign(\'backoffice-orders\',\'backoffice\',\'cms\');';
-                        }
                
-			if (!empty($js_code))
+			if (!empty($js_code)){
+	                        if($backoffice){
+                            		$js_code .= 'MBG.setCampaign(\'backoffice-orders\',\'backoffice\',\'cms\');';
+                        	}
+			
 				$runjs_code .= '
 				<script type="text/javascript">
 					jQuery(document).ready(function(){
@@ -659,6 +660,7 @@ protected function _runJs($js_code, $backoffice = 0)
 						'.$js_code.'
 					});
 				</script>';
+			}
 
 			if (($this->js_state) != 1 && ($backoffice == 0))
 				$runjs_code .= '

From 7879936a49ce00502dc2eaf73b6ae98bdd7bffaa Mon Sep 17 00:00:00 2001
From: zapalm <zapalm@ya.ru>
Date: Thu, 7 Feb 2019 14:51:06 +1000
Subject: [PATCH 5/5] Fixed the error with un-serialization and the error with
 incorrect adding command: MBG.addCheckoutOption(2, 'example')

---
 ganalytics.php | 53 ++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/ganalytics.php b/ganalytics.php
index 3470950..34b3587 100755
--- a/ganalytics.php
+++ b/ganalytics.php
@@ -302,7 +302,7 @@ public function wrapOrder($id_order)
 	 */
 	public function hookOrderConfirmation($params)
 	{
-		$order = $params['objOrder'];
+		$order = $params['objOrder']; /** @var Order $order */
 		if (Validate::isLoadedObject($order) && $order->getCurrentState() != (int)Configuration::get('PS_OS_ERROR'))
 		{
 			$ga_order_sent = Db::getInstance()->getValue('SELECT id_order FROM `'._DB_PREFIX_.'ganalytics` WHERE id_order = '.(int)$order->id);
@@ -311,12 +311,19 @@ public function hookOrderConfirmation($params)
 				Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'ganalytics` (id_order, id_shop, sent, date_add) VALUES ('.(int)$order->id.', '.(int)$this->context->shop->id.', 0, NOW())');
 				if ($order->id_customer == $this->context->cookie->id_customer)
 				{
+                    $ga_scripts = '';
+
+                    if ((int)$order->id_carrier > 0) { // Not a order with virtual products only
+                        $carrierName = Db::getInstance()->getValue('SELECT name FROM ' . _DB_PREFIX_ . 'carrier WHERE id_carrier = ' . (int)$order->id_carrier);
+                        $ga_scripts .= 'MBG.addCheckoutOption(2, \'' . $carrierName . '\');' . PHP_EOL;
+                    }
+
 					$order_products = array();
 					$cart = new Cart($order->id_cart);
 					foreach ($cart->getProducts() as $order_product)
 						$order_products[] = $this->wrapProduct($order_product, array(), 0, true);
 
-					$ga_scripts = 'MBG.addCheckoutOption(3,\''.$order->payment.'\');';
+					$ga_scripts .= 'MBG.addCheckoutOption(3, \''.$order->payment.'\');' . PHP_EOL;
 
 					$transaction = array(
 						'id' => $order->id,
@@ -347,17 +354,17 @@ public function hookFooter()
 		{
 			$this->filterable = 0;
 
-			$gacarts = unserialize($this->context->cookie->ga_cart);
-			foreach ($gacarts as $gacart)
-			{
-				if ($gacart['quantity'] > 0)
-					$ga_scripts .= 'MBG.addToCart('.Tools::jsonEncode($gacart).');';
-				elseif ($gacart['quantity'] < 0)
-				{
-					$gacart['quantity'] = abs($gacart['quantity']);
-					$ga_scripts .= 'MBG.removeFromCart('.Tools::jsonEncode($gacart).');';
-				}
-			}
+			$gacarts = json_decode($this->context->cookie->ga_cart, true);
+            if (is_array($gacarts)) {
+                foreach ($gacarts as $gacart) {
+                    if ($gacart['quantity'] > 0) {
+                        $ga_scripts .= 'MBG.addToCart(' . Tools::jsonEncode($gacart) . ');';
+                    } elseif ($gacart['quantity'] < 0) {
+                        $gacart['quantity'] = abs($gacart['quantity']);
+                        $ga_scripts         .= 'MBG.removeFromCart(' . Tools::jsonEncode($gacart) . ');';
+                    }
+                }
+            }
 			unset($this->context->cookie->ga_cart);
 		}
 
@@ -826,10 +833,13 @@ public function hookActionCartSave()
 			else
 				$id_product = Tools::getValue('id_product');
 
-			if (isset($this->context->cookie->ga_cart))
-				$gacart = unserialize($this->context->cookie->ga_cart);
-			else
-				$gacart = array();
+            $gacart = array();
+            if (isset($this->context->cookie->ga_cart)) {
+                $gacart = json_decode($this->context->cookie->ga_cart, true);
+                if (false === is_array($gacart)) {
+                    $gacart = array();
+                }
+            }
 
 			if ($cart['removeAction'] == 'delete')
 				$ga_products['quantity'] = -1;
@@ -847,16 +857,9 @@ public function hookActionCartSave()
 			}
 
 			$gacart[$id_product] = $ga_products;
-			$this->context->cookie->ga_cart = serialize($gacart);
+			$this->context->cookie->ga_cart = json_encode($gacart);
 		}
 	}
-	
-        public function hookProcessCarrier($params){
-		if(isset($params['cart']->id_carrier)){
-			$carrier_name = Db::getInstance()->getValue('SELECT name FROM `'._DB_PREFIX_.'carrier` WHERE id_carrier = '.(int)$params['cart']->id_carrier);
-			$this->context->cookie->ga_cart .= 'MBG.addCheckoutOption(2,\''.$carrier_name.'\');';
-		}
-        }
 
 	protected function checkForUpdates()
 	{