antadis/roykin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

event click sur mobile

Browse Source
This commit is contained in:
Romuald 2016-04-06 09:58:55 +02:00
parent 2d4367818b
commit 183ad35f79
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
override/controllers/front/AuthController.php
View File

@ -311,7 +311,7 @@ class AuthController extends AuthControllerCore
}
}
protected function processSubmitLogin()
protected function processSubmitLogin()
{
Hook::exec('actionBeforeAuthentication');
$passwd = trim(Tools::getValue('passwd'));
@ -375,10 +375,11 @@ class AuthController extends AuthControllerCore
CartRule::autoAddToCart($this->context);
if (!$this->ajax) {
Tools::redirect($this->context->link->getCategoryLink(IndexController::CATEGORY));
Tools::redirect($this->context->link->getCategoryLink(Category::CATEGORY_COLLECTION_ALL));
}
}
}
if ($this->ajax) {
$return = array(
'hasError' => !empty($this->errors),
@ -387,7 +388,7 @@ class AuthController extends AuthControllerCore
);
$this->ajaxDie(Tools::jsonEncode($return));
} else {
$this->context->smarty->assign('authentification_error', $this->errors);
$this->context->smarty->assign('errors', $this->errors);
}
}
}

4
override/controllers/front/IndexController.php
View File

@ -2,14 +2,14 @@
class IndexController extends IndexControllerCore
{
const CATEGORY = 4;
public function initContent()
{
parent::initContent();
if($this->context->customer->logged)
{
Tools::redirect($this->context->link->getCategoryLink(IndexController::CATEGORY));
Tools::redirect($this->context->link->getCategoryLink(Category::CATEGORY_COLLECTION_ALL));
}
}
}

10
themes/roykin/authentication.tpl
View File

@ -7,14 +7,6 @@
{capture name=title}{if !isset($email_create)}{l s='Espace professionnel Roykin'}{else}{l s='Create an account'}{/if}{/capture}
{if isset($back) && $back != 'my-account'}
{assign var=type value='order-process'}
{else}
{assign var=type value=''}
{/if}
{assign var=currentStep value='login'}
{assign var='stateExist' value=false}
{assign var="postCodeExist" value=false}
{assign var="dniExist" value=false}
@ -22,7 +14,7 @@
<main>
<section>
{include file="$tpl_dir./page-heading.tpl" title=$smarty.capture.title type=$type currentStep=$currentStep}
{include file="$tpl_dir./page-heading.tpl" title=$smarty.capture.title type=''}
<div id="auth" class="ctn">
<div class="row">

6
themes/roykin/css/k2000.css
View File

@ -448,9 +448,9 @@ header.page-heading.order-process { padding: 15px 0 0 0; }
width: 220px;
z-index: 1000
}
.product-ctn .product-combinations li:hover .hover { opacity: 1; pointer-events: auto }
.no-csspointerevents .product-ctn .product-combinations li:hover .hover { display: none }
.no-csspointerevents .product-ctn .product-combinations li:hover .hover { display: block }
.product-ctn .product-combinations li:hover .hover, .product-ctn .product-combinations li.over .hover { opacity: 1; pointer-events: auto }
.no-csspointerevents .product-ctn .product-combinations li .hover { display: none }
.no-csspointerevents .product-ctn .product-combinations li:hover .hover, .no-csspointerevents .product-ctn .product-combinations li.over .hover { display: block }
.product-ctn .product-combinations ul .hover .inner {
background: #202020;
padding: 10px;

8
themes/roykin/js/modules/blockcart/ajax-cart.js
View File

@ -57,6 +57,14 @@ var ajaxCart = {
overrideButtonsInThePage : function()
{
$('.product-ctn .product-combinations .nb').on('click', function(e) {
if(isMobile)
{
$('.product-ctn .product-combinations li').removeClass('over');
$(this).closest('li').addClass('over');
}
});
$('.product-ctn .product-combinations .custom-qty input').on('keyup', function(e) {
if(e.keyCode == 13)
{

4
themes/roykin/lang/fr.php
View File

@ -56,6 +56,7 @@ $_LANG['category-count_79ac892bd1769d83ef1c16dae9f4eddd'] = 'Il y a 1 produit.';
$_LANG['category-count_a9d48596a6537347711527bab8fcd152'] = 'Il y a %d produits.';
$_LANG['category-count_ff32f7dba36bcd6d0a4214cd80253c3a'] = 'La catégorie est vide.';
$_LANG['category-list_2f4e54ec9bebe1122b5c23217e764828'] = 'Cette catégorie est indisponible.';
$_LANG['category_2035e6c998c5353232ca886564bde1ff'] = 'Produit(s) ajouté(s) avec succés';
$_LANG['cms_af1b98adf7f686b84cd0b443e022b7a0'] = 'Catégories';
$_LANG['cms_eecc2cef7e0fa128ecb0557b66486539'] = 'Cette page n\'existe pas';
$_LANG['contact-form_13d6078da2e6592822ede083931d6826'] = 'Joindre un fichier';
@ -253,8 +254,10 @@ $_LANG['order-carrier_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Adresses';
$_LANG['order-carrier_86024cad1e83101d97359d7351051156'] = 'produits';
$_LANG['order-carrier_a40cab5994f36d4c48103a22ca082e8f'] = 'Votre panier';
$_LANG['order-carrier_a4d3b161ce1309df1c4e25df28694b7b'] = 'ENVOYER';
$_LANG['order-carrier_bd5b551d1757a856d9f2d01dc7850080'] = 'Message pour la livraison';
$_LANG['order-carrier_c20905e8fdd34a1bf81984e597436134'] = 'Continuer mes achats';
$_LANG['order-carrier_c9cc8cce247e49bae79f15173ce97354'] = 'Valider';
$_LANG['order-carrier_d93651d012e77dac5581b08db33195b2'] = 'Si vous souhaitez nous laisser un message à propos de votre commande, à l’attention du transporteur, merci de le saisir ci-dessous :';
$_LANG['order-carrier_dd1f775e443ff3b9a89270713580a51b'] = 'Précédent';
$_LANG['order-carrier_f5bf48aa40cad7891eb709fcf1fde128'] = 'produit';
$_LANG['order-confirmation_241cc604e9c62701f4bc4a2e1848ec13'] = 'Voir l\'historique de vos commandes';
@ -522,6 +525,7 @@ $_LANG['scenes_d3d2e617335f08df83599665eef8a418'] = 'Fermer';
$_LANG['scenes_f2cd171bd42220283b7a595c3ff2aaaf'] = 'Promotion';
$_LANG['search_05cf990f79d935b0ea6105855adef686'] = 'Retour à la page précédente';
$_LANG['search_13348442cc6a27032d2b4aa28b75a5d3'] = 'Rechercher';
$_LANG['search_2035e6c998c5353232ca886564bde1ff'] = 'Produit(s) ajouté(s) avec succés';
$_LANG['search_3a93aed43691aed28d2ce3a53d3c63f8'] = '%d résultat a été trouvé.';
$_LANG['search_a09e4037d02313230a191007246e1694'] = '%d résultats ont été trouvés.';
$_LANG['shopping-cart-product-line_1d9baf077ee87921f57a8fe42d510b65'] = 'Soustraire';