From: ivan <ivan>
Date: Fri, 14 Jan 2011 02:51:49 +0000 (+0000)
Subject: fix old form of order_pkgs in favor of seconds_ref as an option, RT#10122
X-Git-Tag: freeside_2_3_0~762
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=b7a6c44ce03edfe635425cbd9f7a946a607131f7

fix old form of order_pkgs in favor of seconds_ref as an option, RT#10122
---

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index d619e8493..ad40b1760 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -1272,7 +1272,7 @@ sub order_pkg {
       map { $_ => $p->{$_} } @{$fields{$svcdb}}
     } );
     
-    if ( $svcdb eq 'svc_acct' ) {
+    if ( $svcdb eq 'svc_acct' && exists($p->{"snarf_machine1"}) ) {
       my @acct_snarf;
       my $snarfnum = 1;
       while ( length($p->{"snarf_machine$snarfnum"}) ) {
@@ -1302,7 +1302,7 @@ sub order_pkg {
   tie my %hash, 'Tie::RefHash';
   %hash = ( $cust_pkg => \@svc );
   #msgcat
-  $error = $cust_main->order_pkgs( \%hash, '', 'noexport' => 1 );
+  $error = $cust_main->order_pkgs( \%hash, 'noexport' => 1 );
   return { 'error' => $error } if $error;
 
   my $conf = new FS::Conf;
diff --git a/FS/FS/Maestro.pm b/FS/FS/Maestro.pm
index 84f278c2f..8c33e3bf9 100644
--- a/FS/FS/Maestro.pm
+++ b/FS/FS/Maestro.pm
@@ -218,7 +218,7 @@ sub order_pkg {
   tie my %hash, 'Tie::RefHash';
   %hash = ( $cust_pkg => \@svc );
   #msgcat
-  $error = $cust_main->order_pkgs( \%hash, '', 'noexport' => 1 );
+  $error = $cust_main->order_pkgs( \%hash, 'noexport' => 1 );
   return { 'error' => $error } if $error;
 
 # currently they're using this in the reseller scenario, so don't
diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index ab7bde316..4b44fdd5d 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -142,7 +142,6 @@ sub order_pkg {
 
 }
 
-#deprecated #=item order_pkgs HASHREF [ , SECONDSREF ] [ , OPTION => VALUE ... ]
 =item order_pkgs HASHREF [ , OPTION => VALUE ... ]
 
 Like the insert method on an existing record, this method orders multiple
@@ -185,9 +184,7 @@ values of the prepaid card.`
 sub order_pkgs {
   my $self = shift;
   my $cust_pkgs = shift;
-  my $seconds_ref = ref($_[0]) ? shift : ''; #deprecated
   my %options = @_;
-  $seconds_ref ||= $options{'seconds_ref'};
 
   local($DEBUG) = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
 
@@ -213,10 +210,8 @@ sub order_pkgs {
     my $error = $self->order_pkg(
       'cust_pkg'     => $cust_pkg,
       'svcs'         => $cust_pkgs->{$cust_pkg},
-      'seconds_ref'  => $seconds_ref,
-      map { $_ => $options{$_} } qw( upbytes_ref downbytes_ref totalbytes_ref
-                                     depend_jobnum
-                                   )
+      map { $_ => $options{$_} }
+        qw( seconds_ref upbytes_ref downbytes_ref totalbytes_ref depend_jobnum )
     );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;