[freeside-commits] freeside/httemplate/misc/process recharge_svc.html, 1.5, 1.6

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/misc/process
In directory wavetail:/tmp/cvs-serv31900/httemplate/misc/process

Modified Files:
	recharge_svc.html 
Log Message:
add a reset feature to manual recharges (#1858)

Index: recharge_svc.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/process/recharge_svc.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- recharge_svc.html	13 Jul 2007 23:52:22 -0000	1.5
+++ recharge_svc.html	23 Dec 2007 22:05:54 -0000	1.6
@@ -40,7 +40,8 @@
 %  } elsif ( $payby =~ /^(CARD|DCRD|CHEK|DCHK|LECB|BILL|COMP)$/ ) {
 %    my $part_pkg = $svc_acct->cust_svc->cust_pkg->part_pkg;
 %    $amount = $part_pkg->option('recharge_amount', 1);
-%    my %rhash = map { $_ =~ /^recharge_(.*)$/; $1, $part_pkg->option($_, 1) }
+%    my %rhash = map { $_ =~ /^recharge_(.*)$/; $1, $part_pkg->option($_) }
+%      grep { $part_pkg->option($_, 1) }
 %      qw ( recharge_seconds recharge_upbytes recharge_downbytes
 %           recharge_totalbytes );
 %
@@ -53,7 +54,11 @@
 %    $error = $cust_main->charge($amount, "Recharge " . $svc_acct->label,
 %                                $description, $part_pkg->taxclass);
 %
-%    $error ||= $svc_acct->recharge(\%rhash);
+%    if ($part_pkg->option('recharge_reset', 1)) {
+%      $error ||= $svc_acct->set_usage(\%rhash);
+%    }else{
+%      $error ||= $svc_acct->recharge(\%rhash);
+%    }
 %
 %    my $old_balance = $cust_main->balance;
 %    $error ||= $cust_main->bill;