[freeside-commits] freeside/FS/FS/ClientAPI Signup.pm,1.32,1.33

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/ClientAPI
In directory wavetail:/tmp/cvs-serv24934

Modified Files:
	Signup.pm 
Log Message:
fix up the info passing for optional packages

Index: Signup.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/ClientAPI/Signup.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Signup.pm	30 Jan 2007 18:52:35 -0000	1.32
+++ Signup.pm	1 Feb 2007 02:35:54 -0000	1.33
@@ -100,17 +100,20 @@
   if ( grep { $conf->exists($_) } @addl ) {
   
     $signup_info->{optional_packages} = [];
-    $signup_info->{optional_packages_options} = [];
 
     foreach my $addl ( @addl ) {
       my $classnum = $conf->config($addl) or next;
-      my @pkgs = map { $_->hashref }
+
+      my @pkgs = map { {
+                         'freq_pretty' => $_->freq_pretty,
+                         'options'     => { $_->options },
+                         %{ $_->hashref }
+                       };
+                     }
                      qsearch( 'part_pkg', { classnum => $classnum } );
+
       push @{$signup_info->{optional_packages}}, \@pkgs;
-      my @options = map { { $_->options,
-                            'freq_pretty' => $_->freq_pretty
-                        } } @pkgs;
-      push @{$signup_info->{options_packages_options}}, \@options
+
     }
 
   }
@@ -152,7 +155,8 @@
                 'freq_pretty' => $_->freq_pretty,
                 'options'     => { $_->options },
                 %{$_->hashref}
-            } }
+              };
+            }
           grep { $_->svcpart('svc_acct') }
           map { $_->part_pkg }
             qsearchs( 'reg_code', { 'code'     => $packet->{'reg_code'},