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

Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop

Browse Source
This commit is contained in:
Michael RICOIS 2017-11-22 11:29:41 +01:00
commit 281f8399f0
15 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/mails/bienvenue-ES_02.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
img/mails/bienvenue-ES_04.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
img/mails/bienvenue-ES_05.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
img/mails/bienvenue-FR_02.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
img/mails/bienvenue-FR_04.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
img/mails/bienvenue-FR_05.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
img/mails/bienvenue-FR_bord1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
img/mails/bienvenue-FR_bord2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
img/mails/bienvenue-FR_phone2_14.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
img/mails/bienvenue-FR_phone_14.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
img/mails/bienvenue-FR_phone_16.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
img/mails/bienvenue-FR_titre_02.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

6
mails/es/account.html
View File

@ -20,15 +20,15 @@
</td>
</tr>
<tr>
<td align="left"><img src="{shop_url}img/mails/bienvenue-ES_05.jpg" style="border:none;" /></td>
<td width="406" align="center" style="font-size: 13px; color: #4d4b7d;">
<td width="112" style="width: 112px;" align="left"><img src="{shop_url}img/mails/bienvenue-ES_05.jpg" style="border:none; " /></td>
<td align="center" valign="middle" style="font-size: 13px; color: #4d4b7d;">
Hola {firstname},<br/>
Tu cuenta ha sido creada correctamente: ya eres miembro de Bebé Boutik, ¡el club de ventas privadas para mamás, bebés y niños de hasta 12 años!
Aprovecha a partir de ahora de las mejores marcas ¡hasta -70%!
<br/><br/>
<a href="{shop_url}" style="text-transform: uppercase; color: #fff; text-decoration: none; background-color: #fb66a9; border-radius: 5px;padding: 3px 20px;">¡DESCUBRE!</a>
</td>
<td align="left"><img src="{shop_url}img/mails/bienvenue-ES_04.jpg" style="border:none;" /></td>
<td align="left" style="width: 123px;"><img src="{shop_url}img/mails/bienvenue-ES_04.jpg" style="border:none; " /></td>
</tr>
<tr>
<td colspan="3"><img alt="4 buenas rezonas" src="{shop_url}img/mails/bienvenue-ES_08.jpg" style="border:none;" /></td>

15
mails/fr/account.html
View File

@ -16,21 +16,21 @@
</tr>
<tr>
<td align="left" colspan="3">
<img alt="Bienvenue" src="{shop_url}img/mails/bienvenue-FR_02.jpg" style="border:none;" />
<img alt="Bienvenue" src="{shop_url}img/mails/bienvenue-FR_titre_02.jpg" style="border:none;" />
</td>
</tr>
<tr>
<td width="118" align="left" style="width:118px;"><img src="{shop_url}img/mails/bienvenue-FR_05.jpg" style="border:none;" /></td>
<td align="center" style=" font-size: 13px; color: #4d4b7d; width: 403px;">
<tr style="font-style: 0; border:none;">
<td width="112" align="left" style="width:112px;"><img src="{shop_url}img/mails/bienvenue-FR_bord1.jpg" style="border:none;" /></td>
<td align="center" style=" font-size: 13px; color: #4d4b7d; " >
<font face="Open-sans, sans-serif">
Bonjour {firstname},<br/>
Votre compte a bien été créé : vous êtes maintenant membre de Bébé Boutik, le site de ventes privées pour mamans, bébés et enfants jusqu'à 12 ans ! <br/>
Profitez dès maintenant des meilleures marques jusqu'à -70% !
<br/><br/>
<a href="{shop_url}" style="text-transform: uppercase; color: #fff; text-decoration: none; background-color: #fb66a9; border-radius: 5px;padding: 3px 20px;">A tout de suite</a>
<a href="../../" style="text-transform: uppercase; color: #fff; text-decoration: none; background-color: #fb66a9; border-radius: 5px;padding: 3px 20px;">A tout de suite</a>
</font>
</td>
<td width="124" align="left" style="width:124px;"><img src="{shop_url}img/mails/bienvenue-FR_04.jpg" style="border:none;" /></td>
<td width="121" align="left" style="width:121px;"><img src="{shop_url}img/mails/bienvenue-FR_bord2.jpg" style="border:none;" /></td>
</tr>
<tr>
<td colspan="3"><img alt="4 bonnes raisons" src="{shop_url}img/mails/bienvenue-FR_08.jpg" style="border:none;" /></td>
@ -74,13 +74,12 @@
<td colspan="3">
<table cellpadding="0" cellspacing="0" style="border-collapse: collapse">
<tr align="center">
<td><img src="{shop_url}img/mails/bienvenue-FR_phone_14.jpg" style="border:none;" /></td>
<td rowspan="2"><img src="{shop_url}img/mails/bienvenue-FR_phone2_14.jpg" style="border:none;" /></td>
<td>
<a href="#appli1" style="text-decoration: none;" title="App Store"><img alt="App Store" src="{shop_url}img/mails/bienvenue-FR_appli_15.jpg" style="border:none;" /></a>
</td>
</tr>
<tr align="center">
<td><img src="{shop_url}img/mails/bienvenue-FR_phone_16.jpg" style="border:none;" /></td>
<td>
<a href="#appli2" style="text-decoration: none;" title="App Store"><img alt="Google Play" src="{shop_url}img/mails/bienvenue-FR_appli_17.jpg" style="border:none;" /></a>
</td>

7
override/controllers/AuthController.php
View File

@ -109,6 +109,13 @@ class AuthController extends AuthControllerCore {
}
$_POST['email'] = trim($_POST['email']);
/** @Override Antadis - mail fixing */
$_POST['email'] = str_replace(array('@hotmil.','@htmail.','@hotmal.','@hotml.','@hotmai.'),'@hotmail.',$_POST['email']);
$_POST['email'] = str_replace(array('@gmal.','@gail.','@gml.','@gmai.','@gmil.'),'@gmail.',$_POST['email']);
$_POST['email'] = str_replace('@gmailcom','@gmail.com',$_POST['email']);
$_POST['email'] = str_replace('@hotmailcom','@hotmail.com',$_POST['email']);
$_POST['email'] = str_replace('@hotmailfr','@hotmail.fr',$_POST['email']);
/** @End Override Antadis - mail fixing */
/* Preparing customer */
$customer = new Customer();