From 8a5d57b09aa43a46edf78ad845ff005efdcb4be1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Nov 2023 11:31:16 +0100 Subject: [PATCH] Debug v19 --- htdocs/expensereport/card.php | 2 +- htdocs/public/ticket/view.php | 22 +++++++++++++++++--- htdocs/takepos/index.php | 4 +--- htdocs/ticket/class/actions_ticket.class.php | 11 +++++++++- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 640ddf6a08a..8063167a000 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1559,7 +1559,7 @@ if ($action == 'create') { $linkback = ''.$langs->trans("BackToList").''; - print ''; + print '
'; print ''; print ''; diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php index 44f71ac251b..f8ca10ee6eb 100644 --- a/htdocs/public/ticket/view.php +++ b/htdocs/public/ticket/view.php @@ -238,10 +238,12 @@ $arrayofcss = array('/ticket/css/styles.css.php'); llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss); -print '
'; if ($action == "view_ticket" || $action == "presend" || $action == "close" || $action == "confirm_public_close") { if ($display_ticket) { + print ''; + print '
'; + // 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 '
'; if ($action == 'presend') { + print '
'; 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 '
'; } + print '
'; + // Message list + print '
'; print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'conversation'); + print '
'; + $object->viewTicketMessages(false, true, $object->dao); } else { + print ''; + print '
'; + print ''; + + print '
'; } } else { + print ''; + print '
'; + print '
'.$langs->trans("TicketPublicMsgViewLogIn").'
'; print '
'; @@ -453,9 +469,9 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a print "\n"; print "
\n"; -} -print "
"; + print ''; +} if (getDolGlobalInt('TICKET_SHOW_COMPANY_FOOTER')) { // End of page diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index 3c9b24ea52a..42482814998 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -1441,9 +1441,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) { -
> +
'; $this->viewTicketOriginalMessage($user, $action, $object); + print '
'; if (is_array($this->dao->cache_msgs_ticket) && count($this->dao->cache_msgs_ticket) > 0) { - print '
'.$langs->trans("User").'
'; + print '
'; + + print '
'; + print '
'; print ''; @@ -391,8 +396,12 @@ class ActionsTicket extends CommonHookActions } print '
'; + print ''; + print ''; } else { + print '
'; print '
'.$langs->trans('NoMsgForThisTicket').'
'; + print '
'; } }