qualification address handling changes, RT#7111

[freeside.git] / FS / FS / qual.pm

diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index 1bc3397..d0b3fbd 100644 (file)
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -2,7 +2,7 @@ package FS::qual;
 
 use strict;
 use base qw( FS::option_Common );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch qsearchs dbh );
 
 =head1 NAME
 
@@ -74,7 +74,56 @@ otherwise returns false.
 
 =cut
 
-# the insert method can be inherited from FS::Record
+sub insert {
+  my $self = shift;
+  my %options = @_;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  if ( $options{'cust_location'} ) {
+    my $cust_location = $options{'cust_location'};
+    my $method = $cust_location->locationnum ? 'replace' : 'insert';
+    my $error = $cust_location->$method();
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+    $self->locationnum( $cust_location->locationnum );
+  }
+
+  my @qual_option = ();
+  if ( $self->exportnum ) {
+    my $export = qsearchs( 'part_export', { 'exportnum' => $self->exportnum } )
+      or die 'Invalid exportnum';
+
+    my $qres = $export->qual($self);
+    unless ( ref($qres) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Qualification error: $qres";
+    }
+
+    $self->$_($qres->{$_}) foreach grep $qres->{$_}, qw(status vendor_qual_id);
+    @qual_option = ( $qres->{'options'} ) if ref($qres->{'options'});
+  }
+
+  my $error = $self->SUPER::insert(@qual_option);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+}
 
 =item delete
 
@@ -127,7 +176,7 @@ sub check {
   $self->SUPER::check;
 }
 
-sub export {
+sub part_export {
     my $self = shift;
     if ( $self->exportnum ) {
        return qsearchs('part_export', { exportnum => $self->exportnum } )
@@ -136,20 +185,31 @@ sub export {
     '';
 }
 
-sub location {
+sub location_hash {
     my $self = shift;
     if ( $self->locationnum ) {
        my $l = qsearchs( 'cust_location', 
                    { 'locationnum' => $self->locationnum });
-       return $l->location_hash if $l;
+       if ( $l ) {
+           my %loc_hash = $l->location_hash;
+           $loc_hash{locationnum} = $self->locationnum;
+           return %loc_hash;
+       }
     }
     if ( $self->custnum ) {
        my $c = qsearchs( 'cust_main', { 'custnum' => $self->custnum });
-       return $c->location_hash if $c;
+       
+       if($c) {
+           # always override location_kind as it would never be known in the 
+           # case of cust_main "default service address"
+           my %loc_hash = $c->location_hash;
+           $loc_hash{location_kind} = $c->company ? 'B' : 'R';
+           return %loc_hash;
+       }
     }
-  # prospectnum does not imply any particular address! must specify locationnum
 
-    '';
+  warn "prospectnum does not imply any particular address! must specify locationnum";
+  return ();
 }
 
 sub cust_or_prospect {