-small svc_dsl UI and flow changes, RT7111

-finish basic qualifications, except prospect support, RT7111

5 files changed, 15 insertions, 18 deletions

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 04c47aa3e..ed4ca60c4 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,8 +1,9 @@
 % my $s = 0;
 
-% # XXX: add qual access right
+% if ( $curuser->access_right('Qualify service') ) { 
   <% $s++ ? ' | ' : '' %>
   <% include('qual_link.html', $cust_main) %>
+% }
 
 % if ( $curuser->access_right('Order customer package') ) { 
   <% $s++ ? ' | ' : '' %>
@@ -60,7 +61,11 @@ Current packages
 
     </TD>
     <TD ALIGN="right">
-      <A HREF="<%$p%>search/report_cust_pkg.html?custnum=<% $cust_main->custnum %>">Package reports</A><BR>
+      <A HREF="<%$p%>search/report_cust_pkg.html?custnum=<% $cust_main->custnum %>">Package reports</A>
+% if ( $curuser->access_right('Qualify service') ) { 
+    | <A HREF="<%$p%>search/qual.cgi?custnum=<% $cust_main->custnum %>">View Qualifications</A>
+% }
+      <BR>
       Service reports:
         <A HREF="<%$p%>search/report_svc_acct.html?custnum=<% $cust_main->custnum %>">accounts</A><BR>
       Usage reports:
diff --git a/httemplate/view/cust_main/qual_link.html b/httemplate/view/cust_main/qual_link.html
index 077142c0a..b8dfaf9b2 100644
--- a/httemplate/view/cust_main/qual_link.html
+++ b/httemplate/view/cust_main/qual_link.html
@@ -1,7 +1,7 @@
 <% include( '/elements/popup_link-cust_main.html',
               'action'      => $p. 'misc/qual.html',
-              'label'       => 'Service&nbsp;Qualification',
-              'actionlabel' => 'Service Qualification',
+              'label'       => 'New&nbsp;Qualification',
+              'actionlabel' => 'New Qualification',
               'color'       => '#333399',
               'cust_main'   => $cust_main,
               'closetext'   => 'Close',
diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index e3b8da4fe..de49b50d2 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -53,11 +53,9 @@ Service #<B><% $svcnum %></B>
 % my $url = $opt{'edit_url'} || $p. 'edit/'. $opt{'table'}. '.cgi?';
 | <A HREF="<%$url%><%$svcnum%>">Edit this <% $label %></A>
 
-% unless ( $opt{'disable_unprovision'} ) {
 | <A HREF="javascript:areyousure('<%$p.'misc/unprovision.cgi?'.$svcnum%>')">
 Unprovision this Service</A>
 <BR>
-% }
 
 <% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 
diff --git a/httemplate/view/qual.cgi b/httemplate/view/qual.cgi
index f96726995..ebdc5cf12 100644
--- a/httemplate/view/qual.cgi
+++ b/httemplate/view/qual.cgi
@@ -1,6 +1,6 @@
 <% include("/elements/header.html","View Qualification") %>
 
-% if ( $cust_or_prospect->custnum ) {
+% if ( $cust_or_prospect->get('custnum') ) {
 
   <% include( '/elements/small_custview.html', $cust_or_prospect->custnum, '', 1,
      "${p}view/cust_main.cgi") %>
@@ -28,7 +28,8 @@
 
 <%init>
 
-# XXX: add access right for quals?
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Qualify service');
 
 my $qualnum;
 if ( $cgi->param('qualnum') ) {
@@ -48,18 +49,12 @@ if ( %location_hash ) {
     $cust_location = new FS::cust_location(\%location_hash);
     $location_line = $cust_location->location_label;
 }
-# XXX: geocode_Mixin location_label doesn't currently have the new cust_location fields - add them
 
 my $location_kind;
-$location_kind = "Residential" if $cust_location->location_kind eq 'R';
-$location_kind = "Business" if $cust_location->location_kind eq 'B';
+$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 $export;
-if ( $qual->exportnum ) {
-    $export = qsearchs('part_export', { exportnum => $qual->exportnum } )
-		or die 'invalid exportnum';
-}
+my $export = $qual->export;
 
 </%init>
diff --git a/httemplate/view/svc_dsl.cgi b/httemplate/view/svc_dsl.cgi
index 7bbdca1c7..ade13501b 100644
--- a/httemplate/view/svc_dsl.cgi
+++ b/httemplate/view/svc_dsl.cgi
@@ -36,7 +36,6 @@ my $svc_cb = sub {
     return if ( scalar(@exports) == 0 );
 
     my $export = @exports[0];
-    $opt->{'disable_unprovision'} = 1;
 
     @fields = ( 'phonenum',
 	    { field => 'loop_type',