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

big commit from prod

Browse Source
This commit is contained in:
lamenuit 2016-06-28 11:54:23 +02:00
parent 73ba3dca8f
commit 04dd66dce9
113 changed files with 3330 additions and 2840 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1020
modules/flux/fluxVP.xml
View File

File diff suppressed because it is too large Load Diff

BIN
modules/ganalyticscom/debug/logs.txt
View File

Binary file not shown.

1039
modules/mailjet_sync/mailjet_sync.php
View File

File diff suppressed because it is too large Load Diff

145
modules/privatesales/controllers/admin/AdminPreferencePrivateSales.php
View File

@ -72,6 +72,10 @@ class AdminPreferencePrivateSalesController extends ModuleAdminController {
$urlslidermobile2 = _THEME_IMG_DIR_.'slider/slider_2_mobile_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMGMOBILE_2').'.png';
$urlslider3 = _THEME_IMG_DIR_.'slider/slider_3_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMG_3').'.png';
$urlslidermobile3 = _THEME_IMG_DIR_.'slider/slider_3_mobile_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMGMOBILE_3').'.png';
$urlslider4 = _THEME_IMG_DIR_.'slider/slider_4_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMG_4').'.png';
$urlslidermobile4 = _THEME_IMG_DIR_.'slider/slider_4_mobile_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMGMOBILE_4').'.png';
$urlslider5 = _THEME_IMG_DIR_.'slider/slider_5_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMG_5').'.png';
$urlslidermobile5 = _THEME_IMG_DIR_.'slider/slider_5_mobile_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMGMOBILE_5').'.png';
$fields = array(
'general' => array(
@ -241,6 +245,13 @@ class AdminPreferencePrivateSalesController extends ModuleAdminController {
'type' => 'text',
'default' => Configuration::get('PRIVATESALES_SLIDER_LINK_1'),
),
'PRIVATESALES_SLIDER_ACTIVE_1' => array(
'title' => $this->l('Activer la slide 1'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
'default' => Configuration::get('PRIVATESALES_SLIDER_ACTIVE_1'),
),
'PRIVATESALES_SLIDER_TITLE_1' => array(
'title' => $this->l('Titre de la slide 1'),
'type' => 'text',
@ -264,6 +275,13 @@ class AdminPreferencePrivateSalesController extends ModuleAdminController {
'url' => $urlslidermobile1,
'desc' => 'dimension 300px x 200px'
),
'PRIVATESALES_SLIDER_ACTIVE_2' => array(
'title' => $this->l('Activer la slide 2'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
'default' => Configuration::get('PRIVATESALES_SLIDER_ACTIVE_2'),
),
'PRIVATESALES_SLIDER_LINK_2' => array(
'title' => $this->l('Lien de la slide 2'),
'type' => 'text',
@ -292,6 +310,13 @@ class AdminPreferencePrivateSalesController extends ModuleAdminController {
'url' => $urlslidermobile2,
'desc' => 'dimension 300px x 200px'
),
'PRIVATESALES_SLIDER_ACTIVE_3' => array(
'title' => $this->l('Activer la slide 3'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
'default' => Configuration::get('PRIVATESALES_SLIDER_ACTIVE_3'),
),
'PRIVATESALES_SLIDER_LINK_3' => array(
'title' => $this->l('Lien de la slide 3'),
'type' => 'text',
@ -320,6 +345,76 @@ class AdminPreferencePrivateSalesController extends ModuleAdminController {
'url' => $urlslidermobile3,
'desc' => 'dimension 300px x 200px'
),
'PRIVATESALES_SLIDER_ACTIVE_4' => array(
'title' => $this->l('Activer la slide 4'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
'default' => Configuration::get('PRIVATESALES_SLIDER_ACTIVE_4'),
),
'PRIVATESALES_SLIDER_LINK_4' => array(
'title' => $this->l('Lien de la slide 4'),
'type' => 'text',
'default' => Configuration::get('PRIVATESALES_SLIDER_LINK_4'),
),
'PRIVATESALES_SLIDER_TITLE_4' => array(
'title' => $this->l('Titre de la slide 4'),
'type' => 'text',
'default' => Configuration::get('PRIVATESALES_SLIDER_TITLE_4'),
),
array(
'title' => $this->l('Image Slide 4'),
'type' => 'file',
'label' => $this->l('Select an image'),
'name' => 'imageslider4',
'form_group_class' => 'fieldhide input_img',
'url' => $urlslider4,
'desc' => 'dimension 940px x 300px'
),
array(
'title' => $this->l('Image Mobile Slide 4'),
'type' => 'file',
'label' => $this->l('Select an image'),
'name' => 'imageslidermobile4',
'form_group_class' => 'fieldhide input_img',
'url' => $urlslidermobile4,
'desc' => 'dimension 300px x 200px'
),
'PRIVATESALES_SLIDER_ACTIVE_5' => array(
'title' => $this->l('Activer la slide 5'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
'default' => Configuration::get('PRIVATESALES_SLIDER_ACTIVE_2'),
),
'PRIVATESALES_SLIDER_LINK_5' => array(
'title' => $this->l('Lien de la slide 5'),
'type' => 'text',
'default' => Configuration::get('PRIVATESALES_SLIDER_LINK_5'),
),
'PRIVATESALES_SLIDER_TITLE_5' => array(
'title' => $this->l('Titre de la slide 5'),
'type' => 'text',
'default' => Configuration::get('PRIVATESALES_SLIDER_TITLE_5'),
),
array(
'title' => $this->l('Image Slide 5'),
'type' => 'file',
'label' => $this->l('Select an image'),
'name' => 'imageslider5',
'form_group_class' => 'fieldhide input_img',
'url' => $urlslider5,
'desc' => 'dimension 940px x 300px'
),
array(
'title' => $this->l('Image Mobile Slide 5'),
'type' => 'file',
'label' => $this->l('Select an image'),
'name' => 'imageslidermobile5',
'form_group_class' => 'fieldhide input_img',
'url' => $urlslidermobile5,
'desc' => 'dimension 300px x 200px'
),
),
'banner' => array(
'PRIVATESALES_BANNER_LINK_TOP_ACTIVE' => array(
@ -665,13 +760,27 @@ class AdminPreferencePrivateSalesController extends ModuleAdminController {
parent::postProcess();
if (Tools::isSubmit('submitPrivateSaleHomeSlider')) {
Configuration::updateValue('PRIVATESALES_SLIDER_ACTIVE', Tools::getValue('PRIVATESALES_SLIDER_ACTIVE'));
Configuration::updateValue('PRIVATESALES_SLIDER_ACTIVE_1', Tools::getValue('PRIVATESALES_SLIDER_ACTIVE_1'));
Configuration::updateValue('PRIVATESALES_SLIDER_LINK_1', Tools::getValue('PRIVATESALES_SLIDER_LINK_1'));
Configuration::updateValue('PRIVATESALES_SLIDER_TITLE_1', Tools::getValue('PRIVATESALES_SLIDER_TITLE_1'));
Configuration::updateValue('PRIVATESALES_SLIDER_ACTIVE_2', Tools::getValue('PRIVATESALES_SLIDER_ACTIVE_2'));
Configuration::updateValue('PRIVATESALES_SLIDER_LINK_2', Tools::getValue('PRIVATESALES_SLIDER_LINK_2'));
Configuration::updateValue('PRIVATESALES_SLIDER_TITLE_2', Tools::getValue('PRIVATESALES_SLIDER_TITLE_2'));
Configuration::updateValue('PRIVATESALES_SLIDER_ACTIVE_3', Tools::getValue('PRIVATESALES_SLIDER_ACTIVE_3'));
Configuration::updateValue('PRIVATESALES_SLIDER_LINK_3', Tools::getValue('PRIVATESALES_SLIDER_LINK_3'));
Configuration::updateValue('PRIVATESALES_SLIDER_TITLE_3', Tools::getValue('PRIVATESALES_SLIDER_TITLE_3'));
Configuration::updateValue('PRIVATESALES_SLIDER_ACTIVE_4', Tools::getValue('PRIVATESALES_SLIDER_ACTIVE_4'));
Configuration::updateValue('PRIVATESALES_SLIDER_LINK_4', Tools::getValue('PRIVATESALES_SLIDER_LINK_4'));
Configuration::updateValue('PRIVATESALES_SLIDER_TITLE_4', Tools::getValue('PRIVATESALES_SLIDER_TITLE_4'));
Configuration::updateValue('PRIVATESALES_SLIDER_ACTIVE_5', Tools::getValue('PRIVATESALES_SLIDER_ACTIVE_5'));
Configuration::updateValue('PRIVATESALES_SLIDER_LINK_5', Tools::getValue('PRIVATESALES_SLIDER_LINK_5'));
Configuration::updateValue('PRIVATESALES_SLIDER_TITLE_5', Tools::getValue('PRIVATESALES_SLIDER_TITLE_5'));
$languages = Language::getLanguages(false);
foreach ($languages as $language) {
$tabimgs = array(
@ -681,6 +790,10 @@ class AdminPreferencePrivateSalesController extends ModuleAdminController {
"slidermobile2" => 'slider_2_mobile',
"slider3" => 'slider_3',
"slidermobile3" => 'slider_3_mobile',
"slider4" => 'slider_4',
"slidermobile4" => 'slider_4_mobile',
"slider5" => 'slider_5',
"slidermobile5" => 'slider_5_mobile',
);
foreach($tabimgs as $key => $imgName){
$namePost = 'image'.$key.'_'.$language['id_lang'];
@ -741,6 +854,38 @@ class AdminPreferencePrivateSalesController extends ModuleAdminController {
}
Configuration::updateValue('PRIVATESALES_SLIDER_TITLEIMGMOBILE_3', $random);
break;
case 'slider4':
if (glob(_PS_THEME_DIR_.'img/slider/slider_4_*.png')) {
foreach (glob(_PS_THEME_DIR_.'img/slider/slider_4_*.png') as $filename) {
unlink($filename);
}
}
Configuration::updateValue('PRIVATESALES_SLIDER_TITLEIMG_4', $random);
break;
case 'slidermobile4':
if (glob(_PS_THEME_DIR_.'img/slider/slider_4_mobile_*.png')) {
foreach (glob(_PS_THEME_DIR_.'img/slider/slider_4_mobile_*.png') as $filename) {
unlink($filename);
}
}
Configuration::updateValue('PRIVATESALES_SLIDER_TITLEIMGMOBILE_4', $random);
break;
case 'slider5':
if (glob(_PS_THEME_DIR_.'img/slider/slider_5_*.png')) {
foreach (glob(_PS_THEME_DIR_.'img/slider/slider_5_*.png') as $filename) {
unlink($filename);
}
}
Configuration::updateValue('PRIVATESALES_SLIDER_TITLEIMG_5', $random);
break;
case 'slidermobile5':
if (glob(_PS_THEME_DIR_.'img/slider/slider_5_mobile_*.png')) {
foreach (glob(_PS_THEME_DIR_.'img/slider/slider_5_mobile_*.png') as $filename) {
unlink($filename);
}
}
Configuration::updateValue('PRIVATESALES_SLIDER_TITLEIMGMOBILE_5', $random);
break;
default:
break;
}

38
modules/privatesales/controllers/front/home.php
View File

@ -68,9 +68,10 @@ class privatesaleshomeModuleFrontController extends ModuleFrontController {
$futuresales = SaleCore::getSales("future",Configuration::get('PRIVATESALES_FUTURELIMIT'), TRUE, FALSE, TRUE, 'date_start', 'ASC');
else
$futuresales = array();
$currentsales = SaleCore::getSales("current",0,TRUE,FALSE,TRUE,'position','ASC',FALSE,FALSE,$news);
//$currentsales = SaleCore::getSales("current",0,TRUE,FALSE,TRUE,'position','ASC',FALSE,FALSE,$news);
$currentsales = SaleCore::getSales("current",0,TRUE,FALSE,TRUE,'date_start','DESC',FALSE,FALSE,$news);
$this->addCSS(array(
_THEME_CSS_DIR_.'product_list.css' => 'all',
));
@ -83,26 +84,17 @@ class privatesaleshomeModuleFrontController extends ModuleFrontController {
$customer = Context::getContext()->customer;
$slider = array(
'1' => array(
'title' => Configuration::get('PRIVATESALES_SLIDER_TITLE_1'),
'link' => Configuration::get('PRIVATESALES_SLIDER_LINK_1'),
'img' => 'slider/slider_1_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMG_1').'.png',
'img_mobile' => 'slider/slider_1_mobile_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMGMOBILE_1').'.png',
),
'2' => array(
'title' => Configuration::get('PRIVATESALES_SLIDER_TITLE_2'),
'link' => Configuration::get('PRIVATESALES_SLIDER_LINK_2'),
'img' => 'slider/slider_2_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMG_2').'.png',
'img_mobile' => 'slider/slider_2_mobile_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMGMOBILE_2').'.png',
),
'3' => array(
'title' => Configuration::get('PRIVATESALES_SLIDER_TITLE_3'),
'link' => Configuration::get('PRIVATESALES_SLIDER_LINK_3'),
'img' => 'slider/slider_3_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMG_3').'.png',
'img_mobile' => 'slider/slider_3_mobile_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMGMOBILE_3').'.png',
)
);
$slider = array();
for ($i=1; $i < 6; $i++) {
if (Configuration::get('PRIVATESALES_SLIDER_ACTIVE_'.$i)) {
$slider[] = array(
'title' => Configuration::get('PRIVATESALES_SLIDER_TITLE_'.$i),
'link' => Configuration::get('PRIVATESALES_SLIDER_LINK_'.$i),
'img' => 'slider/slider_'.$i.'_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMG_'.$i).'.png',
'img_mobile' => 'slider/slider_'.$i.'_mobile_'.Configuration::get('PRIVATESALES_SLIDER_TITLEIMGMOBILE_'.$i).'.png',
);
}
}
$this->context->smarty->assign(array(
'news' => $news,

BIN
modules/privatesales/img/121/current/121_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 78 KiB

BIN
modules/privatesales/img/163/newsletter/163_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
modules/privatesales/img/336/newsletter/336_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
modules/privatesales/img/406/current/406_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
modules/privatesales/img/406/future/406_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
modules/privatesales/img/406/newsletter/406_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
modules/privatesales/img/406/trailer/406_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 39 KiB

BIN
modules/privatesales/img/432/newsletter/432_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
modules/privatesales/img/445/newsletter/445_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
modules/privatesales/img/453/newsletter/453_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
modules/privatesales/img/492/current/492_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
modules/privatesales/img/492/future/492_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
modules/privatesales/img/492/logo/492_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
modules/privatesales/img/492/newsletter/492_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
modules/privatesales/img/492/trailer/492_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
modules/privatesales/img/508/current/508_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 227 KiB

After

Width:  |  Height:  |  Size: 44 KiB

BIN
modules/privatesales/img/508/future/508_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
modules/privatesales/img/508/logo/508_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
modules/privatesales/img/508/newsletter/508_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
modules/privatesales/img/508/trailer/508_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 KiB

After

Width:  |  Height:  |  Size: 45 KiB

BIN
modules/privatesales/img/538/current/538_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
modules/privatesales/img/538/future/538_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
modules/privatesales/img/538/newsletter/538_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 90 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
modules/privatesales/img/538/trailer/538_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 42 KiB

BIN
modules/privatesales/img/605/newsletter/605_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
modules/privatesales/img/673/current/673_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
modules/privatesales/img/673/future/673_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
modules/privatesales/img/673/logo/673_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
modules/privatesales/img/673/trailer/673_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
modules/privatesales/img/729/current/729_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
modules/privatesales/img/729/future/729_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
modules/privatesales/img/729/newsletter/729_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
modules/privatesales/img/729/trailer/729_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
modules/privatesales/img/73/newsletter/73_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

8
modules/privatesales/views/templates/admin/helpers/uploader/simple.tpl
View File

@ -15,6 +15,10 @@
&& $name != "imageslidermobile2"
&& $name != "imageslider3"
&& $name != "imageslidermobile3"
&& $name != "imageslider4"
&& $name != "imageslidermobile4"
&& $name != "imageslider5"
&& $name != "imageslidermobile5"
&& $name != "imagebanner1"
&& $name != "imagebannermobile1"
&& $name != "imagebanner2"
@ -34,6 +38,10 @@
|| $name == "imageslidermobile2"
|| $name == "imageslider3"
|| $name == "imageslidermobile3"
|| $name == "imageslider4"
|| $name == "imageslidermobile4"
|| $name == "imageslider5"
|| $name == "imageslidermobile5"
|| $name == "imagebanner1"
|| $name == "imagebannermobile1"
|| $name == "imagebanner2"

2
modules/psblog/sitemap-blog.xml
View File

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url><loc>http://www.privilegedemarque.com/blog</loc><priority>0.7</priority><changefreq>weekly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/217-pourquoi-un-couteau-ne-s-offre-pas-mais-s-echange-contre-une-piece-de-monnaie-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/218-clafoutis-aux-cerises-et-a-l-orange</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/157-9-astuces-pour-un-barbecue-parfaitement-propre-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/216--video-les-arts-de-la-table-l-excellence-francaise-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/143-quelques-regles-simples-pour-dresser-la-table-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/4-marques-a-la-une-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/13-retour-en-images-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/6-secrets-de-grands-chefs-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/14-sorties-gourmandes-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/5-tendances-et-inspirations-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/8-scoops-hotellerie-restauration-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url></urlset>
<url><loc>http://www.privilegedemarque.com/blog</loc><priority>0.7</priority><changefreq>weekly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/156-ne-jetez-plus-les-bouchons-de-liege-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/223--la-chronique-de-chef-virginie-bien-se-nourrir-pendant-le-bac-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/219-le-gaspillage-alimentaire-dans-la-restauration-ca-suffit-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/220-recruter-un-extra-en-un-clic</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/217-pourquoi-un-couteau-ne-s-offre-pas-mais-s-echange-contre-une-piece-de-monnaie-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/4-marques-a-la-une-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/13-retour-en-images-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/6-secrets-de-grands-chefs-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/14-sorties-gourmandes-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/5-tendances-et-inspirations-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url><url><loc>http://www.privilegedemarque.com/blog/category/8-scoops-hotellerie-restauration-</loc><priority>0.6</priority><changefreq>monthly</changefreq></url></urlset>

2
modules/referralprogram/referralprogram.php
View File

@ -526,6 +526,8 @@ class ReferralProgram extends Module
if((int) $orderState->id == 6)
{
$cartRule = new CartRule((int)$referralprogram->id_cart_rule_sponsor);
if (!Validate::isLoadedObject($cartRule))
return true;
$cartRule->delete();
return true;
}

41
modules/yieldify/js/yieldify.js
View File

@ -13,7 +13,7 @@ var Yieldify = {
'cookie_lifetime' : 30*24*60*60
},
'customer':{
'display' : 10000,
'display' : 0,
'cookie_lifetime' : 30*24*60*60
},
'product':{
@ -40,11 +40,15 @@ var Yieldify = {
'concours':{
'display' : 0,
'cookie_lifetime' : 12*60*60
},
'promo':{
'display' : 3000,
'cookie_lifetime' : 24*60*60
}
},
// Global conf
overlay : $('.y_overlay'),
popups : [$('#YIELDIFY_CART_YIELD'), $('#YIELDIFY_CUSTOMER_YIELD'), $('#YIELDIFY_PRODUCT_YIELD'), $('#YIELDIFY_CONCOURS_YIELD')],
popups : [$('#YIELDIFY_CART_YIELD'), $('#YIELDIFY_CUSTOMER_YIELD'), $('#YIELDIFY_PRODUCT_YIELD'), $('#YIELDIFY_CONCOURS_YIELD'), $('#YIELDIFY_PROMO_YIELD')],
triggered: false,
_init : function() {
@ -54,6 +58,7 @@ var Yieldify = {
Yieldify._customerYieldInit();
Yieldify._productYieldInit();
Yieldify._concoursYieldInit();
Yieldify._promoYieldInit();
}, Yieldify.conf.enable_delay);
/* Init close button */
@ -70,6 +75,19 @@ var Yieldify = {
e.preventDefault();
Yieldify.addToCart();
});
// init cookie if we click on link
$('.y_text_link').click(function(e){
e.preventDefault();
var container = $(this).closest('.yieldify_container');
var y_event = container.data('event');
var link = $(this).attr('href');
Yieldify._ajaxCall(y_event, 1, 0, function(resp){
$('.y_overlay').removeClass('shown');
container.removeClass('shown').addClass('closed');
window.location.href = link;
});
});
},
_cartYieldInit : function(){
if ($('#YIELDIFY_CART_YIELD').length){
@ -84,7 +102,7 @@ var Yieldify = {
// after a short delay
Yieldify.displayOnStay('customer', $('#YIELDIFY_CUSTOMER_YIELD'), Yieldify.conf.customer.cookie_lifetime, Yieldify.conf.customer.display);
// mouse leave screen
Yieldify.displayOnLeave('customer', $('#YIELDIFY_CUSTOMER_YIELD'), Yieldify.conf.customer.cookie_lifetime);
// Yieldify.displayOnLeave('customer', $('#YIELDIFY_CUSTOMER_YIELD'), Yieldify.conf.customer.cookie_lifetime);
}
},
_productYieldInit : function(){
@ -106,8 +124,16 @@ var Yieldify = {
// mouse leave screen
/*Yieldify.displayOnLeave('concours', $('#YIELDIFY_CONCOURS_YIELD'), Yieldify.conf.concours.cookie_lifetime);*/
}
}
, displayOnStay : function(event, element, cookie_lifetime, delay){
},
_promoYieldInit : function(){
if ($('#YIELDIFY_PROMO_YIELD').length){
// after a short delay
Yieldify.displayOnStay('promo', $('#YIELDIFY_PROMO_YIELD'), Yieldify.conf.promo.cookie_lifetime, Yieldify.conf.promo.display);
// mouse leave screen
/*Yieldify.displayOnLeave('promo', $('#YIELDIFY_PROMO_YIELD'), Yieldify.conf.promo.cookie_lifetime);*/
}
},
displayOnStay : function(event, element, cookie_lifetime, delay){
// after a short delay
var _ydost = new YTimer(function() {
Yieldify.displayPopup(event, element, cookie_lifetime, delay);
@ -130,8 +156,11 @@ var Yieldify = {
if (resp===true){
if (!$('input:focus').length && !$('.yieldify_container.shown').length){
element.addClass('shown');
Yieldify.overlay.addClass('shown');
/*Yieldify.overlay.addClass('shown');*/
$('.y_overlay').addClass('shown');
/*if(y_event == "promo") {
Yieldify._ajaxCall(y_event, 1, 0, function(resp){});
}*/
}
else if (typeof(delay!=='undefined') && delay){
_pdtid = new YTimer(function() {

2
modules/yieldify/views/templates/hook/y_footer.tpl
View File

@ -2,6 +2,6 @@
{foreach from=$y_paths item=path}
{include file="$path"}
{/foreach}
<div class="y_overlay"></div>
<div class="y_overlay"></div>
{/if}
{addJsDef y_ajax_path=$y_ajax_path}

13
modules/yieldify/views/templates/hook/yieldify_promo_yield.tpl Normal file
View File

@ -0,0 +1,13 @@
<div data-event="promo" id="YIELDIFY_PROMO_YIELD" class="yieldify_container" style="
background: url('{$img_dir}home/popup_promo.png') no-repeat;
background-size: 100%;
-moz-background-size: 100%;
-webkit-background-size: 100%;
-o-bo-background-size: 100%;">
<div class="y_header"><a class="close">X</a></div>
<div class="y_right_content">
<p>
<a class="y_text_link button-grey" {if !$cookie->logged}href="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}"{else}href="{$y_home_link}"{/if}>{$y_home_text_link}</a>
</p>
</div>
</div>

1
modules/yieldify/y_ajax.php
View File

@ -22,6 +22,7 @@ class YAjax{
case 'customer':
case 'product':
case 'concours':
case 'promo':
die(Tools::JsonEncode($response = $this->processYield(Tools::getValue('y_event'), $update, $lifetime)));
break;
default:

38
modules/yieldify/yieldify.php
View File

@ -82,11 +82,11 @@ class Yieldify extends Module {
$form = array(
'form' => array(
'legend' => array(
'title' => $this->l('Yieldify settings'),
'title' => $this->l('Pop-up settings'),
'icon' => 'icon-cogs'
),
'input' => array(
array(
/*array(
'type' => 'switch',
'label' => $this->l('Display new customer yield'),
'name' => 'YIELDIFY_CUSTOMER_YIELD',
@ -154,19 +154,19 @@ class Yieldify extends Module {
)
),
),
/*array(
array(
'type' => 'switch',
'label' => $this->l('Afficher la pop up d\'entrée de site'),
'name' => 'YIELDIFY_INFO_YIELD',
'name' => 'YIELDIFY_PROMO_YIELD',
'class' => 't',
'is_bool' => true,
'values' => array(
array(
'id' => 'YIELDIFY_INFO_YIELD_on',
'id' => 'YIELDIFY_PROMO_YIELD_on',
'value' => 1
),
array(
'id' => 'YIELDIFY_INFO_YIELD_off',
'id' => 'YIELDIFY_PROMO_YIELD_off',
'value' => 0
)
),
@ -194,19 +194,25 @@ class Yieldify extends Module {
public function getSettingsVar(){
return array(
'YIELDIFY_CUSTOMER_YIELD' => Configuration::get('YIELDIFY_CUSTOMER_YIELD'),
'YIELDIFY_PROMO_YIELD' => Configuration::get('YIELDIFY_PROMO_YIELD'),
'YIELDIFY_PROMO_YIELD_LINK' => Configuration::get('YIELDIFY_PROMO_YIELD_LINK'),
'YIELDIFY_PROMO_YIELD_TEXT' => Configuration::get('YIELDIFY_PROMO_YIELD_TEXT'),
'YIELDIFY_CART_YIELD' => Configuration::get('YIELDIFY_CART_YIELD'),
'YIELDIFY_PRODUCT_YIELD' => Configuration::get('YIELDIFY_PRODUCT_YIELD'),
'YIELDIFY_CONCOURS_YIELD' => Configuration::get('YIELDIFY_CONCOURS_YIELD'),
/*'YIELDIFY_INFO_YIELD' => Configuration::get('YIELDIFY_INFO_YIELD')*/
);
}
public function updateSettings(){
Configuration::updateValue('YIELDIFY_CUSTOMER_YIELD', Tools::getValue('YIELDIFY_CUSTOMER_YIELD'));
Configuration::updateValue('YIELDIFY_PROMO_YIELD', Tools::getValue('YIELDIFY_PROMO_YIELD'));
Configuration::updateValue('YIELDIFY_PROMO_YIELD_LINK', Tools::getValue('YIELDIFY_PROMO_YIELD_LINK'));
Configuration::updateValue('YIELDIFY_PROMO_YIELD_TEXT', Tools::getValue('YIELDIFY_PROMO_YIELD_TEXT'));
Configuration::updateValue('YIELDIFY_CART_YIELD', Tools::getValue('YIELDIFY_CART_YIELD'));
Configuration::updateValue('YIELDIFY_PRODUCT_YIELD', Tools::getValue('YIELDIFY_PRODUCT_YIELD'));
Configuration::updateValue('YIELDIFY_CONCOURS_YIELD', Tools::getValue('YIELDIFY_CONCOURS_YIELD'));
/*Configuration::updateValue('YIELDIFY_INFO_YIELD', Tools::getValue('YIELDIFY_INFO_YIELD'));*/
}
@ -276,6 +282,14 @@ class Yieldify extends Module {
$yield_paths[] = $this->getPath('yieldify_product_yield');
if (Configuration::get('YIELDIFY_CONCOURS_YIELD') && ($page_name == 'index' || $page_name == 'module-privatesales-home'))
$yield_paths[] = $this->getPath('yieldify_concours_yield');
if (Configuration::get('YIELDIFY_PROMO_YIELD') && !$yield_cart)
{
$yield_paths[] = $this->getPath('yieldify_promo_yield');
$this->smarty->assign(array(
'y_home_link' => Configuration::get('YIELDIFY_PROMO_YIELD_LINK'),
'y_home_text_link'=> Configuration::get('YIELDIFY_PROMO_YIELD_TEXT')
));
}
$this->smarty->assign(array(
'y_paths' => $yield_paths,
'y_img_dir' => $this->getImgPath(),
@ -326,6 +340,14 @@ class Yieldify extends Module {
$yield_paths[] = $this->getPath('yieldify_product_yield');
if (Configuration::get('YIELDIFY_CONCOURS_YIELD') && ($page_name == 'index' || $page_name == 'module-privatesales-home'))
$yield_paths[] = $this->getPath('yieldify_concours_yield');
if (Configuration::get('YIELDIFY_PROMO_YIELD') && !$yield_cart)
{
$yield_paths[] = $this->getPath('yieldify_promo_yield');
$this->smarty->assign(array(
'y_home_link' => Configuration::get('YIELDIFY_PROMO_YIELD_LINK'),
'y_home_text_link'=> Configuration::get('YIELDIFY_PROMO_YIELD_TEXT')
));
}
$this->smarty->assign(array(
'y_paths' => $yield_paths,
'y_img_dir' => $this->getImgPath(),

10
override/controllers/admin/AdminProductsController.php
View File

@ -136,7 +136,7 @@ class AdminProductsController extends AdminProductsControllerCore
FROM `'._DB_PREFIX_.'specific_price` sp
WHERE sp.id_product = a.id_product
LIMIT 1
) as specific_price';
) as specific_price, a.wholesale_price';
if ($join_category)
{
@ -181,6 +181,14 @@ class AdminProductsController extends AdminProductsControllerCore
'title' => $this->l('Category'),
'filter_key' => 'cl!name',
);
$this->fields_list['wholesale_price'] = array(
'title' => $this->l('Prix d\'achat'),
'type' => 'price',
'align' => 'text-right',
'havingFilter' => true,
'orderby' => false,
'search' => false
);
$this->fields_list['price'] = array(
'title' => $this->l('Base price'),
'type' => 'price',

3538
themes/site/css/global2.css
View File

File diff suppressed because it is too large Load Diff

6
themes/site/lang/fr.php
View File

@ -203,6 +203,7 @@ $_LANG['discount_f4a0d7cb0cd45214c8ca5912c970de13'] = 'TTC';
$_LANG['errors_0557fa923dcee4d0f86b1409f5c2167f'] = 'Précédent';
$_LANG['errors_5fbddd8d4e0d8c7a868272f2f171df09'] = 'Il y a %d erreur';
$_LANG['errors_9ead913c5b7c87efda39ca9640c46ae4'] = 'Il y a %d erreurs';
$_LANG['footer_04da3567e5f681018b6875273401ef55'] = 'Satisfait ou remboursé';
$_LANG['footer_0f181f5a5760c08e62d0f948d243f278'] = 'Inscrivez-vous';
$_LANG['footer_1f4165f982906958dfde1345628b321b'] = 'particulier';
$_LANG['footer_2e7a144eec0d4ceb74a479f4904996f3'] = 'en ventes privées !';
@ -210,8 +211,9 @@ $_LANG['footer_34c32ef77b5a5b551b005e0158843c09'] = 'Finaliser votre commande';
$_LANG['footer_3a5779ef7e961640a0fccaa8c753566d'] = 'J\'accepte d\'adhérer à Privilège de Marque et de recevoir les newsletters ';
$_LANG['footer_4931fa232e876ae17165d664f56677bb'] = 'Email';
$_LANG['footer_519faaedd2a863f1eea1093c8be52649'] = 'Profitez de la qualité des marques professionnelles ';
$_LANG['footer_53964f84a1a329dbb4fae12cdf5094e1'] = 'Livraison gratuite à partir de 49€ d\'achat';
$_LANG['footer_6ca5e60e36d138d619805a430770e6b8'] = 'Se connecter';
$_LANG['footer_6cd8985f3eb9454240223013e9d1ca9d'] = 'Ventes privées jusqu\'à -70%';
$_LANG['footer_6cd8985f3eb9454240223013e9d1ca9d'] = 'Ventes privées jusqu\'à -80%';
$_LANG['footer_9aa849c54deb4986c685418bfac2115d'] = 'Satisfait ou remboursé';
$_LANG['footer_a0a3e9059011e8d485f24e0a923b74d0'] = 'Je m\'inscris';
$_LANG['footer_b8f6a0049eeb602be9a5be0fde2006af'] = 'Mot de passe';
@ -221,7 +223,7 @@ $_LANG['footer_cf9e429119f923397903edef2e641fb4'] = 'Merci de bien vouloir rense
$_LANG['footer_d2d365cfbf98497d680e5fd6b98b0b6c'] = 'Acceptez les conditions générales d\'utilisation';
$_LANG['footer_e2ee86d09416a88ce2c85cf661813647'] = 'Prénom';
$_LANG['footer_e7102fd5d8349c52289cf22e60c5c48f'] = 'Nom';
$_LANG['footer_fe84088fefbd83805c07156652e6ad9f'] = 'Livraison gratuite sur votre 1ère commande';
$_LANG['footer_fe84088fefbd83805c07156652e6ad9f'] = 'Livraison gratuite à partir de 49€ ttc d\'achat';
$_LANG['global_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Suivant';
$_LANG['global_d3d2e617335f08df83599665eef8a418'] = 'Fermer';
$_LANG['global_dd1f775e443ff3b9a89270713580a51b'] = 'Précédent';

4
themes/site/mails/fr/account.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -74,5 +74,7 @@
</tr>
</tbody>
</table>
</body>
</html>

4
themes/site/mails/fr/backoffice_order.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -94,6 +94,8 @@

4
themes/site/mails/fr/bankwire.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -130,6 +130,8 @@

4
themes/site/mails/fr/cheque.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -144,6 +144,8 @@

4
themes/site/mails/fr/contact.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -113,6 +113,8 @@

4
themes/site/mails/fr/contact_form.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -113,6 +113,8 @@

4
themes/site/mails/fr/credit_slip.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -126,6 +126,8 @@

4
themes/site/mails/fr/download_product.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -126,6 +126,8 @@

4
themes/site/mails/fr/employee_password.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -126,6 +126,8 @@

4
themes/site/mails/fr/forward_msg.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -126,6 +126,8 @@

4
themes/site/mails/fr/guest_to_customer.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -124,6 +124,8 @@

4
themes/site/mails/fr/in_transit.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -79,5 +79,7 @@
</body>
</html>

4
themes/site/mails/fr/log_alert.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -106,6 +106,8 @@

4
themes/site/mails/fr/mailessaiemmanuel.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
@ -154,6 +154,8 @@

4
themes/site/mails/fr/newsletter.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -98,6 +98,8 @@

4
themes/site/mails/fr/order_canceled.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -127,6 +127,8 @@

4
themes/site/mails/fr/order_changed.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -124,6 +124,8 @@

4
themes/site/mails/fr/order_conf.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -315,6 +315,8 @@

4
themes/site/mails/fr/order_customer_comment.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -103,6 +103,8 @@

4
themes/site/mails/fr/order_merchant_comment.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -103,6 +103,8 @@

4
themes/site/mails/fr/order_return_state.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -121,6 +121,8 @@

4
themes/site/mails/fr/outofstock.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -121,6 +121,8 @@

4
themes/site/mails/fr/password.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -121,6 +121,8 @@

4
themes/site/mails/fr/password_query.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -121,6 +121,8 @@

4
themes/site/mails/fr/payment.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -121,6 +121,8 @@

4
themes/site/mails/fr/payment_error.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -121,6 +121,8 @@

4
themes/site/mails/fr/preparation.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -94,6 +94,8 @@

4
themes/site/mails/fr/refund.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -97,6 +97,8 @@

4
themes/site/mails/fr/reply_msg.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -82,6 +82,8 @@

4
themes/site/mails/fr/shipped.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -61,6 +61,8 @@

4
themes/site/mails/fr/test.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -71,6 +71,8 @@

4
themes/site/mails/fr/voucher.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -85,6 +85,8 @@

4
themes/site/mails/fr/voucher_new.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -94,6 +94,8 @@

4
themes/site/modules/advsendtoafriend/mails/fr/_send_to_a_friend_sale.html
View File

@ -5,7 +5,7 @@
<title>J'ai beaucoup aimé cette vente, qu'en penses-tu?</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -61,5 +61,7 @@
</body>
</html>

4
themes/site/modules/advsendtoafriend/mails/fr/send_to_a_friend.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -56,5 +56,7 @@
</body>
</html>

4
themes/site/modules/advsendtoafriend/mails/fr/send_to_a_friend_sale.html
View File

@ -5,7 +5,7 @@
<title>J'ai beaucoup aimé cette vente, qu'en penses-tu?</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -62,5 +62,7 @@
</body>
</html>

4
themes/site/modules/atos/mails/fr/notification.html
View File

@ -5,7 +5,7 @@
<title>Atos / Notification</title>
</head>
<body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<tbody>
<tr>
<td>{message}</td>
@ -70,6 +70,8 @@

4
themes/site/modules/blocknewsletter/mails/fr/newsletter_conf.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
@ -99,6 +99,8 @@

4
themes/site/modules/blocknewsletter/mails/fr/newsletter_verif.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
@ -184,6 +184,8 @@

4
themes/site/modules/blocknewsletter/mails/fr/newsletter_voucher.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
@ -186,6 +186,8 @@

4
themes/site/modules/blockwishlist/mails/fr/wishlink.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
@ -101,6 +101,8 @@

4
themes/site/modules/blockwishlist/mails/fr/wishlist.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<table class="table table-mail" style="width: 100%; margin-top: 10px; -moz-box-shadow: 0 0 5px #afafaf; -webkit-box-shadow: 0 0 5px #afafaf; -o-box-shadow: 0 0 5px #afafaf; box-shadow: 0 0 5px #afafaf; filter: progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5);">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 7px 0;">&nbsp;</td>
@ -200,6 +200,8 @@

4
themes/site/modules/chronopost/mails/fr/return.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<tbody>
<tr>
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
@ -56,5 +56,7 @@
</body>
</html>

4
themes/site/modules/chronopost/mails/fr/tracking.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
<tbody>
<tr>
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
@ -66,5 +66,7 @@
</body>
</html>

4
themes/site/modules/followup/mails/fr/_followup_1.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -77,5 +77,7 @@
</body>
</html>

4
themes/site/modules/followup/mails/fr/followup_2.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -71,5 +71,7 @@
</body>
</html>

4
themes/site/modules/followup/mails/fr/followup_3.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -73,5 +73,7 @@
</body>
</html>

4
themes/site/modules/followup/mails/fr/followup_4.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -93,5 +93,7 @@
</body>
</html>

11
themes/site/modules/followup/mails/fr/followup_J1.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td style="padding: 0;" align="center">
@ -48,12 +48,7 @@
</tr>
</tbody>
</table>
<table class="table" style="width: 100%; margin-top: 10px;">
<tbody>
{cartHtml}
</tbody>
</table>
</td>
{cartHtml}</td>
</tr>
<tr>
<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
@ -80,7 +75,5 @@
</tbody>
</table>
</body>
</html>

12
themes/site/modules/followup/mails/fr/followup_J3.html
View File

@ -5,7 +5,7 @@
<title>Message de {shop_name}</title>
</head>
<body>
<table class="table table-mail" style="width: 650px;">
<table class="table table-mail" style="width: 650px;">
<tbody>
<tr>
<td class="space" style="width: 20px; padding: 0;">&nbsp;</td>
@ -48,12 +48,7 @@
</tr>
</tbody>
</table>
<table class="table" style="width: 100%; margin-top: 10px;">
<tbody>
{cartHtml}
</tbody>
</table>
</td>
{cartHtml}</td>
</tr>
<tr>
<td class="space_footer" style="padding: 0!important;">&nbsp;</td>
@ -78,8 +73,5 @@
</table>
<p> </p>
</body>
</html>

Some files were not shown because too many files have changed in this diff Show More