From 224ad5fa1f63df09dee2312acf3a3c7d0a5310d1 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Wed, 14 Nov 2012 13:10:09 +0000
Subject: [PATCH] [-] FO : fixed bug #PSCFV-5617 - fixed bug #PSCFV-5616 -
 mobile theme issues

---
 controllers/front/OrderOpcController.php    | 1 -
 controllers/front/ParentOrderController.php | 4 ++--
 themes/default/mobile/shopping-cart.tpl     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 6a46736ed..2694f60ac 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -318,7 +318,6 @@ class OrderOpcControllerCore extends ParentOrderController
 
 		$this->context->smarty->assign(array(
 			'free_shipping' => $free_shipping,
-			'isLogged' => $this->isLogged,
 			'isGuest' => isset($this->context->cookie->is_guest) ? $this->context->cookie->is_guest : 0,
 			'countries' => $countries,
 			'sl_country' => isset($selectedCountry) ? $selectedCountry : 0,
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 5fd4b58b3..486fd42fe 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -60,8 +60,7 @@ class ParentOrderControllerCore extends FrontController
 		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 && Dispatcher::getInstance()->getController() != 'order')
 			Tools::redirect('index.php?controller=order');
 			
-		//if getMobileDevice is on a mobile or a tablet we don't redirect to OPC
-		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 && Dispatcher::getInstance()->getController() != 'orderopc' && !$this->context->getMobileDevice())
+		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 && Dispatcher::getInstance()->getController() != 'orderopc')
 		{
 			if (isset($_GET['step']) && $_GET['step'] == 3)
 				Tools::redirect('index.php?controller=order-opc&isPaymentStep=true');
@@ -326,6 +325,7 @@ class ParentOrderControllerCore extends FrontController
 		$this->context->smarty->assign($summary);
 		$this->context->smarty->assign(array(
 			'token_cart' => Tools::getToken(false),
+			'isLogged' => $this->isLogged,
 			'isVirtualCart' => $this->context->cart->isVirtualCart(),
 			'productNumber' => $this->context->cart->nbProducts(),
 			'voucherAllowed' => CartRule::isFeatureActive(),
diff --git a/themes/default/mobile/shopping-cart.tpl b/themes/default/mobile/shopping-cart.tpl
index 79128a950..66c3cc04c 100644
--- a/themes/default/mobile/shopping-cart.tpl
+++ b/themes/default/mobile/shopping-cart.tpl
@@ -20,7 +20,7 @@
 						<input type="hidden" id="cart_product_address_delivery_id_{$product.id_product}" value="{$product.id_address_delivery}"/>
 
 						<div class="fl width-20">
-							<img src="{$img_prod_dir}{$product.id_image}-small_default.jpg" class="img_product_cart" />
+							<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')}" class="img_product_cart" />
 						</div>
 						<div class="fl width-70 padding-left-5px">
 							<h3>{$product.name}</h3>