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

Revert "fix from prod"

Browse Source 
This reverts commit cd44650b28.
This commit is contained in:
root 2017-09-01 11:16:02 +02:00
parent cd44650b28
commit 38a13c74d6
23 changed files with 64293 additions and 57821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mails/fr/order_return_2.html
View File

@ -41,7 +41,7 @@
<br /><br />
Vous devez coller l'&eacute;tiquette fournie par Mondial Relay sur une face bien visible du colis.
<br /><br /><br />
Le d&eacute;p&ocirc;t des colis se fait dans l'un de nos nombreux Points Relais&reg;.
Le d&eacute;p&ocirc;t des colis se fait dans l'un des 4 500 Point Relais&reg; de France.
<br />
Vous pouvez retrouver la liste des points relais près de chez vous en <a href="http://www.mondialrelay.fr/trouver-le-point-relais-le-plus-proche-de-chez-moi/" target="_blank" style="color: #5082f5; text-decoration: none;">cliquant sur ce lien</a>
<br />

12
modules/ant_alert/ant_alert.php
View File

@ -103,13 +103,13 @@ class Ant_Alert extends Module
);
if ((int)$open_messages['total'] >= (int)$alert->limit) {
// dev
//$to = array('marion@antadis.com');
$to = array('marion@antadis.com');
// prod
$to = array(
'frederic@bebeboutik.com',
'jacques@bebeboutik.com',
'valentin@bebeboutik.com',
);
// $to = array(
// 'frederic@bebeboutik.com',
// 'jacques@bebeboutik.com',
// 'valentin@bebeboutik.com',
// );
$contact = new Contact((int)$alert->id_contact,2);
$data = array(
'{limit}' => (int)$alert->limit,

BIN
modules/ant_promobanner/img/img_bmobile_2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
modules/ant_promobanner/img/img_bmobile_3.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

376
modules/criteo_bbb/criteo_sales.fr.xml
View File

File diff suppressed because one or more lines are too long

3
modules/emarsys_rss/flux.xml
View File

File diff suppressed because one or more lines are too long

3
modules/emarsys_rss/flux_es.xml
View File

File diff suppressed because one or more lines are too long

8
modules/labelgenerate/models/generatebarcode.php
View File

@ -82,7 +82,7 @@ class GenerateBarcode {
$this->directory = self::$barcode_directory.$name;
}
public function generateBarcode($id_product, $id_product_attribute = NULL, $reference = NULL, $ean = NULL, $big_label = false) {
public function generateBarcode($id_product, $id_product_attribute = NULL, $reference = NULL, $ean = NULL) {
if($ean == null) {
$ean = $this->_getEanNumber();
}
@ -95,11 +95,7 @@ class GenerateBarcode {
$white = ImageColorAllocate($im, 0xff, 0xff, 0xff);
imagefilledrectangle($im, 0, 0, $width, $height, $white);
Barcode::gd($im, $black, $width / 2, $height / 2 - 10 , 0, "code128", $str, 3, 50);
if(!$big_label && $reference!=NULL) {
imagettftext($im, 11, 0, $width / 2 - (strlen('*'.$reference.'*')* 4), $height - 10 , $black, dirname(__FILE__).'/arial.ttf', '*'.$reference.'*' );
} elseif(!$big_label) {
imagettftext($im, 11, 0, $width / 2 - (strlen('*'.$str.'*')* 4), $height - 10 , $black, dirname(__FILE__).'/arial.ttf', '*'.$str.'*' );
}
//imagettftext($im, 11, 0, $width / 2 - (strlen('*'.$reference.'*')* 4), $height - 10 , $black, dirname(__FILE__).'/arial.ttf', '*'.$reference.'*' );
if ($id_product_attribute) {
imagegif($im, $this->directory.'/ean-'.$id_product.'-'.$id_product_attribute.'.gif');

BIN
modules/landingpages/img/10_1_2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 587 KiB

BIN
modules/landingpages/img/10_1_3.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 517 KiB

BIN
modules/landingpages/img/7_1_2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 196 KiB

106534
modules/logistics/carriers/mondialrelay/pltri.txt
View File

File diff suppressed because it is too large Load Diff

15138
modules/logistics/carriers/mondialrelay/relais.txt
View File

File diff suppressed because it is too large Load Diff

6
modules/paypal/api/paypal_connect.php
View File

@ -28,7 +28,7 @@ class PayPalConnect
{
private $_logs = array();
private $paypal = null;
public function __construct()
{
$this->paypal = new PayPal();
@ -83,8 +83,8 @@ class PayPalConnect
@curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@curl_setopt($ch, CURLOPT_HEADER, false);
@curl_setopt($ch, CURLOPT_TIMEOUT, 30);
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
@curl_setopt($ch, CURLOPT_SSLVERSION, defined(CURL_SSLVERSION_TLSv1) ? CURL_SSLVERSION_TLSv1 : 1);
@curl_setopt($ch, CURLOPT_VERBOSE, false);

4
modules/privatesales/Sale.php
View File

@ -936,7 +936,6 @@ class Sale {
$order_sales = array();
foreach ($_orders as $key => $order) {
$added_sale = false;
// supprime les orders avec plus de 2 ventes pour les multi only
if($multi_only) {
@ -959,7 +958,6 @@ class Sale {
if((int)$row['p_quantity'] != 0) {
continue 3;
}
$added_sale = true;
}
}
}
@ -975,7 +973,7 @@ class Sale {
$order_print[] = $key;
}
} else {
if (count($diff) >= 2 || $added_sale) {
if (count($diff) >= 2) {
$order_print[] = $key;
}
}

2
modules/privatesales/lastupdate.txt
View File

@ -1 +1 @@
20170901 110601
20160818 155601

13
modules/privatesales_logistique/exportOrderForm.php
View File

@ -844,20 +844,19 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$ref = array();
$decli = array();
foreach ($lines_attributes as $key => $row) {
// si le produit n'apparait pas dans une commande, on affiche pas la ligne
if (!isset($row['total_m']) || $row['total_m'] == 0) {
unset($lines_attributes[$key]);
continue;
}
$ref[$key] = $row['line']['product_reference'];
$decli[$key] = $row['line']['product_attribute_name_base'];
}
array_multisort($ref, SORT_ASC, $decli, SORT_ASC, $lines_attributes);
foreach($lines_attributes as $key => $values)
{
// si le produit n'apparait pas dans une commande, on affiche pas la ligne
if (!isset($values['total_m']) || $values['total_m'] == 0) {
continue;
}
if (is_array($lines_attributes[$key+1])
|| $lines2[$k+1][0]['line']['product_reference'] == $values['line']['product_reference']) {
if ((is_array($lines_attributes[$key+1]) && isset($lines_attributes[$key+1]['total_m']) && $lines_attributes[$key+1]['total_m'] != 0)
|| ($lines2[$k+1][0]['line']['product_reference'] == $values['line']['product_reference'] && isset($lines2[$k+1][0]['line']['total_m']) && $lines2[$k+1][0]['line']['total_m'] != 0)) {
$borders_style = array(
'borders' => array(
'right' => array(

7
modules/soflexibilite/classes/SoFlexibiliteDelivery.php
View File

@ -356,9 +356,6 @@ class SoFlexibiliteDelivery
} else {
$result = Db::getInstance()->autoExecute(_DB_PREFIX_.$table_name, $values, 'UPDATE', $where);
}
if($values['type'] == "DOM" || $values['type']== "BOM") {
mail('marion@antadis.com', '[BBB] So Colissimo', json_encode($values).' '.$result);
}
return ($result);
}
@ -457,9 +454,7 @@ class SoFlexibiliteDelivery
} else {
$result = Db::getInstance()->autoExecute(_DB_PREFIX_.$table_name, $values, 'INSERT');
}
if($values['type'] == "DOM" || $values['type']== "BOM") {
mail('marion@antadis.com', '[BBB] So Colissimo', json_encode($values).' '.$result);
}
return ($result);
}

2
override/classes/Customer.php
View File

@ -23,6 +23,6 @@ class Customer extends CustomerCore
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customer_group` WHERE `id_customer` = '.(int)($this->id));
Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customer_thread` SET `id_customer` = 0 WHERE `id_customer` = '.(int)($this->id));
Discount::deleteByIdCustomer((int)($this->id));
return ObjectModel::delete();
return parent::delete();
}
}

BIN
themes/site/img/register.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
themes/site/img/register_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 42 KiB

2
themes/site_mobile/lang/es.php
View File

@ -663,8 +663,6 @@ $_LANG['shopping-cart_f8617a92ba0a0a4eabee724eab7c9f48'] = 'Transportista:';
$_LANG['shopping-cart_914419aa32f04011357d3b604a86d7eb'] = 'Transportista';
$_LANG['shopping-cart_300225ee958b6350abc51805dab83c24'] = 'Continuar la compra';
$_LANG['shopping-cart_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Siguiente';
$_LANG['shopping-cart_ea3bd794dfeb4537c194ee43899516ed'] = 'Mi pedido es un regalo. Esta opción, genera una factura sin los precios indicados y permite añadir una pequeña dedicatoria sobre esta. ¡Ideal para enviar tu regalo directamente a casa de tus familiares o amigos! ';
$_LANG['shopping-cart_b4e59f3a4554655a099738382ebedbff'] = 'Si lo desea, puede añadir una nota al regalo:';
$_LANG['sitemap_5813ce0ec7196c492c97596718f71969'] = 'Mapa del sitio';
$_LANG['sitemap_24cc85476cb8ec1a03192f09231e742b'] = 'Nuestras ofertas';
$_LANG['sitemap_9ff0635f5737513b1a6f559ac2bff745'] = 'Nuevos productos';

2
themes/site_mobile/lang/fr.php
View File

@ -664,8 +664,6 @@ $_LANG['shopping-cart_f8617a92ba0a0a4eabee724eab7c9f48'] = 'Transporteur :';
$_LANG['shopping-cart_914419aa32f04011357d3b604a86d7eb'] = 'Transporteur';
$_LANG['shopping-cart_300225ee958b6350abc51805dab83c24'] = 'Retour aux ventes';
$_LANG['shopping-cart_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Suivant';
$_LANG['shopping-cart_ea3bd794dfeb4537c194ee43899516ed'] = 'Ma commande est un cadeau. Elle me permet de bénéficier d\'une facture sans prix et d\'insérer un petit mot sur cette dernière. C\'est idéal pour expédier votre cadeau directement chez vos proches !';
$_LANG['shopping-cart_b4e59f3a4554655a099738382ebedbff'] = 'Vous pouvez ajouter un message d\'accompagnement à votre commande.';
$_LANG['sitemap_5813ce0ec7196c492c97596718f71969'] = 'Plan du site';
$_LANG['sitemap_24cc85476cb8ec1a03192f09231e742b'] = 'Nos offres';
$_LANG['sitemap_9ff0635f5737513b1a6f559ac2bff745'] = 'Nouveaux produits';