';
}
$content .= Tools::safeOutput($message['message']);
@@ -1079,7 +1211,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$ct->id_contact = $id_contact;
$ct->id_lang = (int)Configuration::get('PS_LANG_DEFAULT');
$ct->id_shop = $this->context->shop->id; //new customer threads for unrecognized mails are not shown without shop id
- $ct->status = 'open';
+ $ct->status = CustomerThread::QLO_CUSTOMER_THREAD_STATUS_OPEN;
$ct->token = Tools::passwdGen(12);
$ct->add();
} else {
diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php
index b933780ad..47159695d 100644
--- a/controllers/admin/AdminEmailsController.php
+++ b/controllers/admin/AdminEmailsController.php
@@ -80,25 +80,11 @@ class AdminEmailsControllerCore extends AdminController
}
parent::__construct();
-
- foreach (Contact::getContacts($this->context->language->id) as $contact) {
- $arr[] = array('email_message' => $contact['id_contact'], 'name' => $contact['name']);
- }
-
$this->fields_options = array(
'email' => array(
'title' => $this->l('Email'),
'icon' => 'icon-envelope',
- 'fields' => array(
- 'PS_MAIL_EMAIL_MESSAGE' => array(
- 'title' => $this->l('Send email to'),
- 'desc' => $this->l('Where customers send messages from the order page.'),
- 'validation' => 'isUnsignedId',
- 'type' => 'select',
- 'cast' => 'intval',
- 'identifier' => 'email_message',
- 'list' => $arr
- ),
+ 'fields' => array(
'PS_MAIL_METHOD' => array(
'title' => '',
'validation' => 'isGenericName',
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index b852574d7..9c33b112a 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1424,7 +1424,7 @@ class AdminOrdersControllerCore extends AdminController
$customer_thread->id_order = (int)$order->id;
$customer_thread->id_lang = (int)$this->context->language->id;
$customer_thread->email = $customer->email;
- $customer_thread->status = 'open';
+ $customer_thread->status = CustomerThread::QLO_CUSTOMER_THREAD_STATUS_OPEN;
$customer_thread->token = Tools::passwdGen(12);
$customer_thread->add();
} else {
@@ -3036,6 +3036,13 @@ class AdminOrdersControllerCore extends AdminController
}
}
}
+
+ $objCustomerThread = new CustomerThread();
+ $messages = Message::getMessagesByOrderId($order->id, true);
+ if ($customerMessages = CustomerMessage::getMessagesByOrderId($order->id, true)) {
+ $messages = array_merge($messages, $customerMessages);
+ }
+
$this->tpl_view_vars = array(
'guestFormattedAddress' => $guestFormattedAddress,
'idOrderAddressInvoice' => $idOrderAddressInvoice,
@@ -3080,8 +3087,9 @@ class AdminOrdersControllerCore extends AdminController
'discounts' => $order->getCartRules(),
'total_paid' => $order->getTotalPaid(),
'customer_thread_message' => CustomerThread::getCustomerMessages($order->id_customer, null, $order->id),
+ 'id_customer_thread' => $objCustomerThread->getIdCustomerThreadByIdOrder($order->id),
'orderMessages' => OrderMessage::getOrderMessages($order->id_lang),
- 'messages' => Message::getMessagesByOrderId($order->id, true),
+ 'messages' => $messages,
'carrier' => new Carrier($order->id_carrier),
'history' => $history,
'order_payment_detail' => $order_payment_detail,
diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index 226909df4..b3b863326 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -39,16 +39,40 @@ class ContactControllerCore extends FrontController
$saveContactKey = $this->context->cookie->contactFormKey;
$extension = array('.txt', '.rtf', '.doc', '.docx', '.pdf', '.zip', '.png', '.jpeg', '.gif', '.jpg');
$file_attachment = Tools::fileAttachment('fileUpload');
- $message = Tools::getValue('message'); // Html entities is not usefull, iscleanHtml check there is no bad html tags.
+ $message = trim(Tools::getValue('message')); // Html entities is not usefull, iscleanHtml check there is no bad html tags.
$url = Tools::getValue('url');
+ $phone = Tools::getValue('phone');
+ $subject = trim(Tools::getValue('subject'));
+ $userName = Tools::getValue('user_name');
+ $id_contact = (int)Tools::getValue('id_contact');
+ $objCustomerThread = new CustomerThread();
+ $id_customer_thread = (int)$objCustomerThread->getIdCustomerThreadByToken(Tools::getValue('token'));
+ $nameRequired = Configuration::get('PS_CUSTOMER_SERVICE_NAME_REQUIRED');
+ $phoneRequired = Configuration::get('PS_CUSTOMER_SERVICE_PHONE_REQUIRED');
+ if (!Configuration::get('PS_CUSTOMER_SERVICE_CONTACT_ALLOW')) {
+ $id_contact = (int) Configuration::get('PS_CUSTOMER_SERVICE_EMAIL_MESSAGE');
+ }
+
if (!($from = trim(Tools::getValue('from'))) || !Validate::isEmail($from)) {
$this->errors[] = Tools::displayError('Invalid email address.');
} elseif (!$message) {
$this->errors[] = Tools::displayError('The message cannot be blank.');
} elseif (!Validate::isCleanHtml($message)) {
$this->errors[] = Tools::displayError('Invalid message');
- } elseif (!($id_contact = (int)Tools::getValue('id_contact')) || !(Validate::isLoadedObject($contact = new Contact($id_contact, $this->context->language->id)))) {
- $this->errors[] = Tools::displayError('Please select a subject from the list provided. ');
+ } elseif (!$id_customer_thread && !$subject) {
+ $this->errors[] = Tools::displayError('The subject cannot be blank.');
+ } elseif (!$id_customer_thread && !Validate::isCleanHtml($subject)) {
+ $this->errors[] = Tools::displayError('Invalid subject$subject');
+ } else if (!$id_customer_thread && $nameRequired && !trim($userName)) {
+ $this->errors[] = Tools::displayError('Name is required.');
+ } else if (!$id_customer_thread && trim($nameRequired) && !Validate::isGenericName($userName)) {
+ $this->errors[] = Tools::displayError('Invalid name.');
+ } else if (!$id_customer_thread && $phoneRequired && !trim($phone)) {
+ $this->errors[] = Tools::displayError('Phone is required.');
+ } else if (!$id_customer_thread && trim($phone) && !Validate::isPhoneNumber($phone)) {
+ $this->errors[] = Tools::displayError('Invalid Phone number.');
+ } elseif (!Validate::isLoadedObject($contact = new Contact($id_contact, $this->context->language->id))) {
+ $this->errors[] = Tools::displayError('Please select a subject from the list provided.');
} elseif (!empty($file_attachment['name']) && $file_attachment['error'] != 0) {
$this->errors[] = Tools::displayError('An error occurred during the file-upload process.');
} elseif (!empty($file_attachment['name']) && !in_array(Tools::strtolower(substr($file_attachment['name'], -4)), $extension) && !in_array(Tools::strtolower(substr($file_attachment['name'], -5)), $extension)) {
@@ -71,44 +95,15 @@ class ContactControllerCore extends FrontController
$id_order = (int) $order->id_customer === (int) $customer->id ? $id_order : 0;
}
- if (!((
- ($id_customer_thread = (int)Tools::getValue('id_customer_thread'))
- && (int)Db::getInstance()->getValue('
- SELECT cm.id_customer_thread FROM '._DB_PREFIX_.'customer_thread cm
- WHERE cm.id_customer_thread = '.(int)$id_customer_thread.' AND cm.id_shop = '.(int)$this->context->shop->id.' AND token = \''.pSQL(Tools::getValue('token')).'\'')
- ) || (
- $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($from, $id_order, $id_contact)
- ))) {
- $fields = Db::getInstance()->executeS('
- SELECT cm.id_customer_thread, cm.id_contact, cm.id_customer, cm.id_order, cm.id_product, cm.email
- FROM '._DB_PREFIX_.'customer_thread cm
- WHERE email = \''.pSQL($from).'\' AND cm.id_shop = '.(int)$this->context->shop->id.' AND ('.
- ($customer->id ? 'id_customer = '.(int)$customer->id.' OR ' : '').'
- id_order = '.(int)$id_order.')');
- $score = 0;
- foreach ($fields as $key => $row) {
- $tmp = 0;
- if ((int)$row['id_customer'] && $row['id_customer'] != $customer->id && $row['email'] != $from) {
- continue;
- }
- if ($row['id_order'] != 0 && $id_order != $row['id_order']) {
- continue;
- }
- if ($row['email'] == $from) {
- $tmp += 4;
- }
- if ($row['id_contact'] == $id_contact) {
- $tmp++;
- }
- if (Tools::getValue('id_product') != 0 && $row['id_product'] == Tools::getValue('id_product')) {
- $tmp += 2;
- }
- if ($tmp >= 5 && $tmp >= $score) {
- $score = $tmp;
- $id_customer_thread = $row['id_customer_thread'];
- }
- }
+ if (!$id_customer_thread) {
+ $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder(
+ $from,
+ $id_order,
+ $id_contact,
+ ' AND a.`status` !='. CustomerThread::QLO_CUSTOMER_THREAD_STATUS_CLOSED
+ );
}
+
$old_message = Db::getInstance()->getValue('
SELECT cm.message FROM '._DB_PREFIX_.'customer_message cm
LEFT JOIN '._DB_PREFIX_.'customer_thread cc on (cm.id_customer_thread = cc.id_customer_thread)
@@ -123,13 +118,10 @@ class ContactControllerCore extends FrontController
if ($contact->customer_service) {
if ((int)$id_customer_thread) {
$ct = new CustomerThread($id_customer_thread);
- $ct->status = 'open';
+ $ct->status = CustomerThread::QLO_CUSTOMER_THREAD_STATUS_OPEN;
$ct->id_lang = (int)$this->context->language->id;
$ct->id_contact = (int)$id_contact;
$ct->id_order = (int)$id_order;
- if ($id_product = (int)Tools::getValue('id_product')) {
- $ct->id_product = $id_product;
- }
$ct->update();
} else {
$ct = new CustomerThread();
@@ -137,14 +129,13 @@ class ContactControllerCore extends FrontController
$ct->id_customer = (int)$customer->id;
}
$ct->id_shop = (int)$this->context->shop->id;
- $ct->id_order = (int)$id_order;
- if ($id_product = (int)Tools::getValue('id_product')) {
- $ct->id_product = $id_product;
- }
+ $ct->phone = $phone;
+ $ct->user_name = $userName;
+ $ct->subject = $subject;
$ct->id_contact = (int)$id_contact;
$ct->id_lang = (int)$this->context->language->id;
$ct->email = $from;
- $ct->status = 'open';
+ $ct->status = CustomerThread::QLO_CUSTOMER_THREAD_STATUS_OPEN;
$ct->token = Tools::passwdGen(12);
$ct->add();
}
@@ -153,6 +144,9 @@ class ContactControllerCore extends FrontController
$cm = new CustomerMessage();
$cm->id_customer_thread = $ct->id;
$cm->message = $message;
+ if ($id_product = (int)Tools::getValue('id_product')) {
+ $cm->id_product = $id_product;
+ }
if (isset($file_attachment['rename']) && !empty($file_attachment['rename']) && rename($file_attachment['tmp_name'], _PS_UPLOAD_DIR_.basename($file_attachment['rename']))) {
$cm->file_name = $file_attachment['rename'];
@chmod(_PS_UPLOAD_DIR_.basename($file_attachment['rename']), 0664);
@@ -266,21 +260,21 @@ class ContactControllerCore extends FrontController
'max_upload_size' => (int)Tools::getMaxUploadSize()
));
- if (($id_customer_thread = (int)Tools::getValue('id_customer_thread')) && $token = Tools::getValue('token')) {
- $customer_thread = Db::getInstance()->getRow('
+ if ($token = Tools::getValue('token')) {
+ if ($customer_thread = Db::getInstance()->getRow('
SELECT cm.*
FROM '._DB_PREFIX_.'customer_thread cm
- WHERE cm.id_customer_thread = '.(int)$id_customer_thread.'
- AND cm.id_shop = '.(int)$this->context->shop->id.'
+ WHERE cm.id_shop = '.(int)$this->context->shop->id.'
AND token = \''.pSQL($token).'\'
- ');
-
- $order = new Order((int)$customer_thread['id_order']);
- if (Validate::isLoadedObject($order)) {
- $customer_thread['reference'] = $order->getUniqReference();
+ ')) {
+ $order = new Order((int)$customer_thread['id_order']);
+ if (Validate::isLoadedObject($order)) {
+ $customer_thread['reference'] = $order->getUniqReference();
+ }
+ $this->context->smarty->assign('customerThread', $customer_thread);
}
- $this->context->smarty->assign('customerThread', $customer_thread);
}
+
// Send Hotel location information
$gblHtlAddress = Configuration::get('WK_HOTEL_GLOBAL_ADDRESS');
$gblHtlPhone = Configuration::get('WK_HOTEL_GLOBAL_CONTACT_NUMBER');
@@ -320,6 +314,9 @@ class ContactControllerCore extends FrontController
'contacts' => Contact::getContacts($this->context->language->id),
'message' => html_entity_decode(Tools::getValue('message')),
'contactKey' => $contactKey,
+ 'contactNameRequired' => Configuration::get('PS_CUSTOMER_SERVICE_NAME_REQUIRED'),
+ 'contactPhoneRequired' => Configuration::get('PS_CUSTOMER_SERVICE_PHONE_REQUIRED'),
+ 'allowContactSelection' => Configuration::get('PS_CUSTOMER_SERVICE_CONTACT_ALLOW')
)
);
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index 3b15a99b6..892273c29 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -695,21 +695,23 @@ class OrderDetailControllerCore extends FrontController
$ct->id_contact = 0;
$ct->id_customer = (int)$order->id_customer;
$ct->id_shop = (int)$this->context->shop->id;
- if ($id_product && $order->orderContainProduct($id_product)) {
- $ct->id_product = $id_product;
- }
$ct->id_order = (int)$order->id;
$ct->id_lang = (int)$this->context->language->id;
$ct->email = $this->context->customer->email;
- $ct->status = 'open';
+ $ct->status = CustomerThread::QLO_CUSTOMER_THREAD_STATUS_OPEN;
$ct->token = Tools::passwdGen(12);
$ct->add();
} else {
$ct = new CustomerThread((int)$id_customer_thread);
- $ct->status = 'open';
+ $ct->status = CustomerThread::QLO_CUSTOMER_THREAD_STATUS_OPEN;
$ct->update();
}
+ if ($id_product && $order->orderContainProduct($id_product)) {
+ $cm->id_product = $id_product;
+ }
+
+ $cm->user_agent = $_SERVER['HTTP_USER_AGENT'];
$cm->id_customer_thread = $ct->id;
$cm->message = $msgText;
$cm->ip_address = (int)ip2long($_SERVER['REMOTE_ADDR']);
@@ -819,4 +821,4 @@ class OrderDetailControllerCore extends FrontController
}
}
}
-}
\ No newline at end of file
+}
diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql
index de57c4024..ed8b8c64e 100644
--- a/install/data/db_structure.sql
+++ b/install/data/db_structure.sql
@@ -633,6 +633,7 @@ CREATE TABLE `PREFIX_customer_message` (
`id_customer_thread` int(11) DEFAULT NULL,
`id_employee` int(10) unsigned DEFAULT NULL,
`message` MEDIUMTEXT NOT NULL,
+ `id_product` int(10) unsigned DEFAULT NULL,
`file_name` varchar(18) DEFAULT NULL,
`ip_address` varchar(16) DEFAULT NULL,
`user_agent` varchar(128) DEFAULT NULL,
@@ -658,8 +659,10 @@ CREATE TABLE `PREFIX_customer_thread` (
`id_contact` int(10) unsigned NOT NULL,
`id_customer` int(10) unsigned DEFAULT NULL,
`id_order` int(10) unsigned DEFAULT NULL,
- `id_product` int(10) unsigned DEFAULT NULL,
- `status` enum('open','closed','pending1','pending2') NOT NULL DEFAULT 'open',
+ `user_name` VARCHAR(128) DEFAULT NULL,
+ `phone` VARCHAR(32) DEFAULT NULL,
+ `subject` TEXT DEFAULT NULL,
+ `status` INT(10) NOT NULL DEFAULT 1,
`email` varchar(128) NOT NULL,
`token` varchar(12) DEFAULT NULL,
`date_add` datetime NOT NULL,
diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
index 490e2b691..1b6169fc9 100644
--- a/install/data/xml/configuration.xml
+++ b/install/data/xml/configuration.xml
@@ -946,6 +946,15 @@
0
+
+
+ 1
+
+
+ 1
+
+
+ 1
diff --git a/js/admin/customer_thread.js b/js/admin/customer_thread.js
new file mode 100644
index 000000000..bee35d067
--- /dev/null
+++ b/js/admin/customer_thread.js
@@ -0,0 +1,32 @@
+/*
+* Copyright since 2010 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through this link for complete license : https://store.webkul.com/license.html
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
+*
+* @author Webkul IN
+* @copyright Since 2010 Webkul IN
+* @license https://store.webkul.com/license.html
+*/
+
+$(document).ready(function() {
+ if ($('#PS_CUSTOMER_SERVICE_CONTACT_ALLOW_on').prop('checked')) {
+ $('[name="PS_CUSTOMER_SERVICE_EMAIL_MESSAGE"]').closest('.form-group').hide();
+ }
+
+ $(document).on('change', '[name="PS_CUSTOMER_SERVICE_CONTACT_ALLOW"]', function() {
+ if ($('#PS_CUSTOMER_SERVICE_CONTACT_ALLOW_on').prop('checked')) {
+ $('[name="PS_CUSTOMER_SERVICE_EMAIL_MESSAGE"]').closest('.form-group').hide();
+ } else {
+ $('[name="PS_CUSTOMER_SERVICE_EMAIL_MESSAGE"]').closest('.form-group').show();
+ }
+ });
+});
diff --git a/mails/en/reply_msg.html b/mails/en/reply_msg.html
index b26a5a41d..c71767da6 100644
--- a/mails/en/reply_msg.html
+++ b/mails/en/reply_msg.html
@@ -4,51 +4,51 @@
Message from {shop_name}
-
-
-
@@ -66,31 +66,29 @@
-
-
-
- Hi {firstname} {lastname},
-
-
-
-
-
-
-
- {reply}
-
-
-
-
-
-
-
-
- Please do not reply directly to this email, we will not receive it.
- In order to reply, please use the following link: {link}
-
-
-
+
+
+ {headingtext}
+
+
+
+
+
+
+
+ {reply}
+
+
+
+
+
+
+
+
+ Please do not reply directly to this email, we will not receive it.
+ In order to reply, you can click here
+
+
diff --git a/mails/en/reply_msg.txt b/mails/en/reply_msg.txt
index 6c91280e4..c654fa2df 100644
--- a/mails/en/reply_msg.txt
+++ b/mails/en/reply_msg.txt
@@ -1,14 +1,14 @@
-[/{shop_url}]
+[/{shop_url}]
-Hi {firstname} {lastname},
+{headingtext},
-{reply}
+{reply}
-Please do not reply directly to this email, we will not receive it.
+Please do not reply directly to this email, we will not receive it.
-In order to reply, please use the following link: {link} [/{link}]
+In order to reply, you can click here [/{link}].
{shop_name} [/{shop_url}] powered by Webkul(tm)
-[https://webkul.com]
+[https://webkul.com]
diff --git a/themes/hotel-reservation-theme/contact-form.tpl b/themes/hotel-reservation-theme/contact-form.tpl
index 6a5aedbe0..144a56043 100644
--- a/themes/hotel-reservation-theme/contact-form.tpl
+++ b/themes/hotel-reservation-theme/contact-form.tpl
@@ -70,25 +70,56 @@
{/if}