Skip to content

Commit 45fb64a

Browse files
author
Pablo Borowicz
committed
// Version updated to 3.1.2
1 parent dd7c119 commit 45fb64a

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<module>
33
<name>ps_googleanalytics</name>
44
<displayName><![CDATA[Google Analytics]]></displayName>
5-
<version><![CDATA[3.0.4]]></version>
5+
<version><![CDATA[3.1.2]]></version>
66
<description><![CDATA[Gain clear insights into important metrics about your customers, using Google Analytics]]></description>
77
<author><![CDATA[PrestaShop]]></author>
88
<tab><![CDATA[analytics_stats]]></tab>

ps_googleanalytics.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct()
4040
{
4141
$this->name = 'ps_googleanalytics';
4242
$this->tab = 'analytics_stats';
43-
$this->version = '3.1.1';
43+
$this->version = '3.1.2';
4444
$this->ps_versions_compliancy = array('min' => '1.7.0.0', 'max' => _PS_VERSION_);
4545
$this->author = 'PrestaShop';
4646
$this->module_key = 'fd2aaefea84ac1bb512e6f1878d990b8';
@@ -50,7 +50,7 @@ public function __construct()
5050

5151
$this->displayName = $this->trans('Google Analytics', array(), 'Modules.GAnalytics.Admin');
5252
$this->description = $this->trans('Gain clear insights into important metrics about your customers, using Google Analytics', array(), 'Modules.GAnalytics.Admin');
53-
53+
5454
$this->confirmUninstall = $this->trans('Are you sure you want to uninstall Google Analytics? You will lose all the data related to this module.', array(), 'Modules.GAnalytics.Admin');
5555
}
5656
public function install()
@@ -114,7 +114,7 @@ protected function createTables()
114114
{
115115
return true;
116116
}
117-
117+
118118
return false;
119119
}
120120

@@ -138,7 +138,7 @@ public function displayForm()
138138
{
139139
// Check if multistore is active
140140
$is_multistore_active = Shop::isFeatureActive();
141-
141+
142142
// Get default language
143143
$default_lang = (int)Configuration::get('PS_LANG_DEFAULT');
144144

@@ -220,13 +220,13 @@ public function displayForm()
220220
'label' => $this->l('Disabled')
221221
),
222222
),
223-
),
223+
),
224224
),
225225
'submit' => array(
226226
'title' => $this->l('Save'),
227227
)
228228
);
229-
229+
230230
if ($is_multistore_active) {
231231
$fields_form[0]['form']['input'][] = array(
232232
'type' => 'switch',
@@ -287,7 +287,7 @@ public function getContent()
287287
$output .= $this->displayConfirmation($this->trans('Settings for Anonymize IP updated successfully', array(), 'Modules.GAnalytics.Admin'));
288288
}
289289
}
290-
290+
291291
$output .= $this->displayForm();
292292

293293
return $this->display(__FILE__, './views/templates/admin/configuration.tpl').$output;
@@ -297,21 +297,21 @@ public function hookdisplayHeader($params, $back_office = false)
297297
{
298298
if (Configuration::get('GA_ACCOUNT_ID')) {
299299
$this->context->controller->addJs($this->_path.'views/js/GoogleAnalyticActionLib.js');
300-
300+
301301
$shops = Shop::getShops();
302302
$is_multistore_active = Shop::isFeatureActive();
303-
303+
304304
$current_shop_id = (int)Context::getContext()->shop->id;
305-
305+
306306
$user_id = null;
307307
$ga_crossdomain_enabled = false;
308-
308+
309309
if (Configuration::get('GA_USERID_ENABLED') &&
310310
$this->context->customer && $this->context->customer->isLogged()
311311
) {
312312
$user_id = (int)$this->context->customer->id;
313313
}
314-
314+
315315
$ga_anonymize_enabled = Configuration::get('GA_ANONYMIZE_ENABLED');
316316

317317
if ((int)Configuration::get('GA_CROSSDOMAIN_ENABLED') && $is_multistore_active && sizeof($shops) > 1) {
@@ -674,7 +674,7 @@ public function addProductFromCheckout($products)
674674
public function hookdisplayFooterProduct($params)
675675
{
676676
$controller_name = Tools::getValue('controller');
677-
if ($controller_name == 'product')
677+
if ($controller_name == 'product')
678678
{
679679
if ($params['product'] instanceof Product) {
680680
$params['product'] = (array) $params['product'];
@@ -875,7 +875,7 @@ public function hookactionCartSave()
875875
$add_product['id_category_default'] = $add_product_object->id_category_default;
876876
$add_product['out_of_stock'] = $add_product_object->out_of_stock;
877877
$add_product['minimal_quantity'] = 1;
878-
$add_product['unit_price_ratio'] = 0;
878+
$add_product['unit_price_ratio'] = 0;
879879
$add_product = Product::getProductProperties((int)Configuration::get('PS_LANG_DEFAULT'), $add_product);
880880
}
881881
}

0 commit comments

Comments
 (0)