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

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

Browse Source
This commit is contained in:
root 2017-04-27 11:06:36 +02:00
commit 6ac2cb948f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bulkupdate/AdminBulkUpdate.php
View File

@ -1365,6 +1365,7 @@ class AdminBulkUpdate extends AdminTab {
ON l.`id_image` = i.`id_image` ON l.`id_image` = i.`id_image`
WHERE l.`id_lang` = '.(int) $id_lang.' WHERE l.`id_lang` = '.(int) $id_lang.'
AND i.`id_product` = '.(int) $p->id.' AND i.`id_product` = '.(int) $p->id.'
ORDER BY i.`position`
') as $img) { ') as $img) {
$link_image = str_split($img['id_image']); $link_image = str_split($img['id_image']);
$images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg'; $images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
@ -1688,6 +1689,7 @@ class AdminBulkUpdate extends AdminTab {
ON a.`id_image` = i.`id_image` ON a.`id_image` = i.`id_image`
WHERE l.`id_lang` = '.(int) $id_lang.' WHERE l.`id_lang` = '.(int) $id_lang.'
AND a.`id_product_attribute` = '.(int) $k.' AND a.`id_product_attribute` = '.(int) $k.'
ORDER BY i.`position`
') as $img) { ') as $img) {
$link_image = str_split($img['id_image']); $link_image = str_split($img['id_image']);
$c_images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg'; $c_images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';

6
modules/emarsys_rss/flux.php
View File

@ -96,7 +96,7 @@ class Catalog
$sale->description[(int) $id_lang] = $desc->get_text(); $sale->description[(int) $id_lang] = $desc->get_text();
} }
$this->setXml($sales_today, $sales_last_day, $sale_current, false, $version); $this->setXml($sales_today, $sales_last_day, $sale_current, false, $version, $test_for_tomorrow);
} }
@ -108,7 +108,7 @@ class Catalog
echo 'Fichier généré'; echo 'Fichier généré';
} }
public function setXml($sales_today, $sales_last_day, $sale_current, $rss=false, $version) public function setXml($sales_today, $sales_last_day, $sale_current, $rss=false, $version, $tomorrow=false)
{ {
$id_lang = (int) $this->versions[$version]; $id_lang = (int) $this->versions[$version];
@ -146,7 +146,7 @@ class Catalog
$sql_title = ' $sql_title = '
SELECT `title`, `preheader` SELECT `title`, `preheader`
FROM `ps_privatesale_newsletter` FROM `ps_privatesale_newsletter`
WHERE `date_pub` = CURDATE() WHERE `date_pub` = '.($tomorrow?'CURDATE() + INTERVAL 1 day':'CURDATE()').'
AND `version` = "'.$version.'"' AND `version` = "'.$version.'"'
; ;
$info_newsletter = Db::getInstance()->getRow($sql_title); $info_newsletter = Db::getInstance()->getRow($sql_title);