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

fix conflict

Browse Source
This commit is contained in:
Thibault GUILLAUME 2016-04-04 11:49:45 +02:00
commit 5beaf8e77e
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adm/tabs/AdminImport.php
View File

@ -792,10 +792,10 @@ class AdminImport extends AdminTab
VALUES ( VALUES (
'.(int) $product->id.', '.(int) $product->id.',
"'.pSQL($product->nc8).'", "'.pSQL($product->nc8).'",
'. pSQL($product->origin_country_id).' "'. pSQL($product->origin_country_id).'"
) )
ON DUPLICATE KEY UPDATE `nc8` = "'.pSQL($product->nc8).'", ON DUPLICATE KEY UPDATE `nc8` = "'.pSQL($product->nc8).'",
`id_country` = '.pSQL($product->origin_country_id).' `id_country` = "'.pSQL($product->origin_country_id).'"
'); ');
} }

5
adm/tabs/AdminProducts.php
View File

@ -286,6 +286,7 @@ class AdminProducts extends AdminTab
ORDER BY cp.id_product ORDER BY cp.id_product
'); ');
$products = array_merge($first_products,$second_products); $products = array_merge($first_products,$second_products);
// Update des postions // Update des postions
foreach ($products as $key => $product) { foreach ($products as $key => $product) {
@ -1381,10 +1382,10 @@ class AdminProducts extends AdminTab
VALUES ( VALUES (
'.(int) $object->id.', '.(int) $object->id.',
"'.pSQL(Tools::getValue('nc8')).'", "'.pSQL(Tools::getValue('nc8')).'",
'.pSQL(Tools::getValue('id_country')).' "'.pSQL(Tools::getValue('id_country')).'"
) )
ON DUPLICATE KEY UPDATE `nc8` = "'.pSQL(Tools::getValue('nc8')).'", ON DUPLICATE KEY UPDATE `nc8` = "'.pSQL(Tools::getValue('nc8')).'",
`id_country` = '.pSQL(Tools::getValue('id_country')).' `id_country` = "'.pSQL(Tools::getValue('id_country')).'"
'); ');
if (Validate::isLoadedObject($object)) if (Validate::isLoadedObject($object))

8
modules/ant_alert/ant_alert.php
View File

@ -82,13 +82,13 @@ class Ant_Alert extends Module
); );
if ((int)$open_messages['total'] >= (int)Configuration::get('ANT_ALTER_LIMIT')) { if ((int)$open_messages['total'] >= (int)Configuration::get('ANT_ALTER_LIMIT')) {
// dev // dev
$to = array('marion@antadis.com'); // $to = array('marion@antadis.com');
// prod // prod
/*$to = array( $to = array(
'frederic@bebeboutik.com', 'frederic@bebeboutik.com',
'jacques@bebeboutik.com', 'jacques@bebeboutik.com',
'valentin@bebeboutik.com' 'valentin@bebeboutik.com',
);*/ );
$data = array( $data = array(
'{limit}' => (int)Configuration::get('ANT_ALTER_LIMIT'), '{limit}' => (int)Configuration::get('ANT_ALTER_LIMIT'),
'{hours}' => (int)Configuration::get('ANT_ALTER_HOURS'), '{hours}' => (int)Configuration::get('ANT_ALTER_HOURS'),

2
themes/site/product.tpl
View File

@ -199,7 +199,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</ul>*} </ul>*}
<div class="facebook_like"> <div class="facebook_like">
<iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;layout=standard&amp;show_faces=false&amp;width=420&amp;action=like&amp;colorscheme=light" scrolling="no" frameborder="0" allowTransparency="true" style="border:none; overflow:hidden; width:420px; height:35px; margin-left:0px; margin-top:10px; margin-bottom: 20px"></iframe> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;layout=standard&amp;show_faces=false&amp;width=420&amp;action=like&amp;colorscheme=light" scrolling="no" frameborder="0" allowTransparency="true" style="border:none; overflow:hidden; width:420px; height:35px; margin-left:0px; margin-top:10px; margin-bottom: 20px"></iframe>
</div> </div>
</div> </div>

8
themes/site_mobile/product.tpl
View File

@ -383,14 +383,6 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</form> </form>
{/if} {/if}
<div class="facebook_like"> <div class="facebook_like">
<iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2FBricoPrive&amp;send=false&amp;layout=standard&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=35" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:35px;" allowTransparency="true" style="border:none; overflow:hidden; width:420px; height:35px; margin-left:0px; margin-top:10px; margin-bottom: 20px"></iframe> <iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2FBricoPrive&amp;send=false&amp;layout=standard&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=35" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:35px;" allowTransparency="true" style="border:none; overflow:hidden; width:420px; height:35px; margin-left:0px; margin-top:10px; margin-bottom: 20px"></iframe>
</div> </div>