show active discounts on invoices more cleanly, #31273

2 files changed, 33 insertions, 21 deletions

diff --git a/conf/invoice_html b/conf/invoice_html
index 509bf950d..bd99899e0 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -161,23 +161,28 @@
                  ) }
             @detail_items )
           {
-            $OUT .=
-              '<tr class="invoice_desc';
             if ( $section->{description_generator} ) {
-              $OUT .= &{$section->{description_generator}}($line);
+              $OUT .= '<tr class="invoice_desc' .
+                      &{$section->{description_generator}}($line);
             } else {
-              $OUT .=  ( ($line->{'ref'} && $line->{'ref'} ne $lastref) ? '' : '_more' ).
-                       '">'.
-                       '<td align="center">'. 
-                       ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). '</td>'.
-                       '<td align="left">'. $line->{'description'}. '</td>'.
-                       ( $unitprices 
-                           ? '<td align="right">'. $line->{'unit_amount'}. '</td>'.
-                             '<td align="right">'. $line->{'quantity'}. '</td>'
-                           : ''
-                       ).
-
-                       '<td align="right">'. $line->{'amount'}. '</td>';
+              my $class = 'invoice_desc_more';
+              if ( $line->{'ref'} and $line->{'ref'} ne $lastref ) {
+                # then it's a new package (not a continuation)
+                $class = 'invoice_desc';
+              }
+              $OUT .= '<tr class="'.$class.'">
+                       <td align="center">';
+              if ( $line->{'ref'} ne $lastref ) {
+                $OUT .= $line->{'ref'};
+              }
+              $OUT .= '</td>
+                       <td align="left">'. $line->{'description'}. '</td>';
+              if ( $unitprices ) {
+                $OUT .= 
+                  '<td align="right">'. $line->{'unit_amount'}. '</td>'.
+                  '<td align="right">'. $line->{'quantity'}. '</td>';
+              }
+              $OUT .= '<td align="right">'. $line->{'amount'}. '</td>';
             }
             $OUT .= '</tr>';
             $lastref = $line->{'ref'};
diff --git a/conf/invoice_latex b/conf/invoice_latex
index 6a5b53dd5..99d12d5c7 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -187,11 +187,11 @@
 \newcommand{\FSdesc}[5]{

   \multicolumn{1}{c}{\rule{0pt}{2.5ex}\textbf{#1}} &

   \multicolumn{[@-- $unitprices ? '4' : '6' --@]}{l}{\textbf{#2}} &

-[@-- $unitprices ? '  \multicolumn{1}{r}{\textbf{\dollar #3}} &'."\n".

+[@-- $unitprices ? '  \multicolumn{1}{r}{\textbf{#3}} &'."\n".

                    '  \multicolumn{1}{r}{\textbf{#4}} &'."\n"

                  : ''

 --@]

-  \multicolumn{1}{r}{\textbf{\dollar #5}}\\

+  \multicolumn{1}{r}{\textbf{#5}}\\

 }

 % ...extended description...

 \newcommand{\FSextdesc}[1]{

@@ -333,10 +333,17 @@
         } else {

           $OUT .= '\FSdesc'.

                   '{' . ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ) . '}'.

-                  '{' . $line->{'description'} . '}' .

-                  '{' . ( $unitprices ? $line->{'unit_amount'} : '' ) . '}'.

-                  '{' . ( $unitprices ? $line->{'quantity'} : ''  ) . '}' .

-                  '{' . $line->{'amount'} . "}${rowbreak}\n";

+                  '{' . $line->{'description'} . '}' ;

+          if ( $unitprices and length($line->{'unit_amount'}) ) {

+            # then show the unit amount and quantity

+            $OUT .= 

+                '{\\dollar' . $line->{'unit_amount'} . '}'.

+                '{'         . $line->{'quantity'}    . '}';

+          } else {

+            # leave those columns blank

+            $OUT .= '{}{}';

+          }

+          $OUT .= '{\\dollar' . $line->{'amount'} . "}${rowbreak}\n";

         }

         $lastref = $line->{'ref'};