Merge pull request #1928 from norahmollo/master

UnassignedMessage translation added
This commit is contained in:
julceslauhub
2013-07-25 11:59:30 -07:00
4 changed files with 34 additions and 7 deletions

View File

@@ -4920,10 +4920,10 @@ class Cases
case "SELF_SERVICE":
if ($swtplDefault == 1) {
G::verifyPath($pathEmail, true); //Create if it does not exist
$fileTemplate = $pathEmail . "unassignedMessage.html";
$fileTemplate = $pathEmail . G::LoadTranslation('ID_UNASSIGNED_MESSAGE');
if (!file_exists($fileTemplate)) {
@copy(PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $fileTemplate);
@copy(PATH_TPL . "mails" . PATH_SEP . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'), $fileTemplate);
}
$sBody = G::replaceDataField(file_get_contents($fileTemplate), $aFields);

View File

@@ -3866,7 +3866,11 @@ class Processes
}
if (! file_exists( $dir . "unassignedMessage.html" )) {
@copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $dir . "unassignedMessage.html" );
if (defined('PARTNER_FLAG')) {
@copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessagePartner.html", $dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'));
} else {
@copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'));
}
}
$files = glob( $dir . "*.*" );
@@ -3874,9 +3878,8 @@ class Processes
foreach ($files as $file) {
$fileName = basename( $file );
if ($fileName != "alert_message.html" && $fileName != "unassignedMessage.html") {
$filesList[] = array ("filepath" => $file,"filename" => $fileName
);
if ($fileName != "alert_message.html" && $fileName != G::LoadTranslation('ID_UNASSIGNED_MESSAGE')) {
$filesList[] = array ("filepath" => $file,"filename" => $fileName);
}
}
return $filesList;

View File

@@ -86,7 +86,7 @@ try {
$result->msg .= G::LoadTranslation("ID_FAILED_RECORD") . ($importResults->recordsCount - $importResults->recordsCountSuccess) . "\n";
if ($importResults->errMsg != '') {
$result->msg .= "Errors registered: \n" . $importResults->errMsg . "\n";
$result->msg .= G::LoadTranslation("ID_ERROR_REGISTERED"). " \n" . $importResults->errMsg . "\n";
}
//$result->msg = htmlentities($result->msg);

View File

@@ -0,0 +1,24 @@
<table width="100%" cellpadding="10" cellspacing="0" style="background: #FFFFFF; font: 11px arial, verdana, helvetica, sans-serif;">
<tr>
<td style="font-size: 14px;">
<strong>CASO NAO ATRIBUÍDOS</strong>
<hr />
</td>
</tr>
<tr>
<td>
O caso <strong>#@#APP_NUMBER</strong> está disponível na lista não atribuído.
<br />
<br />
Nota: Se você quer reivindicar o caso e ele não está disponível na lista, pode ser já tomadas.
</td>
</tr>
<tr>
<td>
<hr />
Este processo de negócio é alimentado por DocSystem
<br />
<a href="http://www.docsystemcorp.com" style="color: #C40000;">www.docsystemcorp.com</a>
</td>
</tr>
</table>