inappropriate cluckage

[freeside.git] / FS / FS / ClientAPI / MyAccount.pm

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index ff5b775..dc4ae78 100644 (file)
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -130,7 +130,7 @@ sub customer_info {
     }
 
     if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
-      $return{payinfo} = $cust_main->payinfo_masked;
+      $return{payinfo} = $cust_main->paymask;
       @return{'month', 'year'} = $cust_main->paydate_monthyear;
     }
 
@@ -175,7 +175,7 @@ sub edit_info {
 
   if ( $p->{'payby'} =~ /^(CARD|DCRD)$/ ) {
     $new->paydate($p->{'year'}. '-'. $p->{'month'}. '-01');
-    if ( $new->payinfo eq $cust_main->payinfo_masked ) {
+    if ( $new->payinfo eq $cust_main->paymask ) {
       $new->payinfo($cust_main->payinfo);
     } else {
       $new->paycvv($p->{'paycvv'});
@@ -578,11 +578,11 @@ sub list_svcs {
                             'upbytes'   => $svc_x->upbytes,
                             'downbytes' => $svc_x->downbytes,
                             'totalbytes'=> $svc_x->totalbytes,
-                            'recharge_amount' => $part_pkg->option('recharge_amount'),
-                            'recharge_seconds' => $part_pkg->option('recharge_seconds'),
-                            'recharge_upbytes' => $part_pkg->option('recharge_upbytes'),
-                            'recharge_downbytes' => $part_pkg->option('recharge_downbytes'),
-                            'recharge_totalbytes' => $part_pkg->option('recharge_totalbytes'),
+                            'recharge_amount' => $part_pkg->option('recharge_amount', 1),
+                            'recharge_seconds' => $part_pkg->option('recharge_seconds', 1),
+                            'recharge_upbytes' => $part_pkg->option('recharge_upbytes', 1),
+                            'recharge_downbytes' => $part_pkg->option('recharge_downbytes', 1),
+                            'recharge_totalbytes' => $part_pkg->option('recharge_totalbytes', 1),
                             # more...
                           };
                         }
@@ -721,10 +721,10 @@ sub order_recharge {
   my $part_pkg = $cust_svc->cust_pkg->part_pkg;
 
   my %vhash =
-    map { $_ =~ /^recharge_(.*)$/; $1, $part_pkg->option($_) } 
+    map { $_ =~ /^recharge_(.*)$/; $1, $part_pkg->option($_, 1) } 
     qw ( recharge_seconds recharge_upbytes recharge_downbytes
          recharge_totalbytes );
-  my $amount = $part_pkg->option('recharge_amount'); 
+  my $amount = $part_pkg->option('recharge_amount', 1); 
   
   my $old_balance = $cust_main->balance;