[freeside-commits] freeside/httemplate/view qual.cgi, 1.1, 1.2 svc_dsl.cgi, 1.7, 1.8

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv4911/httemplate/view

Modified Files:
	qual.cgi svc_dsl.cgi 
Log Message:
-small svc_dsl UI and flow changes, RT7111
-finish basic qualifications, except prospect support, RT7111


Index: svc_dsl.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_dsl.cgi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -d -r1.7 -r1.8
--- svc_dsl.cgi	29 Nov 2010 22:11:01 -0000	1.7
+++ svc_dsl.cgi	7 Dec 2010 19:04:43 -0000	1.8
@@ -36,7 +36,6 @@
     return if ( scalar(@exports) == 0 );
 
     my $export = @exports[0];
-    $opt->{'disable_unprovision'} = 1;
 
     @fields = ( 'phonenum',
 	    { field => 'loop_type', 

Index: qual.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/qual.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- qual.cgi	6 Dec 2010 06:36:02 -0000	1.1
+++ qual.cgi	7 Dec 2010 19:04:43 -0000	1.2
@@ -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 @@
     $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>