Merge pull request #988 from shreesh-webkul/gli-1913

Fixed: Unable to send customer request mail from contact us page
This commit is contained in:
Rohit Jain
2024-06-25 20:20:55 +05:30
committed by GitHub
2 changed files with 255 additions and 262 deletions

View File

@@ -115,99 +115,112 @@ class ContactControllerCore extends FrontController
WHERE cc.id_customer_thread = '.(int)$id_customer_thread.' AND cc.id_shop = '.(int)$this->context->shop->id.'
ORDER BY cm.date_add DESC');
if ($old_message == $message) {
$this->context->smarty->assign('alreadySent', 1);
$this->errors[] = Tools::displayError('Your message has already been sent.');
$_POST = array();
$contact->email = '';
$contact->customer_service = 0;
}
if ($contact->customer_service) {
if ((int)$id_customer_thread) {
$ct = new CustomerThread($id_customer_thread);
$ct->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;
} else {
if ($contact->customer_service) {
if ((int)$id_customer_thread) {
$ct = new CustomerThread($id_customer_thread);
$ct->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();
if (isset($customer->id)) {
$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->id_contact = (int)$id_contact;
$ct->id_lang = (int)$this->context->language->id;
$ct->email = $from;
$ct->status = 'open';
$ct->token = Tools::passwdGen(12);
$ct->add();
}
$ct->update();
} else {
$ct = new CustomerThread();
if (isset($customer->id)) {
$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->id_contact = (int)$id_contact;
$ct->id_lang = (int)$this->context->language->id;
$ct->email = $from;
$ct->status = 'open';
$ct->token = Tools::passwdGen(12);
$ct->add();
}
if ($ct->id) {
$cm = new CustomerMessage();
$cm->id_customer_thread = $ct->id;
$cm->message = $message;
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);
}
$cm->ip_address = (int)ip2long(Tools::getRemoteAddr());
$cm->user_agent = $_SERVER['HTTP_USER_AGENT'];
if (!$cm->add()) {
$this->errors[] = Tools::displayError('An error occurred while sending the message.');
}
} else {
$this->errors[] = Tools::displayError('An error occurred while sending the message.');
}
}
if (!count($this->errors)) {
$var_list = array(
'{order_name}' => '-',
'{attached_file}' => '-',
'{message}' => Tools::nl2br(stripslashes($message)),
'{email}' => $from,
'{product_name}' => '',
);
if (isset($file_attachment['name'])) {
$var_list['{attached_file}'] = $file_attachment['name'];
}
$id_product = (int)Tools::getValue('id_product');
if (isset($ct) && Validate::isLoadedObject($ct) && $ct->id_order) {
$order = new Order((int)$ct->id_order);
$var_list['{order_name}'] = $order->getUniqReference();
$var_list['{id_order}'] = (int)$order->id;
}
if ($id_product) {
$product = new Product((int)$id_product);
if (Validate::isLoadedObject($product) && isset($product->name[Context::getContext()->language->id])) {
$var_list['{product_name}'] = $product->name[Context::getContext()->language->id];
}
}
if (!empty($contact->email)) {
if (!Mail::Send($this->context->language->id, 'contact', Mail::l('Message from contact form').' [no_sync]',
$var_list, $contact->email, $contact->name, null, null,
$file_attachment, null, _PS_MAIL_DIR_, false, null, null, $from)) {
if ($ct->id) {
$cm = new CustomerMessage();
$cm->id_customer_thread = $ct->id;
$cm->message = $message;
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);
}
$cm->ip_address = (int)ip2long(Tools::getRemoteAddr());
$cm->user_agent = $_SERVER['HTTP_USER_AGENT'];
if (!$cm->add()) {
$this->errors[] = Tools::displayError('An error occurred while sending the message.');
}
} else {
$this->errors[] = Tools::displayError('An error occurred while sending the message.');
}
}
}
if (count($this->errors) > 1) {
array_unique($this->errors);
} elseif (!count($this->errors)) {
$this->context->smarty->assign('confirmation', 1);
if (!count($this->errors)) {
$var_list = array(
'{order_name}' => '-',
'{attached_file}' => '-',
'{message}' => Tools::nl2br(stripslashes($message)),
'{email}' => $from,
'{product_name}' => '',
);
if (isset($file_attachment['name'])) {
$var_list['{attached_file}'] = $file_attachment['name'];
}
$id_product = (int)Tools::getValue('id_product');
if (isset($ct) && Validate::isLoadedObject($ct) && $ct->id_order) {
$order = new Order((int)$ct->id_order);
$var_list['{order_name}'] = $order->getUniqReference();
$var_list['{id_order}'] = (int)$order->id;
}
if ($id_product) {
$product = new Product((int)$id_product);
if (Validate::isLoadedObject($product) && isset($product->name[Context::getContext()->language->id])) {
$var_list['{product_name}'] = $product->name[Context::getContext()->language->id];
}
}
if (!empty($contact->email)) {
Mail::Send(
$this->context->language->id,
'contact',
Mail::l('Message from contact form').' [no_sync]',
$var_list,
$contact->email,
$contact->name,
null,
null,
$file_attachment,
null,
_PS_MAIL_DIR_,
false,
null,
null,
$from
);
}
}
if (count($this->errors) > 1) {
array_unique($this->errors);
} elseif (!count($this->errors)) {
Tools::redirect($this->context->link->getPageLink('contact', null, null, array('confirm' => 1)));
}
}
}
}
@@ -312,6 +325,7 @@ class ContactControllerCore extends FrontController
}
}
//End
$this->setTemplate(_PS_THEME_DIR_.'contact-form.tpl');
}

View File

@@ -23,196 +23,175 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{if isset($confirmation)}
{if isset($smarty.get.confirm)}
<p class="alert alert-success">{l s='Your message has been successfully sent to our team.'}</p>
<ul class="footer_links clearfix">
<li>
<a class="btn btn-default button button-small" href="{if isset($force_ssl) && $force_ssl}{$base_dir_ssl}{else}{$base_dir}{/if}">
<span>
<i class="icon-chevron-left"></i>{l s='Home'}
</span>
</a>
</li>
</ul>
{elseif isset($alreadySent)}
<p class="alert alert-warning">{l s='Your message has already been sent.'}</p>
<ul class="footer_links clearfix">
<li>
<a class="btn btn-default button button-small" href="{if isset($force_ssl) && $force_ssl}{$base_dir_ssl}{else}{$base_dir}{/if}">
<span>
<i class="icon-chevron-left"></i>{l s='Home'}
</span>
</a>
</li>
</ul>
{else}
{include file="$tpl_dir./errors.tpl"}
<div class="margin-top-50 htl-contact-page">
<div class="row">
<p class="contact-header col-sm-offset-2 col-sm-8">{l s='Contact Us'}</p>
<p class="contact-desc col-sm-offset-2 col-sm-8">{l s='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry`s standard dummy text.'}</p>
</div>
<div class="row margin-top-50">
{if (isset($gblHtlAddress) && $gblHtlAddress) && (isset($gblHtlPhone) && $gblHtlPhone) && (isset($gblHtlEmail) && $gblHtlEmail)}
<div class="col-sm-6">
<div class="htl-global-address-div col-md-8 col-sm-12">
{if isset($gblHtlPhone) && $gblHtlPhone }
<div>
<p class="global-address-header">{l s='Main Branch'}</p>
<p class="global-address-value">
{$gblHtlAddress}
</p>
</div>
{/if}
{if isset($gblHtlPhone) && $gblHtlPhone}
<div>
<p class="global-address-header">{l s='Phone'}</p>
<p class="global-address-value">
{$gblHtlPhone}
</p>
</div>
{/if}
{if isset($gblHtlEmail) && $gblHtlEmail}
<div>
<p class="global-address-header">{l s='Mail Us'}</p>
<p class="global-address-value">
{$gblHtlEmail}
</p>
</div>
{/if}
</div>
</div>
{/if}
<div class="col-sm-6 {if !(isset($gblHtlAddress) && $gblHtlAddress) && !(isset($gblHtlPhone) && $gblHtlPhone) && !(isset($gblHtlEmail) && $gblHtlEmail)} col-sm-offset-3 {/if}">
<form action="{$request_uri}" method="post" class="contact-form-box" enctype="multipart/form-data">
{if isset($customerThread.id_contact) && $customerThread.id_contact && $contacts|count}
{assign var=flag value=true}
{foreach from=$contacts item=contact}
{if $contact.id_contact == $customerThread.id_contact}
<input type="text" class="form-control" id="contact_name" name="contact_name" value="{$contact.name|escape:'html':'UTF-8'}" readonly="readonly" />
<input type="hidden" name="id_contact" value="{$contact.id_contact|intval}" />
{$flag=false}
{/if}
{/foreach}
{if $flag && isset($contacts.0.id_contact)}
<input type="text" class="form-control" id="contact_name" name="contact_name" value="{$contacts.0.name|escape:'html':'UTF-8'}" readonly="readonly" />
<input type="hidden" name="id_contact" value="{$contacts.0.id_contact|intval}" />
{/if}
{else}
<div class="form-group row">
<div class="col-sm-12">
<label for="message" class="control-label">
{l s='Subject'}
</label>
<div class="dropdown">
<button class="form-control contact_type_input" type="button" data-toggle="dropdown">
<span id="contact_type" class="pull-left">{l s='Choose'}</span>
<input type="hidden" id="id_contact" name="id_contact" value="0">
<span class="arrow_span">
<i class="icon icon-angle-down"></i>
</span>
</button>
<ul class="dropdown-menu contact_type_ul">
{foreach from=$contacts item=contact}
<li value="{$contact.id_contact|intval}"{if isset($smarty.request.id_contact) && $smarty.request.id_contact == $contact.id_contact} selected="selected"{/if}>{$contact.name|escape:'html':'UTF-8'}
</li>
{/foreach}
{if isset($all_hotels_info) && $all_hotels_info}
{foreach from=$all_hotels_info key=htl_k item=htl_v}
{/foreach}
{/if}
</ul>
</div>
</div>
{/if}
{include file="$tpl_dir./errors.tpl"}
<div class="margin-top-50 htl-contact-page">
<div class="row">
<p class="contact-header col-sm-offset-2 col-sm-8">{l s='Contact Us'}</p>
<p class="contact-desc col-sm-offset-2 col-sm-8">{l s='Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry`s standard dummy text.'}</p>
</div>
<div class="row margin-top-50">
{if (isset($gblHtlAddress) && $gblHtlAddress) && (isset($gblHtlPhone) && $gblHtlPhone) && (isset($gblHtlEmail) && $gblHtlEmail)}
<div class="col-sm-6">
<div class="htl-global-address-div col-md-8 col-sm-12">
{if isset($gblHtlPhone) && $gblHtlPhone }
<div>
<p class="global-address-header">{l s='Main Branch'}</p>
<p class="global-address-value">
{$gblHtlAddress}
</p>
</div>
{/if}
<div class="form-group row">
<div class="col-sm-12">
<label for="price" class="control-label">
{l s='Email'}
</label>
{if isset($customerThread.email)}
<input class="form-control contact_input" type="email" id="email" name="from" value="{$customerThread.email|escape:'html':'UTF-8'}" readonly="readonly" />
{else}
<input class="form-control contact_input validate" type="email" id="email" name="from" data-validate="isEmail" value="{$email|escape:'html':'UTF-8'}" />
{/if}
{if isset($gblHtlPhone) && $gblHtlPhone}
<div>
<p class="global-address-header">{l s='Phone'}</p>
<p class="global-address-value">
{$gblHtlPhone}
</p>
</div>
</div>
{/if}
{if isset($gblHtlEmail) && $gblHtlEmail}
<div>
<p class="global-address-header">{l s='Mail Us'}</p>
<p class="global-address-value">
{$gblHtlEmail}
</p>
</div>
{/if}
</div>
</div>
{/if}
<div class="col-sm-6 {if !(isset($gblHtlAddress) && $gblHtlAddress) && !(isset($gblHtlPhone) && $gblHtlPhone) && !(isset($gblHtlEmail) && $gblHtlEmail)} col-sm-offset-3 {/if}">
<form action="{$link->getPageLink('contact')}" method="post" class="contact-form-box" enctype="multipart/form-data">
{if isset($customerThread.id_contact) && $customerThread.id_contact && $contacts|count}
{assign var=flag value=true}
{foreach from=$contacts item=contact}
{if $contact.id_contact == $customerThread.id_contact}
<input type="text" class="form-control" id="contact_name" name="contact_name" value="{$contact.name|escape:'html':'UTF-8'}" readonly="readonly" />
<input type="hidden" name="id_contact" value="{$contact.id_contact|intval}" />
{$flag=false}
{/if}
{/foreach}
{if $flag && isset($contacts.0.id_contact)}
<input type="text" class="form-control" id="contact_name" name="contact_name" value="{$contacts.0.name|escape:'html':'UTF-8'}" readonly="readonly" />
<input type="hidden" name="id_contact" value="{$contacts.0.id_contact|intval}" />
{/if}
{else}
<div class="form-group row">
<div class="col-sm-12">
<label for="message" class="control-label">
{l s='Message/Query'}
{l s='Subject'}
</label>
<textarea class="form-control contact_textarea" id="message" name="message">{if isset($message)}{$message|escape:'html':'UTF-8'|stripslashes}{/if}</textarea>
</div>
</div>
{if $fileupload == 1}
<div class="form-group row">
<div class="col-sm-12">
<label for="fileUpload" class="control-label">
{l s='Attach File'}
</label>
<input type="hidden" name="MAX_FILE_SIZE" value="{if isset($max_upload_size) && $max_upload_size}{$max_upload_size|intval}{else}2000000{/if}" />
<input type="file" name="fileUpload" id="fileUpload" class="form-control" />
<div class="dropdown">
<button class="form-control contact_type_input" type="button" data-toggle="dropdown">
<span id="contact_type" class="pull-left">{l s='Choose'}</span>
<input type="hidden" id="id_contact" name="id_contact" value="0">
<span class="arrow_span">
<i class="icon icon-angle-down"></i>
</span>
</button>
<ul class="dropdown-menu contact_type_ul">
{foreach from=$contacts item=contact}
<li value="{$contact.id_contact|intval}"{if isset($smarty.request.id_contact) && $smarty.request.id_contact == $contact.id_contact} selected="selected"{/if}>{$contact.name|escape:'html':'UTF-8'}
</li>
{/foreach}
{if isset($all_hotels_info) && $all_hotels_info}
{foreach from=$all_hotels_info key=htl_k item=htl_v}
{/foreach}
{/if}
</ul>
</div>
</div>
{/if}
{hook h='displayGDPRConsent' moduleName='contactform'}
<div class="form-group">
<input type="text" name="url" value="" class="hidden" />
<input type="hidden" name="contactKey" value="{$contactKey}" />
<button class="btn button button-medium contact_btn" type="submit" name="submitMessage" id="submitMessage" ><span>{l s='Send Message'}</span></button>
</div>
</form>
{/if}
<div class="form-group row">
<div class="col-sm-12">
<label for="price" class="control-label">
{l s='Email'}
</label>
{if isset($customerThread.email)}
<input class="form-control contact_input" type="email" id="email" name="from" value="{$customerThread.email|escape:'html':'UTF-8'}" readonly="readonly" />
{else}
<input class="form-control contact_input validate" type="email" id="email" name="from" data-validate="isEmail" value="{$email|escape:'html':'UTF-8'}" />
{/if}
</div>
</div>
<div class="form-group row">
<div class="col-sm-12">
<label for="message" class="control-label">
{l s='Message/Query'}
</label>
<textarea class="form-control contact_textarea" id="message" name="message">{if isset($message)}{$message|escape:'html':'UTF-8'|stripslashes}{/if}</textarea>
</div>
</div>
{if $fileupload == 1}
<div class="form-group row">
<div class="col-sm-12">
<label for="fileUpload" class="control-label">
{l s='Attach File'}
</label>
<input type="hidden" name="MAX_FILE_SIZE" value="{if isset($max_upload_size) && $max_upload_size}{$max_upload_size|intval}{else}2000000{/if}" />
<input type="file" name="fileUpload" id="fileUpload" class="form-control" />
</div>
</div>
{/if}
{hook h='displayGDPRConsent' moduleName='contactform'}
<div class="form-group">
<input type="text" name="url" value="" class="hidden" />
<input type="hidden" name="contactKey" value="{$contactKey}" />
<button class="btn button button-medium contact_btn" type="submit" name="submitMessage" id="submitMessage" ><span>{l s='Send Message'}</span></button>
</div>
</form>
</div>
</div>
{if isset($hotelsInfo) && $hotelsInfo}
<div class="row hotels-container">
<div class="col-sm-12 hotel-header">
<span>{l s='Our Hotels'}</span>
</div>
{foreach $hotelsInfo as $hotel}
<div class="col-sm-6 margin-bottom-50">
<div class="hotel-city-container">
<span class="htl-map-icon"></span><span>{$hotel['city']}</span>
</div>
<div class="hotel-address-container">
<div class="col-xs-4">
<img class="htl-img" style="width:100%" src="{$hotel['image_url']}">
</div>
<div class="col-xs-8">
<p class="hotel-name"><span>{$hotel['hotel_name']}</span></p>
<p class="hotel-branch-info-value">{$hotel['address']}, {$hotel['city']}, {if {$hotel['state_name']}}{$hotel['state_name']},{/if} {$hotel['country_name']}, {$hotel['postcode']}</p>
{if $hotel['latitude'] != 0 || $hotel['longitude'] != 0}
<p class="hotel-branch-info-value">
<a class="btn htl-map-direction-btn" href="http://maps.google.com/maps?daddr=({$hotel['latitude']},{$hotel['longitude']})" target="_blank">
<span class="">{l s='View on map'}</span>
</a>
</p>
{/if}
<p class="hotel-branch-info-value">
<span class="htl-address-icon htl-phone-icon"></span>{$hotel['phone']}
</p>
<p class="hotel-branch-info-value">
<span class="htl-address-icon htl-email-icon"></span>{$hotel['email']}
</p>
</div>
</div>
</div>
{/foreach}
</div>
{/if}
{if isset($hotelLocationArray)}
<div class="row">
<div class="col-xs-12 col-sm-12" id="googleMapWrapper">
<div id="map"></div>
</div>
</div>
{if isset($hotelsInfo) && $hotelsInfo}
<div class="row hotels-container">
<div class="col-sm-12 hotel-header">
<span>{l s='Our Hotels'}</span>
</div>
{foreach $hotelsInfo as $hotel}
<div class="col-sm-6 margin-bottom-50">
<div class="hotel-city-container">
<span class="htl-map-icon"></span><span>{$hotel['city']}</span>
</div>
<div class="hotel-address-container">
<div class="col-xs-4">
<img class="htl-img" style="width:100%" src="{$hotel['image_url']}">
</div>
<div class="col-xs-8">
<p class="hotel-name"><span>{$hotel['hotel_name']}</span></p>
<p class="hotel-branch-info-value">{$hotel['address']}, {$hotel['city']}, {if {$hotel['state_name']}}{$hotel['state_name']},{/if} {$hotel['country_name']}, {$hotel['postcode']}</p>
{if $hotel['latitude'] != 0 || $hotel['longitude'] != 0}
<p class="hotel-branch-info-value">
<a class="btn htl-map-direction-btn" href="http://maps.google.com/maps?daddr=({$hotel['latitude']},{$hotel['longitude']})" target="_blank">
<span class="">{l s='View on map'}</span>
</a>
</p>
{/if}
<p class="hotel-branch-info-value">
<span class="htl-address-icon htl-phone-icon"></span>{$hotel['phone']}
</p>
<p class="hotel-branch-info-value">
<span class="htl-address-icon htl-email-icon"></span>{$hotel['email']}
</p>
</div>
</div>
</div>
{/foreach}
</div>
{/if}
{if isset($hotelLocationArray)}
<div class="row">
<div class="col-xs-12 col-sm-12" id="googleMapWrapper">
<div id="map"></div>
</div>
</div>
{/if}
<div style="clear:both;"></div>
</div>
{/if}
{/if}
<div style="clear:both;"></div>
</div>
{strip}
{addJsDefL name='contact_fileDefaultHtml'}{l s='No file selected' js=1}{/addJsDefL}