Debug v19
This commit is contained in:
parent
4cd4221a52
commit
8a5d57b09a
4 changed files with 31 additions and 8 deletions
|
|
@ -1559,7 +1559,7 @@ if ($action == 'create') {
|
|||
|
||||
$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
|
||||
|
||||
print '<table class="border" style="width:100%;">';
|
||||
print '<table class="border centpercent">';
|
||||
|
||||
print '<tr>';
|
||||
print '<td>'.$langs->trans("User").'</td>';
|
||||
|
|
|
|||
|
|
@ -238,10 +238,12 @@ $arrayofcss = array('/ticket/css/styles.css.php');
|
|||
|
||||
llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
|
||||
|
||||
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
|
||||
|
||||
if ($action == "view_ticket" || $action == "presend" || $action == "close" || $action == "confirm_public_close") {
|
||||
if ($display_ticket) {
|
||||
print '<!-- public view ticket -->';
|
||||
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
|
||||
|
||||
// Confirmation close
|
||||
if ($action == 'close') {
|
||||
print $form->formconfirm($_SERVER["PHP_SELF"]."?track_id=".$track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:''), $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
|
||||
|
|
@ -378,6 +380,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
|
|||
print '<div style="clear: both; margin-top: 1.5em;"></div>';
|
||||
|
||||
if ($action == 'presend') {
|
||||
print '<br>';
|
||||
print load_fiche_titre($langs->trans('TicketAddMessage'), '', 'conversation');
|
||||
|
||||
$formticket = new FormTicket($db);
|
||||
|
|
@ -422,13 +425,26 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
|
|||
print '</div>';
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
|
||||
// Message list
|
||||
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
|
||||
print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'conversation');
|
||||
print '</div>';
|
||||
|
||||
$object->viewTicketMessages(false, true, $object->dao);
|
||||
} else {
|
||||
print '<!-- public view ticket -->';
|
||||
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
|
||||
|
||||
print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
|
||||
|
||||
print '</div>';
|
||||
}
|
||||
} else {
|
||||
print '<!-- public view ticket -->';
|
||||
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
|
||||
|
||||
print '<div class="center opacitymedium margintoponly marginbottomonly ticketlargemargin">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>';
|
||||
|
||||
print '<div id="form_view_ticket">';
|
||||
|
|
@ -453,9 +469,9 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
|
|||
|
||||
print "</form>\n";
|
||||
print "</div>\n";
|
||||
}
|
||||
|
||||
print "</div>";
|
||||
print '</div>';
|
||||
}
|
||||
|
||||
if (getDolGlobalInt('TICKET_SHOW_COMPANY_FOOTER')) {
|
||||
// End of page
|
||||
|
|
|
|||
|
|
@ -1441,9 +1441,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
|
|||
</div>
|
||||
|
||||
<!-- Show product -->
|
||||
<div class="div5"<?php if (getDolGlobalInt('TAKEPOS_HIDE_CATEGORIES') == 1) {
|
||||
print ' style="width:100%;"';
|
||||
} ?>>
|
||||
<div class="div5<?php if (getDolGlobalInt('TAKEPOS_HIDE_CATEGORIES') == 1) { print ' centpercent'; } ?>">
|
||||
<?php
|
||||
$count = 0;
|
||||
while ($count < $MAXPRODUCT) {
|
||||
|
|
|
|||
|
|
@ -277,10 +277,15 @@ class ActionsTicket extends CommonHookActions
|
|||
|
||||
$action = GETPOST('action', 'aZ09');
|
||||
|
||||
print '<div class="ticketpublicarea ticketlargemargin centpercent" style="padding-top: 0">';
|
||||
$this->viewTicketOriginalMessage($user, $action, $object);
|
||||
print '</div>';
|
||||
|
||||
if (is_array($this->dao->cache_msgs_ticket) && count($this->dao->cache_msgs_ticket) > 0) {
|
||||
print '<table class="border" style="width:100%;">';
|
||||
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
|
||||
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="border centpercent">';
|
||||
|
||||
print '<tr class="liste_titre">';
|
||||
|
||||
|
|
@ -391,8 +396,12 @@ class ActionsTicket extends CommonHookActions
|
|||
}
|
||||
|
||||
print '</table>';
|
||||
print '</div>';
|
||||
print '</div>';
|
||||
} else {
|
||||
print '<div class="ticketpublicarea ticketlargemargin centpercent">';
|
||||
print '<div class="info">'.$langs->trans('NoMsgForThisTicket').'</div>';
|
||||
print '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue