Merge branch 'ticket-12487-HTTPS3'

This commit is contained in:
Marion Muszynski 2017-04-10 16:31:37 +02:00
commit d8515e1fca

View File

@ -70,14 +70,14 @@ class Catalog
$this->_xml .= '<catalogue>';
//Shop details
$this->_xml .= '<infos_boutique>';
$this->_xml .= '<logo>http://www.bebeboutik.com/img/logo.png</logo>';
$this->_xml .= '<logo>https://www.bebeboutik.com/img/logo.png</logo>';
$this->_xml .= '<nom>bebeboutik.com</nom>';
if (Tools::getValue('partenaire')
&& Tools::getValue('partenaire') == "family_deal") {
$this->_xml .= '<url><![CDATA[http://www.bebeboutik.com/invite/MjAxMy0xMC0y=02bj5yapRXdvJWZiVmYAxWYlRWL5xWatFmZ&lp=mosaique-enfant]]></url>';
$this->_xml .= '<url><![CDATA[https://www.bebeboutik.com/invite/MjAxMy0wNC0z=02bj5yapRXdvJWZiVmYANWasJWdwtCdjFGdu92Y&lp=mosaique-enfant?utm_source=publicidees&utm_medium=CPL]]></url>';
} else {
$this->_xml .= '<url>www.bebeboutik.com</url>';
$this->_xml .= '<url>https://www.bebeboutik.com</url>';
}
$this->_xml .= '</infos_boutique>';
@ -90,7 +90,7 @@ class Catalog
$this->_xml .= '<date_debut>'.$item->date_start.'</date_debut>';
$this->_xml .= '<date_fin>'.$item->date_end.'</date_fin>';
$this->_xml .= '<reduction>'.$item->reduction.'</reduction>';
$this->_xml .= '<image_vente>http://www.bebeboutik.com/modules/privatesales/img/'.$item->id.'/liston_'.(int) $id_lang.'.jpg</image_vente>';
$this->_xml .= '<image_vente>https://www.bebeboutik.com/modules/privatesales/img/'.$item->id.'/liston_'.(int) $id_lang.'.jpg</image_vente>';
$this->_xml.='</vente>';