diff options
| author | ivan <ivan> | 2011-03-12 21:30:57 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-03-12 21:30:57 +0000 |
| commit | 1888d732dcc9f50b7f88ebc684d1c05b534cbd92 (patch) | |
| tree | b9a67d17b38f1e508fa6bb07bd9e799edabe65e8 | |
| parent | 4e76632c66f001a4f4d97aadc308038172eaeaa7 (diff) | |
refactor transaction from process/qual.cgi to qual.pm insert, RT#7111
| -rw-r--r-- | FS/FS/part_export/ikano.pm | 8 | ||||
| -rw-r--r-- | FS/FS/qual.pm | 7 | ||||
| -rw-r--r-- | httemplate/view/qual.cgi | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/FS/FS/part_export/ikano.pm b/FS/FS/part_export/ikano.pm index 5d8285e6b..604f47e99 100644 --- 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 e7483825f..98e137c6b 100644 --- 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 45f3d2a62..ec3a7cf1d 100644 --- 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); |