[freeside-commits] branch master updated. 2e93aa2c2371022e78d45688bfb675fbcca73c63

Christopher Burger burgerc at freeside.biz
Tue Dec 4 13:33:45 PST 2018


The branch, master has been updated
       via  2e93aa2c2371022e78d45688bfb675fbcca73c63 (commit)
      from  8ddf2ae7b5e02463c87599186f0279b86ddaeaac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2e93aa2c2371022e78d45688bfb675fbcca73c63
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Dec 4 16:33:14 2018 -0500

    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 --@]

-----------------------------------------------------------------------

Summary of changes:
 conf/invoice_latex | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)




More information about the freeside-commits mailing list