projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eb3541f
)
RT# 81822 - cleanup footer display when coupon on top
author
Christopher Burger
<burgerc@freeside.biz>
Tue, 4 Dec 2018 21:33:14 +0000
(16:33 -0500)
committer
Christopher Burger
<burgerc@freeside.biz>
Tue, 4 Dec 2018 21:35:33 +0000
(16:35 -0500)
conf/invoice_latex
patch
|
blob
|
history
diff --git
a/conf/invoice_latex
b/conf/invoice_latex
index
885be3d
..
cd36450
100644
(file)
--- a/
conf/invoice_latex
+++ b/
conf/invoice_latex
@@
-73,23
+73,16
@@
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{1pt}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{1pt}
+\renewcommand{\footrule}{
[@--
[@--
- if ($couponlocation eq "top") {
- if ($coupon) {
- '\makeatletter
- \newcommand\ifpageone{
- \ifnum\value{page}=1
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}
- \makeatother';
- }
+ $coupon ? '\ifthenelse{\equal{\thepage}{1}}' : '';
+--@]
+ {
}
}
-
else
{
- '\renewcommand{\footrule}{\ifthenelse{\equal{\thepage}{1}}{}{ \vbox to 0pt{\rule{\headwidth}{\footrulewidth}\vss} } }';
+ {
+ \vbox to 0pt{\rule{\headwidth}{\footrulewidth}\vss}
}
}
---@]
+}
% Adjust the inset of the mailing address
\newcommand{\addressinset}[1][]{\hspace{1.0cm}}
% Adjust the inset of the mailing address
\newcommand{\addressinset}[1][]{\hspace{1.0cm}}
@@
-123,6
+116,9
@@
(defined($couponfootsep) ? $couponfootsep : '0.2in') .
'}';
}
(defined($couponfootsep) ? $couponfootsep : '0.2in') .
'}';
}
+ elsif ($coupon && $couponlocation eq "top") {
+ $OUT .= '\vspace{-\extracouponspace}';
+ }
'';
--@] [@-- $smallerfooter ? '\scriptsize{' : '\small{' --@]
[@-- $footer --@]
'';
--@] [@-- $smallerfooter ? '\scriptsize{' : '\small{' --@]
[@-- $footer --@]