Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
2c43d902
Commit
2c43d902
authored
Nov 02, 2021
by
Quentin Ribac
Browse files
FIX #18589 TIME 0:10 display better recipient label in deposit list pdf
parent
94d45766
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/app/registeredMail/controllers/RegisteredMailController.php
View file @
2c43d902
...
...
@@ -1058,16 +1058,22 @@ class RegisteredMailController
$pdf
->
Cell
(
30
,
10
,
mb_strimwidth
(
$registeredMail
[
'reference'
],
0
,
22
,
"..."
,
"UTF-8"
),
1
,
0
,
'C'
);
$pdf
->
setFont
(
'times'
,
''
,
6
);
if
(
strlen
(
$recipient
[
1
]
.
" "
.
$recipient
[
4
]
.
" "
.
$recipient
[
6
]
.
" "
.
$recipient
[
7
])
>
60
)
{
$pdf
->
Cell
(
95
,
10
,
$recipient
[
1
],
1
);
$recipientLabel
=
$recipient
[
2
]
??
''
;
if
(
empty
(
$recipientLabel
))
{
$recipientLabel
=
$recipient
[
1
];
}
elseif
(
!
empty
(
$recipient
[
1
]))
{
$recipientLabel
.
=
' ('
.
$recipient
[
1
]
.
')'
;
}
$recipientLabel
=
trim
(
$recipientLabel
);
if
(
strlen
(
$recipientLabel
.
" "
.
$recipient
[
4
]
.
" "
.
$recipient
[
6
]
.
" "
.
$recipient
[
7
])
>
60
)
{
$pdf
->
Cell
(
95
,
10
,
$recipientLabel
,
1
);
$pdf
->
SetXY
(
$pdf
->
GetX
()
-
95
,
$pdf
->
GetY
()
+
3
);
$pdf
->
Cell
(
95
,
10
,
$recipient
[
4
]
.
" "
.
$recipient
[
6
]
.
" "
.
$recipient
[
7
],
0
);
$pdf
->
SetXY
(
$pdf
->
GetX
()
+
95
,
$pdf
->
GetY
()
-
3
);
}
else
{
$pdf
->
Cell
(
95
,
10
,
$recipient
[
1
]
.
" "
.
$recipient
[
4
]
.
" "
.
$recipient
[
6
]
.
" "
.
$recipient
[
7
],
1
);
$pdf
->
Cell
(
95
,
10
,
$recipient
Label
.
" "
.
$recipient
[
4
]
.
" "
.
$recipient
[
6
]
.
" "
.
$recipient
[
7
],
1
);
}
$pdf
->
Ln
();
//contrôle du nb de reco présent sur la page. Si 16 lignes, changement de page et affichage du footer
if
(
$position
%
12
>=
11
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment