X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fchange-cust_pkg.html;h=0b36e9053c2f8ed00d5238681524838ff46874aa;hp=e1b220e5109605533f2a9f5bb90702799fde7a7c;hb=71231d6bd803d2a3977c3ce2fa1f3c0ed4746b2d;hpb=0ed464c391924a455fc2a9ba3f89eb6ca2ebab6b

diff --git a/httemplate/edit/process/change-cust_pkg.html b/httemplate/edit/process/change-cust_pkg.html
index e1b220e51..0b36e9053 100644
--- a/httemplate/edit/process/change-cust_pkg.html
+++ b/httemplate/edit/process/change-cust_pkg.html
@@ -40,6 +40,12 @@ if ( $cgi->param('locationnum') == -1 ) {
   $change{'cust_location'} = $cust_location;
 }
 
+my %discount = (discountnum => $cgi->param('discountnum'));
+if (%discount) {
+  $discount{$_} = $cgi->param("discountnum_$_")
+    for qw(_type amount months percent setup);
+}
+
 my $error;
 my $now = time;
 if (defined($cgi->param('contract_end'))) {
@@ -56,6 +62,7 @@ unless ($error) {
     } else {
       # schedule the change
       $change{'start_date'} = $date;
+      $change{discount} = \%discount if %discount;
       $error = $cust_pkg->change_later(\%change);
     }
   } else {
@@ -74,9 +81,11 @@ unless ($error) {
         %change = ( 'cust_pkg' => $change_to );
       }
     }
-    
+
     # do a package change right now
     my $pkg_or_error = $cust_pkg->change( \%change );
+    $pkg_or_error->change_discount(\%discount)
+      if ref $pkg_or_error && $discount{discountnum} =~ /$-?\d+$/;
     $error = ref($pkg_or_error) ? '' : $pkg_or_error;
   }
 }