X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fqual.cgi;h=21516542cbaf54510c38824908b688d57304f11a;hp=789834ebf21c0abea4e7edef2be6f406d4401257;hb=4d5e45b24200386a7fc47f2cd69949e82e4bc9c3;hpb=c58774a70c3326ad2ba5a7a38b174dfbd76a9f78

diff --git a/httemplate/edit/process/qual.cgi b/httemplate/edit/process/qual.cgi
index 789834ebf..21516542c 100644
--- a/httemplate/edit/process/qual.cgi
+++ b/httemplate/edit/process/qual.cgi
@@ -1,14 +1,11 @@
 %if ($error) {
 %  $cgi->param('error', $error);
-%  $dbh->rollback if $oldAutoCommit;
 <% $cgi->redirect(popurl(3). 'misc/qual.html?'. $cgi->query_string ) %>
 %} else {
-%  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-<% header('Qualification entered') %>
+<& /elements/header-popup.html, 'Qualification entered' &>
   <SCRIPT TYPE="text/javascript">
-    window.top.location = '<% popurl(3). "view/qual.cgi?qualnum=$qualnum" %>';
+    window.top.location = '<% popurl(3).'view/qual.cgi?qualnum='. $qual->qualnum %>';
   </SCRIPT>
-
   </BODY></HTML>
 %}
 <%init>
@@ -18,98 +15,73 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 die "access denied"
   unless $curuser->access_right('Qualify service');
 
-$cgi->param('custnum') =~ /^(\d+)$/
-  or die 'illegal custnum '. $cgi->param('custnum');
+# copied from misc/qual.html :(
+$cgi->param('custnum') =~ /^(\d+)$/;
 my $custnum = $1;
-my $cust_main = qsearchs({
-  'table'     => 'cust_main',
-  'hashref'   => { 'custnum' => $custnum },
+$cgi->param('prospectnum') =~ /^(\d+)$/;
+my $prospectnum = $1;
+my $cust_or_prospect = $custnum ? "cust" : "prospect";
+my $table = $cust_or_prospect . "_main";
+my $custnum_or_prospectnum = $custnum ? $custnum : $prospectnum;
+my $cust_main_or_prospect_main = qsearchs({
+  'table'     => $table,
+  'hashref'   => { $cust_or_prospect."num" => $custnum_or_prospectnum },
   'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
 });
-die 'unknown custnum' unless $cust_main;
+die "neither prospect nor customer specified or found" 
+    unless $cust_main_or_prospect_main;
 
 $cgi->param('exportnum') =~ /^(\d+)$/ or die 'illegal exportnum';
 my $exportnum = $1;
 
-$cgi->param('phonenum') =~ /^(\d*)$/ or die 'illegal phonenum';
+my $phonenum = $cgi->param('phonenum');
+$phonenum =~ s/\D//g;
+$phonenum =~ /^(\d*)$/ or die 'illegal phonenum';
 my $phonenum = $1;
 
 $cgi->param('locationnum') =~ /^(\-?\d*)$/
   or die 'illegal locationnum '. $cgi->param('locationnum');
 my $locationnum = $1;
 
-my $oldAutoCommit = $FS::UID::AutoCommit;
-local $FS::UID::AutoCommit = 0;
-my $dbh = dbh;
 my $error = '';
-my $cust_location;
-if ( $locationnum == -1 ) { # adding a new one
-  my %location_hash = map { $_ => scalar($cgi->param($_)) }
-	qw( custnum address1 address2 city county state zip country geocode );
-  $location_hash{location_type} = $cgi->param('location_type') 
-    if $cgi->param('location_type');
-  $location_hash{location_number} = $cgi->param('location_number') 
-    if $cgi->param('location_number');
-  $location_hash{location_kind} = $cgi->param('location_kind') 
-    if $cgi->param('location_kind');
-  $cust_location = new FS::cust_location ( { %location_hash } );
-  $error = $cust_location->insert;
-  die "Unable to insert cust_location: $error" if $error;
-}
-elsif ( $locationnum eq '' ) { # default service location
-  $cust_location = new FS::cust_location ( {
-	$cust_main->location_hash,
-	custnum => $custnum,
-  } );
-}
-elsif ( $locationnum != -2 ) { # -2 = address not required for qual
-  $cust_location = qsearchs('cust_location', { 'locationnum' => $locationnum })
-    or die 'Invalid locationnum'; 
-}
+my $cust_location = '';
+my %location_hash = (
+  map { $_ => scalar($cgi->param($_)) }
+    qw( address1 address2 city county state zip country geocode ),
+    grep scalar($cgi->param($_)),
+      qw( location_type location_number location_kind )
+);
 
-my $export;
-if ( $exportnum > 0 ) {
- $export = qsearchs( 'part_export', { 'exportnum' => $exportnum } )
-    or die 'Invalid exportnum';
-}
+if ( $locationnum == -1 || $locationnum == -3 ) { # adding a new one
 
-die "Nothing to qualify - neither TN nor address specified" 
-    unless ( defined $cust_location || $phonenum ne '' );
+  $cust_location = new FS::cust_location {
+    $cust_or_prospect."num" => $custnum_or_prospectnum,
+    %location_hash,
+  };
 
-my $qual;
-if ( $locationnum != -2 && $cust_location->locationnum > 0 ) {
-    $qual = new FS::qual( { locationnum => $cust_location->locationnum } );
-}
-else { # a cust_main default service address *OR* address not required
-    $qual = new FS::qual( { custnum => $custnum } );
-}
-$qual->phonenum($phonenum) if $phonenum ne '';
-$qual->status('N');
+          #locationnum '': default service location
+} elsif ( $locationnum eq '' && $cust_or_prospect eq 'prospect' ) {
+    die "a location must be specified explicitly for prospects";
 
-if ( $export ) {
-    $qual->exportnum($export->exportnum);
-    my $qres = $export->qual($qual);
-    $error = "Qualification error: $qres" unless ref($qres);
-    unless ( $error ) {
-	$qual->status($qres->{'status'}) if $qres->{'status'};
-	$qual->vendor_qual_id($qres->{'vendor_qual_id'}) 
-	    if $qres->{'vendor_qual_id'};
-	$error = $qual->insert($qres->{'options'}) if ref($qres->{'options'});
-    }
-}
+          #locationnum -2: address not required for qual
+} elsif ( $locationnum == -2 && $phonenum eq '' ) {
+  $error = "Nothing to qualify - neither phone number nor address specified";
 
-unless ( $error || $qual->qualnum ) {
-    $error = $qual->insert;
+} else { #existing location, possibly with an edit
+  $cust_location = qsearchs('cust_location', { 'locationnum'=>$locationnum })
+    or die "Unknown locationnum $locationnum";
+  $cust_location->$_($location_hash{$_}) foreach keys %location_hash;
 }
 
-my $qualnum;
-unless ( $error ) {
-    if($qual->qualnum) {
-	$qualnum = $qual->qualnum;
-    }
-    else {
-	$error = "Unable to save qualification";
-    }
-}
+my $qual = new FS::qual {
+  'status' => 'N',
+};
+$qual->phonenum($phonenum)       if $phonenum ne '';
+#$qual->locationnum($locationnum) if $locationnum > 0;
+$qual->exportnum($exportnum)     if $exportnum > 0;
+$qual->set( $cust_or_prospect."num" => $custnum_or_prospectnum )
+  unless $locationnum == -1 || $locationnum == -3 || $locationnum > 0;
+
+$error ||= $qual->insert( 'cust_location' => $cust_location );
 
 </%init>