Merge branch 'ticket-12643-OpenLoyaltyEs' into develop

This commit is contained in:
Marion Muszynski 2017-03-22 17:12:01 +01:00
commit 15cb213c18

View File

@ -30,7 +30,7 @@
{if $cookie->isLogged()} {if $cookie->isLogged()}
<div id="header_nav"> <div id="header_nav">
<div class="inner">{l s='Bonjour' mod='blockuserinfo'} <div class="inner">{l s='Bonjour' mod='blockuserinfo'}
{if $cookie->id_lang == 3} {if $cookie->id_lang == 3}
<span>{$cookie->customer_firstname}!</span> <span>{$cookie->customer_firstname}!</span>
{else} {else}
<span>{$cookie->customer_firstname} !</span> <span>{$cookie->customer_firstname} !</span>
@ -43,7 +43,7 @@
<ul class="submenu_top"> <ul class="submenu_top">
<li><a href="{$link->getPageLink('history.php', true)}" title="{l s='Orders' mod='blockuserinfo'}">{l s='History and details of my orders' mod='blockuserinfo'}</a></li> <li><a href="{$link->getPageLink('history.php', true)}" title="{l s='Orders' mod='blockuserinfo'}">{l s='History and details of my orders' mod='blockuserinfo'}</a></li>
<li><a href="{$link->getPageLink('identity.php', true)}" title="{l s='Information' mod='blockuserinfo'}">{l s='My personal information' mod='blockuserinfo'}</a></li> <li><a href="{$link->getPageLink('identity.php', true)}" title="{l s='Information' mod='blockuserinfo'}">{l s='My personal information' mod='blockuserinfo'}</a></li>
{if $cookie->id_lang != 3}<li><a href="{$base_dir_ssl}modules/loyalty/loyalty-program.php" title="{l s='Loyalty program' mod='blockuserinfo'}">{l s='Loyalty program' mod='blockuserinfo'}</a></li>{/if} <li><a href="{$base_dir_ssl}modules/loyalty/loyalty-program.php" title="{l s='Loyalty program' mod='blockuserinfo'}">{l s='Loyalty program' mod='blockuserinfo'}</a></li>
<li><a href="{$link->getPageLink('order-slip.php', true)}" title="{l s='Credit slips' mod='blockuserinfo'}">{l s='My credit slips' mod='blockuserinfo'}</a></li> <li><a href="{$link->getPageLink('order-slip.php', true)}" title="{l s='Credit slips' mod='blockuserinfo'}">{l s='My credit slips' mod='blockuserinfo'}</a></li>
<li><a title="Referral program" href="{$base_dir_ssl}modules/invite/invite-program.php">{l s='Programme de parrainage' mod='blockuserinfo'}</a></li> <li><a title="Referral program" href="{$base_dir_ssl}modules/invite/invite-program.php">{l s='Programme de parrainage' mod='blockuserinfo'}</a></li>
<li class="logout"> <li class="logout">
@ -55,11 +55,11 @@
</div> </div>
{if $display_credits} {if $display_credits}
<div class="inner"> <div class="inner">
{if $cookie->id_lang == 3} {* {if $cookie->id_lang == 3}
<a class="credit" href="{$base_dir_ssl}modules/invite/invite-program.php" title="{l s='Sponsor your friends' mod='blockuserinfo'}"> <a class="credit" href="{$base_dir_ssl}modules/invite/invite-program.php" title="{l s='Sponsor your friends' mod='blockuserinfo'}">
<span class="desc">{l s='Your credit:' mod='blockuserinfo'} <span class="green">{$customer_credit}</span></span> <span class="desc">{l s='Your credit:' mod='blockuserinfo'} <span class="green">{$customer_credit}</span></span>
</a> </a>
{else} {else} *}
<ul> <ul>
<li class="account_hover"> <li class="account_hover">
<a class="submenu_top_btn credit" href="{$base_dir_ssl}modules/invite/invite-program.php" title="{l s='Sponsor your friends' mod='blockuserinfo'}">{l s='Your credit' mod='blockuserinfo'}</a> <a class="submenu_top_btn credit" href="{$base_dir_ssl}modules/invite/invite-program.php" title="{l s='Sponsor your friends' mod='blockuserinfo'}">{l s='Your credit' mod='blockuserinfo'}</a>
@ -79,7 +79,7 @@
</ul> </ul>
{/if} {/if}
</div> </div>
{/if} {* {/if} *}
</div> </div>
{else} {else}
<form id="login_form_top" method="post" action="{$link->getPageLink('authentication.php')}"> <form id="login_form_top" method="post" action="{$link->getPageLink('authentication.php')}">
@ -98,7 +98,7 @@
<a class="forgot" href="{$link->getPageLink('password.php')}">{l s='Mot de passe oublié ?' mod='blockuserinfo'}</a> <a class="forgot" href="{$link->getPageLink('password.php')}">{l s='Mot de passe oublié ?' mod='blockuserinfo'}</a>
</fieldset> </fieldset>
</form> </form>
{/if} {/if}
</div> </div>
<!-- /Block user information module HEADER --> <!-- /Block user information module HEADER -->
{/if} {/if}