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

Merge branch 'ticket-AideContact-SAV' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-18 16:12:31 +02:00
commit 6c51d23463
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
adm/tabs/AdminCustomerThreads.php
View File

@ -414,7 +414,8 @@ class AdminCustomerThreads extends AdminTab
if (!$email)
{
if (empty($message['employee_name']))
if (empty($message['employee_name'])) {
$orderMessages = OrderMessage::getOrderMessages((int)($cookie->id_lang));
$output .= '
<p class="btn-answer" style="text-align:right">
<button class="button" onclick="$(\'#reply_to_'.(int)($message['id_customer_message']).'\').show(500); $(this).hide();">
@ -425,10 +426,17 @@ class AdminCustomerThreads extends AdminTab
<div id="reply_to_'.(int)($message['id_customer_message']).'" style="display: none; margin-top: 10px;" class="panel-answer">
<form action="'.Tools::htmlentitiesutf8($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">
<p>'.$this->l('Please type your reply below:').'</p>
<select name="order_message" id="order_message" onchange="savOverwriteMessage(this, \''.$this->l('Do you want to overwrite your existing message?').'\', \''.(int)($message['id_customer_message']).'\')">
<option value="0" selected="selected">-- '.$this->l('Choose a standard message').' --</option>';
foreach ($orderMessages AS $orderMessage) {
$output .= '<option value="'.htmlentities($orderMessage['message'], ENT_COMPAT, 'UTF-8').'">'.$orderMessage['name'].'</option>';
}
$output .= '
</select>
<div style="width: 450px; margin-top: 0px;margin-bottom:5px;">
<input type="file" name="joinFile"/>
</div>
<textarea name="reply_message">'.str_replace('\r\n', "\n", Configuration::get('PS_CUSTOMER_SERVICE_SIGNATURE', $message['id_lang'])).'</textarea>
<textarea id="txt_msg_'.(int)($message['id_customer_message']).'" name="reply_message">'.str_replace('\r\n', "\n", Configuration::get('PS_CUSTOMER_SERVICE_SIGNATURE', $message['id_lang'])).'</textarea>
<div style="text-align: right; font-style: italic; font-size: 9px; margin-top: 2px;">
'.$this->l('Your reply will be sent to:').' '.$message['email'].'
</div>
@ -439,6 +447,7 @@ class AdminCustomerThreads extends AdminTab
</div>
</form>
</div>';
}
}
$output .= '</div>';

5
css/admin.css
View File

@ -3474,11 +3474,16 @@ span.anticon{
}
.panel-message input[type="file"] {
border :0px;
margin-top: 5px;
}
.panel-answer,
.panel-answer div {
width: 100%;
}
.panel-message select {
border: 1px solid #796dc7;
background-color: rgba(121,109,199,0.2);
}
.panel-answer textarea{
width: 670px;
height: 120px;

13
js/admin.js
View File

@ -765,6 +765,19 @@ function orderOverwriteMessage(sl, text)
}
}
function savOverwriteMessage(sl, text, id_message)
{
var $zone = $('#txt_msg_'+id_message);
var sl_value = sl.options[sl.selectedIndex].value;
if (sl_value != '0')
{
if ($zone.val().length > 0 && !confirm(text))
return ;
$zone.val(sl_value);
}
}
function setCancelQuantity(itself, id_order_detail, quantity)
{
$('#cancelQuantity_' + id_order_detail).val($(itself).attr('checked') ? quantity : '');