dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : fixed bug #PSCFV-5617 - fixed bug #PSCFV-5616 - mobile theme issues

Browse Source
This commit is contained in:
vAugagneur
2012-11-14 13:10:09 +00:00
parent ea08ccc531
commit 224ad5fa1f
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderOpcController.php
-1
View File
@@ -318,7 +318,6 @@ class OrderOpcControllerCore extends ParentOrderController
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'free_shipping' => $free_shipping, 'free_shipping' => $free_shipping,
'isLogged' => $this->isLogged,
'isGuest' => isset($this->context->cookie->is_guest) ? $this->context->cookie->is_guest : 0, 'isGuest' => isset($this->context->cookie->is_guest) ? $this->context->cookie->is_guest : 0,
'countries' => $countries, 'countries' => $countries,
'sl_country' => isset($selectedCountry) ? $selectedCountry : 0, 'sl_country' => isset($selectedCountry) ? $selectedCountry : 0,
controllers/front/ParentOrderController.php
+2 -2
View File
@@ -60,8 +60,7 @@ class ParentOrderControllerCore extends FrontController
if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 && Dispatcher::getInstance()->getController() != 'order') if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 && Dispatcher::getInstance()->getController() != 'order')
Tools::redirect('index.php?controller=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')
if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 && Dispatcher::getInstance()->getController() != 'orderopc' && !$this->context->getMobileDevice())
{ {
if (isset($_GET['step']) && $_GET['step'] == 3) if (isset($_GET['step']) && $_GET['step'] == 3)
Tools::redirect('index.php?controller=order-opc&isPaymentStep=true'); 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($summary);
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'token_cart' => Tools::getToken(false), 'token_cart' => Tools::getToken(false),
'isLogged' => $this->isLogged,
'isVirtualCart' => $this->context->cart->isVirtualCart(), 'isVirtualCart' => $this->context->cart->isVirtualCart(),
'productNumber' => $this->context->cart->nbProducts(), 'productNumber' => $this->context->cart->nbProducts(),
'voucherAllowed' => CartRule::isFeatureActive(), 'voucherAllowed' => CartRule::isFeatureActive(),
themes/default/mobile/shopping-cart.tpl
+1 -1
View File
@@ -20,7 +20,7 @@
<input type="hidden" id="cart_product_address_delivery_id_{$product.id_product}" value="{$product.id_address_delivery}"/> <input type="hidden" id="cart_product_address_delivery_id_{$product.id_product}" value="{$product.id_address_delivery}"/>
<div class="fl width-20"> <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>
<div class="fl width-70 padding-left-5px"> <div class="fl width-70 padding-left-5px">
<h3>{$product.name}</h3> <h3>{$product.name}</h3>