From fbec8b2d252b8b452f566ffbb51a3e2cd6a2fe2f Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Tue, 27 Mar 2012 08:28:07 +0000
Subject: [PATCH] [-] MO : #PSFV-717 - Carrier compare: Fix some problems with
 the module displaying

---
 modules/carriercompare/carriercompare.php |  6 +++---
 modules/carriercompare/style.css          | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/carriercompare/carriercompare.php b/modules/carriercompare/carriercompare.php
index 81710e849..8d16a8644 100755
--- a/modules/carriercompare/carriercompare.php
+++ b/modules/carriercompare/carriercompare.php
@@ -114,12 +114,12 @@ class CarrierCompare extends Module
 		if (method_exists('Tools', 'getShopDomainSsl'))
 			$moduleURL = $protocol.Tools::getShopDomainSsl().$endURL;
 		else
-			$moduleURL = $protocol.$_SERVER['HTTP_HOST'].$endURL;		
+			$moduleURL = $protocol.$_SERVER['HTTP_HOST'].$endURL;
 		
 		$refresh_method = Configuration::get('SE_RERESH_METHOD');
 		
 		$this->smarty->assign(array(
-			'countries' => Country::getCountries((int)$cookie->id_lang),
+			'countries' => Country::getCountries((int)$this->context->cookie->id_lang),
 			'id_carrier' => ($params['cart']->id_carrier ? $params['cart']->id_carrier : Configuration::get('PS_CARRIER_DEFAULT')),
 			'id_country' => (isset($this->context->customer->geoloc_id_country) ? $this->context->customer->geoloc_id_country : Configuration::get('PS_COUNTRY_DEFAULT')),
 			'id_state' => (isset($this->context->customer->geoloc_id_state) ? $this->context->customer->geoloc_id_state : 0),
@@ -246,7 +246,7 @@ class CarrierCompare extends Module
 		 * This module is only available on standard order process because
 		 * on One Page Checkout the carrier list is already available.
 		 */
-		if (!in_array($fileName, array('order.php', 'cart.php')))
+		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
 			return false;
 		/**
 		 * If visitor is logged, the module isn't available on Front office,
diff --git a/modules/carriercompare/style.css b/modules/carriercompare/style.css
index c49fdbae5..34eec6256 100644
--- a/modules/carriercompare/style.css
+++ b/modules/carriercompare/style.css
@@ -1,7 +1,14 @@
 #compare_shipping .center {text-align: center;}
 
+#compare_shipping {
+	padding: 10px;
+}
+
+#compare_shipping #availableCarriers {
+	margin-bottom: 20px;
+}
+
 #compare_shipping #availableCarriers_table {
-	width: 95%;
 	margin: auto;
 }
 
@@ -34,4 +41,4 @@
 .SE_SubmitRefreshCard input
 {
 	display: inline;
-}
+}
\ No newline at end of file