Merge branch 'ticket-11935-SuiviConversation' into develop

This commit is contained in:
Marion Muszynski 2016-12-02 16:18:53 +01:00
commit 900d2dcb2c

View File

@ -196,14 +196,17 @@ class AdminCustomerThreads extends AdminTab
$fileAttachment['name'] = $_FILES['joinFile']['name'];
$fileAttachment['mime'] = $_FILES['joinFile']['type'];
}
$id_reason = Db::getInstance()->getValue('
SELECT sr.`id_reason`
FROM `'._DB_PREFIX_.'support_reason` sr
LEFT JOIN `'._DB_PREFIX_.'support_reason_customerthread` src ON (src.id_reason = sr.id_reason)
WHERE `id_customer_thread` = '.(int)($ct->id)
);
$link_reply = Tools::getShopDomain(true).__PS_BASE_URI__.'modules/ant_support_form/support.php?id_customer_thread='.(int)($ct->id).'&token='.$ct->token.(($ct->id_contact == 9 || $ct->id_contact == 1)?'&id_contact='.$ct->id_contact : '').((isset($id_reason) && $id_reason)?'&id_reason='.(int)$id_reason : '');
//$link_reply = $link->getPageLink('contact-form.php', true).'?id_customer_thread='.(int)($ct->id).'&token='.$ct->token;
if($ct->id_contact == 9 || $ct->id_contact == 1) {
$id_reason = Db::getInstance()->getValue('
SELECT sr.`id_reason`
FROM `'._DB_PREFIX_.'support_reason` sr
LEFT JOIN `'._DB_PREFIX_.'support_reason_customerthread` src ON (src.id_reason = sr.id_reason)
WHERE `id_customer_thread` = '.(int)($ct->id)
);
$link_reply = Tools::getShopDomain(true).__PS_BASE_URI__.'modules/ant_support_form/support.php?id_customer_thread='.(int)($ct->id).'&token='.$ct->token.(($ct->id_contact == 9 || $ct->id_contact == 1)?'&id_contact='.$ct->id_contact : '').((isset($id_reason) && $id_reason)?'&id_reason='.(int)$id_reason : '');
} else {
$link_reply = $link->getPageLink('contact-form.php', true).'?id_customer_thread='.(int)($ct->id).'&token='.$ct->token;
}
$params = array(
'{reply}' => nl2br2(Tools::getValue('reply_message')),
'{link}' => $link_reply);