[freeside-commits] freeside/conf invoice_latexcoupon, NONE, 1.1 invoice_latex, 1.18, 1.19

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail.420.am:/tmp/cvs-serv1084/conf

Modified Files:
	invoice_latex 
Added Files:
	invoice_latexcoupon 
Log Message:
typeset tear-off remittance coupon

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- invoice_latex	31 May 2008 14:49:03 -0000	1.18
+++ invoice_latex	2 Jun 2008 11:16:08 -0000	1.19
@@ -19,7 +19,7 @@
 
 \documentclass[letterpaper]{article}
 
-\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,caption}
+\usepackage{fancyhdr,lastpage,ifthen,longtable,afterpage,caption,multirow,bigstrut}
 \usepackage{graphicx}			% required for logo graphic
 
 \addtolength{\voffset}{-0.0cm}		% top margin to top of header
@@ -40,6 +40,19 @@
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{1pt}
 
+\renewcommand{\footrule}{
+[@--
+  $coupon ? '\ifthenelse{\equal{\thepage}{1}}' : '';
+--@]
+  {
+  }
+  {
+    \vbox to 0pt{\rule{\headwidth}{\footrulewidth}\vss}
+  }
+}
+
+\newcommand{\extracouponspace}{4.8cm}
+
 % Adjust the inset of the mailing address
 \newcommand{\addressinset}[1][]{\hspace{1.0cm}}
 
@@ -62,9 +75,16 @@
 \fancyfoot[C]{
   \ifthenelse{\equal{\thepage}{1}}
   { % First page
-    \small{
+[@--
+  if ($coupon) {
+    $OUT .= '\vspace{-\extracouponspace}';
+    $OUT .= '\rule[0.5em]{\textwidth}{\footrulewidth}\\\\';
+    $OUT .= $coupon;
+  }
+  '';
+--@] \small{
 [@-- $footer --@]
-    }
+    }[@-- $coupon ? '\vspace{\extracouponspace}' : '' --@]
   }
   { % ... pages
     \small{
@@ -167,6 +187,7 @@
 %
 %
 %
+[@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]
 \begin{tabular}{ll}
 \addressinset \rule{0cm}{0cm} &
 \makebox{
@@ -227,12 +248,12 @@
               '{' . $section->{'subtotal'} . '}' . "\n";
     }
 
-    if ($section == $sections[$#sections]) {
-      foreach my $line (@total_items) {
+    #if ($section == $sections[$#sections]) {
+      foreach my $line (grep {$_->{section}->{description} eq $section->{description}} @total_items) {
         $OUT .= '\FStotaldesc{' . $line->{'total_item'} . '}' .
                 '{' . $line->{'total_amount'} . '}' . "\n";
       }
-    }
+    #}
 
     $OUT .= '\hline';
     $OUT .= '\endlastfoot';

--- NEW FILE: invoice_latexcoupon ---
Detach and return this remittance form with your your payment.\\
\begin{tabular}{ll}
\returninset
\begin{tabular}{ll}
  \makebox{ \includegraphics{[@-- $logo_file --@]}} &
  \begin{minipage}[b]{5.5cm}
[@-- $returnaddress --@]
    \end{minipage}
\end{tabular}&
\begin{tabular}{r@{: }lr}
Invoice date & \textbf{[@-- $date --@]} & \multirow{4}*{
\makebox{
\begin{minipage}[t]{5.0cm}
\textbf{[@-- $payname --@]}\\
\addressline{[@-- $company --@]}
\addressline{[@-- $address1 --@]}
\addressline{[@-- $address2 --@]}
\addressline{[@-- $city --@], [@-- $state --@]~~[@-- $zip --@]}
\addressline{[@-- $country --@]}
\end{minipage}}}\\
Customer\#& \textbf{[@-- $custnum --@]} & \\
Total Due & \textbf{[@-- $balance --@]} & \\
\rule{0pt}{2.25em}Amount Enclosed & \rule{2cm}{1pt}& \\
\end{tabular}\\
\rule{0pt}{1cm} &\\
\begin{tabular}{ll}
\addressinset \rule{0.5cm}{0cm} &
\makebox{
\begin{minipage}[t]{5.0cm}
[@-- $returnaddress --@]
\end{minipage}}
\end{tabular}\\
\end{tabular}\\