Ikano / svc_dsl / qualification improvements, RT7111

2 files changed, 43 insertions, 3 deletions

diff --git a/httemplate/view/cust_main/order_pkg_link.html b/httemplate/view/cust_main/order_pkg_link.html
index 30c86a757..2e8b1dac1 100644
--- a/httemplate/view/cust_main/order_pkg_link.html
+++ b/httemplate/view/cust_main/order_pkg_link.html
@@ -1,16 +1,22 @@
 <% include( '/elements/popup_link-cust_main.html',
               'action'      => $p. 'misc/order_pkg.html',
-              'label'       => 'Order&nbsp;new&nbsp;package',
+              'label'       => $opt{'label'} || 'Order&nbsp;new&nbsp;package',
               'actionlabel' => 'Order new package',
               'color'       => '#333399',
               'cust_main'   => $cust_main,
               'closetext'   => 'Close',
               'width'       => 763,
               'height'      => 538,
+	      %optional,
           )
 %>
 <%init>
 
-my($cust_main) = @_;
+my($cust_main, %opt) = @_;
+
+my %optional = ();
+$optional{'pkgpart'} = $opt{'pkgpart'} if $opt{'pkgpart'};
+$optional{'locationnum'} = $opt{'locationnum'} if $opt{'locationnum'};
+$optional{'svcpart'} = $opt{'svcpart'} if $opt{'svcpart'};
 
 </%init>
diff --git a/httemplate/view/qual.cgi b/httemplate/view/qual.cgi
index 8ab0032ad..45f3d2a62 100644
--- a/httemplate/view/qual.cgi
+++ b/httemplate/view/qual.cgi
@@ -28,7 +28,41 @@
 <BR><BR>
 
 % if ( $export ) {
-<% $export->qual_html($qual) %>
+%  my $qual_result = $export->qual_result($qual);
+%  if ($qual_result->{'header'}) {
+	<B><% $qual_result->{'header'} %></B>
+%  }
+%  if ($qual_result->{'pkglist'}) { # one of the possible formats
+%   my $svcpart = '';
+%   my $pkglist = $qual_result->{'pkglist'};
+%   my $cust_or_prospect = $qual->cust_or_prospect;
+%   my $locationnum = '';
+%   my %location = $qual->location;
+%   if (%location && $location{'locationnum'}) { 
+%      $locationnum = $location{'locationnum'};
+%   }
+    <UL>
+%       foreach my $pkgpart ( keys %$pkglist ) { 
+%           my %opt = ( 'label' => $pkglist->{$pkgpart},
+%                          'pkgpart' => $pkgpart,
+%                          'locationnum' => $locationnum, );
+%           if ( $export->exporttype eq 'ikano' ) {
+% 		my $pkg_svc = qsearchs('pkg_svc', { 'pkgpart' => $pkgpart,
+%                                                 'primary_svc' => 'Y',
+%                                               } );
+%		$opt{'svcpart'} = $pkg_svc->svcpart if $pkg_svc;
+%           }
+	    <LI>
+%		if($cust_or_prospect && $cust_or_prospect->custnum) {
+		   <% include('/view/cust_main/order_pkg_link.html', $qual->cust_or_prospect, %opt) %>
+%		}
+%		else {
+		    <% $opt{label} %>
+%		}
+	    </LI>
+%       }
+    </UL>
+%  }
 % }
 
 <%init>