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

Merge branch 'ticket-11935-SuiviConversation' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-12-02 16:00:29 +01:00
commit 24a06175ba
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adm/tabs/AdminCustomerThreads.php
View File

@ -196,9 +196,11 @@ class AdminCustomerThreads extends AdminTab
$fileAttachment['name'] = $_FILES['joinFile']['name'];
$fileAttachment['mime'] = $_FILES['joinFile']['type'];
}
$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 : '');
//$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->getPageLink('contact-form.php', true).'?id_customer_thread='.(int)($ct->id).'&token='.$ct->token);
'{link}' => $link_reply);
if (Mail::Send($ct->id_lang, 'reply_msg', Mail::l('An answer to your message is available'),
$params, Tools::getValue('msg_email'), NULL, NULL, NULL, $fileAttachment, NULL,
_PS_MAIL_DIR_, true))

6
override/controllers/CartController.php
View File

@ -90,7 +90,7 @@ class CartController extends CartControllerCore
'shipping' => Sale::getShippingSale((int)$sale2->id)
);
//die('{"hasError" : true,"popup_error_cart": true, "errors" : ["'.implode(' , ',$current_sale).' - '.implode(' , ',$adding_sale).'"]}');
//die('{"hasError" : true,"popup_error_cart": true, "errors" : [" '.implode(' , ',$current_sale).' - '.implode(' , ',$adding_sale).'"]}');
if (!empty($current_sale)) {
global $smarty;
@ -105,6 +105,7 @@ class CartController extends CartControllerCore
)
|| ((int)$current_sale['shipping'] != 1 && (int)$adding_sale['shipping'] == 1)
|| ((int)$current_sale['shipping'] == 1 && (int)$adding_sale['shipping'] != 1)
|| ((int)$current_sale['shipping'] != 1 && (int)$adding_sale['shipping'] != 1)
)
) || (
((int)$current_sale['delivery_delay'] != 1 && (int)$adding_sale['delivery_delay'] == 1)
@ -116,7 +117,8 @@ class CartController extends CartControllerCore
) || (
((int)$current_sale['delivery_delay'] != 5 && (int)$adding_sale['delivery_delay'] == 5)
|| ((int)$current_sale['delivery_delay'] == 5 && (int)$adding_sale['delivery_delay'] != 5)
)) {
)
) {
// Product in cart comes from special delivery sale - only products from the same sale can be added
if (Tools::getValue('ajax') == 'true') {
die('{"hasError" : true,"popup_error_cart": true, "errors" : ["'.Tools::displayError('Sorry your cart already contains products from a sale shipped within a special period. To continue, please confirm your order or empty your cart.', false).'"]}');