Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into gli-758

Browse Source
This commit is contained in:
Shreesh Arora
2022-11-09 16:21:10 +05:30
parent dbd7e0fb66 92ec35ee71
commit 50b61ca1f5
2745 changed files with 201353 additions and 10234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/admin/AdminCustomerThreadsController.php
View File

@@ -366,6 +366,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$current_employee->email,
$current_employee->firstname.' '.$current_employee->lastname,
null, null, _PS_MAIL_DIR_, true)) {
$cm->id_employee = (int)$employee->id;
$cm->private = 1;
$cm->message = $this->l('Message forwarded to').' '.$employee->firstname.' '.$employee->lastname."\n".$this->l('Comment:').' '.$message;
$cm->add();
@@ -458,7 +459,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
public function initContent()
{
if (isset($_GET['filename']) && (bool)Tools::file_get_contents($context->link->getMediaLink(_THEME_PROD_PIC_DIR_.$_GET['filename'])) && Validate::isFileName($_GET['filename'])) { // by webkul
if (isset($_GET['filename']) && (bool)Tools::file_get_contents($this->context->link->getMediaLink(_THEME_PROD_PIC_DIR_.$_GET['filename'])) && Validate::isFileName($_GET['filename'])) { // by webkul
AdminCustomerThreadsController::openUploadedFile();
}
@@ -546,7 +547,6 @@ class AdminCustomerThreadsControllerCore extends AdminController
return;
}
$this->context = Context::getContext();
if (!($thread = $this->loadObject())) {
return;
}
@@ -786,7 +786,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
'thread_url' => Tools::getAdminUrl(basename(_PS_ADMIN_DIR_).'/'.
$this->context->link->getAdminLink('AdminCustomerThreads').'&id_customer_thread='
.(int)$message['id_customer_thread'].'&viewcustomer_thread=1'),
'link' => Context::getContext()->link,
'link' => $this->context->link,
'current' => self::$currentIndex,
'token' => $this->token,
'message' => $message,
@@ -794,7 +794,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
'email' => $email,
'id_employee' => $id_employee,
'PS_SHOP_NAME' => Configuration::get('PS_SHOP_NAME'),
'file_name' => (bool)Tools::file_get_contents($context->link->getMediaLink(_THEME_PROD_PIC_DIR_.$message['file_name'])), // by webkul
'file_name' => (bool)Tools::file_get_contents($this->context->link->getMediaLink(_THEME_PROD_PIC_DIR_.$message['file_name'])), // by webkul
'contacts' => $contacts,
'is_valid_order_id' => $is_valid_order_id
));