From: Christopher Burger <burgerc@freeside.biz>
Date: Tue, 4 Dec 2018 21:33:14 +0000 (-0500)
Subject: RT# 81822 - cleanup footer display when coupon on top
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2e93aa2c2371022e78d45688bfb675fbcca73c63

RT# 81822 - cleanup footer display when coupon on top
---

diff --git a/conf/invoice_latex b/conf/invoice_latex
index 885be3d08..cd36450f3 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -73,23 +73,16 @@
 \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}}
@@ -123,6 +116,9 @@
       (defined($couponfootsep) ? $couponfootsep : '0.2in') .
       '}';
   }
+  elsif ($coupon && $couponlocation eq "top") {
+    $OUT .= '\vspace{-\extracouponspace}';
+  }
   '';
 --@] [@-- $smallerfooter ? '\scriptsize{' : '\small{' --@]
 [@-- $footer --@]