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

fix conflicts

Browse Source
This commit is contained in:
Marion Muszynski 2017-09-29 15:51:41 +02:00
commit d5bbf47f10
10 changed files with 201 additions and 2753 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
adm/tabs/AdminCategories.php
View File

@ -761,24 +761,24 @@ class AdminCategories extends AdminTab
</div>';
// @Override Antadis
echo '<label>'.$this->l('Image app mobile:').'</label>
<div class="margin-form translatable">';
foreach($this->_languages as $language) {
echo '
<div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').'; float: left;">';
if(file_exists(_PS_ROOT_DIR_.'/img/c/'.$obj->id.'_mobile_vp_'.$language['id_lang'].'.jpg')) {
echo '<div id="image">
<img src="'.__PS_BASE_URI__.'img/c/'.$obj->id.'_mobile_vp_'.$language['id_lang'].'.jpg" alt="" class="imgm">
<p></p>
<a href="'.$currentIndex.'&id_category='.$obj->id.'&token='.Tools::getAdminTokenLite('AdminCatalog').'&deleteImageMobile=1&id_lang='.$language['id_lang'].'">
<img src="../img/admin/delete.gif" alt="Supprimer"> Supprimer</a>
</div>';
}
echo '<input id="image_thumb_'.$language['id_lang'].'" type="file" name="image_mobile_'.$language['id_lang'].'" />
</div>';
}
echo '<p class="clear"></p>
</div>';
// echo '<label>'.$this->l('Image app mobile:').'</label>
// <div class="margin-form translatable">';
// foreach($this->_languages as $language) {
// echo '
// <div class="lang_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').'; float: left;">';
// if(file_exists(_PS_ROOT_DIR_.'/img/c/'.$obj->id.'_mobile_vp_'.$language['id_lang'].'.jpg')) {
// echo '<div id="image">
// <img src="'.__PS_BASE_URI__.'img/c/'.$obj->id.'_mobile_vp_'.$language['id_lang'].'.jpg" alt="" class="imgm">
// <p></p>
// <a href="'.$currentIndex.'&id_category='.$obj->id.'&token='.Tools::getAdminTokenLite('AdminCatalog').'&deleteImageMobile=1&id_lang='.$language['id_lang'].'">
// <img src="../img/admin/delete.gif" alt="Supprimer"> Supprimer</a>
// </div>';
// }
// echo '<input id="image_thumb_'.$language['id_lang'].'" type="file" name="image_mobile_'.$language['id_lang'].'" />
// </div>';
// }
// echo '<p class="clear"></p>
// </div>';
// echo ' <label>'.$this->l('Image logo:').' </label>
// <div class="margin-form">';

1210
js/jquery/jquery.fancybox-1.3.4.js
View File

File diff suppressed because it is too large Load Diff

16
modules/ant_creationcategories/AdminAntCreationcategories.php
View File

@ -224,14 +224,14 @@ class AdminAntCreationcategories extends AdminTab
'name' => 'image_category',
'id' => 'preview_category',
),
array(
'type' => 'uploadImage',
'label' => $this->l('Image Application : '),
'label-class' => 'col-md-2',
'input-class' => 'col-md-6',
'name' => 'image_mobile',
'id' => 'preview_mobile',
),
// array(
// 'type' => 'uploadImage',
// 'label' => $this->l('Image Application : '),
// 'label-class' => 'col-md-2',
// 'input-class' => 'col-md-6',
// 'name' => 'image_mobile',
// 'id' => 'preview_mobile',
// ),
array(
'type' => 'tag',
'label' => $this->l('Sous Catégorie : '),

87
modules/blockbestsellers/assets/css/flexslider.css
View File

@ -8,89 +8,4 @@
*
* Contributing author: Tyler Smith (@mbmufffin)
*/
/* Browser Resets
*********************************/
.flex-container a:active,
.flexslider a:active,
.flex-container a:focus,
.flexslider a:focus {outline: none;}
.slides,
.flex-control-nav,
.flex-direction-nav {margin: 0; padding: 0; list-style: none;}
/* Icon Fonts
*********************************/
/* Font-face Icons */
@font-face {
font-family: 'flexslider-icon';
src:url('fonts/flexslider-icon.eot');
src:url('fonts/flexslider-icon.eot?#iefix') format('embedded-opentype'),
url('fonts/flexslider-icon.woff') format('woff'),
url('fonts/flexslider-icon.ttf') format('truetype'),
url('fonts/flexslider-icon.svg#flexslider-icon') format('svg');
font-weight: normal;
font-style: normal;
}
/* FlexSlider Necessary Styles
*********************************/
.flexslider {margin: 0; padding: 0;}
.flexslider .slides > li {display: none; -webkit-backface-visibility: hidden;} /* Hide the slides before the JS is loaded. Avoids image jumping */
.flexslider .slides img {width: 100%; display: block;}
.flex-pauseplay span {text-transform: capitalize;}
/* Clearfix for the .slides element */
.slides:after {content: "\0020"; display: block; clear: both; visibility: hidden; line-height: 0; height: 0;}
html[xmlns] .slides {display: block;}
* html .slides {height: 1%;}
/* No JavaScript Fallback */
/* If you are not using another script, such as Modernizr, make sure you
* include js that eliminates this class on page load */
.no-js .slides > li:first-child {display: block;}
/* FlexSlider Default Theme
*********************************/
.flexslider { margin: 0 0 60px; background: #fff; border: 4px solid #fff; position: relative; -webkit-border-radius: 4px; -moz-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.2); -moz-box-shadow: 0 1px 4px rgba(0,0,0,.2); -o-box-shadow: 0 1px 4px rgba(0,0,0,.2); box-shadow: 0 1px 4px rgba(0,0,0,.2); zoom: 1; }
.flex-viewport { max-height: 2000px; -webkit-transition: all 1s ease; -moz-transition: all 1s ease; -o-transition: all 1s ease; transition: all 1s ease; }
.loading .flex-viewport { max-height: 300px; }
.flexslider .slides { zoom: 1; }
.carousel li { margin-right: 5px; }
/* Direction Nav */
.flex-direction-nav {*height: 0;}
.flex-direction-nav a { display: block; width: 40px; height: 40px; margin: -20px 0 0; position: absolute; top: 50%; z-index: 10; overflow: hidden; opacity: 0; cursor: pointer; color: rgba(0,0,0,0.8); text-shadow: 1px 1px 0 rgba(255,255,255,0.3); -webkit-transition: all .3s ease; -moz-transition: all .3s ease; transition: all .3s ease; }
.flex-direction-nav .flex-prev { left: -50px; }
.flex-direction-nav .flex-next { right: -50px; text-align: right; }
.flexslider:hover .flex-prev { opacity: 0.7; left: 10px; }
.flexslider:hover .flex-next { opacity: 0.7; right: 10px; }
.flexslider:hover .flex-next:hover, .flexslider:hover .flex-prev:hover { opacity: 1; }
.flex-direction-nav .flex-disabled { opacity: 0!important; filter:alpha(opacity=0); cursor: default; }
.flex-direction-nav a:before { font-family: "flexslider-icon"; font-size: 40px; display: inline-block; content: '\f001'; }
.flex-direction-nav a.flex-next:before { content: '\f002'; }
/* Pause/Play */
.flex-pauseplay a { display: block; width: 20px; height: 20px; position: absolute; bottom: 5px; left: 10px; opacity: 0.8; z-index: 10; overflow: hidden; cursor: pointer; color: #000; }
.flex-pauseplay a:before { font-family: "flexslider-icon"; font-size: 20px; display: inline-block; content: '\f004'; }
.flex-pauseplay a:hover { opacity: 1; }
.flex-pauseplay a.flex-play:before { content: '\f003'; }
/* Control Nav */
.flex-control-nav {width: 100%; position: absolute; bottom: -40px; text-align: center;}
.flex-control-nav li {margin: 0 6px; display: inline-block; zoom: 1; *display: inline;}
.flex-control-paging li a {width: 11px; height: 11px; display: block; background: #666; background: rgba(0,0,0,0.5); cursor: pointer; text-indent: -9999px; -webkit-border-radius: 20px; -moz-border-radius: 20px; -o-border-radius: 20px; border-radius: 20px; -webkit-box-shadow: inset 0 0 3px rgba(0,0,0,0.3); -moz-box-shadow: inset 0 0 3px rgba(0,0,0,0.3); -o-box-shadow: inset 0 0 3px rgba(0,0,0,0.3); box-shadow: inset 0 0 3px rgba(0,0,0,0.3); }
.flex-control-paging li a:hover { background: #333; background: rgba(0,0,0,0.7); }
.flex-control-paging li a.flex-active { background: #000; background: rgba(0,0,0,0.9); cursor: default; }
.flex-control-thumbs {margin: 5px 0 0; position: static; overflow: hidden;}
.flex-control-thumbs li {width: 25%; float: left; margin: 0;}
.flex-control-thumbs img {width: 100%; display: block; opacity: .7; cursor: pointer;}
.flex-control-thumbs img:hover {opacity: 1;}
.flex-control-thumbs .flex-active {opacity: 1; cursor: default;}
@media screen and (max-width: 860px) {
.flex-direction-nav .flex-prev { opacity: 1; left: 10px;}
.flex-direction-nav .flex-next { opacity: 1; right: 10px;}
}
.flex-container a:active,.flexslider a:active,.flex-container a:focus,.flexslider a:focus{outline:none}.slides,.flex-control-nav,.flex-direction-nav{margin:0;padding:0;list-style:none}@font-face{font-family:'flexslider-icon';src:url(fonts/flexslider-icon.eot);src:url('fonts/flexslider-icon.eot?#iefix') format('embedded-opentype'),url(fonts/flexslider-icon.woff) format('woff'),url(fonts/flexslider-icon.ttf) format('truetype'),url('fonts/flexslider-icon.svg#flexslider-icon') format('svg');font-weight:400;font-style:normal}.flexslider{margin:0;padding:0}.flexslider .slides>li{display:none;-webkit-backface-visibility:hidden}.flexslider .slides img{width:100%;display:block}.flex-pauseplay span{text-transform:capitalize}.slides:after{content:"\0020";display:block;clear:both;visibility:hidden;line-height:0;height:0}html[xmlns] .slides{display:block}* html .slides{height:1%}.no-js .slides>li:first-child{display:block}.flexslider{margin:0 0 60px;background:#fff;border:4px solid #fff;position:relative;-webkit-border-radius:4px;-moz-border-radius:4px;-o-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0,0,0,.2);-moz-box-shadow:0 1px 4px rgba(0,0,0,.2);-o-box-shadow:0 1px 4px rgba(0,0,0,.2);box-shadow:0 1px 4px rgba(0,0,0,.2);zoom:1}.flex-viewport{max-height:2000px;-webkit-transition:all 1s ease;-moz-transition:all 1s ease;-o-transition:all 1s ease;transition:all 1s ease}.loading .flex-viewport{max-height:300px}.flexslider .slides{zoom:1}.carousel li{margin-right:5px}.flex-direction-nav{*height:0}.flex-direction-nav a{display:block;width:40px;height:40px;margin:-20px 0 0;position:absolute;top:50%;z-index:10;overflow:hidden;opacity:0;cursor:pointer;color:rgba(0,0,0,.8);text-shadow:1px 1px 0 rgba(255,255,255,.3);-webkit-transition:all .3s ease;-moz-transition:all .3s ease;transition:all .3s ease}.flex-direction-nav .flex-prev{left:-50px}.flex-direction-nav .flex-next{right:-50px;text-align:right}.flexslider:hover .flex-prev{opacity:.7;left:10px}.flexslider:hover .flex-next{opacity:.7;right:10px}.flexslider:hover .flex-next:hover,.flexslider:hover .flex-prev:hover{opacity:1}.flex-direction-nav .flex-disabled{opacity:0!important;filter:alpha(opacity=0);cursor:default}.flex-direction-nav a:before{font-family:"flexslider-icon";font-size:40px;display:inline-block;content:'\f001'}.flex-direction-nav a.flex-next:before{content:'\f002'}.flex-pauseplay a{display:block;width:20px;height:20px;position:absolute;bottom:5px;left:10px;opacity:.8;z-index:10;overflow:hidden;cursor:pointer;color:#000}.flex-pauseplay a:before{font-family:"flexslider-icon";font-size:20px;display:inline-block;content:'\f004'}.flex-pauseplay a:hover{opacity:1}.flex-pauseplay a.flex-play:before{content:'\f003'}.flex-control-nav{width:100%;position:absolute;bottom:-40px;text-align:center}.flex-control-nav li{margin:0 6px;display:inline-block;zoom:1;*display:inline}.flex-control-paging li a{width:11px;height:11px;display:block;background:#666;background:rgba(0,0,0,.5);cursor:pointer;text-indent:-9999px;-webkit-border-radius:20px;-moz-border-radius:20px;-o-border-radius:20px;border-radius:20px;-webkit-box-shadow:inset 0 0 3px rgba(0,0,0,.3);-moz-box-shadow:inset 0 0 3px rgba(0,0,0,.3);-o-box-shadow:inset 0 0 3px rgba(0,0,0,.3);box-shadow:inset 0 0 3px rgba(0,0,0,.3)}.flex-control-paging li a:hover{background:#333;background:rgba(0,0,0,.7)}.flex-control-paging li a.flex-active{background:#000;background:rgba(0,0,0,.9);cursor:default}.flex-control-thumbs{margin:5px 0 0;position:static;overflow:hidden}.flex-control-thumbs li{width:25%;float:left;margin:0}.flex-control-thumbs img{width:100%;display:block;opacity:.7;cursor:pointer}.flex-control-thumbs img:hover{opacity:1}.flex-control-thumbs .flex-active{opacity:1;cursor:default}@media screen and (max-width:860px){.flex-direction-nav .flex-prev{opacity:1;left:10px}.flex-direction-nav .flex-next{opacity:1;right:10px}}

1194
modules/blockbestsellers/assets/js/jquery.flexslider.js
View File

File diff suppressed because it is too large Load Diff

24
modules/cookiesinfos/css/cookiesinfo.css
View File

@ -1,23 +1 @@
#cookiesinfo{
position:fixed;
bottom:0px;
left:0px;
right:0px;
z-index:10000;
display:none;
background:#cdc8c8;
padding:10px 0px;
text-align:center;
}
#cookiesinfo a{ color: #2e3192; }
#cookiesinfo .close{
background:url("../../../themes/site/img/icon/delete.gif") no-repeat scroll right center rgba(0, 0, 0, 0);
cursor:pointer;
position:absolute;
top:0px;
right:10px;
font-size:0px;
height:38px;
line-height: 38px;
width:30px;
}
#cookiesinfo{position:fixed;bottom:0px;left:0px;right:0px;z-index:10000;display:none;background:#cdc8c8;padding:10px 0px;text-align:center;}#cookiesinfo a{ color: #2e3192; }#cookiesinfo .close{background:url("../../../themes/site/img/icon/delete.gif") no-repeat scroll right center rgba(0, 0, 0, 0);cursor:pointer;position:absolute;top:0px;right:10px;font-size:0px;height:38px;line-height: 38px;width:30px;}

25
modules/logistics/carriers/mondialrelay/cron_trace.php
View File

@ -70,8 +70,18 @@ foreach ($iterator as $fileinfo) {
if ($situation == 'DPC')
$expeditions[] = $expedition_number;
}
if (!count($expeditions))
if (!count($expeditions)) {
## ARCHIVE FILE
$repo_archive = dirname(__FILE__) . '/archives/trace/';
$repo_paths = array('others',date('Y'), date('m'));
foreach ($repo_paths as $repo_path) {
$repo_archive .= $repo_path . '/';
if (!file_exists($repo_archive))
mkdir($repo_archive);
}
rename(dirname(__FILE__).'/trace/'.$fileinfo->getFilename(), $repo_archive . $fileinfo->getFilename());
continue;
}
$expedition_orders = array();
$expedition_order_details = array();
@ -121,6 +131,7 @@ foreach ($iterator as $fileinfo) {
$fully_sent = FALSE;
$products_sent = array();
$remaining = array();
foreach(Db::getInstance()->ExecuteS('
SELECT d.`id_order_detail`, IF(
@ -136,6 +147,8 @@ foreach ($iterator as $fileinfo) {
') as $quantity_remain) {
if((int) $quantity_remain['remain'] == 0) {
$products_sent[] = (int) $quantity_remain['id_order_detail'];
} elseif ((int) $quantity_remain['remain'] == 1) {
$remaining[] = (int) $quantity_remain['id_order_detail'];
}
}
@ -153,6 +166,8 @@ foreach ($iterator as $fileinfo) {
') as $quantity_remain) {
if((int) $quantity_remain['remain'] == 0) {
$products_sent[] = (int) $quantity_remain['id_order_detail'];
} elseif ((int) $quantity_remain['remain'] == 1) {
$remaining[] = (int) $quantity_remain['id_order_detail'];
}
}
@ -170,6 +185,8 @@ foreach ($iterator as $fileinfo) {
') as $quantity_remain) {
if((int) $quantity_remain['remain'] == 0) {
$products_sent[] = (int) $quantity_remain['id_order_detail'];
} elseif ((int) $quantity_remain['remain'] == 1) {
$remaining[] = (int) $quantity_remain['id_order_detail'];
}
}
@ -187,6 +204,8 @@ foreach ($iterator as $fileinfo) {
') as $quantity_remain) {
if((int) $quantity_remain['remain'] == 0) {
$products_sent[] = (int) $quantity_remain['id_order_detail'];
} elseif ((int) $quantity_remain['remain'] == 1) {
$remaining[] = (int) $quantity_remain['id_order_detail'];
}
}
@ -204,12 +223,14 @@ foreach ($iterator as $fileinfo) {
') as $quantity_remain) {
if((int) $quantity_remain['remain'] == 0) {
$products_sent[] = (int) $quantity_remain['id_order_detail'];
} elseif ((int) $quantity_remain['remain'] == 1) {
$remaining[] = (int) $quantity_remain['id_order_detail'];
}
}
$remaining = array();
foreach($order_details as $d) {
if(!in_array($d, $products_sent)) {
if(!in_array($d, $products_sent) && !in_array($d, $remaining)) {
$remaining[] = (int) $d;
}
}

4
modules/philea_magistor/script/send_commande.php
View File

@ -410,7 +410,7 @@ if($magistorModule->active) {
str_replace(array("\r", "\n"), '', $ref),
0,
substr(utf8_decode(cleanChar($pack_item['name'])),0,50),
str_replace(array("\r", "\n"), "", $ean)
substr(str_replace(array("\r", "\n"), "", $ean),0,14)
);
}
$product_rows[$p_key][1] += (max($product['product_quantity'] - max($product['product_quantity_return'], $product['product_quantity_refunded']), 0) * $pack_item['pack_quantity']);
@ -425,7 +425,7 @@ if($magistorModule->active) {
str_replace(array("\r", "\n"), '', $ref),
0,
substr(utf8_decode(cleanChar($product['product_name'])),0,50),
str_replace(array("\r", "\n"), "", $ean),
substr(str_replace(array("\r", "\n"), "", $ean),0,14),
);
}
$product_rows[$p_key][1] += max($product['product_quantity'] - max($product['product_quantity_return'], $product['product_quantity_refunded']), 0);

3
modules/privatesales/AdminPrivateSalesSales.php
View File

@ -15,6 +15,7 @@ class AdminPrivateSalesSales extends AdminTab {
'liston' => array($this->l('Listing image (on)'), '380x178'),
'listoff' => array($this->l('Listing image (off)'), '380x178'),
'salebg' => array($this->l('Sale background'), '*x*'),
'mobile' => array($this->l('Listing App'), '900*450px'),
//'thumb' => array($this->l('Thumbnail'), '260x108'),
//'fb' => array($this->l('Facebook image'), '100x100'),
//'trailerbg' => array($this->l('Trailer background'), '*x*'),
@ -1207,7 +1208,7 @@ class AdminPrivateSalesSales extends AdminTab {
$images[] = 'banner_mobile';
foreach(Language::getLanguages(FALSE) as $language) {
foreach($images as $img) {
if((int)$language['id_lang'] == 3 && ($img == 'liston' || $img == 'listoff' || $img == 'thumb' || $img == 'salebg')
if((int)$language['id_lang'] == 3 && ($img == 'liston' || $img == 'listoff' || $img == 'thumb' || $img == 'salebg' || $img == 'mobile')
&& (!isset($_FILES['img_'.$img.'_'.$language['id_lang']]) || $_FILES['img_'.$img.'_'.$language['id_lang']]['name'] == '')
&& (isset($_FILES['img_'.$img.'_2']) && $_FILES['img_'.$img.'_2']['name'] != '')
) {

355
themes/site_mobile/css/jquery.fancybox-1.3.4.css
View File

File diff suppressed because one or more lines are too long