freeside/FS/FS/ClientAPI MyAccount.pm,1.22,1.23

[ivan]

Update of /home/cvs/cvsroot/freeside/FS/FS/ClientAPI
In directory pouncequick:/tmp/cvs-serv17918/ClientAPI

Modified Files:
	MyAccount.pm 
Log Message:
field name is primary_svc, not primary

Index: MyAccount.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/ClientAPI/MyAccount.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- MyAccount.pm	21 Jun 2004 10:26:14 -0000	1.22
+++ MyAccount.pm	21 Jun 2004 10:45:15 -0000	1.23
@@ -61,6 +61,11 @@
                          );
   return { error => 'User not found.' } unless $svc_acct;
 
+  my $conf = new FS::Conf;
+  my $pkg_svc = $svc_acct->cust_svc->pkg_svc;
+  return { error => 'Only primary user may log in.' } 
+    if $conf->exists('selfservice_server-primary_only')
+       && ( ! $pkg_svc || $pkg_svc->primary_svc ne 'Y' );
 
   return { error => 'Incorrect password.' }
     unless $svc_acct->check_password($p->{'password'});
@@ -74,12 +79,6 @@
     my $cust_main = $cust_pkg->cust_main;
     $session->{'custnum'} = $cust_main->custnum;
   }
-
-  my $conf = new FS::Conf;
-  my $pkg_svc = $svc_acct->cust_svc->pkg_svc;
-  return { error => 'Only primary user may log in.' } 
-    if $conf->exists('selfservice_server-primary_only')
-       && ( ! $pkg_svc || $pkg_svc->primary ne 'Y' );
 
   my $session_id;
   do {