\usepackage{graphicx} % required for logo graphic\r
\usepackage[utf8]{inputenc} % multilanguage support\r
\usepackage[T1]{fontenc}\r
+[@-- if ( length($watermark) ) {\r
+ $OUT .= '\r
+\usepackage{background}\r
+\backgroundsetup{\r
+ placement=center,\r
+ opacity=0.25,\r
+ color=black,\r
+ angle=0,\r
+ contents=' . $watermark . '\r
+}';\r
+}\r
+'';\r
+--@]\r
\r
\addtolength{\voffset}{-0.0cm} % top margin to top of header\r
\addtolength{\hoffset}{-0.6cm} % left margin on page\r
-\addtolength{\topmargin}{[@-- defined($topmargin) ? $topmargin : '-1.25cm' --@]}\r
+\addtolength{\topmargin}{[@-- defined($topmargin) ? $topmargin : '-1.00cm' --@]}\r
\setlength{\headheight}{2.0cm} % height of header\r
\setlength{\headsep}{[@-- defined($headsep) ? $headsep : '1.0cm' --@]}\r
\setlength{\footskip}{1.0cm} % bottom of footer from bottom of text\r
}\r
}\r
\r
-\newcommand{\extracouponspace}{[@-- defined($extracouponspace) ? $extracouponspace : '3.6cm' --@]}\r
+\newcommand{\extracouponspace}{[@-- defined($extracouponspace) ? $extracouponspace : '2.7in' --@]}\r
\r
% Adjust the inset of the mailing address\r
\newcommand{\addressinset}[1][]{\hspace{1.0cm}}\r
$OUT .= '\vspace{-\extracouponspace}';\r
$OUT .= '\rule[0.5em]{\textwidth}{\footrulewidth}\\\\';\r
$OUT .= $coupon;\r
- $OUT .= '\vspace{'. $couponfootsep. '}' if defined($couponfootsep);\r
+ $OUT .= '\vspace{'.\r
+ (defined($couponfootsep) ? $couponfootsep : '0.2in') .\r
+ '}';\r
}\r
'';\r
--@] [@-- $smallerfooter ? '\scriptsize{' : '\small{' --@]\r
\returninset\r
\makebox{\r
\begin{tabular}{ll}\r
- \includegraphics{[@-- $logo_file --@]} & [@-- $verticalreturnaddress ? '\\\\' : '' --@]\r
\begin{minipage}[b]{5.5cm}\r
[@-- $returnaddress --@]\r
- \end{minipage}\\\r
+ \end{minipage} &\r
+ \includegraphics{[@-- $logo_file --@]}\\\r
\end{tabular}\r
}\r
}\r
\ifthenelse{\equal{\thepage}{1}}\r
{ % First page\r
\begin{tabular}{ccc}\r
- [@-- join(' & ', emt('Invoice date'), emt('Invoice #'), emt('Customer #') ) --@]\\\r
+ [@-- join(' & ', ( $no_date ? '' : emt('Invoice date') ),\r
+ ( $no_number ? '' : emt('Invoice #') ),\r
+ emt('Customer #')\r
+ )\r
+ --@]\\\r
\vspace{0.2cm}\r
\textbf{[@-- $date --@]} & \textbf{[@-- $invnum --@]} & \textbf{[@-- $custnum --@]} \\\hline\r
\rule{0pt}{5ex} &~~ \huge{\textsc{[@-- emt($notice_name) --@]}} & \\\r
\newcommand{\FShead}{\r
\hline\r
\rule{0pt}{2.5ex}\r
- \makebox[1.4cm]{\textbf{Ref}} &\r
+ \makebox[1.4cm]{} &\r
\multicolumn{\FSdescriptioncolumncount}{l}{\makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}}&\r
\FSunitcolumns\r
\makebox[1.6cm][r]{\textbf{[@-- emt('Amount') --@]}} \\\r
\hline\r
}\r
\r
+\newcommand{\FSusagehead}{\r
+ \hline\r
+ \rule{0pt}{2.5ex}\r
+ \makebox[1.4cm]{} &\r
+ \multicolumn{4}{l}{\r
+ \makebox[\FSdescriptionlength][l]{\textbf{[@-- emt('Description') --@]}}\r
+ } &\r
+ \textbf{~~[@-- emt('Calls') --@]} &\r
+ \textbf{~~[@-- emt('Duration') --@]} &\r
+ \textbf{~~[@-- emt('Amount') --@]} \\\r
+ \hline\r
+}\r
+\r
% ...description...\r
\newcommand{\FSdesc}[5]{\r
\multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &\r
\multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &\r
-[@-- $unitprices ? ' \multicolumn{1}{r}{\textbf{\dollar #3}} &'."\n".\r
+[@-- $unitprices ? ' \multicolumn{1}{r}{\textbf{#3}} &'."\n".\r
' \multicolumn{1}{r}{\textbf{#4}} &'."\n"\r
: ''\r
--@]\r
- \multicolumn{1}{r}{\textbf{\dollar #5}}\\\r
+ \multicolumn{1}{r}{\textbf{#5}}\\\r
}\r
% ...extended description...\r
\newcommand{\FSextdesc}[1]{\r
& \multicolumn{6}{l}{#1} & #2\\\r
}\r
\r
+% ...usage class summary\r
+\newcommand{\FSusagedesc}[4]{\r
+ \multicolumn{1}{c}{\rule{0pt}{2.5ex}} &\r
+ \multicolumn{4}{l}{\textbf{#1}} &\r
+ \multicolumn{1}{r}{\textbf{#2}} &\r
+ \multicolumn{1}{r}{\textbf{#3}} &\r
+ \multicolumn{1}{r}{\textbf{#4}}\r
+ \\\r
+}\r
\r
\begin{document}\r
% Headers and footers defined for the first page\r
}\r
--@]\r
\begin{flushright}\r
-[@-- $terms ? emt('Terms') .": $terms" : '' --@]\\\r
+[@-- $terms ? emt('Terms') . ': ' . emt($terms) : '' --@]\\\r
[@-- $po_line --@]\\\r
\end{flushright}\r
\end{minipage}}\r
if $coupon;\r
$OUT .= '\begin{longtable}{cllllllr}';\r
$OUT .= '\caption*{ ';\r
- $OUT .= ($section->{'description'}) ? $section->{'description'}: emt('Charges');\r
+ if ($section->{'location'}) {\r
+ $OUT .= $section->{'location'}{'label_prefix'}. ': '\r
+ if length($section->{'location'}{'label_prefix'});\r
+ $OUT .= $section->{'location'}{'address1'};\r
+ $OUT .= ', ' . $section->{'location'}{'address2'}\r
+ if length($section->{'location'}{'address2'});\r
+ $OUT .= ', ' .\r
+ $section->{'location'}{'city'} . ', ' .\r
+ $section->{'location'}{'state'} . '~' .\r
+ $section->{'location'}{'zip'};\r
+ } elsif ( $section->{'description'} ) {\r
+ $OUT .= ($section->{'description'});\r
+ } else {\r
+ $OUT .= emt('Charges');\r
+ }\r
$OUT .= '}\\\\';\r
if ($section->{header_generator}) {\r
$OUT .= &{$section->{header_generator}}();\r
+ } elsif ( $section->{usage_section} ) {\r
+ $OUT .= '\FSusagehead';\r
} else {\r
$OUT .= '\FShead';\r
}\r
$OUT .= '\multicolumn{7}{r}{\rule{0pt}{2.5ex}'.emt('Continued from previous page').'}\\\\';\r
if ($section->{header_generator}) {\r
$OUT .= &{$section->{header_generator}}();\r
+ } elsif ( $section->{usage_section} ) {\r
+ $OUT .= '\FSusagehead';\r
} else {\r
$OUT .= '\FShead';\r
}\r
# Don't break-up small packages.\r
my $rowbreak = @$ext_description < 5 ? '*' : '';\r
\r
- $OUT .= "\\hline\n" if ($line->{'ref'} && $line->{'ref'} ne $lastref);\r
+ $OUT .= "\\hline\n" if (($line->{'ref'} || 0) ne $lastref);\r
if ($section->{description_generator}) {\r
$OUT .= &{$section->{description_generator}}($line);\r
+ } elsif ($section->{usage_section}) {\r
+ my $minutes = sprintf('%d', $line->{'duration'} / 60);\r
+ my $seconds = $line->{'duration'} % 60;\r
+ $OUT .= '\FSusagedesc\r
+ {' . $line->{'description'} . '}\r
+ {' . $line->{'quantity'} . '}\r
+ {' . $minutes . 'm ' . $seconds . 's' . '}\r
+ {' . $line->{'amount'} . '}';\r
} else {\r
$OUT .= '\FSdesc'.\r
- '{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.\r
- '{' . $line->{'description'} . '}' .\r
- '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.\r
- '{' . ( $unitprices ? $line->{'quantity'} : '' ) . '}' .\r
- '{' . $line->{'amount'} . "}${rowbreak}\n";\r
+ '{}'.\r
+ '{' . $line->{'description'} . '}' ;\r
+ if ( $unitprices and length($line->{'unit_amount'}) ) {\r
+ # then show the unit amount and quantity\r
+ $OUT .= \r
+ '{\\dollar' . $line->{'unit_amount'} . '}'.\r
+ '{' . $line->{'quantity'} . '}';\r
+ } else {\r
+ # leave those columns blank\r
+ $OUT .= '{}{}';\r
+ }\r
+ $OUT .= '{\\dollar' . $line->{'amount'} . "}${rowbreak}\n";\r
}\r
- $lastref = $line->{'ref'};\r
+ $lastref = $line->{'ref'} || 0;\r
\r
foreach my $ext_desc (@$ext_description) {\r
if ($section->{extended_description_generator}) {\r
projects / freeside.git / blobdiff