Merge branch 'master' into ticket/r11755-datalayer-gtm-2eme-partie
This commit is contained in:
Rodney Figaro
commit
4ac27f49ff
@ -169,10 +169,11 @@ class FrontController extends FrontControllerCore
|
||||
if($this->context->customer->isLogged())
|
||||
$this->context->smarty->assign('customerObj', $this->context->customer);
|
||||
|
||||
/*if($_SERVER['REMOTE_ADDR'] == '80.13.158.176' || $_SERVER['REMOTE_ADDR'] == '88.120.248.124' ) {
|
||||
error_log(print_r($this->context->cookie,true),1,"thomas@antadis.com");
|
||||
}*/
|
||||
|
||||
// TOS
|
||||
$cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id);
|
||||
$link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite, (bool)Configuration::get('PS_SSL_ENABLED'));
|
||||
|
||||
$this->context->smarty->assign('link_conditions', $link_conditions);
|
||||
}
|
||||
|
||||
}
|
||||
27
robots.txt
27
robots.txt
@ -76,9 +76,30 @@ Disallow: /commande-rapide
|
||||
Disallow: /suivi-commande-invite
|
||||
Disallow: /confirmation-commande
|
||||
Disallow: /detail-de-la-commande
|
||||
|
||||
|
||||
Disallow: /nouveaux-produits
|
||||
Disallow: /meilleures-ventes
|
||||
Disallow: /plan-du-site
|
||||
Disallow: /magasins
|
||||
Disallow: /magasins
|
||||
|
||||
User-agent: Googlebot
|
||||
Disallow:
|
||||
Disallow: */classes/
|
||||
Disallow: */config/
|
||||
Disallow: */download/
|
||||
Disallow: */mails/
|
||||
Disallow: */modules/
|
||||
Disallow: */translations/
|
||||
Disallow: */tools/
|
||||
|
||||
User-agent: AdsBot-Google
|
||||
Disallow:
|
||||
Disallow: */classes/
|
||||
Disallow: */config/
|
||||
Disallow: */download/
|
||||
Disallow: */mails/
|
||||
Disallow: */modules/
|
||||
Disallow: */translations/
|
||||
Disallow: */tools/
|
||||
|
||||
User-agent: Googlebot-Image
|
||||
Disallow: *
|
||||
|
||||
@ -72,6 +72,7 @@
|
||||
</footer>
|
||||
</div><!-- #footer -->
|
||||
{/if}
|
||||
|
||||
{if $launch_popup}
|
||||
|
||||
<div class="popup_change" style="display: none;">
|
||||
@ -264,20 +265,19 @@
|
||||
<div class="col-xs-6">
|
||||
<div class="clearfix">
|
||||
<div class="box-b2b">
|
||||
<div class="group-radio">
|
||||
<input name="check_b2b" id="b2b_on" type="radio" value="1" {if isset($is_pro) && $is_pro}checked="checked"{/if} />
|
||||
<label for="b2b_on">{l s='Je suis un'} <b>{l s='professionnel'}</b> {l s='de l\'hôtellerie restauration ou des métiers de bouche'}</label>
|
||||
</div>
|
||||
<div class="group-radio">
|
||||
<input name="check_b2b" id="b2b_off" type="radio" value="0" {*if !isset($is_pro) || !$is_pro}checked="checked"{/if*}/>
|
||||
<label for="b2b_off">{l s='Je suis un'} <b>{l s='particulier'}</b> {l s=', à la recherche de matériel de marques professionnelles'}</label>
|
||||
</div>
|
||||
<div class="group-radio">
|
||||
<input name="check_b2b" id="b2b_on" type="radio" value="1" {if isset($is_pro) && $is_pro}checked="checked"{/if} />
|
||||
<label for="b2b_on">{l s='Je suis un'} <b>{l s='professionnel'}</b> {l s='de l\'hôtellerie restauration ou des métiers de bouche'}</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) and $smarty.post.newsletter == 1} checked="checked"{/if} />
|
||||
<label class="newsletter_label" for="newsletter">{l s='J\'accepte les conditions générales de vente'}</label>
|
||||
<p class="error newsletter"></p>
|
||||
<label class="newsletter_label" for="newsletter"> {l s='et j\'accepte'} <a href="{$link_conditions|escape:'html':'UTF-8'}" id="link_conditions" class="iframe" rel="nofollow" target="_blank">{l s='les conditions générales de vente'}</a></label>
|
||||
<input name='newsletter' type='hidden' value="1" />
|
||||
</div>
|
||||
<div class="clearfix"> </div>
|
||||
|
||||
@ -295,168 +295,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{*<div class="privatesales_popup_connection" style="display: none;">
|
||||
<div class="text-intro-popup col-xs-12 col-sm-6">
|
||||
<div class="box-auth">
|
||||
<div class="container-box-white">
|
||||
<div class="container-logo">
|
||||
<img src="{$img_dir}logo_min.png" />
|
||||
</div>
|
||||
<p>
|
||||
{l s='Toutes les marques des PROS'}<br>
|
||||
{l s='de l\'hôtellerie restauration'}<br/>
|
||||
{l s='en ventes privées.'}
|
||||
</p>
|
||||
<div class="clearfix"></div>
|
||||
<ul>
|
||||
<li>
|
||||
{l s='Ventes Privées jusqu\'à -70%'}
|
||||
</li>
|
||||
<li>
|
||||
{l s='Nouveautés en avant première'}
|
||||
</li>
|
||||
<li>
|
||||
{l s='Professionnels et particuliers passionnés de cuisine'}
|
||||
</li>
|
||||
<li>
|
||||
{l s='Livraison entre 15 et 25 jours.'}
|
||||
</li>
|
||||
</ul>
|
||||
<h2 class="to_step_login">
|
||||
{l s='Déjà membre ?'}<br/><p class="shape-red"></p>
|
||||
</h2>
|
||||
<h2 class="to_step_create" style="display : none;">
|
||||
{l s='Devenez membre gratuitement'}<br/><p class="shape-red"></p>
|
||||
</h2>
|
||||
<button type="button" class="button-grey button-white to_step_login">
|
||||
<span>{l s='Se connecter'}</span>
|
||||
</button>
|
||||
|
||||
<button type="button" class="button-grey button-white to_step_create" style="display : none;">
|
||||
<span>{l s='Nous rejoindre'}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div id="free_delivery_offer">
|
||||
<img src="{$img_dir}pop_up_free_delivery_offer.png" alt="{l s='Free delivery' mod='privatesales'}" width="150" height="150">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="account-creation_form" class="box-auth">
|
||||
<div class="create_account step_1 col-xs-12 col-sm-6">
|
||||
<h2>
|
||||
{l s='Devenez membre'} <span>{l s='gratuitement'}</span><br/><p class="shape-red"></p>
|
||||
</h2>
|
||||
<div class="alert alert-danger" style="display:none"></div>
|
||||
<div class="required form-group">
|
||||
<label for="customer_firstname">{l s='Votre prénom'} <sup>*</sup></label>
|
||||
<input onkeyup="$('#firstname').val(this.value);" type="text" class="is_required validate form-control" data-validate="isName" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.post.customer_firstname)}{$smarty.post.customer_firstname|escape:'html':'UTF-8'}{/if}{if isset($smarty.get.customer_firstname)}{$smarty.get.customer_firstname|escape:'html':'UTF-8'}{/if}" />
|
||||
<p class="error firstname"></p>
|
||||
</div>
|
||||
<div class="required form-group">
|
||||
<label for="customer_lastname">{l s='Votre nom'} <sup>*</sup></label>
|
||||
<input onkeyup="$('#lastname').val(this.value);" type="text" class="is_required validate form-control" data-validate="isName" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.post.customer_lastname)}{$smarty.post.customer_lastname|escape:'html':'UTF-8'}{/if}{if isset($smarty.get.customer_lastname)}{$smarty.get.customer_lastname|escape:'html':'UTF-8'}{/if}" />
|
||||
<p class="error lastname"></p>
|
||||
</div>
|
||||
<div class="required form-group">
|
||||
<label for="email">{l s='Adresse email'} <sup>*</sup></label>
|
||||
<input type="text" class="is_required validate form-control" data-validate="isEmail" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'html':'UTF-8'}{/if}{if isset($smarty.get.email)}{$smarty.get.email|escape:'html':'UTF-8'}{/if}" />
|
||||
<p class="error email"></p>
|
||||
</div>
|
||||
<div class="required password form-group">
|
||||
<label for="passwd">{l s='Mot de passe'} <sup>*</sup></label>
|
||||
<input type="password" class="is_required validate form-control" data-validate="isPasswd" name="passwd" id="passwd" />
|
||||
<p class="error password"></p>
|
||||
</div>
|
||||
|
||||
<p class="submit clearfix">
|
||||
<input type="hidden" name="email_create" value="1" />
|
||||
<input type="hidden" name="is_new_customer" value="1" />
|
||||
<input type="hidden" name="back" value="{$link->getModuleLink('privatesales', 'home')|escape:'html':'UTF-8'}" />
|
||||
<button type="button" name="nextStep" id="nextStep" class="nextStep button-grey">
|
||||
<span>{l s='Nous rejoindre'}</span>
|
||||
</button>
|
||||
</p>
|
||||
|
||||
{literal}
|
||||
<!-- Public idees Product/Inscription Nom Tag : Formulaire -->
|
||||
<script type="text/javascript">
|
||||
var tip = tip || [];
|
||||
tip.push(['_setSegment', '3913', '4982',
|
||||
'' // Product ID
|
||||
]);
|
||||
(function(e){function t(){var e=document.createElement("script");e.type="text/javascript";e.async=true;e.src=(document.location.protocol=="https:"?"https":"http")+"://tracking.publicidees.com/p/tip/";
|
||||
var t=document.getElementsByTagName("script")[0];t.parentNode.insertBefore(e,t)}if(e.addEventListener){e.addEventListener("load",t,false)}else if(e.attachEvent){e.attachEvent("onload",t)}})(window)
|
||||
</script>
|
||||
{/literal}
|
||||
</div>
|
||||
<div class="create_account step_2 col-xs-12 col-sm-6" style="display : none;">
|
||||
<h2>
|
||||
{l s='Devenez membre'} <span>{l s='gratuitement'}</span><br/><p class="shape-red"></p>
|
||||
</h2>
|
||||
<div class="clearfix">
|
||||
<div class="box-b2b">
|
||||
<div class="group-radio">
|
||||
<input name="check_b2b" id="b2b_on" type="radio" value="1" {if isset($is_pro) && $is_pro}checked="checked"{/if} />
|
||||
<label for="b2b_on">{l s='Je suis un'} <b>{l s='professionnel'}</b> {l s='de l\'hôtellerie restauration ou des métiers de bouche'}</label>
|
||||
</div>
|
||||
<div class="group-radio">
|
||||
<input name="check_b2b" id="b2b_off" type="radio" value="0" {if !isset($is_pro) || !$is_pro}checked="checked"{/if}/>
|
||||
<label for="b2b_off">{l s='Je suis un'} <b>{l s='particulier'}</b> {l s=', à la recherche de matériel de marques professionnelles'}</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) and $smarty.post.newsletter == 1} checked="checked"{/if} />
|
||||
<label for="newsletter">{l s='J\'accepte les conditions générales d\'utilisations'}</label>
|
||||
<p class="error newsletter"></p>
|
||||
</div>
|
||||
<div class="clearfix"> </div>
|
||||
|
||||
<p class="submit clearfix text-center">
|
||||
<input type="hidden" name="email_create" value="1" />
|
||||
<input type="hidden" name="is_new_customer" value="1" />
|
||||
<input type="hidden" class="hidden" name="back" value="{$link->getPageLink('index', true)}" />
|
||||
<button type="button" name="submitAccount2" id="submitAccount2" class="button-grey right">
|
||||
<span>{l s='Devenir membre gratuitement'}</span>
|
||||
</button>
|
||||
<button type="submit" name="submitAccount" id="submitAccount" class="button-grey right" style="display : none;">
|
||||
<span>{l s='Devenir membre gratuitement'}</span>
|
||||
</button>
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
<div class="login_account step_login col-xs-12 col-sm-6" style="display : none;">
|
||||
<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="login_form" class="box-auth">
|
||||
<div class="container-box-white">
|
||||
<h2>
|
||||
{l s='Déjà membre'} <span>{l s='privilégié'}</span> ?<br/>
|
||||
{l s='connectez-vous !'}<br/>
|
||||
<p class="shape-red"></p>
|
||||
</h2>
|
||||
<div class="form_content clearfix">
|
||||
<div class="form-group" >
|
||||
<label for="email">{l s='Adresse email'}</label>
|
||||
<input class="is_required validate account_input form-control" data-validate="isEmail" type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|stripslashes}{/if}{if isset($smarty.get.email)}{$smarty.get.email|stripslashes}{/if}" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="passwd">{l s='Mot de passe'}</label>
|
||||
<span><input class="is_required validate account_input form-control" type="password" data-validate="isPasswd" id="passwd" name="passwd" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|stripslashes}{/if}{if isset($smarty.get.passwd)}{$smarty.get.passwd|stripslashes}{/if}" /></span>
|
||||
</div>
|
||||
<p class="lost_password form-group text-center"><a href="{$link->getPageLink('password')|escape:'html':'UTF-8'}" title="{l s='Recover your forgotten password'}" rel="nofollow">{l s='Mot de passe oublié ?'}</a></p>
|
||||
<p class="submit text-center">
|
||||
<input type="hidden" class="hidden" name="back" value="{$link->getPageLink('index', true)}" />
|
||||
<button type="submit" id="SubmitLogin" name="SubmitLogin" class="button-grey ">
|
||||
<span>
|
||||
{l s='Me connecter'}
|
||||
</span>
|
||||
</button>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>*}
|
||||
|
||||
<div class="popup_welcome" style="display:none;">
|
||||
<a href="{$base_dir}ventes-privees?create_account=1" class="button-grey button-white right"><span>Nous rejoindre</span></a>
|
||||
<a href="#" class="close_popup">Fermer</a>
|
||||
@ -521,25 +359,30 @@
|
||||
$('.popup_overlay').fadeIn(100);
|
||||
$('.privatesales_popup_connection').fadeIn(250);
|
||||
});*/
|
||||
$('.popup_overlay').on('click touchstart', function(){
|
||||
$(this).fadeOut(100);
|
||||
$('.privatesales_popup_connection').fadeOut(100);
|
||||
$('.popup_welcome').fadeOut(100);
|
||||
open = false;
|
||||
});
|
||||
$('.close_popup').click(function(){
|
||||
$('.popup_overlay').fadeOut(100);
|
||||
$('.popup_welcome').fadeOut(100);
|
||||
open = false;
|
||||
return false;
|
||||
});
|
||||
{/literal}{if !$smarty.get.popup && !$smarty.get.source}{literal}
|
||||
$('.popup_overlay').on('click touchstart', function(){
|
||||
$(this).fadeOut(100);
|
||||
$('.privatesales_popup_connection').fadeOut(100);
|
||||
$('.popup_welcome').fadeOut(100);
|
||||
open = false;
|
||||
});
|
||||
$('.close_popup').click(function(){
|
||||
$('.popup_overlay').fadeOut(100);
|
||||
$('.popup_welcome').fadeOut(100);
|
||||
open = false;
|
||||
return false;
|
||||
});
|
||||
{/literal}{/if}{literal}
|
||||
|
||||
{/literal}{if $smarty.get.popup}{literal}
|
||||
$(".loggin_button").trigger("click");
|
||||
$(".to_step_create").trigger("click");
|
||||
{/literal}{if $smarty.get.source}{literal}
|
||||
$("#referralprogram").val("{/literal}{$smarty.get.source|replace:' ':'+'}{literal}");
|
||||
var href_link_conditions = $("#link_conditions").attr('href');
|
||||
$("#link_conditions").attr('href', href_link_conditions + '?content_only=1');
|
||||
{/literal}{/if}{literal}
|
||||
|
||||
{/literal}{/if}{literal}
|
||||
|
||||
}
|
||||
@ -806,3 +649,18 @@
|
||||
{/literal}
|
||||
</body>
|
||||
</html>
|
||||
{if (isset($smarty.post.referralprogram) && $smarty.post.referralprogram)}
|
||||
<script language='javascript'>
|
||||
$(document).ready(function() {
|
||||
$('#lofadva-pos-1').hide();
|
||||
$('#lofadva-pos-2').hide();
|
||||
$('#lofadva-pos-3').css('margin-top', '40px');
|
||||
$('#lofadva-pos-3').find('a').each(function() {
|
||||
var href_link = $(this).attr('href');
|
||||
$(this).attr('href', href_link + '?content_only=1');
|
||||
$(this).attr('target', '_blank');
|
||||
});
|
||||
|
||||
});
|
||||
</script>
|
||||
{/if}
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
<div class="row hidden">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<p class="payment_module">
|
||||
<a class="cheque" href="{$link->getModuleLink('cheque', 'payment', [], true)|escape:'html':'UTF-8'}" title="{l s='Pay by check.' mod='cheque'}">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user