// Merge -> 10309

This commit is contained in:
rMalie
2011-11-21 11:05:10 +00:00
parent 3bfd9ad4ca
commit 82c9dead2a
365 changed files with 11185 additions and 1571 deletions
+12 -6
View File
@@ -59,17 +59,23 @@ class AdminMondialRelay extends AdminTab
$errorListTicket = $MRCreateTicket->checkPreValidation();
if (count($errorListTicket))
{
$html .= '<div class="error">'.
$this->l('Thanks to kindly correct the following errors on ').
$titleType = array(
'error' => $this->l('Thanks to kindly correct the following errors on ').
' <a href="index.php?tab=AdminContact&token='.Tools::getAdminToken('AdminContact'.
(int)Tab::getIdFromClassName('AdminContact').(int)$this->context->id_employee).'" style="color:#f00;">&nbsp;'.
$this->l('the contact page').'</a>:<ul>';
foreach($errorListTicket as $type => $error)
$this->l('the contact page').'</a>:<ul>',
'warn' => $this->l('Please take a look to this following warning, maybe the ticket won\'t be generated'));
foreach($errorListTicket as $errorType => $errorList)
{
if (count($errorList))
{
$html .= '<div class="MR_'.$errorType.'">'.$titleType[$errorType];
foreach($errorList as $type => $error)
$html .= '<li>'.$type.': '.$error.'</li>';
$html .= '</ul></div>';
}
}
$html .= '<p>'.$this->l('All orders which have the state').' "<b>'.$order_state->name.'</b>" '.
$this->l('will be available for sticker creation');