dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : fixed bugs on customer messages #PSCFV-3733 #PSCFV-3712

Browse Source
This commit is contained in:
dMetzger
2012-08-24 07:48:04 +00:00
parent c0389a263c
commit 9162db16eb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCustomerThreadsController.php
+1
View File
@@ -349,6 +349,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$current_employee->firstname.' '.$current_employee->lastname, $current_employee->firstname.' '.$current_employee->lastname,
null, null, _PS_MAIL_DIR_, true)) null, null, _PS_MAIL_DIR_, true))
{ {
$cm->private = 1;
$cm->message = $this->l('Message forwarded to').' '.$employee->firstname.' '.$employee->lastname."\n".$this->l('Comment:').' '.$_POST['message_forward']; $cm->message = $this->l('Message forwarded to').' '.$employee->firstname.' '.$employee->lastname."\n".$this->l('Comment:').' '.$_POST['message_forward'];
$cm->add(); $cm->add();
} }
themes/default/js/history.js
+3 -2
View File
@@ -100,15 +100,16 @@ function updateOrderLineDisplay(domCheckbox)
} }
//send a message in relation to the order with ajax //send a message in relation to the order with ajax
function sendOrderMessage () function sendOrderMessage()
{ {
paramString = "ajax=true"; paramString = "ajax=true";
$('form#sendOrderMessage').find('input, textarea').each(function(){ $('form#sendOrderMessage').find('input, textarea').each(function(){
paramString += '&' + $(this).attr('name') + '=' + encodeURI($(this).val()); paramString += '&' + $(this).attr('name') + '=' + encodeURI($(this).val());
}); });
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: baseUri + "index.php?controller=order-detail", url: $('form#sendOrderMessage').attr("action"),
data: paramString, data: paramString,
success: function (msg){ success: function (msg){
$('#block-order-detail').fadeOut('slow', function() { $('#block-order-detail').fadeOut('slow', function() {