refactor transaction from process/qual.cgi to qual.pm insert, RT#7111

diff --git a/FS/FS/part_export/ikano.pm b/FS/FS/part_export/ikano.pm
index 5d8285e..604f47e 100644 (file)
--- a/FS/FS/part_export/ikano.pm
+++ b/FS/FS/part_export/ikano.pm
@@ -258,12 +258,14 @@ sub ikano2fsnote {
      } );
 }
 
+# address always required for Ikano qual, TN optional (assume dry if not given)
 sub qual {
     my($self,$qual) = (shift,shift);
-# address always required for Ikano qual, TN optional (assume dry if not given)
 
-    my %location_hash = $qual->location; 
-    return 'No address provided' unless %location_hash;
+    my %location_hash = $qual->location_hash; 
+    warn Dumper $qual->location_hash;
+    return 'No address provided' unless keys %location_hash;
+
     my $svctn = $qual->phonenum;
 
     my $result = $self->ikano_command('PREQUAL',

diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index e748382..98e137c 100644 (file)
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -184,8 +184,9 @@ sub part_export {
     '';
 }
 
-sub location {
+sub location_hash {
     my $self = shift;
+    use Data::Dumper; warn Dumper($self);
     if ( $self->locationnum ) {
        my $l = qsearchs( 'cust_location', 
                    { 'locationnum' => $self->locationnum });
@@ -206,9 +207,9 @@ sub location {
            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 {

diff --git a/httemplate/view/qual.cgi b/httemplate/view/qual.cgi
index 45f3d2a..ec3a7cf 100644 (file)
--- a/httemplate/view/qual.cgi
+++ b/httemplate/view/qual.cgi
@@ -37,7 +37,7 @@
 %   my $pkglist = $qual_result->{'pkglist'};
 %   my $cust_or_prospect = $qual->cust_or_prospect;
 %   my $locationnum = '';
-%   my %location = $qual->location;
+%   my %location = $qual->location_hash;
 %   if (%location && $location{'locationnum'}) { 
 %      $locationnum = $location{'locationnum'};
 %   }
@@ -82,7 +82,7 @@ if ( $cgi->param('qualnum') ) {
 
 my $qual = qsearchs('qual', { qualnum => $qualnum }) or die "invalid qualnum";
 my $location_line = '';
-my %location_hash = $qual->location;
+my %location_hash = $qual->location_hash;
 my $cust_location;
 if ( %location_hash ) {
     $cust_location = new FS::cust_location(\%location_hash);