-small svc_dsl UI and flow changes, RT7111

-finish basic qualifications, except prospect support, RT7111

5 files changed, 20 insertions, 1 deletions

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 8dbc22bd5..adb4a0667 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -143,6 +143,7 @@ tie my %rights, 'Tie::IxHash',
     'Add on-the-fly suspend reason', #NEW
     'Edit customer package invoice details', #NEW
     'Edit customer package comments', #NEW
+    'Qualify service', #NEW
   ],
   
   ###
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 08bdedd6f..f5b2451b0 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4067,6 +4067,13 @@ and customer address. Include units.',
     'description' => 'Default the "Continue recurring billing while suspended" flag to on for new package definitions.',
     'type'        => 'checkbox',
   },
+  
+  {
+    'key'         => 'qual-alt-address-format',
+    'section'     => 'UI',
+    'description' => 'Enable the alternate address format (location type, number, and kind) on qualifications',
+    'type'        => 'checkbox',
+  },
 
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm
index d784b5709..08e7b8619 100644
--- a/FS/FS/geocode_Mixin.pm
+++ b/FS/FS/geocode_Mixin.pm
@@ -88,7 +88,7 @@ sub location_label {
   my $prefix = $self->has_ship_address ? 'ship_' : '';
 
   my $notfirst = 0;
-  foreach (qw ( address1 address2 ) ) {
+  foreach (qw ( address1 address2 location_type location_number ) ) {
     my $method = "$prefix$_";
     $line .= ($notfirst ? $separator : ''). &$escape($self->$method)
       if $self->$method;
diff --git a/FS/FS/part_export/ikano.pm b/FS/FS/part_export/ikano.pm
index d3715829b..d7203af9d 100644
--- a/FS/FS/part_export/ikano.pm
+++ b/FS/FS/part_export/ikano.pm
@@ -324,6 +324,8 @@ sub qual_html {
 		&& $optionvalue ne '' );
     }
 
+    # XXX: eventually perhaps this should return both the packages a link to
+    # order each package and go to the svc prov with the prequal id filled in
     my $list = "<B>Qualifying Packages:</B><UL>";
     my @part_pkgs = qsearch( 'part_pkg', { 'disabled' => '' } );
     foreach my $part_pkg ( @part_pkgs ) {
diff --git a/FS/FS/qual.pm b/FS/FS/qual.pm
index 4859b7734..1bc339796 100644
--- a/FS/FS/qual.pm
+++ b/FS/FS/qual.pm
@@ -127,6 +127,15 @@ sub check {
   $self->SUPER::check;
 }
 
+sub export {
+    my $self = shift;
+    if ( $self->exportnum ) {
+	return qsearchs('part_export', { exportnum => $self->exportnum } )
+		or die 'invalid exportnum';
+    }
+    '';
+}
+
 sub location {
     my $self = shift;
     if ( $self->locationnum ) {