X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fqual.cgi;h=5c15ec0c35f419d00cad17c387d345cfafac1e49;hb=b5c4237a34aef94976bc343c8d9e138664fc3984;hp=45f3d2a625dbe68f622de8cf30e0fb6870247ef7;hpb=98779ec47370ad67c716154f67f6a726b83e09ed;p=freeside.git

diff --git a/httemplate/view/qual.cgi b/httemplate/view/qual.cgi
index 45f3d2a62..5c15ec0c3 100644
--- a/httemplate/view/qual.cgi
+++ b/httemplate/view/qual.cgi
@@ -1,14 +1,17 @@
 <% include("/elements/header.html","View Qualification") %>
 
-% if ( $cust_or_prospect->get('custnum') ) {
+% if ( $cust_or_prospect->custnum ) {
 
-  <% include( '/elements/small_custview.html', $cust_or_prospect->custnum, '', 1,
-     "${p}view/cust_main.cgi") %>
+    <% include( '/elements/small_custview.html', $cust_or_prospect,
+                  '',                        #countrydefault override
+                  1,                         #no balance
+                  "${p}view/cust_main.cgi"), #url
+    %>
+
+% } elsif ( $cust_or_prospect->prospectnum ) {
+
+    <% include( '/elements/small_prospect_view.html', $cust_or_prospect) %>
 
-% } elsif ( $cust_or_prospect->get('prospectnum') ) {
-%  	my $prospectnum = $cust_or_prospect->get('prospectnum');
-% 	my $link = "${p}view/prospect_main.html?$prospectnum";
-	<A HREF="<%$link%>">Prospect #<%$prospectnum%></A>
 % }
 
 <BR><BR>
@@ -16,7 +19,7 @@
 <B>Qualification #<% $qual->qualnum %></B>
 <% ntable("#cccccc", 2) %>
 <% include('elements/tr.html', label => 'Status', value => $qual->status_long ) %>
-<% include('elements/tr.html', label => 'Service Telephone Number', value => $qual->phonenum ) %>
+<% include('elements/tr.html', label => 'Service Telephone Number', value => $qual->phonenum || '(none - dry loop)' ) %>
 <% include('elements/tr.html', label => 'Address', value => $location_line ) %>
 % if ( $location_kind ) {
 <% include('elements/tr.html', label => 'Location Kind', value => $location_kind ) %>
@@ -28,41 +31,56 @@
 <BR><BR>
 
 % if ( $export ) {
-%  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>
+%   my $qual_result = $export->qual_result($qual);
+%   if ($qual_result->{'pkglist'}) { # one of the possible formats (?)
+      <B>Qualifying Packages</B> - click to order
+%     my $svcpart = '';
+%     my $pkglist = $qual_result->{'pkglist'};
+%     my $cust_or_prospect = $qual->cust_or_prospect;
+%     my $locationnum = '';
+%     my %location = $qual->location_hash;
+%     my $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->custnum) {
+
+%             my %opt = ( 'label'            => $pkglist->{$pkgpart},
+%                         'lock_pkgpart'     => $pkgpart,
+%                         'lock_locationnum' => $location{'locationnum'},
+%                         'qualnum'          => $qual->qualnum,                
+%                       );
+%             if ( $export->exporttype eq 'ikano' ) {
+%               my $pkg_svc = qsearchs('pkg_svc', { 'pkgpart'     => $pkgpart,
+%                                                   'primary_svc' => 'Y',
+%                                                 }
+%                                     );
+%               $opt{'svcpart'} = $pkg_svc->svcpart if $pkg_svc;
+%             }
+
+              <% include('/view/cust_main/order_pkg_link.html',
+                           $cust_or_prospect, %opt) %>
+
+%           } elsif ($cust_or_prospect->prospectnum) {
+
+%             my $link = "${p}edit/cust_main.cgi?qualnum=". $qual->qualnum.
+%                                              ";lock_pkgpart=$pkgpart";
+              <A HREF="<% $link %>"><% $pkglist->{$pkgpart} |h %></A>
+
 %           }
-	    <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>
+          </LI>
 %       }
-    </UL>
+      </UL>
 %  }
+
+%  my $not_avail = $qual_result->{'not_avail'};
+%  if ( keys %$not_avail ) {
+     <BR>
+     Qualifying vendor packages (not yet configured in any package definition):
+     <% join(', ', map $not_avail->{$_}, keys %$not_avail ) |h %>
+%  }
+
 % }
 
 <%init>
@@ -82,7 +100,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);
@@ -93,7 +111,7 @@ my $location_kind;
 $location_kind = "Residential" if $cust_location->get('location_kind') eq 'R';
 $location_kind = "Business" if $cust_location->get('location_kind') eq 'B';
 
-my $cust_or_prospect = $qual->cust_or_prospect;
+my $cust_or_prospect = $qual->cust_or_prospect; #or die?  qual without this?
 my $export = $qual->part_export;
 
 </%init>