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

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-24 11:30:02 +01:00
commit e02f19c21b
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
adm/scaddressedit.php
View File

@ -55,7 +55,25 @@ if($address) {
WHERE id_cart = '.pSQL(intval(Tools::getValue('id_cart'))).'
');
/* mail('marion@antadis.com', '[BBB] Modif transporteur BO',
/* Log modif Address to check errors */
if($address['prfirstname'] != $address['cefirstname']
|| $address['cefirstname'] != Tools::getValue('cefirstname', '')
|| $address['cename'] != Tools::getValue('cename', '')) {
$message = 'Modification address Socol -- id_order :'.$order['id_order'];
$message .= ' -- ancien prfirstname : '.$address['prfirstname'].' remplacé par : '.Tools::getValue('prfirstname', '');
$message .= ' -- ancien cefirstname : '.$address['cefirstname'].' remplacé par : '.Tools::getValue('cefirstname', '');
$message .= ' -- ancien cename : '.$address['cename'].' remplacé par : '.Tools::getValue('cename', '');
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'ant_log`
VALUES (
DEFAULT,
'.(int) $cookie->id_employee.',
"'.pSQL($message).'",
NOW()
)
');
}
/* mail('marion@antadis.com', '[BBB] Modif transporteur BO',
'ID Customer : ' . $address['id_customer'].
' , ID Order : ' . $order['id_order'].
' , Date Order : ' . $order['date_add'].

5
themes/site/css/style.css
View File

@ -7200,6 +7200,11 @@ table#carrierTable tbody td {
width: 700px;
}
/* Order Carrier (socol) */
#super-selector {
display: none!important;
}
/* Mondial Relay */
#relay_point_selected_box{
border: 1px solid #BDC2C9;

6
themes/site_mobile/css/style.css
View File

@ -5116,3 +5116,9 @@ h3.gift_title {
line-height: 16px;
font-size: 13px;
}
/* Order Carrier (socol) */
#super-selector {
display: none!important;
}