From ivan at wavetail.420.am  Fri Jun  2 06:20:26 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Fri Jun  2 06:20:32 2006
Subject: [freeside-commits] freeside/httemplate/search svc_Smart.html, NONE,
	1.1
Message-ID: <20060602132026.3E708FC872C@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv15334/httemplate/search

Added Files:
	svc_Smart.html 
Log Message:
add a service search

--- NEW FILE: svc_Smart.html ---
<%

if ( $cgi->param('search_svc') =~ /\.[a-z]{2,8}$/i ) {

  # looks (enough) like a domain

  %><%= $cgi->redirect('svc_domain.cgi?domain='. uri_escape( $cgi->param('search_svc') ) ) %><%

} elsif ( $cgi->param('search_svc') =~ /\w/ ) {

  #looks (enough) like a username

  %><%= $cgi->redirect('svc_acct.cgi?username_type=Exact;username='. uri_escape( $cgi->param('search_svc') ) ) %><%

} else {

%><%= include('/elements/header.html', 'Unrecognized service string') %>
  <%= include('/elements/footer.html') %><%

} 

%>

From ivan at wavetail.420.am  Fri Jun  2 06:20:26 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Fri Jun  2 06:20:32 2006
Subject: [freeside-commits] freeside/rt/html/Elements Tabs, 1.7,
	1.8 FreesideSvcSearch, NONE, 1.1 PageLayout, 1.7, 1.8
Message-ID: <20060602132026.41CF6FC8A23@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/rt/html/Elements
In directory wavetail:/tmp/cvs-serv15334/rt/html/Elements

Modified Files:
	Tabs PageLayout 
Added Files:
	FreesideSvcSearch 
Log Message:
add a service search

Index: Tabs
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/Tabs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Tabs	15 May 2006 11:05:04 -0000	1.7
+++ Tabs	2 Jun 2006 13:20:24 -0000	1.8
@@ -63,7 +63,9 @@
 		},
 	B => { html => $m->scomp('/Elements/FreesideSearch')	
 		},
-	C => { html => $m->scomp('/Elements/SimpleSearch') 
+	C => { html => $m->scomp('/Elements/FreesideSvcSearch')	
+		},
+	D => { html => $m->scomp('/Elements/SimpleSearch') 
 		}
 	};
 my $basetabs = {

Index: PageLayout
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Elements/PageLayout,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PageLayout	15 May 2006 11:05:04 -0000	1.7
+++ PageLayout	2 Jun 2006 13:20:24 -0000	1.8
@@ -45,14 +45,14 @@
 %# END BPS TAGGED BLOCK }}}
 <table class="black" border=0 cellspacing=0 cellpadding=0 width="100%">
 <tr>
-  <TD colspan=4 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
+  <TD colspan=5 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<% $RT::URI::freeside::URL %>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
 </tr>
 <tr>
-  <th class="black" align="left" width=15%><span class="rtname"><%$AppName%></span>
-  </th>
+%#  <th class="black" align="left" width=15%><span class="rtname"><%$AppName%></span>
+%#  </th>
       <span class="topactions">
-% foreach my $action (sort keys %{$topactions}) {
-        <td class="blackright">
+% my $notfirst = 0; foreach my $action (sort keys %{$topactions}) {
+        <td class="blackright" ALIGN="right" <% $notfirst++ ? '' : 'WIDTH="15%"' %>>
         <%$topactions->{"$action"}->{'html'} |n %>
         </td>
 % }

--- NEW FILE: FreesideSvcSearch ---
<form action="<% $RT::URI::freeside::URL %>/search/svc_Smart.html" STYLE="margin:0">
    <SCRIPT TYPE="text/javascript">
      function clearhint_search_svc (what) {
        if ( what.value = '(user, user@domain or domain)' )
          what.value = '';
      }
    </SCRIPT>
<input name="search_svc" accesskey="0" VALUE="(user, user@domain or domain)" SIZE="27" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="text-align:right">
<input type="submit" value="<&|/l&>Search services</&>">&nbsp;
</form>

From ivan at wavetail.420.am  Fri Jun  2 06:20:25 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Fri Jun  2 06:22:36 2006
Subject: [freeside-commits] freeside/httemplate/elements header.html, 1.6,
	1.7
Message-ID: <20060602132025.3E7C1FC8A20@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv15334/httemplate/elements

Modified Files:
	header.html 
Log Message:
add a service search

Index: header.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/header.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- header.html	15 May 2006 13:57:15 -0000	1.6
+++ header.html	2 Jun 2006 13:20:23 -0000	1.7
@@ -21,9 +21,12 @@
         if ( what.value = '(cust #, name or company)' )
           what.value = '';
       }
-    </SCRIPT>
 
-    <SCRIPT TYPE="text/javascript">
+      function clearhint_search_svc (what) {
+        if ( what.value = '(user, user@domain or domain)' )
+          what.value = '';
+      }
+
       function clearhint_search_ticket (what) {
         if ( what.value = '(ticket # or subject string)' )
           what.value = '';
@@ -79,20 +82,24 @@
         <TD COLSPAN=4 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
       </TR>
       <TR>
-        <TD COLSPAN=1 BGCOLOR="#000000" WIDTH="154">
-        </TD>
-        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right" WIDTH="15%">
           <FORM ACTION="<%=$fsurl%>edit/cust_main.cgi" METHOD="GET" STYLE="margin:0">
             <INPUT TYPE="submit" VALUE="New customer">
           </FORM>
         </TD>
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
-            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="23" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
+            <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name or company)" SIZE="22" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="text-align:right">
             <INPUT TYPE="submit" VALUE="Search customers">
           </FORM>
         </TD>
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
+          <FORM ACTION="<%=$fsurl%>search/svc_Smart.html" METHOD="GET" STYLE="margin:0">
+            <INPUT NAME="search_svc" TYPE="text" VALUE="(user, user@domain or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="text-align:right">
+            <INPUT TYPE="submit" VALUE="Search services">
+          </FORM>
+        </TD>
+        <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
           <FORM ACTION="<%=$fsurl%>rt/index.html" METHOD="GET" STYLE="margin:0">
             <INPUT NAME="q" TYPE="text" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="text-align:right">
             <INPUT TYPE="submit" VALUE="Search tickets">

From ivan at wavetail.420.am  Fri Jun  2 06:20:26 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Fri Jun  2 06:24:20 2006
Subject: [freeside-commits] freeside/rt FREESIDE_MODIFIED,1.9,1.10
Message-ID: <20060602132026.62CA6FC8A24@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/rt
In directory wavetail:/tmp/cvs-serv15334/rt

Modified Files:
	FREESIDE_MODIFIED 
Log Message:
add a service search

Index: FREESIDE_MODIFIED
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/FREESIDE_MODIFIED,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FREESIDE_MODIFIED	15 May 2006 11:05:04 -0000	1.9
+++ FREESIDE_MODIFIED	2 Jun 2006 13:20:24 -0000	1.10
@@ -24,3 +24,8 @@
 
 html/Elements/TitleBoxStart
 html/Search/Bulk.html
+
+html/Elements/FreesideNewCust
+html/Elements/FreesideSearch
+html/Elements/FreesideSvcSearch
+

From ivan at wavetail.420.am  Tue Jun  6 03:30:11 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Tue Jun  6 03:30:19 2006
Subject: [freeside-commits] freeside/FS/FS cdr.pm,1.2,1.3
Message-ID: <20060606103012.40618FC83E3@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv22252

Modified Files:
	cdr.pm 
Log Message:
fix unmatched =back somehow futzing things up with automated install. wtf?!

Index: cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cdr.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cdr.pm	20 Mar 2006 19:13:26 -0000	1.2
+++ cdr.pm	6 Jun 2006 10:30:09 -0000	1.3
@@ -119,8 +119,6 @@
 
 #Telstra =1, Optus = 2, RSL COM = 3
 
-=back
-
 =item upstream_rateid - Upstream Rate ID
 
 =item svcnum - Link to customer service (see L<FS::cust_svc>)

From ivan at wavetail.420.am  Tue Jun  6 03:46:41 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Tue Jun  6 03:46:48 2006
Subject: [freeside-commits] freeside/rt/html/NoAuth webrt.css,1.6,1.7
Message-ID: <20060606104641.5046EFC83E3@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/rt/html/NoAuth
In directory wavetail:/tmp/cvs-serv22435

Modified Files:
	webrt.css 
Log Message:
attempt to fix weird black RT navigation links

Index: webrt.css
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/NoAuth/webrt.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- webrt.css	15 May 2006 11:05:03 -0000	1.6
+++ webrt.css	6 Jun 2006 10:46:39 -0000	1.7
@@ -75,7 +75,6 @@
 	 font-size: 16px;
 	 font-weight: normal;
 	 color: #FFFFFF;
-%#	 color: #000000;
 	 text-decoration: none;
 	 white-space: nowrap}
 
@@ -87,42 +86,36 @@
 a.topnav-0 {  font-family: Verdana, sans-serif;
 	 font-size: 16px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-1 {  font-family: Verdana, sans-serif;
 	 font-size: 14px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-2 {  font-family: Verdana, sans-serif;
 	 font-size: 12px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-3 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-4 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 a.topnav-5 {  font-family: Verdana, sans-serif;
 	 font-size: 11px;
 	 font-weight: normal;
-%#	 color: #000000;
 	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
@@ -190,8 +183,7 @@
 .currenttopnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 16px;
          font-weight: bold;
-%#	 color: #FFFF66;
-	 color: #000000; background-color: #cccccc;
+	 color: #ffffff; background-color: #7e0079;
 	 text-decoration: none;
 	 white-space: nowrap}
 

From ivan at wavetail.420.am  Tue Jun  6 03:54:04 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Tue Jun  6 03:54:10 2006
Subject: [freeside-commits] freeside/rt/html/NoAuth webrt.css,1.7,1.8
Message-ID: <20060606105404.A60C7FC83E3@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/rt/html/NoAuth
In directory wavetail:/tmp/cvs-serv22502

Modified Files:
	webrt.css 
Log Message:
another attempt to fix weird black RT navigation links

Index: webrt.css
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/NoAuth/webrt.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- webrt.css	6 Jun 2006 10:46:39 -0000	1.7
+++ webrt.css	6 Jun 2006 10:54:02 -0000	1.8
@@ -59,10 +59,8 @@
 	 white-space: nowrap}
 .nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 13px;
-%#	 font-weight: normal;
 	 font-weight: bold;
-%#	 color: #FFFFFF;
-	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 .currentnav {  font-family: Arial, Verdana, Helvetica, sans-serif;

From ivan at wavetail.420.am  Tue Jun  6 03:57:05 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Tue Jun  6 03:57:11 2006
Subject: [freeside-commits] freeside/rt/html/NoAuth webrt.css,1.8,1.9
Message-ID: <20060606105705.79233FC859F@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/rt/html/NoAuth
In directory wavetail:/tmp/cvs-serv22553

Modified Files:
	webrt.css 
Log Message:
yet another attempt to fix weird black RT navigation links

Index: webrt.css
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/NoAuth/webrt.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- webrt.css	6 Jun 2006 10:54:02 -0000	1.8
+++ webrt.css	6 Jun 2006 10:57:03 -0000	1.9
@@ -51,8 +51,7 @@
 
 SPAN.nav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 12px;
-%#	 color: #FFFFFF;
-	 color: #000000;
+	 color: #FFFFFF;
 	 text-decoration: none;
 	 white-space: nowrap}
 .nav2 {	 font-size: 10px;
@@ -468,7 +467,7 @@
 	       vertical-align: top }
 .productnav {  font-family: Arial, Verdana, Helvetica, sans-serif;
 	 font-size: 11px;
-	 color: #000000;
+	 color: #FFFFFF;
 	 text-align: center;
 	 vertical-align: middle;
 	 text-decoration: none}
@@ -576,7 +575,7 @@
              }
 
 
-A { font-weight: bold; color: #000000;
+A { font-weight: bold;
             }
 
 .currenttab { color: #ffffff;}

From ivan at wavetail.420.am  Tue Jun  6 04:08:57 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Tue Jun  6 04:09:04 2006
Subject: [freeside-commits] freeside/rt/html/NoAuth webrt.css,1.9,1.10
Message-ID: <20060606110857.B70AFFC83E3@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/rt/html/NoAuth
In directory wavetail:/tmp/cvs-serv22720

Modified Files:
	webrt.css 
Log Message:
yay this should finally fix the weird black navigation links; hide the Mason stuff from browsers when it doesn't get processed for some reason

Index: webrt.css
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/NoAuth/webrt.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- webrt.css	6 Jun 2006 10:57:03 -0000	1.9
+++ webrt.css	6 Jun 2006 11:08:55 -0000	1.10
@@ -1,3 +1,4 @@
+/*
 %# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
@@ -43,6 +44,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
+*/
 
 /* * {
   font-family: Arial, Verdana, Helvetica, sans-serif;
@@ -75,10 +77,12 @@
 	 text-decoration: none;
 	 white-space: nowrap}
 
+/*
 %# .topnav is the original RT class for the sidebar navigation tabs.
 %# Font-sizing by level depth was originally hard-coded into Elements/Menu.
 %# This modification sets a different class name for each level, allowing
 %# style sheet control over the formats.
+*/
 
 a.topnav-0 {  font-family: Verdana, sans-serif;
 	 font-size: 16px;
@@ -184,10 +188,12 @@
 	 text-decoration: none;
 	 white-space: nowrap}
 
+/*
 %# .currenttopnav is the original RT class for the sidebar navigation tabs.
 %# Font-sizing by level depth was originally hard-coded into Elements/Menu.
 %# This modification sets a different class name for each level, allowing
 %# style sheet control over the formats
+*/
 
 a.currenttopnav-0 {  font-family: Verdana, sans-serif;
 	 font-size: 16px;
@@ -315,12 +321,12 @@
          }
 .blue {
 	 background-color: #4682B4;
-%#	 background-color: #eeeeee;
+/* %#	 background-color: #eeeeee; */
 	 background-position: left top;
 	 vertical-align: top;
 	 text-align: left;
          }
-%# Actually the "topactions" section
+/* %# Actually the "topactions" section */
 .blueright {  background-color: #4682B4;
 	 background-position: left top;
 	 vertical-align: top;
@@ -604,7 +610,7 @@
 
 span.title { font-size: 1.6em;
 	     vertical-align: middle;
-%#	     color: #ffffff;
+/* %#	     color: #ffffff; */
              color: #000000;
            }
 span.productname { font-size: 2em;
@@ -703,6 +709,7 @@
     width: 100%;
 }
 
+/*
 %# Provide a callback for adding/modifying the style sheet.
 %# http://www.w3.org/TR/REC-CSS1 - section 3.2, says:
 %#   "latter specified rule wins"
@@ -714,3 +721,4 @@
 $r->content_type('text/css');
 #$r->headers_out->{'Expires'} = '+30m';
 </%init>
+*/

From ivan at wavetail.420.am  Tue Jun  6 04:16:38 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Tue Jun  6 04:16:44 2006
Subject: [freeside-commits] freeside/rt/html/NoAuth webrt.css,1.10,1.11
Message-ID: <20060606111638.B0F37FC888A@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/rt/html/NoAuth
In directory wavetail:/tmp/cvs-serv22833

Modified Files:
	webrt.css 
Log Message:
whew, this can go back

Index: webrt.css
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/NoAuth/webrt.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- webrt.css	6 Jun 2006 11:08:55 -0000	1.10
+++ webrt.css	6 Jun 2006 11:16:36 -0000	1.11
@@ -581,7 +581,7 @@
              }
 
 
-A { font-weight: bold;
+A { font-weight: bold; color: #000000
             }
 
 .currenttab { color: #ffffff;}

From ivan at wavetail.420.am  Thu Jun  8 03:32:48 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun  8 03:32:55 2006
Subject: [freeside-commits] freeside/httemplate/elements menu.html,1.2,1.3
Message-ID: <20060608103248.92B37FC88D3@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv30772

Modified Files:
	menu.html 
Log Message:
fix link to prepaid card setup

Index: menu.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/menu.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- menu.html	22 May 2006 00:45:37 -0000	1.2
+++ menu.html	8 Jun 2006 10:32:46 -0000	1.3
@@ -147,7 +147,7 @@
   tie my %config_billing, 'Tie::IxHash',
     'View/Edit payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ],
     'View/Edit invoice events'           => [ $fsurl.'browse/part_bill_event.cgi', 'Actions for overdue invoices' ],
-    'View/Edit prepaid cards'            => [ $fsurl.'browse/prepay_credit.html', 'View outstanding cards, generate new cards' ],
+    'View/Edit prepaid cards'            => [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ],
     'View/Edit call rates and regions'   => [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ],
     'View/Edit locales and tax rates'    => [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ],
   ;

From ivan at wavetail.420.am  Thu Jun 15 17:27:45 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 15 17:27:54 2006
Subject: [freeside-commits] 
	freeside/httemplate/misc download-batch.cgi, 1.6, 1.7
Message-ID: <20060616002745.D284CFC83AD@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail:/tmp/cvs-serv32733

Modified Files:
	download-batch.cgi 
Log Message:
s/printf/sprintf/ and make the config a little less strange

Index: download-batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/download-batch.cgi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- download-batch.cgi	20 May 2006 20:06:30 -0000	1.6
+++ download-batch.cgi	16 Jun 2006 00:27:43 -0000	1.7
@@ -5,11 +5,12 @@
 #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
 http_header('Content-Type' => 'text/plain' );
 
-#need default
-my $formatconfig = "batchconfig".$cgi->param('format');
-
-die "No batch configuration exists.\n$formatconfig\n" unless $conf->exists($formatconfig);
-my $format = $conf->config($formatconfig);
+my $format;
+if ( $cgi->param('format') =~ /^([\w ]+)$/ ) {
+  $format = $1;
+} else {
+  $format = $conf->config('batch_default_format');
+}
 
 my $oldAutoCommit = $FS::UID::AutoCommit;
 local $FS::UID::AutoCommit = 0;
@@ -31,11 +32,14 @@
 my $jdate = sprintf("%03d", $date[5] % 100).sprintf("%03d", $date[7]);
 
 if ($format eq "BoM") {
-  my($reformat,$origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) = $conf->config('batchconfig');
-  printf "A%10s%04u%06u%05u%54s\n",$origid,$pay_batch->batchnum,$jdate,$datacenter,"";
-  printf "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct;
+
+  my($reformat,$origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) = $conf->config("batchconfig-$format");
+  %><%= sprintf( "A%10s%04u%06u%05u%54s\n",$origid,$pay_batch->batchnum,$jdate,$datacenter,"").
+        sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
+  %><%
+
 }elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
-  1;
+#  1;
 }else{
   die "Unknown format for batch in batchconfig. \n";
 }
@@ -46,30 +50,36 @@
 			      {'batchnum'=>$pay_batch->batchnum} )
 ) {
 
-$cust_pay_batch->exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-my( $mon, $y ) = ( $2, $1 );
-$mon = "0$mon" if $mon < 10;
-my $exp = "$mon$y";
-$batchcount++;
-$batchtotal += $cust_pay_batch->amount;
+  $cust_pay_batch->exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+  my( $mon, $y ) = ( $2, $1 );
+  $mon = "0$mon" if $mon < 10;
+  my $exp = "$mon$y";
+  $batchcount++;
+  $batchtotal += $cust_pay_batch->amount;
+  
+  if ($format eq "BoM") {
 
-if ($format eq "BoM") {
-  my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
-  printf "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum;
-}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
-%>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %>
-<% }else{
-   die "I'm already dead, but you did not know that.\n";
-}
+    my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
+    %><%= sprintf( "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum %><%
+
+  } elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch") {
+
+    %>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %><%
+
+  } else {
+    die "I'm already dead, but you did not know that.\n";
+  }
 
 }
 
 if ($format eq "BoM") {
-  printf "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"";
-  printf "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","";
-}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
-  1;
-} else{
+
+  %><%= sprintf( "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"" ).
+        sprintf( "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","" ) %><%
+
+} elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+  #1;
+} else {
   die "I'm already dead (again), but you did not know that.\n";
 }
 

From ivan at wavetail.420.am  Thu Jun 15 17:33:33 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 15 17:33:35 2006
Subject: [freeside-commits] 
	freeside/httemplate/misc download-batch.cgi, 1.7, 1.8
Message-ID: <20060616003333.BC6EEFC83AD@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail:/tmp/cvs-serv340

Modified Files:
	download-batch.cgi 
Log Message:
oops i'm gonna do that too, now that the batch format file is not the same as the batch params files

Index: download-batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/download-batch.cgi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- download-batch.cgi	16 Jun 2006 00:27:43 -0000	1.7
+++ download-batch.cgi	16 Jun 2006 00:33:31 -0000	1.8
@@ -33,7 +33,8 @@
 
 if ($format eq "BoM") {
 
-  my($reformat,$origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) = $conf->config("batchconfig-$format");
+  my($origid,$datacenter,$typecode,$shortname,$longname,$mybank,$myacct) =
+    $conf->config("batchconfig-$format");
   %><%= sprintf( "A%10s%04u%06u%05u%54s\n",$origid,$pay_batch->batchnum,$jdate,$datacenter,"").
         sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
   %><%

From ivan at wavetail.420.am  Thu Jun 15 17:47:41 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 15 17:47:43 2006
Subject: [freeside-commits] 
	freeside/httemplate/misc download-batch.cgi, 1.8, 1.9
Message-ID: <20060616004741.8D042FC8324@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail:/tmp/cvs-serv585

Modified Files:
	download-batch.cgi 
Log Message:
and fix the  name for TD Canada Trust.  and that's it for now.  really.

Index: download-batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/download-batch.cgi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- download-batch.cgi	16 Jun 2006 00:33:31 -0000	1.8
+++ download-batch.cgi	16 Jun 2006 00:47:39 -0000	1.9
@@ -6,10 +6,10 @@
 http_header('Content-Type' => 'text/plain' );
 
 my $format;
-if ( $cgi->param('format') =~ /^([\w ]+)$/ ) {
+if ( $cgi->param('format') =~ /^([\w\- ]+)$/ ) {
   $format = $1;
 } else {
-  $format = $conf->config('batch_default_format');
+  $format = $conf->config('batch-default_format');
 }
 
 my $oldAutoCommit = $FS::UID::AutoCommit;
@@ -39,7 +39,7 @@
         sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",$typecode,$jdate,$shortname,$longname,$mybank,$myacct )
   %><%
 
-}elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+}elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
 #  1;
 }else{
   die "Unknown format for batch in batchconfig. \n";
@@ -63,7 +63,7 @@
     my( $account, $aba ) = split( '@', $cust_pay_batch->payinfo );
     %><%= sprintf( "D%010u%09u%-12s%-29s%-19s\n",$cust_pay_batch->amount*100,$aba,$account,$cust_pay_batch->payname,$cust_pay_batch->invnum %><%
 
-  } elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch") {
+  } elsif ($format eq "csv-td_canada_trust-merchant_pc_batch") {
 
     %>,,,,<%= $cust_pay_batch->payinfo %>,<%= $exp %>,<%= $cust_pay_batch->amount %>,<%= $cust_pay_batch->paybatchnum %><%
 
@@ -78,7 +78,7 @@
   %><%= sprintf( "YD%08u%014u%56s\n",$batchcount,$batchtotal*100,"" ).
         sprintf( "Z%014u%05u%014u%05u%41s\n",$batchtotal*100,$batchcount,"0","0","" ) %><%
 
-} elsif ($format eq "CSV file for TD Canada Trust Merchant PC Batch"){
+} elsif ($format eq "csv-td_canada_trust-merchant_pc_batch"){
   #1;
 } else {
   die "I'm already dead (again), but you did not know that.\n";

From jeff at wavetail.420.am  Thu Jun 15 18:23:43 2006
From: jeff at wavetail.420.am (Jeff Finucane,420,,)
Date: Thu Jun 15 18:26:57 2006
Subject: [freeside-commits] freeside/FS/FS cust_bill.pm, 1.147,
	1.148 pay_batch.pm, 1.1, 1.2
Message-ID: <20060616012343.700BBFC88F7@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv1347/FS/FS

Modified Files:
	cust_bill.pm pay_batch.pm 
Log Message:
value issues and many bits remain

Index: pay_batch.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/pay_batch.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pay_batch.pm	20 May 2006 20:06:30 -0000	1.1
+++ pay_batch.pm	16 Jun 2006 01:23:40 -0000	1.2
@@ -98,7 +98,7 @@
 
   my $error = 
     $self->ut_numbern('batchnum')
-    || $self->ut_enum('status', [ '', 'I', 'R' ])
+    || $self->ut_enum('status', [ 'O', 'I', 'R' ])
   ;
   return $error if $error;
 

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- cust_bill.pm	20 May 2006 20:06:30 -0000	1.147
+++ cust_bill.pm	16 Jun 2006 01:23:40 -0000	1.148
@@ -1286,10 +1286,11 @@
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $pay_batch = qsearchs('pay_batch'=> '');
+  my $pay_batch = qsearchs('pay_batch', {'status' => 'O'});
 
   unless ($pay_batch) {
     $pay_batch = new FS::pay_batch;
+    $pay_batch->setfield('status' => 'O');
     my $error = $pay_batch->insert;
     if ( $error ) {
       die "error creating new batch: $error\n";

From jeff at wavetail.420.am  Thu Jun 15 18:23:43 2006
From: jeff at wavetail.420.am (Jeff Finucane,420,,)
Date: Thu Jun 15 18:28:45 2006
Subject: [freeside-commits] 
	freeside/httemplate/misc download-batch.cgi, 1.9, 1.10
Message-ID: <20060616012343.7064BFC88FA@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail:/tmp/cvs-serv1347/httemplate/misc

Modified Files:
	download-batch.cgi 
Log Message:
value issues and many bits remain

Index: download-batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/download-batch.cgi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- download-batch.cgi	16 Jun 2006 00:47:39 -0000	1.9
+++ download-batch.cgi	16 Jun 2006 01:23:41 -0000	1.10
@@ -16,7 +16,7 @@
 local $FS::UID::AutoCommit = 0;
 my $dbh = dbh;
 
-my $pay_batch = qsearchs('pay_batch', {'status'=>''} );
+my $pay_batch = qsearchs('pay_batch', {'status'=>'O'} );
 die "No pending batch. \n" unless $pay_batch;
 
 my %batchhash = $pay_batch->hash;

From ivan at wavetail.420.am  Sun Jun 18 05:54:50 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 05:54:56 2006
Subject: [freeside-commits] freeside/httemplate/edit access_group.html, 1.1,
	1.2 part_pkg.cgi, 1.60, 1.61
Message-ID: <20060618125450.12BF9FC8380@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv30582/httemplate/edit

Modified Files:
	access_group.html part_pkg.cgi 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: part_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_pkg.cgi,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- part_pkg.cgi	22 Apr 2006 00:58:39 -0000	1.60
+++ part_pkg.cgi	18 Jun 2006 12:54:48 -0000	1.61
@@ -237,7 +237,7 @@
   push @form_radio, 'pkg_svc_primary';
 }
 
-tie my %freq, 'Tie::IxHash', %FS::part_pkg::freq;
+tie my %freq, 'Tie::IxHash', %{FS::part_pkg->freqs_href()};
 if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
   delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq;
 }

Index: access_group.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/access_group.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- access_group.html	14 May 2006 16:47:30 -0000	1.1
+++ access_group.html	18 Jun 2006 12:54:48 -0000	1.2
@@ -5,6 +5,42 @@
                                'groupnum'   => 'Group number',
                                'groupname'  => 'Group name',
                              },
+
                  'viewall_dir' => 'browse',
+
+                 'html_bottom' =>
+                   sub {
+                     my $access_group = shift;
+
+                     "<BR>Group virtualized to customers of agents:<BR>".
+                     ntable("#cccccc",2).
+                     '<TR><TD>'.
+                     include( '/elements/checkboxes-table.html',
+                                'source_obj'   => $access_group,
+                                'link_table'   => 'access_groupagent',
+                                'target_table' => 'agent',
+                                'name_col'     => 'agent',
+                                'target_link'  => $p.'edit/agent.cgi?',
+                                'disable-able' => 1,
+                            ).
+                     '</TR></TD></TABLE>'.
+
+                     "<BR>Group rights:<BR>".
+                     ntable("#cccccc",2).
+                     '<TR><TD>'.
+                     include( '/elements/checkboxes-table-name.html',
+                                'source_obj'   => $access_group,
+                                'link_table'   => 'access_right',
+                                'link_static'  => { 'righttype' =>
+                                                      'FS::access_group',
+                                                  },
+                                'num_col'      => 'rightobjnum',
+                                'name_col'     => 'rightname',
+                                'names_list'   => [ FS::AccessRight->rights() ],
+                            ).
+                     '</TR></TD></TABLE>'
+
+                     ;
+                   },
            )
 %>

From ivan at wavetail.420.am  Sun Jun 18 05:54:50 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 05:54:57 2006
Subject: [freeside-commits] freeside/httemplate/elements
	checkboxes-table.html, 1.1, 1.2 checkboxes-table-name.html,
	NONE, 1.1
Message-ID: <20060618125450.152D9FC8867@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv30582/httemplate/elements

Modified Files:
	checkboxes-table.html 
Added Files:
	checkboxes-table-name.html 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: checkboxes-table.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/checkboxes-table.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- checkboxes-table.html	14 May 2006 16:47:30 -0000	1.1
+++ checkboxes-table.html	18 Jun 2006 12:54:48 -0000	1.2
@@ -68,16 +68,28 @@
    ) {
 
      my $targetnum = $target_obj->$target_pkey();
+
+     my $checked;
+     if ( $cgi->param('error') ) {
+
+       $checked = $cgi->param($target_pkey.$targetnum)
+                    ? 'CHECKED'
+                    : '';
+
+     } else {
+
+       $checked = qsearchs( $opt{'link_table'}, {
+                                                  $source_pkey => $sourcenum,
+                                                  $target_pkey => $targetnum,
+                                                }                             )
+                    ? 'CHECKED'
+                    : ''
+
+     }
+
 %>
 
-  <INPUT TYPE="checkbox" NAME="<%= $target_pkey. $targetnum %>" <%=
-        qsearchs( $opt{'link_table'}, {
-          $source_pkey => $sourcenum,
-          $target_pkey => $targetnum,
-        })
-          ? 'CHECKED '
-          : ''
-  %> VALUE="ON">
+  <INPUT TYPE="checkbox" NAME="<%= $target_pkey. $targetnum %>" <%= $checked %> VALUE="ON">
 
   <% if ( $opt{'target_link'} ) { %>
 

--- NEW FILE: checkboxes-table-name.html ---
<%

  ##
  # required
  ##
  # 'link_table'      => 'table_name',
  #
  # 'name_col' => 'name_column',
  # #or
  # 'name_callback' => sub { },
  #
  # 'names_list' => [ 'value', 'other value' ],
  #
  ##
  # recommended (required?)
  ##
  # 'source_obj'   => $obj,
  # #or?
  # #'source_table' => 'table_name',
  # #'sourcenum'    => '4', #current value of primary key in source_table
  # #                       # (none is okay, just pass it if you have it)
  ##
  # optional
  ##
  # 'num_col' => 'col_name' #if column name is different in link_table than
  #                         #source_table
  # 'link_static' => { 'column' => 'value' },

  my( %opt ) = @_;

  my( $source_pkey, $sourcenum, $source_obj );
  if ( $opt{'source_obj'} ) {

    $source_obj = $opt{'source_obj'};
    #$source_table = $source_obj->dbdef_table->table;
    $source_pkey = $source_obj->dbdef_table->primary_key;
    $sourcenum = $source_obj->$source_pkey();

  } else {

    #$source_obj?
    $source_pkey = $opt{'source_table'}
                     ? dbdef->table($opt{'source_table'})->primary_key
                     : '';
    $sourcenum = $opt{'sourcenum'};
  }

  $source_pkey = $opt{'num_col'} || $source_pkey;

  my $link_static = $opt{'link_static'} || {};

%>

<% foreach my $name ( @{ $opt{'names_list'} } ) {

     my $checked;
     if ( $cgi->param('error') ) {

       $checked = $cgi->param($opt{'link_table'}. ".$name" )
                    ? 'CHECKED'
                    : '';

     } else {

       $checked =
         qsearchs( $opt{'link_table'}, {
                                         $source_pkey     => $sourcenum,
                                         $opt{'name_col'} => $name,
                                         %$link_static,
                                       }                                 )
                    ? 'CHECKED'
                    : ''

     }

%>

  <INPUT TYPE="checkbox" NAME="<%= $opt{'link_table'}. ".$name" %>" <%= $checked %> VALUE="ON">

  <%= $name %>

  <BR>

<% } %>


From ivan at wavetail.420.am  Sun Jun 18 05:54:51 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 05:54:57 2006
Subject: [freeside-commits] freeside/httemplate/edit/process/elements
	process.html, 1.3, 1.4
Message-ID: <20060618125451.513A1FC8929@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/edit/process/elements
In directory wavetail:/tmp/cvs-serv30582/httemplate/edit/process/elements

Modified Files:
	process.html 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: process.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/elements/process.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- process.html	14 May 2006 16:47:30 -0000	1.3
+++ process.html	18 Jun 2006 12:54:49 -0000	1.4
@@ -16,7 +16,14 @@
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
   # 'process_m2m' => { 'link_table'   => 'link_table_name',
   #                    'target_table' => 'target_table_name',
-  #                  }.
+  #                  },
+  # 'process_m2name' => { 'link_table'   => 'link_table_name',
+  #                       'link_static' => { 'column' => 'value' },
+  #                       'num_col' => 'column', #if column name is different in
+  #                                              #link_table than source_table 
+  #                       'name_col' => 'name_column',
+  #                       'names_list' => [ 'list', 'names' ],
+  #                     },
 
   my(%opt) = @_;
 
@@ -52,6 +59,12 @@
                               );
   }
 
+  if ( !$error && $opt{'process_m2name'} ) {
+    $error = $new->process_m2name( %{ $opt{'process_m2name'} },
+                                   'params' => scalar($cgi->Vars),
+                                 );
+  }
+
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "$table.html?". $cgi->query_string );

From ivan at wavetail.420.am  Sun Jun 18 05:54:51 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 05:54:59 2006
Subject: [freeside-commits] freeside/FS MANIFEST,1.99,1.100
Message-ID: <20060618125451.8E7A2FC894F@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS
In directory wavetail:/tmp/cvs-serv30582/FS

Modified Files:
	MANIFEST 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: MANIFEST
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/MANIFEST,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- MANIFEST	24 May 2006 10:22:54 -0000	1.99
+++ MANIFEST	18 Jun 2006 12:54:49 -0000	1.100
@@ -342,3 +342,6 @@
 FS/m2m_Common.pm
 FS/pay_batch.pm
 t/pay_batch.t
+FS/ConfDefaults.pm
+t/ConfDefaults.t
+FS/m2name_Common.pm

From ivan at wavetail.420.am  Sun Jun 18 05:56:22 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 05:56:24 2006
Subject: [freeside-commits] 
	freeside/httemplate/edit/elements edit.html, 1.4, 1.5
Message-ID: <20060618125622.39480FC822C@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/edit/elements
In directory wavetail:/tmp/cvs-serv30675

Modified Files:
	edit.html 
Log Message:
well, it isn't broken...

Index: edit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/elements/edit.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- edit.html	18 Jun 2006 12:54:48 -0000	1.4
+++ edit.html	18 Jun 2006 12:56:20 -0000	1.5
@@ -25,8 +25,9 @@
   # #run when adding
   # 'new_callback' => sub { my $cgi, $object = @_; },
   #
-  # #broken'html_table_bottom' => '', #string or listref of additinal HTML to
-  #                            #add before </TABLE>
+  # #uninmplemented
+  # #'html_table_bottom' => '', #string or listref of additinal HTML to
+  # #                           #add before </TABLE>
   #
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
   #

From ivan at wavetail.420.am  Sun Jun 18 05:54:50 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 05:58:13 2006
Subject: [freeside-commits] 
	freeside/httemplate/edit/elements edit.html, 1.3, 1.4
Message-ID: <20060618125450.14250FC86D2@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/edit/elements
In directory wavetail:/tmp/cvs-serv30582/httemplate/edit/elements

Modified Files:
	edit.html 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: edit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/elements/edit.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- edit.html	14 May 2006 16:47:30 -0000	1.3
+++ edit.html	18 Jun 2006 12:54:48 -0000	1.4
@@ -16,6 +16,18 @@
   #
   # 'menubar'     => '', #menubar arrayref
   #
+  # #run when re-displaying with an error
+  # 'error_callback' => sub { my $cgi, $object = @_; },
+  #
+  # #run when editing
+  # 'edit_callback' => sub { my $cgi, $object = @_; },
+  #
+  # #run when adding
+  # 'new_callback' => sub { my $cgi, $object = @_; },
+  #
+  # #broken'html_table_bottom' => '', #string or listref of additinal HTML to
+  #                            #add before </TABLE>
+  #
   # 'viewall_dir' => '', #'search' or 'browse', defaults to 'search'
   #
   # 'html_bottom' => '', #string
@@ -43,16 +55,25 @@
       map { $_ => scalar($cgi->param($_)) } fields($table)
     });
 
+    &{$opt{'error_callback'}}($cgi, $object)
+      if $opt{'error_callback'};
+
   } elsif ( $cgi->keywords ) { #editing
 
     my( $query ) = $cgi->keywords;
     $query =~ /^(\d+)$/;
     $object = qsearchs( $table, { $pkey => $1 } );
 
+    &{$opt{'edit_callback'}}($cgi, $object)
+      if $opt{'edit_callback'};
+
   } else { #adding
 
     $object = $class->new( {} );
 
+    &{$opt{'new_callback'}}($cgi, $object)
+      if $opt{'new_callback'};
+
   }
 
   my $action = $object->$pkey() ? 'Edit' : 'Add';

From ivan at wavetail.420.am  Sun Jun 18 05:54:50 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 05:58:16 2006
Subject: [freeside-commits] freeside/httemplate/edit/process
	access_group.html, 1.1, 1.2
Message-ID: <20060618125450.1613DFC8873@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/edit/process
In directory wavetail:/tmp/cvs-serv30582/httemplate/edit/process

Modified Files:
	access_group.html 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: access_group.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/access_group.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- access_group.html	14 May 2006 16:47:30 -0000	1.1
+++ access_group.html	18 Jun 2006 12:54:48 -0000	1.2
@@ -1,5 +1,15 @@
 <%= include( 'elements/process.html',
                'table'       => 'access_group',
                'viewall_dir' => 'browse',
+               'process_m2m' => { 'link_table'   => 'access_groupagent',
+                                  'target_table' => 'agent',
+                                },
+               'process_m2name' => {
+                     'link_table'   => 'access_right',
+                     'link_static'  => { 'righttype' => 'FS::access_group', },
+                     'num_col'      => 'rightobjnum',
+                     'name_col'     => 'rightname',
+                     'names_list'   => [ FS::AccessRight->rights() ],
+               },
            )
 %>

From ivan at wavetail.420.am  Sun Jun 18 05:54:51 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 06:17:32 2006
Subject: [freeside-commits] freeside/FS/FS part_pkg.pm, 1.47,
	1.48 access_group.pm, 1.1, 1.2 access_groupagent.pm, 1.1,
	1.2 m2name_Common.pm, NONE, 1.1 AccessRight.pm, 1.1, 1.2
Message-ID: <20060618125451.1B806FC8923@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv30582/FS/FS

Modified Files:
	part_pkg.pm access_group.pm access_groupagent.pm 
	AccessRight.pm 
Added Files:
	m2name_Common.pm 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: part_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg.pm,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- part_pkg.pm	22 Apr 2006 00:58:40 -0000	1.47
+++ part_pkg.pm	18 Jun 2006 12:54:48 -0000	1.48
@@ -1,7 +1,7 @@
 package FS::part_pkg;
 
 use strict;
-use vars qw( @ISA %freq %plans $DEBUG );
+use vars qw( @ISA %plans $DEBUG );
 use Carp qw(carp cluck confess);
 use Tie::IxHash;
 use FS::Conf;
@@ -571,6 +571,32 @@
   }
 }
 
+
+sub freqs_href {
+  #method, class method or sub? #my $self = shift;
+
+  tie my %freq, 'Tie::IxHash', 
+    '0'  => '(no recurring fee)',
+    '1h' => 'hourly',
+    '1d' => 'daily',
+    '1w' => 'weekly',
+    '2w' => 'biweekly (every 2 weeks)',
+    '1'  => 'monthly',
+    '2'  => 'bimonthly (every 2 months)',
+    '3'  => 'quarterly (every 3 months)',
+    '6'  => 'semiannually (every 6 months)',
+    '12' => 'annually',
+    '24' => 'biannually (every 2 years)',
+    '36' => 'triannually (every 3 years)',
+    '48' => '(every 4 years)',
+    '60' => '(every 5 years)',
+    '120' => '(every 10 years)',
+  ;
+
+  \%freq;
+
+}
+
 =item freq_pretty
 
 Returns an english representation of the I<freq> field, such as "monthly",
@@ -578,29 +604,14 @@
 
 =cut
 
-tie %freq, 'Tie::IxHash', 
-  '0'  => '(no recurring fee)',
-  '1h' => 'hourly',
-  '1d' => 'daily',
-  '1w' => 'weekly',
-  '2w' => 'biweekly (every 2 weeks)',
-  '1'  => 'monthly',
-  '2'  => 'bimonthly (every 2 months)',
-  '3'  => 'quarterly (every 3 months)',
-  '6'  => 'semiannually (every 6 months)',
-  '12' => 'annually',
-  '24' => 'biannually (every 2 years)',
-  '36' => 'triannually (every 3 years)',
-  '48' => '(every 4 years)',
-  '60' => '(every 5 years)',
-  '120' => '(every 10 years)',
-;
-
 sub freq_pretty {
   my $self = shift;
   my $freq = $self->freq;
-  if ( exists($freq{$freq}) ) {
-    $freq{$freq};
+
+  my $freqs_href = $self->freqs_href;
+
+  if ( exists($freqs_href->{$freq}) ) {
+    $freqs_href->{$freq};
   } else {
     my $interval = 'month';
     if ( $freq =~ /^(\d+)([hdw])$/ ) {

Index: access_group.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/access_group.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- access_group.pm	14 May 2006 16:47:31 -0000	1.1
+++ access_group.pm	18 Jun 2006 12:54:48 -0000	1.2
@@ -3,8 +3,11 @@
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::m2name_Common;
+use FS::access_groupagent;
+use FS::access_right;
 
-@ISA = qw(FS::Record);
+@ISA = qw(FS::m2m_Common FS::m2name_Common FS::Record);
 
 =head1 NAME
 
@@ -27,15 +30,14 @@
 
 =head1 DESCRIPTION
 
-An FS::access_group object represents an example.  FS::access_group inherits from
+An FS::access_group object represents an access group.  FS::access_group inherits from
 FS::Record.  The following fields are currently supported:
 
 =over 4
 
 =item groupnum - primary key
 
-=item groupname - 
-
+=item groupname - Access group name
 
 =back
 
@@ -45,7 +47,7 @@
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new access group.  To add the access group to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -84,7 +86,7 @@
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid access group.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
@@ -105,12 +107,51 @@
   $self->SUPER::check;
 }
 
+=item access_groupagent
+
+Returns all associated FS::access_groupagent records.
+
+=cut
+
+sub access_groupagent {
+  my $self = shift;
+  qsearch('access_groupagent', { 'groupnum' => $self->groupnum } );
+}
+
+=item access_rights
+
+Returns all associated FS::access_right records.
+
+=cut
+
+sub access_rights {
+  my $self = shift;
+  qsearch('access_right', { 'righttype'   => 'FS::access_group',
+                            'rightobjnum' => $self->groupnum 
+                          }
+         );
+}
+
+=item access_right RIGHTNAME
+
+Returns the specified FS::access_right record.  Can be used as a boolean, to
+test if this group has the given RIGHTNAME.
+
+=cut
+
+sub access_right {
+  my( $self, $name ) = shift;
+  qsearchs('access_right', { 'righttype'   => 'FS::access_group',
+                             'rightobjnum' => $self->groupnum,
+                             'rightname'   => $name,
+                           }
+          );
+}
+
 =back
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.

--- NEW FILE: m2name_Common.pm ---
package FS::m2name_Common;

use strict;
use vars qw( @ISA $DEBUG );
use FS::Schema qw( dbdef );
use FS::Record qw( qsearch qsearchs ); #dbh );

@ISA = qw( FS::Record );

$DEBUG = 0;

=head1 NAME

FS::m2name_Common - Base class for tables with a related table listing names

=head1 SYNOPSIS

use FS::m2name_Common;

@ISA = qw( FS::m2name_Common );

=head1 DESCRIPTION

FS::m2name_Common is intended as a base class for classes which have a
related table that lists names.

=head1 METHODS

=over 4

=item process_m2name

=cut

sub process_m2name {
  my( $self, %opt ) = @_;

  my $self_pkey = $self->dbdef_table->primary_key;
  my $link_sourcekey = $opt{'num_col'} || $self_pkey;

  my $link_table = $self->_load_table($opt{'link_table'});

  my $link_static = $opt{'link_static'} || {};

  foreach my $name ( @{ $opt{'names_list'} } ) {

    my $obj = qsearchs( $link_table, {
        $link_sourcekey  => $self->$self_pkey(),
        $opt{'name_col'} => $name,
        %$link_static,
    });

    if ( $obj && ! $opt{'params'}->{"$link_table.$name"} ) {

      my $d_obj = $obj; #need to save $obj for below.
      my $error = $d_obj->delete;
      die "error deleting $d_obj for $link_table.$name: $error" if $error;

    } elsif ( $opt{'params'}->{"$link_table.$name"} && ! $obj ) {

      #ok to clobber it now (but bad form nonetheless?)
      #$obj = new "FS::$link_table" ( {
      $obj = "FS::$link_table"->new( {
        $link_sourcekey  => $self->$self_pkey(),
        $opt{'name_col'} => $name,
        %$link_static,
      });
      my $error = $obj->insert;
      die "error inserting $obj for $link_table.$name: $error" if $error;
    }

  }

  '';
}

sub _load_table {
  my( $self, $table ) = @_;
  eval "use FS::$table";
  die $@ if $@;
  $table;
}

=back

=head1 BUGS

=head1 SEE ALSO

L<FS::Record>

=cut

1;


Index: access_groupagent.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/access_groupagent.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- access_groupagent.pm	14 May 2006 16:47:31 -0000	1.1
+++ access_groupagent.pm	18 Jun 2006 12:54:48 -0000	1.2
@@ -3,6 +3,7 @@
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs );
+use FS::agent;
 
 @ISA = qw(FS::Record);
 
@@ -27,7 +28,7 @@
 
 =head1 DESCRIPTION
 
-An FS::access_groupagent object represents an example.  FS::access_groupagent inherits from
+An FS::access_groupagent object represents an group reseller virtualization.  FS::access_groupagent inherits from
 FS::Record.  The following fields are currently supported:
 
 =over 4
@@ -47,7 +48,7 @@
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new group reseller virtualization.  To add the record to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -86,7 +87,7 @@
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid group reseller virtualization.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
@@ -100,20 +101,29 @@
 
   my $error = 
     $self->ut_numbern('groupagentnum')
-    || $self->ut_number('groupnum')
-    || $self->ut_number('agentnum')
+    || $self->ut_foreign_key('groupnum', 'access_group', 'groupnum')
+    || $self->ut_foreign_key('agentnum', 'agent',        'agentnum')
   ;
   return $error if $error;
 
   $self->SUPER::check;
 }
 
+=item agent
+
+Returns the associated FS::agent object.
+
+=cut
+
+sub agent {
+  my $self = shift;
+  qsearchs('agent', { 'agentnum' => $self->agentnum } );
+}
+
 =back
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.

Index: AccessRight.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/AccessRight.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AccessRight.pm	14 May 2006 16:47:31 -0000	1.1
+++ AccessRight.pm	18 Jun 2006 12:54:48 -0000	1.2
@@ -1,7 +1,7 @@
 package FS::AccessRight;
 
 use strict;
-user vars qw(@rights %rights);
+use vars qw(@rights); # %rights);
 use Tie::IxHash;
 
 =head1 NAME
@@ -19,59 +19,94 @@
 
 =cut
 
-@rights = (
-  'Reports' => [
-    '_desc' => 'Access to high-level reporting',
-  ],
-  'Configuration' => [
-    '_desc' => 'Access to configuration',
-
-    'Settings' => {},
-
-    'agent' => [
-      '_desc' => 'Master access to reseller configuration',
-      'agent_type'  => {},
-      'agent'       => {},
-    ],
-
-    'export_svc_pkg' => [
-      '_desc' => 'Access to export, service and package configuration',
-      'part_export' => {},
-      'part_svc'    => {},
-      'part_pkg'    => {},
-      'pkg_class'   => {},
-    ],
-
-    'billing' => [
-      '_desc' => 'Access to billing configuration',
-      'payment_gateway'  => {},
-      'part_bill_event'  => {},
-      'prepay_credit'    => {},
-      'rate'             => {},
-      'cust_main_county' => {},
-    ],
+#@rights = (
+#  'Reports' => [
+#    '_desc' => 'Access to high-level reporting',
+#  ],
+#  'Configuration' => [
+#    '_desc' => 'Access to configuration',
+#
+#    'Settings' => {},
+#
+#    'agent' => [
+#      '_desc' => 'Master access to reseller configuration',
+#      'agent_type'  => {},
+#      'agent'       => {},
+#    ],
+#
+#    'export_svc_pkg' => [
+#      '_desc' => 'Access to export, service and package configuration',
+#      'part_export' => {},
+#      'part_svc'    => {},
+#      'part_pkg'    => {},
+#      'pkg_class'   => {},
+#    ],
+#
+#    'billing' => [
+#      '_desc' => 'Access to billing configuration',
+#      'payment_gateway'  => {},
+#      'part_bill_event'  => {},
+#      'prepay_credit'    => {},
+#      'rate'             => {},
+#      'cust_main_county' => {},
+#    ],
+#
+#    'dialup' => [
+#      '_desc' => 'Access to dialup configuraiton',
+#      'svc_acct_pop' => {},
+#    ],
+#
+#    'broadband' => [
+#      '_desc' => 'Access to broadband configuration',
+#      'router'     => {},
+#      'addr_block' => {},
+#    ],
+#
+#    'misc' => [
+#      'part_referral'      => {},
+#      'part_virtual_field' => {},
+#      'msgcat'             => {},
+#      'inventory_class'    => {},
+#    ],
+#
+#  },
+#
+#);
+#
+##turn it into a more hash-like structure, but ordered via IxHash
 
-    'dialup' => [
-      '_desc' => 'Access to dialup configuraiton',
-      'svc_acct_pop' => {},
-    ],
+#well, this is what we have for now.  could be ordered better, could be lots of
+# things better, but this ACL system does 99% of what folks need and the UI
+# isn't *that* bad
+@rights = (
+  'New customer',
+  'View customer',
+  #'View Customer | View tickets',
+  'Edit customer',
+  'Cancel customer',
+  'Delete customer',
 
-    'broadband' => [
-      '_desc' => 'Access to broadband configuration',
-      'router'     => {},
-      'addr_block' => {},
-    ],
+  'Order customer package',
+  'Change customer package',
+  'Edit customer package dates',
+  'Customize customer package',
+  'Suspend customer package',
+  'Unsuspend customer package',
+  'Cancel customer package immediately',
+  'Cancel customer package later',
 
-    'misc' => [
-      'part_referral'      => {},
-      'part_virtual_field' => {},
-      'msgcat'             => {},
-      'inventory_class'    => {},
-    ],
+  'Provision service',
+  'Unprovision service',
+  #legacy link stuff
 
-  },
+  'Post payment',
+  'Process payment',
+  'Post credit',
+  #more financial stuff
 
 );
 
-#turn it into a more hash-like structure, but ordered via IxHash
+sub rights {
+  @rights;
+}
 

From ivan at wavetail.420.am  Sun Jun 18 05:54:51 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 06:19:21 2006
Subject: [freeside-commits] 
	freeside/httemplate/browse access_group.html, 1.1,
	1.2 access_user.html, 1.1, 1.2
Message-ID: <20060618125451.A5684FC89D9@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail:/tmp/cvs-serv30582/httemplate/browse

Modified Files:
	access_group.html access_user.html 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: access_user.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/access_user.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- access_user.html	14 May 2006 16:47:30 -0000	1.1
+++ access_user.html	18 Jun 2006 12:54:49 -0000	1.2
@@ -4,7 +4,7 @@
   "Internal users have access to the back-office interface.  Typically, this is your employees and contractors, but in a VISP setup, you can also add accounts for your reseller's employees.  It is <B>highly recommended</B> to add a <B>separate account for each person</B> rather than using role accounts.<BR><BR>".
   qq!<A HREF="${p}edit/access_user.html"><I>Add an internal user</I></A><BR><BR>!;
 
-#false laziness w/agent_type.cgi
+#false laziness w/access_group.html & agent_type.cgi
 my $groups_sub = sub {
   my $access_user = shift;
 

Index: access_group.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/access_group.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- access_group.html	14 May 2006 16:47:30 -0000	1.1
+++ access_group.html	18 Jun 2006 12:54:49 -0000	1.2
@@ -4,6 +4,45 @@
   "Internal access groups control access to the back-office interface.<BR><BR>".
   qq!<A HREF="${p}edit/access_group.html"><I>Add an internal access group</I></A><BR><BR>!;
 
+#false laziness w/access_user.html & agent_type.cgi
+my $agents_sub = sub {
+  my $access_group = shift;
+
+  [ map {
+          my $access_groupagent = $_;
+          my $agent = $access_groupagent->agent;
+          [
+            {
+              'data'  => $agent->agent,
+              'align' => 'left',
+              'link'  => $p. 'edit/agent.cgi?'. $agent->agentnum,
+            },
+          ];
+        }
+    grep { $_->agent } #?
+    $access_group->access_groupagent,
+
+  ];
+  
+};
+
+my $rights_sub = sub {
+  my $access_group = shift;
+
+  [ map { my $access_right = $_;
+          [
+            { 
+              'data'  => $access_right->rightname,
+              'align' => 'left',
+            },
+          ];
+        }
+    $access_group->access_rights,
+
+  ];
+
+};
+
 my $count_query = 'SELECT COUNT(*) FROM access_group';
 
 my $link = [ $p.'edit/access_group.html?', 'groupnum' ];
@@ -22,12 +61,18 @@
                  'count_query' => $count_query,
                  'header'      => [ '#',
                                     'Group name',
+                                    'Agents',
+                                    'Rights',
                                   ],
                  'fields'      => [ 'groupnum',
                                     'groupname',
+                                    $agents_sub,
+                                    $rights_sub,
                                   ],
                  'links'       => [ $link,
                                     $link,
+                                    '',
+                                    '',
                                   ],
              )
 %>

From ivan at wavetail.420.am  Sun Jun 18 05:54:51 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 06:21:11 2006
Subject: [freeside-commits] freeside/htetc handler.pl,1.70,1.71
Message-ID: <20060618125451.36480FC8924@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/htetc
In directory wavetail:/tmp/cvs-serv30582/htetc

Modified Files:
	handler.pl 
Log Message:
ACLs: finish group edit (agents + rights) & browse

Index: handler.pl
===================================================================
RCS file: /home/cvs/cvsroot/freeside/htetc/handler.pl,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- handler.pl	20 May 2006 20:06:30 -0000	1.70
+++ handler.pl	18 Jun 2006 12:54:49 -0000	1.71
@@ -182,6 +182,10 @@
       use FS::pkg_class;
       use FS::access_user;
       use FS::access_group;
+      use FS::access_usergroup;
+      use FS::access_groupagent;
+      use FS::access_right;
+      use FS::AccessRight;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '

From ivan at wavetail.420.am  Sun Jun 18 19:33:54 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 19:34:03 2006
Subject: [freeside-commits] freeside/httemplate/search cust_main.cgi, 1.63,
	1.64 cust_bill.html, 1.15, 1.16 svc_acct.cgi, 1.34,
	1.35 svc_domain.cgi, 1.18, 1.19 svc_forward.cgi, 1.7,
	1.8 cust_pkg.cgi, 1.36, 1.37
Message-ID: <20060619023354.0A386FC8380@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv8904/httemplate/search

Modified Files:
	cust_main.cgi cust_bill.html svc_acct.cgi svc_domain.cgi 
	svc_forward.cgi cust_pkg.cgi 
Log Message:
agent virtualization, take one (stuff from "inactive" changeset snuck into cust_main.pm and the package reporting changeset in search/cust_pkg.cgi here too)

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_main.cgi,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cust_main.cgi	15 May 2006 11:05:04 -0000	1.63
+++ cust_main.cgi	19 Jun 2006 02:33:52 -0000	1.64
@@ -117,6 +117,10 @@
 
   my $addl_qual = join(' AND ', @qual);
 
+  #here is the agent virtualization
+  $addl_qual .= ( $addl_qual ? ' AND ' : '' ).
+                $FS::CurrentUser::CurrentUser->agentnums_sql;
+
   if ( $addl_qual ) {
     $qual .= ' AND ' if $qual;
     $qual .= $addl_qual;
@@ -322,32 +326,43 @@
 
   print "<BR><BR>". $pager. include('/elements/table-grid.html'). <<END;
       <TR>
-        <TH></TH>
-        <TH>(bill) name</TH>
-        <TH>company</TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc">(bill) name</TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc">company</TH>
 END
 
 if ( defined dbdef->table('cust_main')->column('ship_last') ) {
   print <<END;
-      <TH>(service) name</TH>
-      <TH>company</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc">(service) name</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc">company</TH>
 END
 }
 
 foreach my $addl_header ( @addl_headers ) {
-  print "<TH>$addl_header</TH>";
+  print '<TH CLASS="grid" BGCOLOR="#cccccc">'. "$addl_header</TH>";
 }
 
 print <<END;
-        <TH>Packages</TH>
-        <TH COLSPAN=2>Services</TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc">Packages</TH>
+        <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=2>Services</TH>
       </TR>
 END
 
+  my $bgcolor1 = '#eeeeee';
+  my $bgcolor2 = '#ffffff';
+  my $bgcolor;
+
   my(%saw,$cust_main);
   foreach $cust_main (
     sort $sortby grep(!$saw{$_->custnum}++, @cust_main)
   ) {
+
+    if ( $bgcolor eq $bgcolor1 ) {
+      $bgcolor = $bgcolor2;
+    } else {
+      $bgcolor = $bgcolor1;
+    }
+
     my($custnum,$last,$first,$company)=(
       $cust_main->custnum,
       $cust_main->getfield('last'),
@@ -377,9 +392,9 @@
     %>
 
     <TR>
-      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= $custnum %></FONT></A></TD>
-      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$last, $first" %></FONT></A></TD>
-      <TD ROWSPAN=<%= $rowspan || 1 %>><%= $pcompany %></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= $custnum %></FONT></A></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$last, $first" %></FONT></A></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><%= $pcompany %></TD>
 
     <%
     if ( defined dbdef->table('cust_main')->column('ship_last') ) {
@@ -393,14 +408,14 @@
         : '<FONT SIZE=-1>&nbsp;</FONT>';
       %>
 
-      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$ship_last, $ship_first" %></FONT></A></TD>
-      <TD ROWSPAN=<%= $rowspan || 1 %>><%= $pship_company %></A></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$ship_last, $ship_first" %></FONT></A></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %>><%= $pship_company %></A></TD>
 
     <% }
 
     foreach my $addl_col ( @addl_cols ) { %>
 
-      <TD ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
 
       <% if ( $addl_col eq 'tickets' ) {
         if ( @custom_priorities ) {
@@ -457,14 +472,14 @@
       #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
       my $rowspan = scalar(@cust_svc) || 1;
 
-      print $n1, qq!<TD ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
+      print $n1, qq!<TD CLASS="grid" BGCOLOR="$bgcolor"  ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
       my($n2)='';
       foreach my $cust_svc ( @cust_svc ) {
          my($label, $value, $svcdb) = $cust_svc->label;
          my($svcnum) = $cust_svc->svcnum;
          my($sview) = $p.'view';
-         print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-               qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+         print $n2,qq!<TD CLASS="grid" BGCOLOR="$bgcolor" ><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+               qq!<TD CLASS="grid" BGCOLOR="$bgcolor" ><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
          $n2="</TR><TR>";
       }
       #print qq!</TR><TR>\n!;

Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_domain.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- svc_domain.cgi	14 May 2006 16:47:30 -0000	1.18
+++ svc_domain.cgi	19 Jun 2006 02:33:52 -0000	1.19
@@ -6,38 +6,50 @@
 $query ||= ''; #to avoid use of unitialized value errors
 
 my $orderby = 'ORDER BY svcnum';
-my $join = '';
 my %svc_domain = ();
-my $extra_sql = '';
+my @extra_sql = ();
 if ( $query eq 'svcnum' ) {
   #$orderby = 'ORDER BY svcnum';
 } elsif ( $query eq 'domain' ) {
   $orderby = 'ORDER BY domain';
-} elsif ( $query eq 'UN_svcnum' ) {
+} elsif ( $query eq 'UN_svcnum' ) { #UN searches need to be acl'ed (and need to
+                                    #fix $agentnums_sql
   #$orderby = 'ORDER BY svcnum';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = ' WHERE pkgnum IS NULL';
-} elsif ( $query eq 'UN_domain' ) {
+  push @extra_sql, 'pkgnum IS NULL';
+} elsif ( $query eq 'UN_domain' ) { #UN searches need to be acl'ed (and need to
+                                    #fix $agentnums_sql
   $orderby = 'ORDER BY domain';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = ' WHERE pkgnum IS NULL';
+  push @extra_sql, 'pkgnum IS NULL';
 } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
   #$orderby = 'ORDER BY svcnum';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = " WHERE svcpart = $1";
+  push @extra_sql, "svcpart = $1";
 } else {
   $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
-  $join = '';
   $svc_domain{'domain'} = $1;
 }
 
-my $count_query = "SELECT COUNT(*) FROM svc_domain $join $extra_sql";
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+my $extra_sql = '';
+if ( @extra_sql ) {
+  $extra_sql = ( keys(%svc_domain) ? ' AND ' : ' WHERE ' ).
+               join(' AND ', @extra_sql );
+}
+
+my $count_query = "SELECT COUNT(*) FROM svc_domain $addl_from ";
 if ( keys %svc_domain ) {
   $count_query .= ' WHERE '.
                     join(' AND ', map "$_ = ". dbh->quote($svc_domain{$_}),
                                       keys %svc_domain
                         );
 }
+$count_query .= $extra_sql;
 
 my $sql_query = {
   'table'     => 'svc_domain',
@@ -48,9 +60,7 @@
                     FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 'LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 'LEFT JOIN cust_main USING ( custnum ) ',
+  'addl_from' => $addl_from,
 };
 
 my $link = [ "${p}view/svc_domain.cgi?", 'svcnum' ];
@@ -68,15 +78,18 @@
                  'count_query'       => $count_query,
                  'redirect'          => $link,
                  'header'            => [ '#',
+                                          'Service',
                                           'Domain',
                                           FS::UI::Web::cust_header(),
                                         ],
                  'fields'            => [ 'svcnum',
+                                          'svc',
                                           'domain',
                                           \&FS::UI::Web::cust_fields,
                                         ],
                  'links'             => [ $link,
                                           $link,
+                                          $link,
                                           ( map { $link_cust }
                                                 FS::UI::Web::cust_header()
                                           ),

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_acct.cgi,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- svc_acct.cgi	14 Jul 2005 11:31:35 -0000	1.34
+++ svc_acct.cgi	19 Jun 2006 02:33:52 -0000	1.35
@@ -5,11 +5,9 @@
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
 
-my $cjoin = '';
 my @extra_sql = ();
 if ( $query =~ /^UN_(.*)$/ ) {
   $query = $1;
-  $cjoin = 'LEFT JOIN cust_svc USING ( svcnum )';
   push @extra_sql, 'pkgnum IS NULL';
 }
 
@@ -24,7 +22,6 @@
   push @extra_sql, "popnum = $1";
   $orderby = "ORDER BY LOWER(username)";
 } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-  $cjoin ||= 'LEFT JOIN cust_svc USING ( svcnum )';
   push @extra_sql, "svcpart = $1";
   $orderby = "ORDER BY uid";
   #$orderby = "ORDER BY svcnum";
@@ -72,12 +69,20 @@
 
 }
 
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
 my $extra_sql = 
   scalar(@extra_sql)
     ? ' WHERE '. join(' AND ', @extra_sql )
     : '';
 
-my $count_query = "SELECT COUNT(*) FROM svc_acct $cjoin $extra_sql";
+my $count_query = "SELECT COUNT(*) FROM svc_acct $addl_from $extra_sql";
 #if ( keys %svc_acct ) {
 #  $count_query .= ' WHERE '.
 #                    join(' AND ', map "$_ = ". dbh->quote($svc_acct{$_}),
@@ -94,10 +99,7 @@
                     FS::UI::Web::cust_sql_fields(),
                   ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 ' LEFT JOIN part_svc  USING ( svcpart ) '.
-                 ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 ' LEFT JOIN cust_main USING ( custnum ) ',
+  'addl_from' => $addl_from,
 };
 
 my $link      = [ "${p}view/svc_acct.cgi?",   'svcnum'  ];
@@ -117,21 +119,21 @@
                  'count_query' => $count_query,
                  'redirect'    => $link,
                  'header'      => [ '#',
+                                    'Service',
                                     'Account',
                                     'UID',
-                                    'Service',
                                     FS::UI::Web::cust_header(),
                                   ],
                  'fields'      => [ 'svcnum',
+                                    'svc',
                                     'email',
                                     'uid',
-                                    'svc',
                                     \&FS::UI::Web::cust_fields,
                                   ],
                  'links'       => [ $link,
                                     $link,
                                     $link,
-                                    '',
+                                    $link,
                                     ( map { $link_cust }
                                           FS::UI::Web::cust_header()
                                     ),

Index: cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cust_bill.html	14 Jul 2005 11:18:06 -0000	1.15
+++ cust_bill.html	19 Jun 2006 02:33:52 -0000	1.16
@@ -1,4 +1,9 @@
 <%
+
+   my $join_cust_main = 'LEFT JOIN cust_main USING ( custnum )';
+   #here is the agent virtualization
+   my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
+
    my( $count_query, $sql_query );
    my( $count_addl ) = ( '' );
    my( $distinct ) = ( '' );
@@ -6,11 +11,15 @@
    my($agentnum) = ( '' );
    my($open, $days) = ( '', '' );
    if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
-     $count_query = "SELECT COUNT(*) FROM cust_bill WHERE invnum = $2";
+     $count_query =
+       "SELECT COUNT(*) FROM cust_bill $join_cust_main".
+       "  WHERE invnum = $2 AND $agentnums_sql"; #agent virtualization
      $sql_query = {
        'table'     => 'cust_bill',
+       'addl_from' => $join_cust_main,
        'hashref'   => { 'invnum' => $2 },
        #'select'    => '*',
+       'extra_sql' => " AND $agentnums_sql", #agent virtualization
      };
    } else {
    #if ( $cgi->param('begin') || $cgi->param('end')
@@ -68,10 +77,10 @@
        push @where, "cust_bill._date < ". (time-86400*$days) if $days;
      }
 
+     #here is the agent virtualization
+     push @where, $agentnums_sql;
      my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
 
-     my $addl_from = 'left join cust_main using ( custnum )';
-
      if ( $cgi->param('newest_percust') ) {
        $distinct = 'DISTINCT ON ( cust_bill.custnum )';
        $orderby = 'ORDER BY cust_bill.custnum ASC, cust_bill._date DESC';
@@ -85,11 +94,11 @@
                        '$%.2f total outstanding balance',
                      ];
      }
-     $count_query .=  " FROM cust_bill $addl_from $extra_sql";
+     $count_query .=  " FROM cust_bill $join_cust_main $extra_sql";
    
      $sql_query = {
        'table'     => 'cust_bill',
-       'addl_from' => $addl_from,
+       'addl_from' => $join_cust_main,
        'hashref'   => {},
        'select'    => "$distinct ". join(', ',
                         'cust_bill.*',

Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- cust_pkg.cgi	22 Apr 2006 00:58:39 -0000	1.36
+++ cust_pkg.cgi	19 Jun 2006 02:33:52 -0000	1.37
@@ -1,19 +1,80 @@
 <%
 
-my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
+# my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
 my($query) = $cgi->keywords;
 
-my $orderby;
-my @where;
-my $cjoin = '';
+my @where = ();
+
+##
+# parse agent
+##
 
 if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
-  $cjoin = "LEFT JOIN cust_main USING ( custnum )";
   push @where,
     "agentnum = $1";
 }
 
+##
+# parse status
+##
+
+if (    $cgi->param('magic')  eq 'active'
+     || $cgi->param('status') eq 'active' ) {
+
+  push @where, FS::cust_pkg->active_sql();
+
+} elsif (    $cgi->param('magic')  eq 'suspended'
+          || $cgi->param('status') eq 'suspended'  ) {
+
+  push @where, FS::cust_pkg->suspended_sql();
+
+} elsif (    $cgi->param('magic')  =~ /^cancell?ed$/
+          || $cgi->param('status') =~ /^cancell?ed$/ ) {
+
+  push @where, FS::cust_pkg->cancelled_sql();
+
+} elsif ( $cgi->param('status') =~ /^(one-time charge|inactive)$/ ) {
+
+  push @where, FS::cust_pkg->inactive_sql();
+
+}
+
+###
+# parse package class
+###
+
+#false lazinessish w/graph/cust_bill_pkg.cgi
+my $classnum = 0;
+my @pkg_class = ();
+if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
+  $classnum = $1;
+  if ( $classnum ) { #a specific class
+    push @where, "classnum = $classnum";
+
+    #@pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) );
+    #die "classnum $classnum not found!" unless $pkg_class[0];
+    #$title .= $pkg_class[0]->classname.' ';
+
+  } elsif ( $classnum eq '' ) { #the empty class
+
+    push @where, "classnum IS NULL";
+    #$title .= 'Empty class ';
+    #@pkg_class = ( '(empty class)' );
+  } elsif ( $classnum eq '0' ) {
+    #@pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } );
+    #push @pkg_class, '(empty class)';
+  } else {
+    die "illegal classnum";
+  }
+}
+#eslaf
+
+###
+# parse magic, legacy, etc.
+###
+
+my $orderby;
 if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   $orderby = 'ORDER BY bill';
 
@@ -23,7 +84,8 @@
     #"bill <= $ending",
     "CASE WHEN bill IS NULL THEN 0 ELSE bill END >= $beginning ",
     "CASE WHEN bill IS NULL THEN 0 ELSE bill END <= $ending",
-    '( cancel IS NULL OR cancel = 0 )';
+    #'( cancel IS NULL OR cancel = 0 )'
+  ;
 
 } else {
 
@@ -33,30 +95,6 @@
 
     $orderby = 'ORDER BY pkgnum';
 
-    if ( $cgi->param('magic') eq 'active' ) {
-
-      #push @where,
-      #  '( susp IS NULL OR susp = 0 )',
-      #  '( cancel IS NULL OR cancel = 0)';
-      push @where, FS::cust_pkg->active_sql();
-
-    } elsif ( $cgi->param('magic') eq 'suspended' ) {
-
-      push @where,
-        'susp IS NOT NULL',
-        'susp != 0',
-        '( cancel IS NULL OR cancel = 0)';
-
-    } elsif ( $cgi->param('magic') =~ /^cancell?ed$/ ) {
-
-      push @where,
-        'cancel IS NOT NULL',
-        'cancel != 0';
-
-    } else {
-      die "guru meditation #420";
-    }
-
     if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
       push @where, "pkgpart = $1";
     }
@@ -84,21 +122,35 @@
 
 }
 
+##
+# setup queries, links, subs, etc. for the search
+##
+
+# here is the agent virtualization
+push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
 my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
 
-my $count_query = "SELECT COUNT(*) FROM cust_pkg $cjoin $extra_sql";
+my $addl_from = 'LEFT JOIN cust_main USING ( custnum  ) '.
+                'LEFT JOIN part_pkg  USING ( pkgpart  ) '.
+                'LEFT JOIN pkg_class USING ( classnum ) ';
+
+my $count_query = "SELECT COUNT(*) FROM cust_pkg $addl_from $extra_sql";
 
 my $sql_query = {
   'table'     => 'cust_pkg',
   'hashref'   => {},
   'select'    => join(', ',
                             'cust_pkg.*',
+                            ( map "part_pkg.$_", qw( pkg freq ) ),
+                            'pkg_class.classname',
                             'cust_main.custnum as cust_main_custnum',
-                            FS::UI::Web::cust_sql_fields(),
+                            FS::UI::Web::cust_sql_fields(
+                              $cgi->param('cust_fields')
+                            ),
                  ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_main USING ( custnum ) ',
-                 #' LEFT JOIN part_pkg  USING ( pkgpart ) '
+  'addl_from' => $addl_from,
 };
 
 my $link = sub {
@@ -138,6 +190,10 @@
    };
 }
 
+###
+# and finally, include the search template
+### 
+
 %><%=  include( 'elements/search.html',
                   'title'       => 'Package Search Results', 
                   'name'        => 'packages',
@@ -146,6 +202,7 @@
                   #'redirect'    => $link,
                   'header'      => [ '#',
                                      'Package',
+                                     'Class',
                                      'Status',
                                      'Freq.',
                                      'Setup',
@@ -154,18 +211,25 @@
                                      'Susp.',
                                      'Expire',
                                      'Cancel',
-                                     FS::UI::Web::cust_header(),
+                                     FS::UI::Web::cust_header(
+                                       $cgi->param('cust_fields')
+                                     ),
                                      'Services',
                                    ],
                   'fields'      => [
                     'pkgnum',
-                    sub { my $part_pkg = $part_pkg{shift->pkgpart};
-                          $part_pkg->pkg; # ' - '. $part_pkg->comment;
+                    sub { #my $part_pkg = $part_pkg{shift->pkgpart};
+                          #$part_pkg->pkg; # ' - '. $part_pkg->comment;
+                          $_[0]->pkg; # ' - '. $_[0]->comment;
                         },
+                    'classname',
                     sub { ucfirst(shift->status); },
                     sub { #shift->part_pkg->freq_pretty;
-                          my $part_pkg = $part_pkg{shift->pkgpart};
-                          $part_pkg->freq_pretty;
+
+                          #my $part_pkg = $part_pkg{shift->pkgpart};
+                          #$part_pkg->freq_pretty;
+
+                          FS::part_pkg::freq_pretty(shift);
                         },
 
                     #sub { time2str('%b %d %Y', shift->setup); },
@@ -204,6 +268,7 @@
                   'color' => [
                     '',
                     '',
+                    '',
                     sub { shift->statuscolor; },
                     '',
                     '',
@@ -212,12 +277,16 @@
                     '',
                     '',
                     '',
-                    ( map { '' } FS::UI::Web::cust_header() ),
+                    ( map { '' }
+                          FS::UI::Web::cust_header(
+                                                    $cgi->param('cust_fields')
+                                                  )
+                    ),
                     '',
                   ],
-                  'style' => [ '', '', 'b' ],
-                  'size'  => [ '', '', '-1', ],
-                  'align' => 'rlclrrrrrr',
+                  'style' => [ '', '', '', 'b' ],
+                  'size'  => [ '', '', '', '-1', ],
+                  'align' => 'rllclrrrrrr',
                   'links' => [
                     $link,
                     $link,
@@ -229,7 +298,12 @@
                     '',
                     '',
                     '',
-                    ( map { $clink } FS::UI::Web::cust_header() ),
+                    '',
+                    ( map { $clink }
+                          FS::UI::Web::cust_header(
+                                                    $cgi->param('cust_fields')
+                                                  )
+                    ),
                     '',
                   ],
               )

Index: svc_forward.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_forward.cgi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- svc_forward.cgi	14 Jul 2005 11:31:35 -0000	1.7
+++ svc_forward.cgi	19 Jun 2006 02:33:52 -0000	1.8
@@ -5,14 +5,12 @@
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
 
-
 my $orderby;
 
-my $cjoin = '';
 my @extra_sql = ();
-if ( $query =~ /^UN_(.*)$/ ) {
+if ( $query =~ /^UN_(.*)$/ ) { #UN searches need to be acl'ed (and need to
+                                    #fix $agentnums_sql
   $query = $1;
-  $cjoin = 'LEFT JOIN cust_svc USING ( svcnum )';
   push @extra_sql, 'pkgnum IS NULL';
 }
 
@@ -22,12 +20,20 @@
   eidiot('unimplemented');
 }
 
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
 my $extra_sql = 
   scalar(@extra_sql)
     ? ' WHERE '. join(' AND ', @extra_sql )
     : '';
 
-my $count_query = "SELECT COUNT(*) FROM svc_forward $cjoin $extra_sql";
+my $count_query = "SELECT COUNT(*) FROM svc_forward $addl_from $extra_sql";
 my $sql_query = {
   'table'     => 'svc_forward',
   'hashref'   => {},
@@ -37,10 +43,7 @@
                     FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 ' LEFT JOIN part_svc  USING ( svcpart ) '.
-                 ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 ' LEFT JOIN cust_main USING ( custnum ) ',
+  'addl_from' => $addl_from,
 };
 
 #        <TH>Service #<BR><FONT SIZE=-1>(click to view forward)</FONT></TH>
@@ -100,16 +103,19 @@
                  'count_query'       => $count_query,
                  'redirect'          => $link,
                  'header'            => [ '#',
+                                          'Service',
                                           'Mail to',
                                           'Forwards to',
                                           FS::UI::Web::cust_header(),
                                         ],
                  'fields'            => [ 'svcnum',
+                                          'svc',
                                           $format_src,
                                           $format_dst,
                                           \&FS::UI::Web::cust_fields,
                                         ],
                  'links'             => [ $link,
+                                          $link,
                                           $link_src,
                                           $link_dst,
                                           ( map { $link_cust }

From ivan at wavetail.420.am  Sun Jun 18 19:33:54 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 19:34:07 2006
Subject: [freeside-commits] 
	freeside/FS/FS UID.pm, 1.26, 1.27 CurrentUser.pm,
	NONE, 1.1 access_user.pm, 1.1, 1.2 Schema.pm, 1.16,
	1.17 Record.pm, 1.115, 1.116 cust_main.pm, 1.215,
	1.216 part_pkg.pm, 1.48, 1.49
Message-ID: <20060619023354.0928FFC8034@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv8904/FS/FS

Modified Files:
	UID.pm access_user.pm Schema.pm Record.pm cust_main.pm 
	part_pkg.pm 
Added Files:
	CurrentUser.pm 
Log Message:
agent virtualization, take one (stuff from "inactive" changeset snuck into cust_main.pm and the package reporting changeset in search/cust_pkg.cgi here too)

Index: UID.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/UID.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- UID.pm	8 Feb 2006 02:26:23 -0000	1.26
+++ UID.pm	19 Jun 2006 02:33:52 -0000	1.27
@@ -13,6 +13,7 @@
 use Carp qw(carp croak cluck);
 use DBI;
 use FS::Conf;
+use FS::CurrentUser;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(checkeuid checkruid cgisuidsetup adminsuidsetup forksuidsetup
@@ -87,6 +88,12 @@
 
   $dbh = &myconnect;
 
+  use FS::Schema qw(reload_dbdef);
+  reload_dbdef("/usr/local/etc/freeside/dbdef.$datasrc")
+    unless $FS::Schema::setup_hack;
+
+  FS::CurrentUser->load_user($user);
+
   foreach ( keys %callback ) {
     &{$callback{$_}};
     # breaks multi-database installs # delete $callback{$_}; #run once
@@ -98,7 +105,11 @@
 }
 
 sub myconnect {
-  DBI->connect( getsecrets, {'AutoCommit' => 0, 'ChopBlanks' => 1, } )
+  DBI->connect( getsecrets, { 'AutoCommit'         => 0,
+                              'ChopBlanks'         => 1,
+                              'ShowErrorStatement' => 1,
+                            }
+              )
     or die "DBI->connect error: $DBI::errstr\n";
 }
 
@@ -256,10 +267,10 @@
   $user = $setuser if $setuser;
   die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
-  my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
+  my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets');
   die "User $user not found in mapsecrets!" unless $line;
-  $line =~ /^\s*$user\s+(.*)$/;
-  $secrets = $1;
+  $line =~ /^\s*($user|\*)\s+(.*)$/;
+  $secrets = $2;
   die "Illegal mapsecrets line for user?!" unless $secrets;
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
     or die "Can't get secrets: $secrets: $!\n";

Index: Record.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Record.pm,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- Record.pm	3 Apr 2006 11:36:29 -0000	1.115
+++ Record.pm	19 Jun 2006 02:33:52 -0000	1.116
@@ -29,14 +29,12 @@
 
 $nowarn_identical = 0;
 
-my $conf;
 my $rsa_module;
 my $rsa_loaded;
 my $rsa_encrypt;
 my $rsa_decrypt;
 
 FS::UID->install_callback( sub {
-  $conf = new FS::Conf; 
   $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc;
 } );
 
@@ -441,6 +439,7 @@
     }
 
     # Check for encrypted fields and decrypt them.
+    my $conf = new FS::Conf; 
     if ($conf->exists('encryption') && eval 'defined(@FS::'. $table . '::encrypted_fields)') {
       foreach my $record (@return) {
         foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
@@ -711,6 +710,7 @@
 
   
   # Encrypt before the database
+  my $conf = new FS::Conf;
   if ($conf->exists('encryption') && defined(eval '@FS::'. $table . 'encrypted_fields')) {
     foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
       $self->{'saved'} = $self->getfield($field);
@@ -727,12 +727,18 @@
   my @values = map { _quote( $self->getfield($_), $table, $_) } @real_fields;
   #eslaf
 
-  my $statement = "INSERT INTO $table ( ".
-      join( ', ', @real_fields ).
-    ") VALUES (".
-      join( ', ', @values ).
-    ")"
-  ;
+  my $statement = "INSERT INTO $table ";
+  if ( @real_fields ) {
+    $statement .=
+      "( ".
+        join( ', ', @real_fields ).
+      ") VALUES (".
+        join( ', ', @values ).
+       ")"
+    ;
+  } else {
+    $statement .= 'DEFAULT VALUES';
+  }
   warn "[debug]$me $statement\n" if $DEBUG > 1;
   my $sth = dbh->prepare($statement) or return dbh->errstr;
 
@@ -995,6 +1001,7 @@
   return $error if $error;
   
   # Encrypt for replace
+  my $conf = new FS::Conf;
   my $saved = {};
   if ($conf->exists('encryption') && defined(eval '@FS::'. $new->table . 'encrypted_fields')) {
     foreach my $field (eval '@FS::'. $new->table . '::encrypted_fields') {
@@ -1635,7 +1642,8 @@
                 "WHERE dbtable = '$table'";
     my $dbh = dbh;
     my $result = $dbh->selectcol_arrayref($query);
-    confess $dbh->errstr if $dbh->err;
+    confess "Error executing virtual fields query: $query: ". $dbh->errstr
+      if $dbh->err;
     $virtual_fields_cache{$table} = $result;
   }
 
@@ -1788,6 +1796,7 @@
   my ($self, $value) = @_;
   my $encrypted;
 
+  my $conf = new FS::Conf;
   if ($conf->exists('encryption')) {
     if ($self->is_encrypted($value)) {
       # Return the original value if it isn't plaintext.
@@ -1821,6 +1830,7 @@
 sub decrypt {
   my ($self,$value) = @_;
   my $decrypted = $value; # Will return the original value if it isn't encrypted or can't be decrypted.
+  my $conf = new FS::Conf;
   if ($conf->exists('encryption') && $self->is_encrypted($value)) {
     $self->loadRSA;
     if (ref($rsa_decrypt) =~ /::RSA/) {
@@ -1836,6 +1846,7 @@
     #Initialize the Module
     $rsa_module = 'Crypt::OpenSSL::RSA'; # The Default
 
+    my $conf = new FS::Conf;
     if ($conf->exists('encryptionmodule') && $conf->config('encryptionmodule') ne '') {
       $rsa_module = $conf->config('encryptionmodule');
     }

Index: part_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- part_pkg.pm	18 Jun 2006 12:54:48 -0000	1.48
+++ part_pkg.pm	19 Jun 2006 02:33:52 -0000	1.49
@@ -608,7 +608,8 @@
   my $self = shift;
   my $freq = $self->freq;
 
-  my $freqs_href = $self->freqs_href;
+  #my $freqs_href = $self->freqs_href;
+  my $freqs_href = freqs_href();
 
   if ( exists($freqs_href->{$freq}) ) {
     $freqs_href->{$freq};

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- cust_main.pm	22 May 2006 18:27:46 -0000	1.215
+++ cust_main.pm	19 Jun 2006 02:33:52 -0000	1.216
@@ -20,6 +20,7 @@
 #use Date::Manip;
 use String::Approx qw(amatch);
 use Business::CreditCard 0.28;
+use Locale::Country;
 use FS::UID qw( getotaker dbh );
 use FS::Record qw( qsearchs qsearch dbdef );
 use FS::Misc qw( send_email );
@@ -79,7 +80,7 @@
   my $self = shift;
   my ( $hashref, $cache ) = @_;
   if ( exists $hashref->{'pkgnum'} ) {
-#    #@{ $self->{'_pkgnum'} } = ();
+    #@{ $self->{'_pkgnum'} } = ();
     my $subcache = $cache->subcache( 'pkgnum', 'cust_pkg', $hashref->{custnum});
     $self->{'_pkgnum'} = $subcache;
     #push @{ $self->{'_pkgnum'} },
@@ -3186,6 +3187,7 @@
 
 sub invoicing_list {
   my( $self, $arrayref ) = @_;
+
   if ( $arrayref ) {
     my @cust_main_invoice;
     if ( $self->custnum ) {
@@ -3220,12 +3222,14 @@
       warn $error if $error;
     }
   }
+  
   if ( $self->custnum ) {
     map { $_->address }
       qsearch( 'cust_main_invoice', { 'custnum' => $self->custnum } );
   } else {
     ();
   }
+
 }
 
 =item check_invoicing_list ARRAYREF
@@ -3303,6 +3307,18 @@
   $self->invoicing_list(\@invoicing_list);
 }
 
+=item invoicing_list_emailonly
+
+Returns the list of email invoice recipients (invoicing_list without non-email
+destinations such as POST and FAX).
+
+=cut
+
+sub invoicing_list_emailonly {
+  my $self = shift;
+  grep { $_ !~ /^([A-Z]+)$/ } $self->invoicing_list;
+}
+
 =item referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]
 
 Returns an array of customers referred by this customer (referral_custnum set
@@ -3600,6 +3616,17 @@
     : $self->contact;
 }
 
+=item country_full
+
+Returns this customer's full country name
+
+=cut
+
+sub country_full {
+  my $self = shift;
+  code2country($self->country);
+}
+
 =item status
 
 Returns a status string for this customer, currently:
@@ -3610,6 +3637,8 @@
 
 =item active - One or more recurring packages is active
 
+=item inactive - No active recurring packages, but otherwise unsuspended/uncancelled (the inactive status is new - previously inactive customers were mis-identified as cancelled)
+
 =item suspended - All non-cancelled recurring packages are suspended
 
 =item cancelled - All recurring packages are cancelled
@@ -3620,7 +3649,7 @@
 
 sub status {
   my $self = shift;
-  for my $status (qw( prospect active suspended cancelled )) {
+  for my $status (qw( prospect active inactive suspended cancelled )) {
     my $method = $status.'_sql';
     my $numnum = ( my $sql = $self->$method() ) =~ s/cust_main\.custnum/?/g;
     my $sth = dbh->prepare("SELECT $sql") or die dbh->errstr;
@@ -3635,14 +3664,18 @@
 
 =cut
 
-my %statuscolor = (
-  'prospect'  => '000000',
-  'active'    => '00CC00',
-  'suspended' => 'FF9900',
-  'cancelled' => 'FF0000',
-);
+
 sub statuscolor {
   my $self = shift;
+
+  my %statuscolor = (
+    'prospect'  => '7e0079', #'000000', #black?  naw, purple
+    'active'    => '00CC00', #green
+    'inactive'  => '0000CC', #blue
+    'suspended' => 'FF9900', #yellow
+    'cancelled' => 'FF0000', #red
+  );
+
   $statuscolor{$self->status};
 }
 
@@ -3659,25 +3692,40 @@
 
 =cut
 
+use vars qw($select_count_pkgs);
+$select_count_pkgs =
+  "SELECT COUNT(*) FROM cust_pkg
+    WHERE cust_pkg.custnum = cust_main.custnum";
+
 sub prospect_sql { "
-  0 = ( SELECT COUNT(*) FROM cust_pkg
-          WHERE cust_pkg.custnum = cust_main.custnum
-      )
+  0 = ( $select_count_pkgs )
 "; }
 
 =item active_sql
 
-Returns an SQL expression identifying active cust_main records.
+Returns an SQL expression identifying active cust_main records (customers with
+no active recurring packages, but otherwise unsuspended/uncancelled).
 
 =cut
 
 sub active_sql { "
-  0 < ( SELECT COUNT(*) FROM cust_pkg
-          WHERE cust_pkg.custnum = cust_main.custnum
-            AND ". FS::cust_pkg->active_sql. "
+  0 < ( $select_count_pkgs AND ". FS::cust_pkg->active_sql. "
       )
 "; }
 
+=item inactive_sql
+
+Returns an SQL expression identifying inactive cust_main records (customers with
+active recurring packages).
+
+=cut
+
+sub inactive_sql { "
+  0 = ( $select_count_pkgs AND ". FS::cust_pkg->active_sql. " )
+  AND
+  0 < ( $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " )
+"; }
+
 =item susp_sql
 =item suspended_sql
 
@@ -3685,23 +3733,12 @@
 
 =cut
 
-#my $recurring_sql = FS::cust_pkg->recurring_sql;
-my $recurring_sql = "
-  '0' != ( select freq from part_pkg
-             where cust_pkg.pkgpart = part_pkg.pkgpart )
-";
 
 sub suspended_sql { susp_sql(@_); }
 sub susp_sql { "
-    0 < ( SELECT COUNT(*) FROM cust_pkg
-            WHERE cust_pkg.custnum = cust_main.custnum
-              AND $recurring_sql
-              AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-        )
-    AND 0 = ( SELECT COUNT(*) FROM cust_pkg
-                WHERE cust_pkg.custnum = cust_main.custnum
-                  AND ". FS::cust_pkg->active_sql. "
-            )
+    0 < ( $select_count_pkgs AND ". FS::cust_pkg->suspended_sql. " )
+    AND
+    0 = ( $select_count_pkgs AND ". FS::cust_pkg->active_sql. " )
 "; }
 
 =item cancel_sql
@@ -3712,16 +3749,21 @@
 =cut
 
 sub cancelled_sql { cancel_sql(@_); }
-sub cancel_sql { "
-  0 < ( SELECT COUNT(*) FROM cust_pkg
-          WHERE cust_pkg.custnum = cust_main.custnum
-      )
-  AND 0 = ( SELECT COUNT(*) FROM cust_pkg
-              WHERE cust_pkg.custnum = cust_main.custnum
-                AND $recurring_sql
-                AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-          )
-"; }
+sub cancel_sql {
+
+  my $recurring_sql = FS::cust_pkg->recurring_sql;
+  #my $recurring_sql = "
+  #  '0' != ( select freq from part_pkg
+  #             where cust_pkg.pkgpart = part_pkg.pkgpart )
+  #";
+
+  "
+    0 < ( $select_count_pkgs )
+    AND 0 = ( $select_count_pkgs AND $recurring_sql
+                  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+            )
+  ";
+}
 
 =item uncancel_sql
 =item uncancelled_sql
@@ -3732,15 +3774,12 @@
 
 sub uncancelled_sql { uncancel_sql(@_); }
 sub uncancel_sql { "
-  ( 0 < ( SELECT COUNT(*) FROM cust_pkg
-                 WHERE cust_pkg.custnum = cust_main.custnum
+  ( 0 < ( $select_count_pkgs
                    AND ( cust_pkg.cancel IS NULL
                          OR cust_pkg.cancel = 0
                        )
         )
-    OR 0 = ( SELECT COUNT(*) FROM cust_pkg
-               WHERE cust_pkg.custnum = cust_main.custnum
-           )
+    OR 0 = ( $select_count_pkgs )
   )
 "; }
 
@@ -3802,11 +3841,18 @@
 sub smart_search {
   my %options = @_;
   my $search = delete $options{'search'};
-  my @cust_main = ();
 
+  #here is the agent virtualization
+  my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+  my @cust_main = ();
   if ( $search =~ /^\s*(\d+)\s*$/ ) { # customer # search
 
-    push @cust_main, qsearch('cust_main', { 'custnum' => $1, %options } );
+    push @cust_main, qsearch( {
+      'table'     => 'cust_main',
+      'hashref'   => { 'custnum' => $1, %options },
+      'extra_sql' => " AND $agentnums_sql", #agent virtualization
+    } );
 
   } elsif ( $search =~ /^\s*(\S.*\S)\s*$/ ) { #value search
 
@@ -3820,50 +3866,65 @@
       if defined dbdef->table('cust_main')->column('ship_last');
     $sql .= ' )';
 
-    push @cust_main, qsearch( 'cust_main', \%options, '', $sql );
+    push @cust_main, qsearch( {
+      'table'     => 'cust_main',
+      'hashref'   => \%options,
+      'extra_sql' => "$sql AND $agentnums_sql", #agent virtualization
+    } );
 
     unless ( @cust_main ) {  #no exact match, trying substring/fuzzy
 
       #still some false laziness w/ search/cust_main.cgi
 
       #substring
-      push @cust_main, qsearch( 'cust_main',
-                                { 'last'     => { 'op'    => 'ILIKE',
-                                                  'value' => "%$q_value%" },
-                                  %options,
-                                }
-                              );
-      push @cust_main, qsearch( 'cust_main',
-                                { 'ship_last' => { 'op'    => 'ILIKE',
-                                                   'value' => "%$q_value%" },
-                                  %options,
-
-                                }
-                              )
+      push @cust_main, qsearch( {
+        'table'     => 'cust_main',
+        'hashref'   => { 'last'     => { 'op'    => 'ILIKE',
+                                         'value' => "%$q_value%" },
+                         %options,
+                       },
+        'extra_sql' => " AND $agentnums_sql", #agent virtualizaiton
+      } );
+      push @cust_main, qsearch( {
+        'table'     => 'cust_main',
+        'hashref'   => { 'ship_last' => { 'op'     => 'ILIKE',
+                                          'value' => "%$q_value%" },
+                         %options, 
+                       },
+        'extra_sql' => " AND $agentnums_sql", #agent virtualization
+      } )
         if defined dbdef->table('cust_main')->column('ship_last');
 
-      push @cust_main, qsearch( 'cust_main',
-                                { 'company'  => { 'op'    => 'ILIKE',
-                                                  'value' => "%$q_value%" },
-                                  %options,
-                                }
-                              );
-      push @cust_main, qsearch( 'cust_main',
-                                { 'ship_company' => { 'op' => 'ILIKE',
-                                                   'value' => "%$q_value%" },
-                                  %options,
-                                }
-                              )
+      push @cust_main, qsearch( {
+        'table'     => 'cust_main',
+        'hashref'   => { 'company'  => { 'op'    => 'ILIKE',
+                                         'value' => "%$q_value%" },
+                         %options,
+                       },
+        'extra_sql' => " AND $agentnums_sql", #agent virtualization
+      } );
+      push @cust_main, qsearch(  {
+        'table'     => 'cust_main',
+        'hashref'   => { 'ship_company' => { 'op'    => 'ILIKE',
+                                             'value' => "%$q_value%" },
+                         %options,
+                       },
+        'extra_sql' => " AND $agentnums_sql", #agent virtualization
+      } )
         if defined dbdef->table('cust_main')->column('ship_last');
 
       #fuzzy
       push @cust_main, FS::cust_main->fuzzy_search(
-        { 'last'     => $value },
-        \%options,
+        { 'last'     => $value }, #fuzzy hashref
+        \%options,                #hashref
+        '',                       #select
+        " AND $agentnums_sql",    #extra_sql  #agent virtualization
       );
       push @cust_main, FS::cust_main->fuzzy_search(
-        { 'company'  => $value },
-        \%options,
+        { 'company'  => $value }, #fuzzy hashref
+        \%options,                #hashref
+        '',                       #select
+        " AND $agentnums_sql",    #extra_sql  #agent virtualization
       );
 
     }

Index: access_user.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/access_user.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- access_user.pm	14 May 2006 16:47:31 -0000	1.1
+++ access_user.pm	19 Jun 2006 02:33:52 -0000	1.2
@@ -2,7 +2,7 @@
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::m2m_Common;
 use FS::access_usergroup;
 
@@ -29,7 +29,7 @@
 
 =head1 DESCRIPTION
 
-An FS::access_user object represents an example.  FS::access_user inherits from
+An FS::access_user object represents an internal access user.  FS::access_user inherits from
 FS::Record.  The following fields are currently supported:
 
 =over 4
@@ -52,7 +52,7 @@
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new internal access user.  To add the user to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
@@ -91,7 +91,7 @@
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid internal access user.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
@@ -151,12 +151,51 @@
 #
 #}
 
+=item agentnums 
+
+Returns a list of agentnums this user can view (via group membership).
+
+=cut
+
+sub agentnums {
+  my $self = shift;
+  my $sth = dbh->prepare(
+    "SELECT DISTINCT agentnum FROM access_usergroup
+                              JOIN access_groupagent USING ( groupnum )
+       WHERE usernum = ?"
+  ) or die dbh->errstr;
+  $sth->execute($self->usernum) or die $sth->errstr;
+  map { $_->[0] } @{ $sth->fetchall_arrayref };
+}
+
+=item agentnums_href
+
+Returns a hashref of agentnums this user can view.
+
+=cut
+
+sub agentnums_href {
+  my $self = shift;
+  { map { $_ => 1 } $self->agentnums };
+}
+
+=item agentnums_sql
+
+Returns an sql fragement to select only agentnums this user can view.
+
+=cut
+
+sub agentnums_sql {
+  my $self = shift;
+  '( '.
+    join( ' OR ', map "agentnum = $_", $self->agentnums ).
+  ' )';
+}
+
 =back
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Schema.pm	20 May 2006 20:06:29 -0000	1.16
+++ Schema.pm	19 Jun 2006 02:33:52 -0000	1.17
@@ -16,12 +16,13 @@
 $DEBUG = 0;
 $me = '[FS::Schema]';
 
-#ask FS::UID to run this stuff for us later
-FS::UID->install_callback( sub {
-  #$conf = new FS::Conf; 
-  &reload_dbdef("/usr/local/etc/freeside/dbdef.". datasrc)
-    unless $setup_hack; #$setup_hack needed now?
-} );
+#hardcoded now...
+##ask FS::UID to run this stuff for us later
+#FS::UID->install_callback( sub {
+#  #$conf = new FS::Conf; 
+#  &reload_dbdef("/usr/local/etc/freeside/dbdef.". datasrc)
+#    unless $setup_hack; #$setup_hack needed now?
+#} );
 
 =head1 NAME
 

--- NEW FILE: CurrentUser.pm ---
package FS::CurrentUser;

use vars qw($CurrentUser);

#not at compile-time, circular dependancey causes trouble
#use FS::Record qw(qsearchs);
#use FS::access_user;

=head1 NAME

FS::CurrentUser - Package representing the current user

=head1 SYNOPSIS

=head1 DESCRIPTION

=cut

sub load_user {
  my( $class, $user ) = @_; #, $pass

  #XXX remove me at some point
  return "" if $user =~ /^fs_(queue|selfservice)$/;

  #not the best thing in the world...
  eval "use FS::Record qw(qsearchs);";
  die $@ if $@;
  eval "use FS::access_user;";
  die $@ if $@;

  $CurrentUser = qsearchs('access_user', {
    'username' => $user,
    #'_password' =>
  } );

  die "unknown user: $user" unless $CurrentUser; # or bad password

  $CurrentUser;
}

=head1 BUGS

Creepy crawlies

=head1 SEE ALSO

=cut

1;


From ivan at wavetail.420.am  Sun Jun 18 19:33:54 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 19:35:50 2006
Subject: [freeside-commits] freeside/httemplate/elements
	tr-select-agent.html, 1.1, 1.2 select-table.html, 1.2,
	1.3 select-agent.html, 1.2, 1.3
Message-ID: <20060619023354.0B1D7FC838B@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv8904/httemplate/elements

Modified Files:
	tr-select-agent.html select-table.html select-agent.html 
Log Message:
agent virtualization, take one (stuff from "inactive" changeset snuck into cust_main.pm and the package reporting changeset in search/cust_pkg.cgi here too)

Index: select-agent.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-agent.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- select-agent.html	22 Apr 2006 00:58:39 -0000	1.2
+++ select-agent.html	19 Jun 2006 02:33:52 -0000	1.3
@@ -11,6 +11,8 @@
                  'value'       => $agentnum,
                  'empty_label' => 'all',
                  'hashref'     => { 'disabled' => '' },
+                 'extra_sql'   => ' AND '.
+                                  $FS::CurrentUser::CurrentUser->agentnums_sql,
                  %select_opt,
              )
 %>

Index: select-table.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-table.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- select-table.html	7 May 2006 20:27:21 -0000	1.2
+++ select-table.html	19 Jun 2006 02:33:52 -0000	1.3
@@ -10,6 +10,7 @@
   ##opt
   # 'empty_label' => '', #better specify it though, the default might change
   # 'hashref'     => {},
+  # 'extra_sql'   => '',
   # 'records'     => \@records, #instead of hashref
   # 'pre_options' => [ 'value' => 'option' ], #before normal options
 
@@ -25,7 +26,11 @@
   if ( $opt{'records'} ) {
     @records = @{ $opt{'records'} };
   } else {
-    @records = qsearch( $opt{'table'}, ( $opt{'hashref'} || {} ) );
+    @records = qsearch( {
+      'table'     => $opt{'table'},
+      'hashref'   => ( $opt{'hashref'} || {} ),
+      'extra_sql' => ( $opt{'extra_sql'} || '' ),
+    });
   }
 
   my @pre_options = $opt{'pre_options'} ? @{ $opt{'pre_options'} } : ();

Index: tr-select-agent.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-agent.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr-select-agent.html	22 Dec 2005 04:01:17 -0000	1.1
+++ tr-select-agent.html	19 Jun 2006 02:33:52 -0000	1.2
@@ -3,9 +3,16 @@
 
   my @agents;
   if ( $opt{'agents'} ) {
-    @agents = @{ $opt{'agents'} };
+    #@agents = @{ $opt{'agents'} };
+    #here is the agent virtualization
+    my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
+    @agents = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agents'} };
   } else {
-    @agents = qsearch( 'agent', { disabled=>'' } );
+    @agents = qsearch( {
+      'table'     => 'agent',
+      'hashref'   => { disabled=>'' },
+      'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+    });
   }
 
 %>

From ivan at wavetail.420.am  Sun Jun 18 19:33:54 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 19:35:58 2006
Subject: [freeside-commits] freeside/FS MANIFEST,1.100,1.101
Message-ID: <20060619023354.0BE32FC83B9@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS
In directory wavetail:/tmp/cvs-serv8904/FS

Modified Files:
	MANIFEST 
Log Message:
agent virtualization, take one (stuff from "inactive" changeset snuck into cust_main.pm and the package reporting changeset in search/cust_pkg.cgi here too)

Index: MANIFEST
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/MANIFEST,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- MANIFEST	18 Jun 2006 12:54:49 -0000	1.100
+++ MANIFEST	19 Jun 2006 02:33:52 -0000	1.101
@@ -345,3 +345,4 @@
 FS/ConfDefaults.pm
 t/ConfDefaults.t
 FS/m2name_Common.pm
+FS/CurrentUser.pm

From ivan at wavetail.420.am  Sun Jun 18 23:03:22 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sun Jun 18 23:03:29 2006
Subject: [freeside-commits] freeside/httemplate/search cust_main.cgi, 1.64,
	1.65
Message-ID: <20060619060322.7FB80FC86E6@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv11666

Modified Files:
	cust_main.cgi 
Log Message:
fix up the alternating colors on the customer search results

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_main.cgi,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- cust_main.cgi	19 Jun 2006 02:33:52 -0000	1.64
+++ cust_main.cgi	19 Jun 2006 06:03:18 -0000	1.65
@@ -473,6 +473,7 @@
       my $rowspan = scalar(@cust_svc) || 1;
 
       print $n1, qq!<TD CLASS="grid" BGCOLOR="$bgcolor"  ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
+
       my($n2)='';
       foreach my $cust_svc ( @cust_svc ) {
          my($label, $value, $svcdb) = $cust_svc->label;
@@ -482,9 +483,19 @@
                qq!<TD CLASS="grid" BGCOLOR="$bgcolor" ><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
          $n2="</TR><TR>";
       }
+
+      unless ( @cust_svc ) {
+        print qq!<TD CLASS="grid" BGCOLOR="$bgcolor" COLSPAN=2>&nbsp;</TD>!;
+      }
+
       #print qq!</TR><TR>\n!;
       $n1="</TR><TR>";
     }
+
+    unless ( @{$all_pkgs{$custnum}} ) {
+      print qq!<TD CLASS="grid" BGCOLOR="$bgcolor" COLSPAN=3>&nbsp;</TD>!;
+    }
+    
     print "</TR>";
   }
 

From ivan at wavetail.420.am  Mon Jun 19 01:05:30 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 01:05:37 2006
Subject: [freeside-commits] freeside/httemplate/elements menu.html, 1.3,
	1.4 select-cust_pkg-status.html, NONE,
	1.1 tr-select-cust_pkg-status.html, NONE,
	1.1 tr-select-cust-fields.html, NONE,
	1.1 select-cust-fields.html, NONE, 1.1
Message-ID: <20060619080530.A9DBAFC8742@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv13210/httemplate/elements

Modified Files:
	menu.html 
Added Files:
	select-cust_pkg-status.html tr-select-cust_pkg-status.html 
	tr-select-cust-fields.html select-cust-fields.html 
Log Message:
add ability to select specific package defs. and package status to package report for qis

--- NEW FILE: tr-select-cust-fields.html ---
<%
  my( $cust_fields, %opt ) = @_;

  use FS::ConfDefaults;
  $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];

%>

<TR>
  <TD ALIGN="right"><%= $opt{'label'} || 'Customer fields' %></TD>
  <TD>
    <%= include( '/elements/select-cust-fields.html', $cust_fields, %opt ) %>
  </TD>
</TR>

--- NEW FILE: tr-select-cust_pkg-status.html ---
<%
  my( $status, %opt ) = @_;

  $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )

%>

<TR>
  <TD ALIGN="right"><%= $opt{'label'} || 'Status' %></TD>
  <TD>
    <%= include( '/elements/select-cust_pkg-status.html', $status, %opt ) %>
  </TD>
</TR>

--- NEW FILE: select-cust_pkg-status.html ---
<%
  my( $status, %opt ) = @_;

  $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )

%>

<SELECT NAME="status">

  <OPTION VALUE="">all

  <% foreach my $status ( @{ $opt{'statuses'} } ) { %>

       <OPTION VALUE="<%= $status %>"><%= $status %>

  <% } %>

</SELECT>


--- NEW FILE: select-cust-fields.html ---
<%
  my( $cust_fields, %opt ) = @_;

  use FS::ConfDefaults;
  $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];

  tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} };

%>

<SELECT NAME="cust_fields">

  <OPTION VALUE="">(configured default)

  <% 
     foreach my $value ( keys %hash ) { %>

       <OPTION VALUE="<%= $value %>"><%= $hash{$value} %>

  <% } %>

</SELECT>


Index: menu.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/menu.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- menu.html	8 Jun 2006 10:32:46 -0000	1.3
+++ menu.html	19 Jun 2006 08:05:28 -0000	1.4
@@ -85,7 +85,7 @@
     'All customer packages' => [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ],
     'Suspended customer packages' => [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ],
     'Customer packages with unconfigured services' => [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ],
-    'By next bill date' => [ $fsurl.'search/cust_pkg_report.cgi', 'Search packages by next bill date' ],
+    'Advanced package reports' => [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ],
   ;
 
   tie my %report_financial, 'Tie::IxHash', 
@@ -264,7 +264,7 @@
 
        if ( ref($url_or_submenu) ) {
 
-         warn $item;
+         #warn $item;
 
          my( $subhtml, $submenuname ) = submenu($url_or_submenu, $item);
 

From ivan at wavetail.420.am  Mon Jun 19 01:05:30 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 01:05:37 2006
Subject: [freeside-commits] freeside/FS/FS cust_pkg.pm, 1.62, 1.63 Conf.pm,
	1.153, 1.154 ConfDefaults.pm, NONE, 1.1 cust_main_Mixin.pm, 1.1, 1.2
Message-ID: <20060619080530.B0035FC8823@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv13210/FS/FS

Modified Files:
	cust_pkg.pm Conf.pm cust_main_Mixin.pm 
Added Files:
	ConfDefaults.pm 
Log Message:
add ability to select specific package defs. and package status to package report for qis

Index: cust_main_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main_Mixin.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cust_main_Mixin.pm	14 Jul 2005 10:52:46 -0000	1.1
+++ cust_main_Mixin.pm	19 Jun 2006 08:05:28 -0000	1.2
@@ -89,6 +89,50 @@
     : $self->cust_unlinked_msg;
 }
 
+=item country_full
+
+Given an object that contains fields from cust_main (say, from a JOINed
+search; see httemplate/search/ for examples), returns the equivalent of the
+FS::cust_main I<country_full> method, or "(unlinked)" if this object is not
+linked to a customer.
+
+=cut
+
+sub country_full {
+  my $self = shift;
+  $self->cust_linked
+    ? FS::cust_main::country_full($self)
+    : $self->cust_unlinked_msg;
+}
+
+=item invoicing_list_emailonly
+
+Given an object that contains fields from cust_main (say, from a JOINed
+search; see httemplate/search/ for examples), returns the equivalent of the
+FS::cust_main I<country_full> method, or "(unlinked)" if this object is not
+linked to a customer.
+
+=cut
+
+sub invoicing_list_emailonly {
+  my $self = shift;
+  warn "invoicing_list_email only called on $self, ".
+       "custnum ". $self->custnum. "\n";
+  $self->cust_linked
+    ? FS::cust_main::invoicing_list_emailonly($self)
+    : $self->cust_unlinked_msg;
+}
+
+#read-only
+sub invoicing_list {
+  my $self = shift;
+  $self->cust_linked
+    ? FS::cust_main::invoicing_list($self)
+    : ();
+}
+
+=cut
+
 =back
 
 =head1 BUGS

--- NEW FILE: ConfDefaults.pm ---
package FS::ConfDefaults;

=head1 NAME

FS::ConfDefaults - Freeside configuration default and available values

=head1 SYNOPSIS

  use FS::ConfDefaults;

  @avail_cust_fields = FS::ConfDefaults->cust_fields_avail();

=head1 DESCRIPTION

Just a small class to keep config default and available values

=head1 METHODS

=over 4

=item cust_fields_avail

Returns a list, suitable for assigning to a hash, of available values and
labels for customer fields values.

=cut

# XXX should use msgcat for "Day phone" and "Night phone", but how?
sub cust_fields_avail { (

  'Customer' =>
    'Last, First or Company (Last, First)',
  'Cust# | Customer' =>
    'custnum | Last, First or Company (Last, First)',

  'Name | Company' =>
    'Last, First | Company',
  'Cust# | Name | Company' =>
    'custnum | Last, First | Company',

  '(bill) Customer | (service) Customer' =>
    'Last, First or Company (Last, First) | (same for service contact if present)',
  'Cust# | (bill) Customer | (service) Customer' =>
    'custnum | Last, First or Company (Last, First) | (same for service contact if present)',

  '(bill) Name | (bill) Company | (service) Name | (service) Company' =>
    'Last, First | Company | (same for service address if present)',
  'Cust# | (bill) Name | (bill) Company | (service) Name | (service) Company' =>
    'custnum | Last, First | Company | (same for service address if present)',

  'Cust# | Name | Company | Address 1 | Address 2 | City | State | Zip | Country | Day phone | Night phone | Invoicing email(s)' => 
    'custnum | Last, First | Company | (all address fields ) | Day phone | Night phone | Invoicing email(s)',

); }

=back

=head1 BUGS

Not yet.

=head1 SEE ALSO

L<FS::Conf>

=cut

1;

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- Conf.pm	8 May 2006 11:28:52 -0000	1.153
+++ Conf.pm	19 Jun 2006 08:05:28 -0000	1.154
@@ -4,6 +4,7 @@
 use IO::File;
 use File::Basename;
 use FS::ConfItem;
+use FS::ConfDefaults;
 
 $DEBUG = 0;
 
@@ -1619,18 +1620,9 @@
   {
     'key'         => 'cust-fields',
     'section'     => 'UI',
-    'description' => 'Which customer fields to display on reports',
+    'description' => 'Which customer fields to display on reports by default',
     'type'        => 'select',
-    'select_enum' => [
-      'Customer: Last, First</b> or</i> Company (Last, First)</b>',
-      'Cust# | Customer: custnum | Last, First or Company (Last, First)',
-      'Name | Company: Last, First | Company',
-      'Cust# | Name | Company: custnum | Last, First | Company',
-      '(bill) Customer | (service) Customer: Last, First or Company (Last, First) | (same for service address if present)',
-      'Cust# | (bill) Customer | (service) Customer:  custnum | Last, First or Company (Last, First) | (same for service address if present)',
-      '(bill) Name | (bill) Company | (service) Name | (service) Company: Last, First | Company | (same for service address if present)',
-      'Cust# | (bill) Name | (bill) Company | (service) Name | (service) Company: custnum | Last, First | Company | (same for service address if present)',
-    ],
+    'select_hash' => [ FS::ConfDefaults->cust_fields_avail() ],
   },
 
   {
@@ -1709,6 +1701,21 @@
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'batch-default_format',
+    'section'     => 'billing',
+    'description' => 'Default format for batches.',
+    'type'        => 'select',
+    'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM' ]
+  },
+
+  {
+    'key'         => 'batchconfig-BoM',
+    'section'     => 'billing',
+    'description' => 'Configuration for Bank of Montreal batching, seven lines: 1. Origin ID, 2. Datacenter, 3. Typecode, 4. Short name, 5. Long name, 6. Bank, 7. Bank account',
+    'type'        => 'textarea',
+  },
+
 );
 
 1;

Index: cust_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- cust_pkg.pm	30 Dec 2005 02:41:22 -0000	1.62
+++ cust_pkg.pm	19 Jun 2006 08:05:28 -0000	1.63
@@ -2,6 +2,7 @@
 
 use strict;
 use vars qw(@ISA $disable_agentcheck @SVCDB_CANCEL_SEQ $DEBUG);
+use Tie::IxHash;
 use FS::UID qw( getotaker dbh );
 use FS::Misc qw( send_email );
 use FS::Record qw( qsearch qsearchs );
@@ -824,26 +825,45 @@
 sub status {
   my $self = shift;
 
+  my $freq = length($self->freq) ? $self->freq : $self->part_pkg->freq;
+
   return 'cancelled' if $self->get('cancel');
   return 'suspended' if $self->susp;
   return 'not yet billed' unless $self->setup;
-  return 'one-time charge' if $self->part_pkg->freq =~ /^(0|$)/;
+  return 'one-time charge' if $freq =~ /^(0|$)/;
   return 'active';
 }
 
-=item statuscolor
+=item statuses
 
-Returns a hex triplet color string for this package's status.
+Class method that returns the list of possible status strings for pacakges
+(see L<the status method|/status>).  For example:
+
+  @statuses = FS::cust_pkg->statuses();
 
 =cut
 
-my %statuscolor = (
+tie my %statuscolor, 'Tie::IxHash', 
   'not yet billed'  => '000000',
   'one-time charge' => '000000',
   'active'          => '00CC00',
   'suspended'       => 'FF9900',
   'cancelled'       => 'FF0000',
-);
+;
+
+sub statuses {
+  my $self = shift; #could be class...
+  grep { $_ !~ /^(not yet billed)$/ } #this is a dumb status anyway
+                                      # mayble split btw one-time vs. recur
+    keys %statuscolor;
+}
+
+=item statuscolor
+
+Returns a hex triplet color string for this package's status.
+
+=cut
+
 sub statuscolor {
   my $self = shift;
   $statuscolor{$self->status};
@@ -1163,7 +1183,7 @@
 
 =back
 
-=head1 CLASS METHOD
+=head1 CLASS METHODS
 
 =over 4
 
@@ -1178,6 +1198,17 @@
              where cust_pkg.pkgpart = part_pkg.pkgpart )
 "; }
 
+=item onetime_sql
+
+Returns an SQL expression identifying one-time packages.
+
+=cut
+
+sub onetime_sql { "
+  '0' = ( select freq from part_pkg
+            where cust_pkg.pkgpart = part_pkg.pkgpart )
+"; }
+
 =item active_sql
 
 Returns an SQL expression identifying active packages.
@@ -1190,6 +1221,19 @@
   AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
 "; }
 
+=item inactive_sql
+
+Returns an SQL expression identifying inactive packages (one-time packages
+that are otherwise unsuspended/uncancelled).
+
+=cut
+
+sub inactive_sql { "
+  ". $_[0]->onetime_sql(). "
+  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+  AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
+"; }
+
 =item susp_sql
 =item suspended_sql
 
@@ -1198,11 +1242,13 @@
 =cut
 
 sub suspended_sql { susp_sql(@_); }
-sub susp_sql { "
-  ". $_[0]->recurring_sql(). "
-  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
-  AND cust_pkg.susp IS NOT NULL AND cust_pkg.susp != 0
-"; }
+sub susp_sql {
+  #$_[0]->recurring_sql(). ' AND '.
+  "
+        ( cust_pkg.cancel IS     NULL  OR cust_pkg.cancel = 0 )
+    AND   cust_pkg.susp   IS NOT NULL AND cust_pkg.susp  != 0
+  ";
+}
 
 =item cancel_sql
 =item cancelled_sql
@@ -1212,10 +1258,10 @@
 =cut
 
 sub cancelled_sql { cancel_sql(@_); }
-sub cancel_sql { "
-  ". $_[0]->recurring_sql(). "
-  AND cust_pkg.cancel IS NOT NULL AND cust_pkg.cancel != 0
-"; }
+sub cancel_sql { 
+  #$_[0]->recurring_sql(). ' AND '.
+  "cust_pkg.cancel IS NOT NULL AND cust_pkg.cancel != 0";
+}
 
 =head1 SUBROUTINES
 

From ivan at wavetail.420.am  Mon Jun 19 01:05:30 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 01:05:42 2006
Subject: [freeside-commits] 
	freeside/httemplate/graph cust_bill_pkg.cgi, 1.2, 1.3
Message-ID: <20060619080531.1BF98FC889C@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/graph
In directory wavetail:/tmp/cvs-serv13210/httemplate/graph

Modified Files:
	cust_bill_pkg.cgi 
Log Message:
add ability to select specific package defs. and package status to package report for qis

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/graph/cust_bill_pkg.cgi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cust_bill_pkg.cgi	8 May 2006 10:01:54 -0000	1.2
+++ cust_bill_pkg.cgi	19 Jun 2006 08:05:28 -0000	1.3
@@ -18,6 +18,7 @@
 }
 my $title = $sel_agent ? $sel_agent->agent.' ' : '';
 
+#false lazinessish w/search/cust_pkg.cgi
 my $classnum = 0;
 my @pkg_class = ();
 if ( $cgi->param('classnum') =~ /^(\d*)$/ ) {
@@ -34,6 +35,7 @@
     push @pkg_class, '(empty class)';
   }
 }
+#eslaf
 
 my $hue = 0;
 #my $hue_increment = 170;

From ivan at wavetail.420.am  Mon Jun 19 01:05:30 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 01:07:31 2006
Subject: [freeside-commits] freeside/FS/FS/UI Web.pm,1.16,1.17
Message-ID: <20060619080530.C0A5EFC883B@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS/UI
In directory wavetail:/tmp/cvs-serv13210/FS/FS/UI

Modified Files:
	Web.pm 
Log Message:
add ability to select specific package defs. and package status to package report for qis

Index: Web.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/UI/Web.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Web.pm	14 May 2006 16:47:31 -0000	1.16
+++ Web.pm	19 Jun 2006 08:05:28 -0000	1.17
@@ -8,6 +8,8 @@
 #use FS::UI
 #@ISA = qw( FS::UI );
 
+$DEBUG = 0;
+
 use Date::Parse;
 sub parse_beginning_ending {
   my($cgi) = @_;
@@ -31,73 +33,116 @@
 }
 
 ###
-# cust_main report methods
+# cust_main report subroutines
 ###
 
-=item cust_header
 
-Returns an array of customer information headers according to the
-B<cust-fields> configuration setting.
+=item cust_header [ CUST_FIELDS_VALUE ]
+
+Returns an array of customer information headers according to the supplied
+customer fields value, or if no value is supplied, the B<cust-fields>
+configuration value.
 
 =cut
 
 use vars qw( @cust_fields );
 
-sub cust_sql_fields {
-  my @fields = qw( last first company );
-  push @fields, map "ship_$_", @fields
-    if dbdef->table('cust_main')->column('ship_last');
-  map "cust_main.$_", @fields;
-}
-
 sub cust_header {
 
   warn "FS::svc_Common::cust_header called"
     if $DEBUG;
 
-  my $conf = new FS::Conf;
-
   my %header2method = (
-    'Customer'           => 'name',
-    'Cust#'              => 'custnum',
-    'Name'               => 'contact',
-    'Company'            => 'company',
-    '(bill) Customer'    => 'name',
-    '(service) Customer' => 'ship_name',
-    '(bill) Name'        => 'contact',
-    '(service) Name'     => 'ship_contact',
-    '(bill) Company'     => 'company',
-    '(service) Company'  => 'ship_company',
+    'Customer'                 => 'name',
+    'Cust#'                    => 'custnum',
+    'Name'                     => 'contact',
+    'Company'                  => 'company',
+    '(bill) Customer'          => 'name',
+    '(service) Customer'       => 'ship_name',
+    '(bill) Name'              => 'contact',
+    '(service) Name'           => 'ship_contact',
+    '(bill) Company'           => 'company',
+    '(service) Company'        => 'ship_company',
+    'Address 1'                => 'address1',
+    'Address 2'                => 'address2',
+    'City'                     => 'city',
+    'State'                    => 'state',
+    'Zip'                      => 'zip',
+    'Country'                  => 'country_full',
+    'Day phone'                => 'daytime', # XXX should use msgcat, but how?
+    'Night phone'              => 'night',   # XXX should use msgcat, but how?
+    'Invoicing email(s)'       => 'invoicing_list_emailonly',
   );
 
+  my $cust_fields;
   my @cust_header;
-  if (    $conf->exists('cust-fields')
-       && $conf->config('cust-fields') =~ /^([\w \|\#\(\)]+):/
-     )
-  {
-    warn "  found cust-fields configuration value"
-      if $DEBUG;
+  if ( @_ && $_[0] ) {
 
-    my $cust_fields = $1;
-     @cust_header = split(/ \| /, $cust_fields);
-     @cust_fields = map { $header2method{$_} } @cust_header;
-  } else { 
-    warn "  no cust-fields configuration value found; using default 'Customer'"
+    warn "  using supplied cust-fields override".
+          " (ignoring cust-fields config file)"
       if $DEBUG;
-    @cust_header = ( 'Customer' );
-    @cust_fields = ( 'name' );
+    $cust_fields = shift;
+
+  } else {
+
+    my $conf = new FS::Conf;
+    if (    $conf->exists('cust-fields')
+         && $conf->config('cust-fields') =~ /^([\w \|\#\(\)]+):?/
+       )
+    {
+      warn "  found cust-fields configuration value"
+        if $DEBUG;
+      $cust_fields = $1;
+    } else { 
+      warn "  no cust-fields configuration value found; using default 'Customer'"
+        if $DEBUG;
+      $cust_fields = 'Customer';
+    }
+  
   }
 
+  @cust_header = split(/ \| /, $cust_fields);
+  @cust_fields = map { $header2method{$_} } @cust_header;
+
   #my $svc_x = shift;
   @cust_header;
 }
 
-=item cust_fields
+=item cust_sql_fields [ CUST_FIELDS_VALUE ]
+
+Returns a list of fields for the SELECT portion of an SQL query.
+
+As with L<the cust_header subroutine|/cust_header>, the fields returned are
+defined by the supplied customer fields setting, or if no customer fields
+setting is supplied, the <B>cust-fields</B> configuration value. 
+
+=cut
+
+sub cust_sql_fields {
+
+  my @fields = qw( last first company );
+  push @fields, map "ship_$_", @fields;
+  push @fields, 'country';
+
+  cust_header(@_);
+  #inefficientish, but tiny lists and only run once per page
+  push @fields,
+    grep { my $field = $_; grep { $_ eq $field } @cust_fields }
+         qw( address1 address2 city state zip daytime night );
+
+  map "cust_main.$_", @fields;
+}
+
+=item cust_fields SVC_OBJECT [ CUST_FIELDS_VALUE ]
 
 Given a svc_ object that contains fields from cust_main (say, from a
 JOINed search.  See httemplate/search/svc_* for examples), returns an array
-of customer information according to the <B>cust-fields</B> configuration
-setting, or "(unlinked)" if this service is not linked to a customer.
+of customer information, or "(unlinked)" if this service is not linked to a
+customer.
+
+As with L<the cust_header subroutine|/cust_header>, the fields returned are
+defined by the supplied customer fields setting, or if no customer fields
+setting is supplied, the <B>cust-fields</B> configuration value. 
 
 =cut
 
@@ -107,7 +152,8 @@
        "(cust_fields: @cust_fields)"
     if $DEBUG > 1;
 
-  cust_header() unless @cust_fields;
+  #cust_header(@_) unless @cust_fields; #now need to cache to keep cust_fields
+  #                                     #override incase we were passed as a sub
 
   my $seen_unlinked = 0;
   map { 

From ivan at wavetail.420.am  Mon Jun 19 01:05:30 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 01:07:36 2006
Subject: [freeside-commits] freeside/httemplate/search cust_pkg_report.cgi,
	1.4, NONE report_cust_pkg.html, NONE, 1.1
Message-ID: <20060619080530.AA5B5FC881A@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv13210/httemplate/search

Added Files:
	report_cust_pkg.html 
Removed Files:
	cust_pkg_report.cgi 
Log Message:
add ability to select specific package defs. and package status to package report for qis

--- NEW FILE: report_cust_pkg.html ---
<%= include('/elements/header.html', 'Package Report' ) %>

<FORM ACTION="cust_pkg.cgi" METHOD="GET">
<INPUT TYPE="hidden" NAME="magic" VALUE="bill">

  <TABLE BGCOLOR="#cccccc" CELLSPACING=0>

    <TR>
      <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH>
    </TR>
    <%= include( '/elements/tr-select-agent.html',
                   $cgi->param('agentnum'),
               )
    %>
    <%= include( '/elements/tr-select-cust_pkg-status.html' ) %>
    <%= include( '/elements/tr-select-pkg_class.html', '',
                   'pre_options' => [ '0' => 'all' ],
                   'empty_label' => '(empty class)',
               )
    %>
    <% #include( '/elements/tr-selectmultiple-part_pkg.html' ) %>
    <TR>
      <TD ALIGN="right" VALIGN="center">Next bill date</TD>
      <TD>
        <TABLE>
          <%= include( '/elements/tr-input-beginning_ending.html' ) %>
        </TABLE>
      </TD>
    </TR>
    
    <TR>
      <TH BGCOLOR="#e8e8e8" COLSPAN=2>&nbsp;</TH>
    </TR>

    <TR>
      <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Display options</FONT></TH>
    </TR>
    <%= include( '/elements/tr-select-cust-fields.html' ) %>
    
  </TABLE>

<BR>
<INPUT TYPE="submit" VALUE="Get Report">

</FORM>

<%= include('/elements/footer.html') %>

--- cust_pkg_report.cgi DELETED ---

From ivan at wavetail.420.am  Mon Jun 19 01:05:30 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 01:09:19 2006
Subject: [freeside-commits] freeside/httemplate/config config.cgi,1.16,1.17
Message-ID: <20060619080531.1A9CBFC8896@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/config
In directory wavetail:/tmp/cvs-serv13210/httemplate/config

Modified Files:
	config.cgi 
Log Message:
add ability to select specific package defs. and package status to package report for qis

Index: config.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config.cgi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- config.cgi	31 Jan 2006 04:26:54 -0000	1.16
+++ config.cgi	19 Jun 2006 08:05:28 -0000	1.17
@@ -55,25 +55,65 @@
              #warn $i->key unless defined($type);
         %>
           <% if ( $type eq '' ) { %>
-            <font color="#ff0000">no type</font>
+
+               <font color="#ff0000">no type</font>
+
           <% } elsif ( $type eq 'textarea' ) { %>
-            <textarea name="<%= $i->key. $n %>" rows=5><%= "\n". join("\n", $conf->config($i->key) ) %></textarea>
+
+               <textarea name="<%= $i->key. $n %>" rows=5><%= "\n". join("\n", $conf->config($i->key) ) %></textarea>
+
           <% } elsif ( $type eq 'checkbox' ) { %>
-            <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
+
+               <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
+
           <% } elsif ( $type eq 'text' )  { %>
-            <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+
+               <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+
           <% } elsif ( $type eq 'select' || $type eq 'selectmultiple' )  { %>
-            <select name="<%= $i->key. $n %>" <%= $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
-              <% my %saw;
-                 foreach my $value ( "", @{$i->select_enum} ) {
-                    local($^W)=0; next if $saw{$value}++; %>
-                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $value %>
-              <% } %>
-              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
-                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
+          
+               <select name="<%= $i->key. $n %>" <%= $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
+               <% 
+                  my %hash = ();
+                  if ( $i->select_enum ) {
+                    tie %hash, 'Tie::IxHash',
+                      '' => '', map { $_ => $_ } @{ $i->select_enum };
+                  } elsif ( $i->select_hash ) {
+                    if ( ref($i->select_hash) eq 'ARRAY' ) {
+                      tie %hash, 'Tie::IxHash',
+                        '' => '', @{ $i->select_hash };
+                    } else {
+                      tie %hash, 'Tie::IxHash',
+                        '' => '', %{ $i->select_hash };
+                    }
+                  } else {
+                    %hash = ( '' => 'WARNING: neither select_enum nor select_hash specified in Conf.pm for configuration option "'. $i->key. '"' );
+                  }
+
+                  my %saw = ();
+                  foreach my $value ( keys %hash ) {
+                    local($^W)=0; next if $saw{$value}++;
+                    my $label = $hash{$value};
+               %>
+
+                    <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $label %>
+
+               <% } %>
+
+              <% my $curvalue = $conf->config($i->key);
+                 if ( $conf->exists($i->key) && $curvalue
+                      && ! grep { $curvalue eq $_ } @{$i->select_enum}
+                    ) {
+              %>
+              
+                   <option value="<%= $conf->config($i->key) %>" SELECTED><%= exists( $hash{ $conf->config($i->key) } ) ? $hash{ $conf->config($i->key) } : $conf->config($i->key) %>
+
               <% } %>
+
             </select>
+
           <% } elsif ( $type eq 'select-sub' ) { %>
+
             <select name="<%= $i->key. $n %>">
               <option value="">
               <% my %options = &{$i->options_sub};
@@ -88,7 +128,9 @@
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>: <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
               <% } %>
             </select>
-          <% } elsif ( $type eq 'editlist' )  { %>
+
+          <% } elsif ( $type eq 'editlist' ) { %>
+
             <script>
               function doremove<%= $i->key. $n %>() {
                 fromObject = document.OneTrueForm.<%= $i->key. $n %>;
@@ -167,9 +209,13 @@
             <% } %>
             <td><input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)"></td>
             </tr></table>
+
           <% } else { %>
+
             <font color="#ff0000">unknown type <%= $type %></font>
+
           <% } %>
+
         <% $n++; } %>
       </td>
       <td><a name="<%= $i->key %>">

From ivan at wavetail.420.am  Mon Jun 19 01:05:30 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 01:27:27 2006
Subject: [freeside-commits] 
	freeside/httemplate/view/cust_main contacts.html, 1.3, 1.4
Message-ID: <20060619080531.1D476FC88B2@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv13210/httemplate/view/cust_main

Modified Files:
	contacts.html 
Log Message:
add ability to select specific package defs. and package status to package report for qis

Index: contacts.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/contacts.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- contacts.html	3 Apr 2006 09:46:57 -0000	1.3
+++ contacts.html	19 Jun 2006 08:05:28 -0000	1.4
@@ -114,7 +114,7 @@
 </TR>
 <TR>
   <TD ALIGN="right">Country</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->get("${pre}country") %></TD>
+  <TD BGCOLOR="#ffffff"><%= code2country( $cust_main->get("${pre}country") ) %></TD>
 </TR>
 <TR>
   <TD ALIGN="right"><%= $daytime_label %></TD>

From ivan at wavetail.420.am  Mon Jun 19 04:25:16 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 04:25:23 2006
Subject: [freeside-commits] freeside/httemplate/view cust_main.cgi, 1.100,
	1.101
Message-ID: <20060619112516.199ACFC8199@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail:/tmp/cvs-serv15649/httemplate/view

Modified Files:
	cust_main.cgi 
Log Message:
ACLs, take three or four or something

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main.cgi,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- cust_main.cgi	9 Apr 2006 23:41:01 -0000	1.100
+++ cust_main.cgi	19 Jun 2006 11:25:13 -0000	1.101
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -12,13 +11,17 @@
 
 %>
 
+
 <%= include("/elements/header.html","Customer View", 
 	include("/elements/menubar.html",
   'Main Menu' => $p,
 )) %>
 
+
 <%
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "No customer specified (bad URL)!" unless $cgi->keywords;
 my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array
 $query =~ /^(\d+)$/;
@@ -26,10 +29,14 @@
 my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Customer not found!" unless $cust_main;
 
-print qq!<A HREF="${p}edit/cust_main.cgi?$custnum">Edit this customer</A>!;
-
 %>
 
+
+<% if ( $curuser->access_right('Edit customer') ) { %>
+  <A HREF="<%= $p %>edit/cust_main.cgi?<%= $custnum %>">Edit this customer</A> | 
+<% } %>
+
+
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
@@ -60,37 +67,36 @@
 
 </SCRIPT>
 
-<% if ( $cust_main->ncancelled_pkgs ) { %>
+<% if ( $curuser->access_right('Cancel customer')
+        && $cust_main->ncancelled_pkgs
+      ) {
+%>
+  <A HREF="javascript:void(0);" onClick="overlib(confirm_cancel, CAPTION, 'Confirm cancellation', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' ); return false; ">Cancel this customer</A> | 
+<% } %>
 
-  | <A HREF="javascript:void(0);" onClick="overlib(confirm_cancel, CAPTION, 'Confirm cancellation', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 128, TEXTSIZE, 3, BGCOLOR, '#ff0000', CGCOLOR, '#ff0000' ); return false; ">Cancel this customer</A>
 
+<% if ( $conf->exists('deletecustomers')
+        && $curuser->access_right('Delete customer')
+      ) {
+%>
+  <A HREF="<%= $p %>misc/delete-customer.cgi?<%= $custnum%>">Delete this customer</A> | 
 <% } %>
 
-<%
 
-print qq! | <A HREF="${p}misc/delete-customer.cgi?$custnum">!.
-      'Delete this customer</A>'
-  if $conf->exists('deletecustomers');
+<% unless ( $conf->exists('disable_customer_referrals') ) { %>
+  <A HREF="<%= popurl(2) %>edit/cust_main.cgi?referral_custnum=<%= $custnum %>">Refer a new customer</A> | 
+  <A HREF="<%= popurl(2) %>search/cust_main.cgi?referral_custnum=<%= $custnum %>">View this customer's referrals</A>
+<% } %>
 
-unless ( $conf->exists('disable_customer_referrals') ) {
-  print qq! | <A HREF="!, popurl(2),
-        qq!edit/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!Refer a new customer</A>!;
 
-  print qq! | <A HREF="!, popurl(2),
-        qq!search/cust_main.cgi?referral_custnum=$custnum">!,
-        qq!View this customer's referrals</A>!;
-}
-
-print '<BR><BR>';
+<BR><BR>
 
+<%
 my $signupurl = $conf->config('signupurl');
 if ( $signupurl ) {
-print "This customer's signup URL: ".
-      "<a href=\"$signupurl?ref=$custnum\">$signupurl?ref=$custnum</a><BR><BR>";
-}
-
 %>
+  This customer's signup URL: <A HREF="<%= $signupurl %>?ref=<%= $custnum %>"><%= $signupurl %>?ref=<%= $custnum %></A><BR><BR>
+<% } %>
 
 <A NAME="cust_main"></A>
 <TABLE BORDER=0>
@@ -135,5 +141,4 @@
   <%= include('cust_main/payment_history.html', $cust_main ) %>
 <% } %>
 
-</BODY></HTML>
-
+<%= include('/elements/footer.html') %>

From ivan at wavetail.420.am  Mon Jun 19 04:25:15 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 04:25:24 2006
Subject: [freeside-commits] freeside/FS/FS AccessRight.pm, 1.2,
	1.3 access_user.pm, 1.2, 1.3 cust_main.pm, 1.216, 1.217
Message-ID: <20060619112515.1A80EFC827A@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv15649/FS/FS

Modified Files:
	AccessRight.pm access_user.pm cust_main.pm 
Log Message:
ACLs, take three or four or something

Index: access_user.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/access_user.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- access_user.pm	19 Jun 2006 02:33:52 -0000	1.2
+++ access_user.pm	19 Jun 2006 11:25:13 -0000	1.3
@@ -192,6 +192,29 @@
   ' )';
 }
 
+=item access_right
+
+Given a right name, returns true if this user has this right (currently via
+group membership, eventually also via user overrides).
+
+=cut
+
+sub access_right {
+  my( $self, $rightname ) = @_;
+  my $sth = dbh->prepare("
+    SELECT groupnum FROM access_usergroup
+                    LEFT JOIN access_group USING ( groupnum )
+                    LEFT JOIN access_right
+                         ON ( access_group.groupnum = access_right.rightobjnum )
+      WHERE usernum = ?
+        AND righttype = 'FS::access_group'
+        AND rightname = ?
+  ") or die dbh->errstr;
+  $sth->execute($self->usernum, $rightname) or die $sth->errstr;
+  my $row = $sth->fetchrow_arrayref;
+  $row ? $row->[0] : '';
+}
+
 =back
 
 =head1 BUGS

Index: AccessRight.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/AccessRight.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AccessRight.pm	18 Jun 2006 12:54:48 -0000	1.2
+++ AccessRight.pm	19 Jun 2006 11:25:13 -0000	1.3
@@ -84,10 +84,13 @@
   #'View Customer | View tickets',
   'Edit customer',
   'Cancel customer',
-  'Delete customer',
+  'Complimentary customer', #aka users-allow_comp 
+  'Delete customer', #aka. deletecustomers #Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customers' packages if they cancel service.
 
   'Order customer package',
+  'One-time charge',
   'Change customer package',
+  'Bulk change customer packages',
   'Edit customer package dates',
   'Customize customer package',
   'Suspend customer package',
@@ -95,14 +98,43 @@
   'Cancel customer package immediately',
   'Cancel customer package later',
 
-  'Provision service',
-  'Unprovision service',
-  #legacy link stuff
+  'Provision customer service',
+  'Unprovision customer service',
+
+  'View/link unlinked services', #not agent-virtualizable without more work
+
+  'View invoices',
 
   'Post payment',
+  'Post payment batch',
+  'Unapply payment', #aka. unapplypayments Enable "unapplication" of unclosed payments.
   'Process payment',
+  'Refund payment',
+
+  'Delete payment', #aka. deletepayments - Enable deletion of unclosed payments. Be very careful! Only delete payments that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a payment is deleted.
+
   'Post credit',
-  #more financial stuff
+  #'Apply credit',
+  'Unapply credit', #aka unapplycredits Enable "unapplication" of unclosed credits.
+  'Delete credit', #aka. deletecredits Enable deletion of unclosed credits. Be very careful! Only delete credits that were data-entry errors, not adjustments. Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.
+
+  'Credit card void', #aka. cc-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway
+  'Echeck void', #aka. echeck-void #Enable local-only voiding of echeck payments in addition to refunds against the payment gateway
+  'Unvoid', #aka. unvoid #Enable unvoiding of voided payments
+
+  'List customers',
+  #'List zip codes',
+  'List invoices',
+  'List packages',
+  'List services',
+
+  'Financial reports',
+
+  'Job queue', # these are not currently agent-virtualized
+  'Import',    #
+  'Export',    #
+
+  'Configuration', #none of the configuraiton is agent-virtualized either
 
 );
 

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- cust_main.pm	19 Jun 2006 02:33:52 -0000	1.216
+++ cust_main.pm	19 Jun 2006 11:25:13 -0000	1.217
@@ -944,10 +944,13 @@
     $old = qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
   }
 
-  if ( $self->payby eq 'COMP' && $self->payby ne $old->payby
-       && $conf->config('users-allow_comp')                  ) {
-    return "You are not permitted to create complimentary accounts."
-      unless grep { $_ eq getotaker } $conf->config('users-allow_comp');
+  my $curuser = $FS::CurrentUser::CurrentUser;
+  if (    $self->payby eq 'COMP'
+       && $self->payby ne $old->payby
+       && ! $curuser->access_right('Complimentary customer')
+     )
+  {
+    return "You are not permitted to create complimentary accounts.";
   }
 
   local($ignore_expired_card) = 1
@@ -1302,9 +1305,12 @@
 
   } elsif ( $self->payby eq 'COMP' ) {
 
-    if ( !$self->custnum && $conf->config('users-allow_comp') ) {
+    my $curuser = $FS::CurrentUser::CurrentUser;
+    if (    ! $self->custnum
+         && ! $curuser->access_right('Complimentary customer')
+       )
+    {
       return "You are not permitted to create complimentary accounts."
-        unless grep { $_ eq getotaker } $conf->config('users-allow_comp');
     }
 
     $error = $self->ut_textn('payinfo');

From ivan at wavetail.420.am  Mon Jun 19 04:25:15 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 04:28:40 2006
Subject: [freeside-commits] freeside/httemplate/elements menu.html,1.4,1.5
Message-ID: <20060619112515.1AA4AFC85D9@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv15649/httemplate/elements

Modified Files:
	menu.html 
Log Message:
ACLs, take three or four or something

Index: menu.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/menu.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- menu.html	19 Jun 2006 08:05:28 -0000	1.4
+++ menu.html	19 Jun 2006 11:25:13 -0000	1.5
@@ -3,6 +3,8 @@
   my $conf = new FS::Conf;
   my $fsurl = $opt{'freeside_baseurl'};
 
+  my $curuser = $FS::CurrentUser::CurrentUser;
+
   #Active tickets not assigned to a customer
 
   tie my %report_customers_lists, 'Tie::IxHash',
@@ -40,23 +42,27 @@
   tie my %report_services_acct, 'Tie::IxHash',
     'All accounts by username' => [ $fsurl.'search/svc_acct.cgi?username', '' ],
     'All accounts by UID'      => [ $fsurl.'search/svc_acct.cgi?uid', '' ],
-    'Unlinked accounts'        => [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside accounts without a customer record' ],
   ;
+  $report_services_acct{'Unlinked accounts'} = [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside accounts without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
   tie my %report_services_domain, 'Tie::IxHash',
     'All domains'      => [ $fsurl.'search/svc_domain.cgi?domain', '' ],
-    'Unlinked domains' => [ $fsurl.'search/svc_domain.cgi?UN_domain', 'Pre-Freeside domains without a customer record' ],
   ;
+  $report_services_domain{'Unlinked domains'} = [ $fsurl.'search/svc_domain.cgi?UN_domain', 'Pre-Freeside domains without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
   tie my %report_services_forward, 'Tie::IxHash',
     'All mail forwards'      => [ $fsurl.'search/svc_forward.cgi?svcnum', '' ],
-    'Unlinked mail forwards' => [ $fsurl.'search/svc_forward.cgi?UN_svcnum', 'Pre-Freeside mail forwards without a customer record' ],
   ;
+  $report_services_forward{'Unlinked mail forwards'} = [ $fsurl.'search/svc_forward.cgi?UN_svcnum', 'Pre-Freeside mail forwards without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
   tie my %report_services_www, 'Tie::IxHash',
     'All virtual hosts'     => [ $fsurl.'search/svc_www.cgi?svcnum', '' ],
-    'Unlinked virtual hosts' => [ $fsurl.'search/svc_www.cgi?UN_svcnum', 'Pre-Freeside virtual hosts without a customer record' ],
   ;
+  $report_services_www{'Unlinked virtual hosts'} = [ $fsurl.'search/svc_www.cgi?UN_svcnum', 'Pre-Freeside virtual hosts without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
   tie my %report_services_broadband, 'Tie::IxHash',
     'All broadband services' => [ $fsurl.'search/svc_broadband.cgi?svcnum', '' ],
@@ -65,28 +71,31 @@
 
   tie my %report_services_external, 'Tie::IxHash',
     'All external services' => [ $fsurl.'search/svc_external.cgi?id', '' ],
-    'Unlinked external services' => [ $fsurl.'search/svc_external.cgi?UN_id', 'Pre-Freeside domains without a customer record' ],
   ;
+  $report_services_external{'Unlinked external services'} = [ $fsurl.'search/svc_external.cgi?UN_id', 'Pre-Freeside domains without a customer record' ]
+    if $curuser->access_right('View/link unlinked services');
 
-  tie my %report_services, 'Tie::IxHash',
-    'Service definitions' => [ $fsurl.'browse/part_svc.cgi?orderby=active', 'Service definitions by number of active packages' ],
-    'separator' => '',
-    'Accounts'            => [ \%report_services_acct, 'Access accounts and mailboxes' ],
-    'Domains'             => [ \%report_services_domain, 'Domains', ],
-    'Mail forwards'       => [ \%report_services_forward, 'Mail forwards', ],
-    'Virtual hosts'       => [ \%report_services_www, 'Virtual hosting', ],
-    'Broadband services'  => [ \%report_services_broadband, 'Fixed (username-less) broadband services', ],
-    'External services'   => [ \%report_services_external, 'External services', ],
-  ;
+  tie my %report_services, 'Tie::IxHash';
+  if ( $curuser->access_right('Configuration') ) {
+    $report_services{'Service definitions'} =  [ $fsurl.'browse/part_svc.cgi?orderby=active', 'Service definitions by number of active packages' ];
+    $report_services{'separator'} =  '';
+  }
+  $report_services{'Accounts'} =  [ \%report_services_acct, 'Access accounts and mailboxes' ];
+  $report_services{'Domains'} =  [ \%report_services_domain, 'Domains', ];
+  $report_services{'Mail forwards'} =  [ \%report_services_forward, 'Mail forwards', ];
+  $report_services{'Virtual hosts'} =  [ \%report_services_www, 'Virtual hosting', ];
+  $report_services{'Broadband services'} =  [ \%report_services_broadband, 'Fixed (username-less) broadband services', ];
+  $report_services{'External services'} =  [ \%report_services_external, 'External services', ];
 
-  tie my %report_packages, 'Tie::IxHash',
-    'Package definitions' => [ $fsurl.'browse/part_pkg.cgi?active=1', 'Package definitions by number of active packages' ],
-    'separator' => '',
-    'All customer packages' => [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ],
-    'Suspended customer packages' => [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ],
-    'Customer packages with unconfigured services' => [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ],
-    'Advanced package reports' => [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ],
-  ;
+  tie my %report_packages, 'Tie::IxHash';
+  if ( $curuser->access_right('Configuration') ) {
+    $report_packages{'Package definitions'} =  [ $fsurl.'browse/part_pkg.cgi?active=1', 'Package definitions by number of active packages' ];
+    $report_packages{'separator'} =  '';
+  }
+  $report_packages{'All customer packages'} =  [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ];
+  $report_packages{'Suspended customer packages'} =  [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ];
+  $report_packages{'Customer packages with unconfigured services'} =  [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ];
+  $report_packages{'Advanced package reports'} =  [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ];
 
   tie my %report_financial, 'Tie::IxHash', 
     'Sales, Credits and Receipts' => [ $fsurl.'graph/report_money_time.html', 'Sales, credits and receipts summary graph' ],
@@ -98,13 +107,17 @@
     'Sales Tax Liability' => [ $fsurl.'search/report_tax.html', 'Sales tax liability report' ],
   ;
 
-  tie my %report_menu, 'Tie::IxHash',
-    'Customers' => [ \%report_customers,  'Customer reports'  ],
-    'Invoices'  => [ \%report_invoices,   'Invoice reports'   ],
-    'Packages'  => [ \%report_packages,   'Package reports'   ],
-    'Services'  => [ \%report_services,   'Services reports'   ],
-    'Financial' => [ \%report_financial,  'Financial reports' ],
-  ;
+  tie my %report_menu, 'Tie::IxHash';
+  $report_menu{'Customers'} = [ \%report_customers, 'Customer reports'  ]
+    if $curuser->access_right('List customers');
+  $report_menu{'Invoices'} =  [ \%report_invoices,  'Invoice reports'   ]
+    if $curuser->access_right('List invoices');
+  $report_menu{'Packages'} =  [ \%report_packages,  'Package reports'   ]
+    if $curuser->access_right('List packages');
+  $report_menu{'Services'} =  [ \%report_services,  'Services reports'  ]
+    if $curuser->access_right('List services');
+  $report_menu{'Financial'} = [ \%report_financial, 'Financial reports' ]
+    if $curuser->access_right('Financial reports');
 
   tie my %tools_importing, 'Tie::IxHash',
     'Import customers from CSV file' => [ $fsurl.'misc/cust_main-import.cgi', '' ],
@@ -120,12 +133,15 @@
   #      <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
   #    <BR> -->
 
-  tie my %tools_menu, 'Tie::IxHash',
-    'Quick payment entry' => [ $fsurl.'misc/batch-cust_pay.html', 'Enter multiple payments in a batch' ],
-    'Job Queue' => [ $fsurl.'search/queue.html', 'View pending job queue' ],
-    'Importing' => [ \%tools_importing, 'Import tools' ],
-    'Exporting' => [ \%tools_exporting, 'Export tools' ],
-  ;
+  tie my %tools_menu, 'Tie::IxHash', ();
+  $tools_menu{'Quick payment entry'} =  [ $fsurl.'misc/batch-cust_pay.html', 'Enter multiple payments in a batch' ]
+    if $curuser->access_right('Post payment batch');
+  $tools_menu{'Job Queue'} =  [ $fsurl.'search/queue.html', 'View pending job queue' ]
+    if $curuser->access_right('Job queue');
+  $tools_menu{'Importing'} =  [ \%tools_importing, 'Import tools' ]
+    if $curuser->access_right('Import');
+  $tools_menu{'Exporting'} =  [ \%tools_exporting, 'Export tools' ]
+    if $curuser->access_right('Export');
 
   tie my %config_employees, 'Tie::IxHash',
     'View/Edit employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
@@ -191,10 +207,13 @@
                           ),
                           'Ticketing start page',
                         ],
-    'Reports'        => [ \%report_menu, 'Lists, reporting and graphing' ],
-    'Tools'          => [ \%tools_menu, 'Tools' ],
-    'Configuration'  => [ \%config_menu, 'Configuraiton and setup' ],
   ;
+  $menu{'Reports'} = [ \%report_menu, 'Lists, reporting and graphing' ]
+    if keys %report_menu;
+  $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
+    if keys %tools_menu;
+  $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
+    if $curuser->access_right('Configuration');
 
   use vars qw($gmenunum);
   $gmenunum = 0;

From ivan at wavetail.420.am  Mon Jun 19 04:25:16 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 04:47:32 2006
Subject: [freeside-commits] 
	freeside/httemplate/view/cust_main packages.html, 1.4,
	1.5 payment_history.html, 1.9, 1.10
Message-ID: <20060619112516.37524FC875F@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv15649/httemplate/view/cust_main

Modified Files:
	packages.html payment_history.html 
Log Message:
ACLs, take three or four or something

Index: payment_history.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- payment_history.html	14 May 2006 16:47:31 -0000	1.9
+++ payment_history.html	19 Jun 2006 11:25:14 -0000	1.10
@@ -4,6 +4,8 @@
 
   my $conf = new FS::Conf;
 
+  my $curuser = $FS::CurrentUser::CurrentUser;
+
   my @payby = grep /\w/, $conf->config('payby');
   #@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
   @payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
@@ -16,42 +18,48 @@
 
 <BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
 
-<% if ( $payby{'BILL'} ) { %>
+<% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>edit/cust_pay.cgi?payby=BILL;custnum=<%= $custnum %>">Post check payment</A>
 
 <% } %>
 
-<% if ( $payby{'CASH'} ) { %>
+<% if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>edit/cust_pay.cgi?payby=CASH;custnum=<%= $custnum %>">Post cash payment</A>
 
 <% } %>
 
-<% if ( $payby{'WEST'} ) { %>
+<% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;custnum=<%= $custnum %>">Post Western Union payment</A>
 
 <% } %>
 
-<% if ( $payby{'CARD'} || $payby{'DCRD'} ) { %>
+<% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
+        && $curuser->access_right('Process payment')
+      ) {
+%>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>misc/payment.cgi?payby=CARD;custnum=<%= $custnum %>">Process credit card payment</A>
 
 <% } %>
 
-<% if ( $payby{'CHEK'} || $payby{'DCHK'} ) { %>
+<% if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
+        && $curuser->access_right('Process payment')
+      ) {
+%>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>misc/payment.cgi?payby=CHEK;custnum=<%= $custnum %>">Process electronic check (ACH) payment</A>
 
 <% } %>
 
-<% if ( $payby{'MCRD'} ) { %>
+<% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { %>
 
   <%= $s++ ? ' | ' : '' %>
   <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<%= $custnum %>">Post manual credit card payment</A>
@@ -60,9 +68,13 @@
 
 <BR>
 
-<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">Post credit</A>
+<% if ( $curuser->access_right('Post credit') ) { %>
 
-<BR>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">Post credit</A>
+
+  <BR>
+
+<% } %>
 
 <%
 #get payment history
@@ -75,11 +87,14 @@
               : '';
   my $post = ( $cust_bill->owed > 0 ) ? '</FONT></B>' : '';
   my $invnum = $cust_bill->invnum;
+  my $link = $curuser->access_right('View invoices')
+               ? qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!
+               : '';
   push @history, {
     'date'   => $cust_bill->_date,
-    'desc'   => qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!. $pre.
+    'desc'   => $link. $pre.
                 "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
-                $post. '</A>',
+                $post. ( $link ? '</A>' : '' ),
     'charge' => $cust_bill->charged,
   };
 }
@@ -169,6 +184,7 @@
        && $cust_pay->payby =~ /^(CARD|CHEK)$/
        && time-$cust_pay->_date < $refund_days*86400
        && $cust_pay->unrefunded > 0
+       && $curuser->access_right('Refund payment')
   ) {
     $refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
               qq!paynum=!. $cust_pay->paynum. '"'.
@@ -178,9 +194,17 @@
 
   my $void = '';
   if (    $cust_pay->closed !~ /^Y/i
-       && ( $cust_pay->payby ne 'CARD' || $conf->exists('cc-void')     )
-       && ( $cust_pay->payby ne 'CHEK' || $conf->exists('echeck-void') ) 
-     ) {
+       && (    ( $cust_pay->payby eq 'CARD'
+                 && $conf->exists('cc-void')
+                 && $curuser->acccess_right('Credit card void')
+               )
+            || ( $cust_pay->payby eq 'CHEK'
+                 && $conf->exists('echeck-void')
+                 && $curuser->acccess_right('Echeck void')
+               ) 
+          )
+     )
+  {
     $void = qq! (<A HREF="javascript:areyousure('!.
             qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
             qq!', 'Are you sure you want to void this payment?')"!.
@@ -193,7 +217,11 @@
   }
 
   my $delete = '';
-  if ( $cust_pay->closed !~ /^Y/i && $conf->exists('deletepayments') ) {
+  if ( $cust_pay->closed !~ /^Y/i
+       && $conf->exists('deletepayments')
+       && $curuser->access_right('Delete payment')
+     )
+  {
     $delete = qq! (<A HREF="javascript:areyousure('!.
               qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum.
               qq!', 'Are you sure you want to delete this payment?')"!.
@@ -204,7 +232,10 @@
   my $unapply = '';
   if (    $cust_pay->closed !~ /^Y/i
        && $conf->exists('unapplypayments')
-       && scalar(@cust_bill_pay)           ) {
+       && scalar(@cust_bill_pay)           
+       && $curuser->access_right('Unapply payment')
+     )
+  {
     $unapply = qq! (<A HREF="javascript:areyousure('!.
                qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum.
                qq!', 'Are you sure you want to unapply this payment?')"!.
@@ -236,7 +267,11 @@
   my $info = $payby ? " ($payby$payinfo)" : '';
 
   my $unvoid = '';
-  if ( $cust_pay_void->closed !~ /^Y/i && $conf->exists('unvoid') ) {
+  if ( $cust_pay_void->closed !~ /^Y/i
+       && $conf->exists('unvoid')
+       && $curuser->access_right('Unvoid')
+     )
+  {
     $unvoid = qq! (<A HREF="javascript:areyousure('!.
               qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
               qq!', 'Are you sure you want to unvoid this payment?')"!.
@@ -314,7 +349,11 @@
   }
 #
   my $delete = '';
-  if ( $cust_credit->closed !~ /^Y/i && $conf->exists('deletecredits') ) {
+  if ( $cust_credit->closed !~ /^Y/i
+       && $conf->exists('deletecredits')
+       && $curuser->access_right('Delete credit')
+     )
+  {
     $delete = qq! (<A HREF="javascript:areyousure('!.
               qq!${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum.
               qq!', 'Are you sure you want to delete this credit?')">!.
@@ -324,7 +363,10 @@
   my $unapply = '';
   if (    $cust_credit->closed !~ /^Y/i
        && $conf->exists('unapplycredits')
-       && scalar(@cust_credit_bill)       ) {
+       && scalar(@cust_credit_bill)
+       && $curuser->access_right('Unapply credit')
+     )
+  {
     $unapply = qq! (<A HREF="javascript:areyousure('!.
                qq!${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum.
                qq!', 'Are you sure you want to unapply this credit?')">!.

Index: packages.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- packages.html	14 May 2006 16:47:31 -0000	1.4
+++ packages.html	19 Jun 2006 11:25:14 -0000	1.5
@@ -2,6 +2,8 @@
   my( $cust_main ) = @_;
   my $conf = new FS::Conf;
 
+  my $curuser = $FS::CurrentUser::CurrentUser;
+
   my $packages = get_packages($cust_main, $conf);
 %>
 
@@ -11,13 +13,21 @@
 
 <A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A>
 
-<%= include('order_pkg.html', $cust_main ) %>
+<% if ( $curuser->access_right('Order customer package') ) { %>
+  <%= include('order_pkg.html', $cust_main ) %>
+<% } %>
 
-<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
+<% if ( $curuser->access_right('One-time charge')
+        && $conf->config('payby-default') ne 'HIDE'
+      ) {
+%>
   <%= include('quick-charge.html', $cust_main ) %>
 <% } %>
 
-<A HREF="<%= $p %>edit/cust_pkg.cgi?<%= $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
+<% if ( $curuser->access_right('Bulk change customer packages') ) { %>
+  <A HREF="<%= $p %>edit/cust_pkg.cgi?<%= $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
+<% } %>
+
 <BR><BR>
 
 <% if ( @$packages ) { %>
@@ -70,10 +80,19 @@
   <TD ROWSPAN=<%= $rowspan || 1 %>>
     <A NAME="cust_pkg<%=$pkg->{pkgnum}%>"><%=$pkg->{pkgnum}%></A>:
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
-<% unless ($pkg->{cancel}) { %>
-    (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
-    (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;|&nbsp;<%=pkg_customize_link($pkg,$cust_main->custnum)%>&nbsp;)
-<% } %>
+    <FONT SIZE=-1>
+      <% unless ( $pkg->{cancel} ) { %>
+        <% if ( $curuser->access_right('Change customer package') ) { %>
+            (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
+        <% } %>
+        <% if ( $curuser->access_right('Edit customer package dates') ) { %>
+            (&nbsp;<%=pkg_dates_link($pkg)%>&nbsp;)
+        <% } %>
+        <% if ( $curuser->access_right('Customize customer package') ) { %>
+            (&nbsp;<%=pkg_customize_link($pkg,$cust_main->custnum)%>&nbsp;)
+        <% } %>
+      <% } %>
+    </FONT>
   </TD>
   <TD ROWSPAN=<%= $rowspan || 1 %>>
     <TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
@@ -182,7 +201,16 @@
     <% } %>
 
     <TR>
-      <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_unsuspend_link($pkg) %>&nbsp;|&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
+      <TD COLSPAN=<%=$colspan%>>
+        <FONT SIZE=-1>
+          <% if ( $curuser->access_right('Unsuspend customer package') ) { %>
+            (&nbsp;<%= pkg_unsuspend_link($pkg) %>&nbsp;)
+          <% } %>
+          <% if ( $curuser->access_right('Cancel customer package') ) { %>
+            (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
+          <% } %>
+        </FONT>
+      </TD>
     </TR>
 
   <% } else { %> <!-- #status: active -->
@@ -196,7 +224,13 @@
         </TR>
 
         <TR>
-          <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
+          <TD COLSPAN=<%=$colspan%>>
+            <FONT SIZE=-1>
+              <% if ( $curuser->access_right('Cancel customer package immediately') ) { %>
+                (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
+              <% } %>
+            </FONT>
+          </TD>
         </TR>
 
       <% } else { %>
@@ -258,7 +292,19 @@
 
     <% if ( $pkg->{freq} ) { %>
       <TR>
-        <TD COLSPAN=<%=$colspan%>>(&nbsp;<%= pkg_suspend_link($pkg) %>&nbsp;|&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)</TD>
+        <TD COLSPAN=<%=$colspan%>>
+          <FONT SIZE=-1>
+            <% if ( $curuser->access_right('Suspend customer package') ) { %>
+              (&nbsp;<%= pkg_suspend_link($pkg) %>&nbsp;)
+            <% } %>
+            <% if ( $curuser->access_right('Cancel customer package immediately') ) { %>
+              (&nbsp;<%= pkg_cancel_link($pkg) %>&nbsp;)
+            <% } %>
+            <% if ( $curuser->access_right('Cancel customer package later') ) { %>
+              (&nbsp;<%= pkg_expire_link($pkg) %>&nbsp;)
+            <% } %>
+          <FONT>
+        </TD>
       </TR>
     <% } %>
 
@@ -278,14 +324,20 @@
       print '<TR>' if ($cnt > 0);
 %>
   <TD><%=svc_link($svcpart,$service)%></TD>
-  <TD><%=svc_label_link($svcpart,$service)%><BR>(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)</TD>
+  <TD><%=svc_label_link($svcpart,$service)%>
+    <% if ( $curuser->access_right('Unprovision customer service') ) { %>
+      <BR>(&nbsp;<%=svc_unprovision_link($service)%>&nbsp;)
+    <% } %>
+  </TD>
 </TR>
 <%
       $cnt++;
     }
-    if ($svcpart->{count} < $svcpart->{quantity}) {
+    if ( $svcpart->{count} < $svcpart->{quantity} 
+         && $curuser->access_right('Provision customer services')
+       ) {
       print qq!<TR>\n! if ($cnt > 0);
-      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg, $svcpart, $conf).qq!</TD>\n</TR>\n!;
+      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg, $svcpart, $conf, $curuser).qq!</TD>\n</TR>\n!;
     }
   }
 }
@@ -393,7 +445,7 @@
 }
 
 sub svc_provision_link {
-  my ($pkg, $svcpart, $conf) = @_;
+  my ($pkg, $svcpart, $conf, $curuser) = @_;
   ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
   my $num_left = $svcpart->{quantity} - $svcpart->{count};
   my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
@@ -411,7 +463,10 @@
 
   my $link = qq!<A CLASS="provision" HREF="$url">!.
              "Provision&nbsp;$svc_nbsp&nbsp;($num_left)</A>";
-  if ( $conf->exists('legacy_link') ) {
+  if ( $conf->exists('legacy_link')
+       && $curuser->access_right('View/link unlinked services')
+     )
+  {
     $link .= '<BR>'.
              qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!.
              qq!$pkgnum_svcpart">!.
@@ -475,7 +530,11 @@
   my $pkg = shift or return '';
   qq!<A HREF="javascript:areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}', !.
   qq!'Permanently delete included services and cancel this package?')">!.
-  qq!Cancel now</A> | !.
+  qq!Cancel now</A>!;
+}
+
+sub pkg_expire_link {
+  my $pkg = shift or return '';
   qq!<A HREF="${p}misc/expire_pkg.cgi?$pkg->{pkgnum}">Cancel later</A>!;
 }
 

From ivan at wavetail.420.am  Mon Jun 19 04:57:41 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 04:57:44 2006
Subject: [freeside-commits] freeside Changes.1.7.0, 1.1, 1.2 README.1.7.0,
	1.5, 1.6
Message-ID: <20060619115741.E18DDFC827A@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside
In directory wavetail:/tmp/cvs-serv15984

Modified Files:
	Changes.1.7.0 README.1.7.0 
Log Message:
ACL bootstrapping/upgrade

Index: README.1.7.0
===================================================================
RCS file: /home/cvs/cvsroot/freeside/README.1.7.0,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README.1.7.0	23 May 2006 15:54:50 -0000	1.5
+++ README.1.7.0	19 Jun 2006 11:57:39 -0000	1.6
@@ -18,6 +18,10 @@
 (if freeside-upgrade hangs, try stopping Apache, all Freeside processes, and
  anything else connected to your database, especially on older Pg versions)
 
+ACL bootstrapping:
+  - Run "bin/mapsecrets2access_user username"
+  - You can then add more restrictive groups and move your users into them
+
 If you have any records in the cust_tax_exempt table, you *MUST* migrate them
 to the new cust_tax_exempt_pkg table.  An example script to get you started is
 in bin/fs-migrate-cust_tax_exempt - it may need to be customized for your

Index: Changes.1.7.0
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Changes.1.7.0,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Changes.1.7.0	14 May 2006 16:47:29 -0000	1.1
+++ Changes.1.7.0	19 Jun 2006 11:57:39 -0000	1.2
@@ -9,6 +9,11 @@
 - gross sales report/graph broken down by agent and package class
 - config switch to base tax off shipping address if present (warning: tax reports can take a long time with this switch on)
 - plesk provisioning
+- "inactive" package status 
+- more options in package report (classes, etc.)
+and (now they're finally here)...
+- ACLs
+- Agent virtualization
 
 -------- some of the above, nicely:
 
@@ -33,7 +38,3 @@
   - Bookeeping/Collections | Sales report (by agent, package class ...
 
 --------
-
-and...
-- ACLs
-- Agent virtualization

From ivan at wavetail.420.am  Mon Jun 19 04:57:41 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 04:57:44 2006
Subject: [freeside-commits] freeside/bin mapsecrets2access_user,NONE,1.1
Message-ID: <20060619115741.0D72AFC8302@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/bin
In directory wavetail:/tmp/cvs-serv15984/bin

Added Files:
	mapsecrets2access_user 
Log Message:
ACL bootstrapping/upgrade

--- NEW FILE: mapsecrets2access_user ---
#!/usr/bin/perl -w

use strict;
use File::Copy "cp";
use FS::UID qw(adminsuidsetup);
use FS::AccessRight;
use FS::Record qw(qsearchs qsearch);
use FS::access_group;
use FS::access_user;
use FS::access_usergroup;
use FS::access_right;
use FS::access_groupagent;
use FS::agent;

adminsuidsetup shift;

my $supergroup = qsearchs('access_group', { 'groupname' => 'Superuser' } );
unless ( $supergroup ) {

  $supergroup = new FS::access_group { 'groupname' => 'Superuser' };
  my $error = $supergroup->insert;
  die $error if $error;

  foreach my $rightname ( FS::AccessRight->rights ) {
    my $access_right = new FS::access_right {
      'righttype'   => 'FS::access_group',
      'rightobjnum' => $supergroup->groupnum,
      'rightname'   => $rightname,
    };
    my $ar_error = $access_right->insert;
    die $ar_error if $ar_error;
  }

  foreach my $agent ( qsearch('agent', {} ) ) {
    my $access_groupagent = new FS::access_groupagent {
      'groupnum' => $supergroup->groupnum,
      'agentnum' => $agent->agentnum,
    };
    my $aga_error = $access_groupagent->insert;
    die $aga_error if $aga_error;
  }

}
my $supergroupnum = $supergroup->groupnum;

my $mapsecrets = '/usr/local/etc/freeside/mapsecrets';
open(MAPSECRETS, "<$mapsecrets");
while (<MAPSECRETS>) {
  /([\w]+)\s+secrets\s*$/ or die "unparsable line in mapsecrets: $_";
  my $username = $1;

  next if qsearchs('access_user', { 'username' => $username } );

  my $access_user = new FS::access_user {
    'username'  => $username,
    '_password' => 'notyet',
    'first'     => 'Legacy',
    'last'      => 'User',
  };
  my $au_error = $access_user->insert;
  die $au_error if $au_error;

  my $access_usergroup = new FS::access_usergroup { 
    'usernum'  => $access_user->usernum,
    'groupnum' => $supergroupnum,
  };
  my $aug_error = $access_usergroup->insert;
  die $aug_error if $aug_error;

}

# okay to clobber mapsecrets now i guess
cp $mapsecrets, "$mapsecrets.bak$$";
open(MAPSECRETS, ">$mapsecrets");
print MAPSECRETS '* secrets'. "\n";
close MAPSECRETS;

From ivan at wavetail.420.am  Mon Jun 19 05:09:16 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 05:09:19 2006
Subject: [freeside-commits] freeside/FS/t ConfDefaults.t,NONE,1.1
Message-ID: <20060619120916.B7637FC8302@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/t
In directory wavetail:/tmp/cvs-serv16174

Added Files:
	ConfDefaults.t 
Log Message:
forgot to commit this test

--- NEW FILE: ConfDefaults.t ---
BEGIN { $| = 1; print "1..1\n" }
END {print "not ok 1\n" unless $loaded;}
use FS::ConfDefaults;
$loaded=1;
print "ok 1\n";

From ivan at wavetail.420.am  Mon Jun 19 05:15:34 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 05:15:36 2006
Subject: [freeside-commits] freeside/FS/bin freeside-upgrade,1.3,1.4
Message-ID: <20060619121534.43DF6FC84BC@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail:/tmp/cvs-serv16352/bin

Modified Files:
	freeside-upgrade 
Log Message:
ACL bootstrapping

Index: freeside-upgrade
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-upgrade,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freeside-upgrade	30 Mar 2006 14:22:38 -0000	1.3
+++ freeside-upgrade	19 Jun 2006 12:15:32 -0000	1.4
@@ -5,6 +5,7 @@
 use Term::ReadKey;
 use DBIx::DBSchema 0.31;
 use FS::UID qw(adminsuidsetup checkeuid datasrc );  #getsecrets);
+use FS::CurrentUser;
 use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
 
 $DEBUG = 1;
@@ -12,6 +13,7 @@
 die "Not running uid freeside!" unless checkeuid();
 
 my $user = shift or die &usage;
+$FS::CurrentUser::upgrade_hack = 1;
 my $dbh = adminsuidsetup($user);
 
 #needs to match FS::Schema...

From ivan at wavetail.420.am  Mon Jun 19 05:15:34 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 05:15:39 2006
Subject: [freeside-commits] freeside/FS/FS CurrentUser.pm,1.1,1.2
Message-ID: <20060619121534.2376AFC827A@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv16352/FS

Modified Files:
	CurrentUser.pm 
Log Message:
ACL bootstrapping

Index: CurrentUser.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/CurrentUser.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CurrentUser.pm	19 Jun 2006 02:33:52 -0000	1.1
+++ CurrentUser.pm	19 Jun 2006 12:15:32 -0000	1.2
@@ -1,11 +1,13 @@
 package FS::CurrentUser;
 
-use vars qw($CurrentUser);
+use vars qw($CurrentUser $upgrade_hack);
 
 #not at compile-time, circular dependancey causes trouble
 #use FS::Record qw(qsearchs);
 #use FS::access_user;
 
+$upgrade_hack = 0;
+
 =head1 NAME
 
 FS::CurrentUser - Package representing the current user
@@ -19,8 +21,9 @@
 sub load_user {
   my( $class, $user ) = @_; #, $pass
 
-  #XXX remove me at some point
-  return "" if $user =~ /^fs_(queue|selfservice)$/;
+  return "" if $upgrade_hack;
+
+  #return "" if $user =~ /^fs_(queue|selfservice)$/;
 
   #not the best thing in the world...
   eval "use FS::Record qw(qsearchs);";

From ivan at wavetail.420.am  Mon Jun 19 05:22:11 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 05:22:13 2006
Subject: [freeside-commits] freeside/bin mapsecrets2access_user,1.1,1.2
Message-ID: <20060619122211.8CD30FC8302@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/bin
In directory wavetail:/tmp/cvs-serv16462

Modified Files:
	mapsecrets2access_user 
Log Message:
ACL bootstrapping

Index: mapsecrets2access_user
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/mapsecrets2access_user,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mapsecrets2access_user	19 Jun 2006 11:57:39 -0000	1.1
+++ mapsecrets2access_user	19 Jun 2006 12:22:09 -0000	1.2
@@ -3,6 +3,7 @@
 use strict;
 use File::Copy "cp";
 use FS::UID qw(adminsuidsetup);
+use FS::CurrentUser;
 use FS::AccessRight;
 use FS::Record qw(qsearchs qsearch);
 use FS::access_group;
@@ -12,6 +13,7 @@
 use FS::access_groupagent;
 use FS::agent;
 
+$FS::CurrentUser::upgrade_hack = 1;
 adminsuidsetup shift;
 
 my $supergroup = qsearchs('access_group', { 'groupname' => 'Superuser' } );

From ivan at wavetail.420.am  Mon Jun 19 05:47:57 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 05:47:59 2006
Subject: [freeside-commits] freeside/bin mapsecrets2access_user,1.2,1.3
Message-ID: <20060619124757.50A55FC85D9@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/bin
In directory wavetail:/tmp/cvs-serv16721

Modified Files:
	mapsecrets2access_user 
Log Message:
better error checking for this thrown-together bootstrapping script

Index: mapsecrets2access_user
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/mapsecrets2access_user,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mapsecrets2access_user	19 Jun 2006 12:22:09 -0000	1.2
+++ mapsecrets2access_user	19 Jun 2006 12:47:55 -0000	1.3
@@ -46,7 +46,7 @@
 my $supergroupnum = $supergroup->groupnum;
 
 my $mapsecrets = '/usr/local/etc/freeside/mapsecrets';
-open(MAPSECRETS, "<$mapsecrets");
+open(MAPSECRETS, "<$mapsecrets") or die $!;
 while (<MAPSECRETS>) {
   /([\w]+)\s+secrets\s*$/ or die "unparsable line in mapsecrets: $_";
   my $username = $1;
@@ -70,9 +70,10 @@
   die $aug_error if $aug_error;
 
 }
+close MAPSECRETS;
 
 # okay to clobber mapsecrets now i guess
 cp $mapsecrets, "$mapsecrets.bak$$";
-open(MAPSECRETS, ">$mapsecrets");
+open(MAPSECRETS, ">$mapsecrets") or die $!;
 print MAPSECRETS '* secrets'. "\n";
-close MAPSECRETS;
+close MAPSECRETS or die $!;

From ivan at wavetail.420.am  Mon Jun 19 06:09:16 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Mon Jun 19 06:09:24 2006
Subject: [freeside-commits] 
	freeside/httemplate/view/cust_main packages.html, 1.5, 1.6
Message-ID: <20060619130916.CE44BFC8302@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv17037

Modified Files:
	packages.html 
Log Message:
fix ACL name for service provisioning and prevent disabled service provisioning from messing up table formatting

Index: packages.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- packages.html	19 Jun 2006 11:25:14 -0000	1.5
+++ packages.html	19 Jun 2006 13:09:14 -0000	1.6
@@ -333,12 +333,18 @@
 <%
       $cnt++;
     }
-    if ( $svcpart->{count} < $svcpart->{quantity} 
-         && $curuser->access_right('Provision customer services')
-       ) {
-      print qq!<TR>\n! if ($cnt > 0);
-      print qq!  <TD COLSPAN=2>!.svc_provision_link($pkg, $svcpart, $conf, $curuser).qq!</TD>\n</TR>\n!;
+    if ( $svcpart->{count} < $svcpart->{quantity} ) {
+      print '<TR>' if ($cnt > 0);
+      if ( $curuser->access_right('Provision customer service') ) {
+        print '<TD COLSPAN=2>'.
+              svc_provision_link($pkg, $svcpart, $conf, $curuser).
+              '</TD></TR>';
+      } else {
+        #print '<TD COLSPAN=2>&nbsp;</TD></TR>';
+        print '<TD COLSPAN=2></TD></TR>';
+      }
     }
+
   }
 }
 #end display packages

From ivan at wavetail.420.am  Wed Jun 21 01:42:20 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Wed Jun 21 01:42:51 2006
Subject: [freeside-commits] freeside/httemplate/browse agent_type.cgi, 1.15,
	1.16
Message-ID: <20060621084220.D14F2FC8476@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail:/tmp/cvs-serv25961/httemplate/browse

Modified Files:
	agent_type.cgi 
Log Message:
speed up the agent type report when there are lots of package definitions

Index: agent_type.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/agent_type.cgi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- agent_type.cgi	14 May 2006 16:47:30 -0000	1.15
+++ agent_type.cgi	21 Jun 2006 08:42:18 -0000	1.16
@@ -13,21 +13,18 @@
 
   [ map  {
            my $type_pkgs = $_;
-           my $part_pkg = $type_pkgs->part_pkg;
+           #my $part_pkg = $type_pkgs->part_pkg;
            [
              {
-               'data'  => $part_pkg->pkg. ' - '. $part_pkg->comment,
+               #'data'  => $part_pkg->pkg. ' - '. $part_pkg->comment,
+               'data'  => $type_pkgs->pkg. ' - '. $type_pkgs->comment,
                'align' => 'left',
                'link'  => $p. 'edit/part_pkg.cgi?'. $type_pkgs->pkgpart,
              },
            ];
          }
-    #sort {
-    #     }
-    grep {
-           $_->part_pkg and ! $_->part_pkg->disabled
-         }
-    $agent_type->type_pkgs #XXX the method should order itself by something
+
+    $agent_type->type_pkgs_enabled
   ];
 
 };

From ivan at wavetail.420.am  Wed Jun 21 01:42:20 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Wed Jun 21 01:42:56 2006
Subject: [freeside-commits] freeside/FS/FS agent_type.pm,1.4,1.5
Message-ID: <20060621084220.D143EFC8170@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv25961/FS/FS

Modified Files:
	agent_type.pm 
Log Message:
speed up the agent type report when there are lots of package definitions

Index: agent_type.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/agent_type.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- agent_type.pm	14 May 2006 16:47:31 -0000	1.4
+++ agent_type.pm	21 Jun 2006 08:42:18 -0000	1.5
@@ -136,6 +136,27 @@
   qsearch('type_pkgs', { 'typenum' => $self->typenum } );
 }
 
+=item type_pkgs_enabled
+
+Returns all FS::type_pkg objects (see L<FS::type_pkgs>) that link to enabled
+package definitions (see L<FS::part_pkg>).
+
+An additional strange feature is that the returned type_pkg objects also have
+all fields of the associated part_pkg object.
+
+=cut
+
+sub type_pkgs_enabled {
+  my $self = shift;
+  qsearch({
+    'table'     => 'type_pkgs',
+    'addl_from' => 'JOIN part_pkg USING ( pkgpart )',
+    'hashref'   => { 'typenum' => $self->typenum },
+    'extra_sql' => " AND ( disabled = '' OR disabled IS NULL )".
+                   " ORDER BY pkg",
+  });
+}
+
 =item pkgpart
 
 Returns the pkgpart of all package definitions (see L<FS::part_pkg>) for this
@@ -152,6 +173,13 @@
 
 =head1 BUGS
 
+type_pkgs_enabled should order itself by something (pkg?)
+
+type_pkgs_enabled should populate something that caches for the part_pkg method
+rather than add fields to this object, right?  In fact we need a "poop" object
+framework that does that automatically for any joined search at some point....
+right?
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::agent>, L<FS::type_pkgs>, L<FS::cust_main>,

From ivan at wavetail.420.am  Wed Jun 21 05:56:25 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Wed Jun 21 05:56:57 2006
Subject: [freeside-commits] 
	freeside/httemplate/elements iframecontentmws.js, NONE, 1.1
Message-ID: <20060621125625.D64FBFC895E@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv29187

Added Files:
	iframecontentmws.js 
Log Message:
add overlib iframe function

--- NEW FILE: iframecontentmws.js ---
/*
 iframecontentmws.js - Foteos Macrides
   Initial: October 10, 2004 - Last Revised: May 9, 2005
 Simple script for using an HTML file as iframe content in overlibmws popups.
 Include WRAP and TEXTPADDING,0 in the overlib call to ensure that the width
 arg is respected (unless the CAPTION plus CLOSETEXT widths add up to more than
 the width arg, in which case you should increase the width arg).  The name arg
 should be a unique string for each popup with iframe content in the document.
 The frameborder arg should be 1 (browser default if omitted) or 0.

 See http://www.macridesweb.com/oltest/IFRAME.html for demonstration.
*/

function OLiframeContent(src, width, height, name, frameborder) {
 alert(src);
 return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
 +(name!=null?' name="'+name+'" id="'+name+'"':'')
 +(frameborder!=null?' frameborder="'+frameborder+'"':'')
 +' scrolling="auto">'
 +'<div>[iframe not supported]</div></iframe>');
}

From ivan at wavetail.420.am  Wed Jun 21 05:57:38 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Wed Jun 21 05:58:07 2006
Subject: [freeside-commits] freeside/httemplate/elements header-popup.html,
	NONE, 1.1
Message-ID: <20060621125738.503D1FC86E6@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv29316

Added Files:
	header-popup.html 
Log Message:
adding a header element for popups to replace CGI::header

--- NEW FILE: header-popup.html ---
<%
  my($title, $menubar) = ( shift, shift ); #$menubar is unused here though
  my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
  my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
  my $conf = new FS::Conf;
%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
  <HEAD>
    <TITLE>
      <%= $title %>
    </TITLE>
    <META HTTP-Equiv="Cache-Control" Content="no-cache">
    <META HTTP-Equiv="Pragma" Content="no-cache">
    <META HTTP-Equiv="Expires" Content="0"> 
    <%= $head %>
  </HEAD>
  <BODY BGCOLOR="#e8e8e8" <%= $etc %>>
    <FONT SIZE=6>
      <CENTER><%= $title %></CENTER>
    </FONT>
    <BR><!--<BR>-->

From ivan at wavetail.420.am  Wed Jun 21 05:58:45 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Wed Jun 21 05:58:47 2006
Subject: [freeside-commits] freeside/httemplate/view cust_main.cgi, 1.101,
	1.102
Message-ID: <20060621125845.DF06AFC86E6@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail:/tmp/cvs-serv29399

Modified Files:
	cust_main.cgi 
Log Message:
need the OLiframecontent sub

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main.cgi,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- cust_main.cgi	19 Jun 2006 11:25:13 -0000	1.101
+++ cust_main.cgi	21 Jun 2006 12:58:43 -0000	1.102
@@ -40,6 +40,7 @@
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/iframecontentmws.js"></SCRIPT>
 
 <SCRIPT TYPE="text/javascript">
 function areyousure(href, message) {

From ivan at wavetail.420.am  Wed Jun 21 06:00:11 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Wed Jun 21 06:00:18 2006
Subject: [freeside-commits] freeside/httemplate/view/cust_main
	payment_history.html, 1.10, 1.11
Message-ID: <20060621130011.55BE5FC8958@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv29433

Modified Files:
	payment_history.html 
Log Message:
http://www.macridesweb.com/oltest/ONCLICK.html !!!!!

Index: payment_history.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- payment_history.html	19 Jun 2006 11:25:14 -0000	1.10
+++ payment_history.html	21 Jun 2006 13:00:09 -0000	1.11
@@ -70,7 +70,7 @@
 
 <% if ( $curuser->access_right('Post credit') ) { %>
 
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">Post credit</A>
+  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Post credit</A>
 
   <BR>
 
@@ -135,7 +135,7 @@
     $post = '</FONT></B>';
     $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
              $cust_pay->paynum.
-             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!;
+             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
 
   } elsif (    scalar(@cust_bill_pay)   == 1
             && scalar(@cust_pay_refund) == 0
@@ -173,7 +173,7 @@
                $cust_pay->unapplied. ' unapplied</FONT></B>'.
                qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
                $cust_pay->paynum. 
-               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!.
+               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
                '<BR>';
     }
   }
@@ -307,7 +307,7 @@
     $post = '</FONT></B>';
     $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
              $cust_credit->crednum.
-             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!;
+             qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
   } elsif (    scalar(@cust_credit_bill)   == 1
             && scalar(@cust_credit_refund) == 0
             && $cust_credit->credited == 0      ) {
@@ -343,7 +343,7 @@
                $cust_credit->credited. ' unapplied</FONT></B>'.
                qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
                $cust_credit->crednum.
-               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK )">apply</A>)!.
+               qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
                '<BR>';
     }
   }

From ivan at wavetail.420.am  Wed Jun 21 06:00:45 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Wed Jun 21 06:00:52 2006
Subject: [freeside-commits] 
	freeside/httemplate/elements iframecontentmws.js, 1.1, 1.2
Message-ID: <20060621130045.C12BEFC86E6@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv29451

Modified Files:
	iframecontentmws.js 
Log Message:
oops, don't want this debugging in here

Index: iframecontentmws.js
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/iframecontentmws.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- iframecontentmws.js	21 Jun 2006 12:56:23 -0000	1.1
+++ iframecontentmws.js	21 Jun 2006 13:00:43 -0000	1.2
@@ -12,7 +12,6 @@
 */
 
 function OLiframeContent(src, width, height, name, frameborder) {
- alert(src);
  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
  +(name!=null?' name="'+name+'" id="'+name+'"':'')
  +(frameborder!=null?' frameborder="'+frameborder+'"':'')

From ivan at wavetail.420.am  Wed Jun 21 09:26:50 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Wed Jun 21 09:27:21 2006
Subject: [freeside-commits] freeside/httemplate/browse part_pkg.cgi, 1.32,
	1.33
Message-ID: <20060621162650.BFE33FC8281@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail:/tmp/cvs-serv31843

Modified Files:
	part_pkg.cgi 
Log Message:
fix show/hide disabled link interaction w/pager

Index: part_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/part_pkg.cgi,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- part_pkg.cgi	14 May 2006 16:47:30 -0000	1.32
+++ part_pkg.cgi	21 Jun 2006 16:26:48 -0000	1.33
@@ -53,11 +53,14 @@
 if ( $cgi->param('showdisabled') ) {
   $cgi->param('showdisabled', 0);
   $posttotal = '( <a href="'. $cgi->self_url. '">hide disabled packages</a> )';
+  $cgi->param('showdisabled', 1);
 } else {
   $cgi->param('showdisabled', 1);
   $posttotal = '( <a href="'. $cgi->self_url. '">show disabled packages</a> )';
+  $cgi->param('showdisabled', 0);
 }
 
+
 # ------
 
 my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ];
@@ -68,7 +71,8 @@
 my @links = ( $link, $link, '' );
 my @style = ( '', '', '' );
 
-unless ( $cgi->param('showdisabled') ) { #its been reversed already
+#unless ( $cgi->param('showdisabled') ) { #its been reversed already
+if ( $cgi->param('showdisabled') ) { #its been reversed already
   push @header, 'Status';
   push @fields, sub { shift->disabled
                         ? '<FONT COLOR="#FF0000">DISABLED</FONT>'

From ivan at wavetail.420.am  Sat Jun 24 09:41:47 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sat Jun 24 09:41:50 2006
Subject: [freeside-commits] 
	freeside/httemplate/elements table-grid.html, 1.1,
	1.2 select-table.html, 1.3, 1.4
Message-ID: <20060624164147.5DC4EFC83CB@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv19993/httemplate/elements

Modified Files:
	table-grid.html select-table.html 
Log Message:
Add the ability to link customer service definition fields to inventory
  classes, with an "automatic/manual" flag.  Add the ability for the web
  interface to maintain these links.  Start prettying up the service def.
  edit in preparation for Bigger Changes.


Index: select-table.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-table.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- select-table.html	19 Jun 2006 02:33:52 -0000	1.3
+++ select-table.html	24 Jun 2006 16:41:45 -0000	1.4
@@ -8,11 +8,15 @@
   # 'value'    => 'current_value',
   #
   ##opt
-  # 'empty_label' => '', #better specify it though, the default might change
-  # 'hashref'     => {},
-  # 'extra_sql'   => '',
-  # 'records'     => \@records, #instead of hashref
-  # 'pre_options' => [ 'value' => 'option' ], #before normal options
+  # 'empty_label'  => '', #better specify it though, the default might change
+  # 'hashref'      => {},
+  # 'extra_sql'    => '',
+  # 'records'      => \@records, #instead of hashref
+  # 'pre_options'  => [ 'value' => 'option' ], #before normal options
+  # 'element_name' => '', #HTML element name, defaults to the name of
+  #                       # the primary key column
+  # 'element_etc'  => '', #additional attributes (i.e. "DISABLED") for the
+  #                       #<SELECT> element
 
   my( %opt ) = @_;
 
@@ -37,7 +41,7 @@
 
 %>
 
-<SELECT NAME="<%= $key %>">
+<SELECT NAME="<%= $opt{'element_name'} || $key %>" <%= $opt{'element_etc'} %>>
 
   <% while ( @pre_options ) { %>
     <OPTION VALUE="<%= shift(@pre_options) %>"><%= shift(@pre_options) %>

Index: table-grid.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/table-grid.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- table-grid.html	22 Dec 2005 04:01:17 -0000	1.1
+++ table-grid.html	24 Jun 2006 16:41:45 -0000	1.2
@@ -1,8 +1,14 @@
+<%
+  my %opt = @_;
+  $opt{cellspacing} ||= 0;
+  $opt{cellpadding} ||= 0;
+
+%>
 <STYLE TYPE="text/css">
 .grid table { border: solid; empty-cells: show }
 .grid TH { padding-left: 3px; padding-right: 3px; border: 1px solid #dddddd; border-bottom: dashed 1px black; border-right: none }
 .grid TD { padding-left: 3px; padding-right: 3px; empty-cells: show; border: 1px solid #cccccc; border-bottom: none; border-right: none }
 </STYLE>
 
-<TABLE CLASS="grid" CELLSPACING=0 CELLPADDING=0 BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
+<TABLE CLASS="grid" CELLSPACING=<%= $opt{cellspacing} %> CELLPADDING=<%= $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
 

From ivan at wavetail.420.am  Sat Jun 24 09:41:47 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sat Jun 24 09:41:54 2006
Subject: [freeside-commits] freeside/httemplate/browse part_svc.cgi, 1.25,
	1.26
Message-ID: <20060624164147.655ADFC89F8@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail:/tmp/cvs-serv19993/httemplate/browse

Modified Files:
	part_svc.cgi 
Log Message:
Add the ability to link customer service definition fields to inventory
  classes, with an "automatic/manual" flag.  Add the ability for the web
  interface to maintain these links.  Start prettying up the service def.
  edit in preparation for Bigger Changes.


Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/part_svc.cgi,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- part_svc.cgi	31 Jan 2006 04:26:54 -0000	1.25
+++ part_svc.cgi	24 Jun 2006 16:41:45 -0000	1.26
@@ -1,9 +1,15 @@
 <% 
 
+#code duplication w/ edit/part_svc.cgi, should move this hash to part_svc.pm
 my %flag = (
-  'D' => 'Default',
-  'F' => 'Fixed',
   ''  => '',
+  'D' => 'Default',
+  'F' => 'Fixed (unchangeable)',
+  #'M' => 'Manual selection from inventory',
+  'M' => 'Manual selected from inventory',
+  #'A' => 'Automatically fill in from inventory',
+  'A' => 'Automatically filled in from inventory',
+  'X' => 'Excluded',
 );
 
 my %search;
@@ -27,6 +33,8 @@
   @part_svc = sort { lc($a->svc) cmp lc($b->svc) } @part_svc;
 }
 
+my %inventory_class = ();
+
 %>
 <%= include("/elements/header.html",'Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
@@ -125,7 +133,21 @@
      <%= $n1 %>
      <TD><%= $field %></TD>
      <TD><%= $flag{$flag} %></TD>
-     <TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD>
+
+     <TD>
+       <% my $value = $part_svc->part_svc_column($field)->columnvalue;
+          if ( $flag =~ /^[MA]$/ ) { 
+            $inventory_class{$value}
+              ||= qsearchs('inventory_class', { 'classnum' => $value } );
+       %>
+            <%= $inventory_class{$value}
+                  ? $inventory_class{$value}->classname
+                  : "WARNING: inventory_class.classnum $value not found" %>
+       <% } else { %>
+            <%= $value %>
+       <% } %>
+     </TD>
+
 
 <%     $n1="</TR><TR>";
      }

From ivan at wavetail.420.am  Sat Jun 24 09:41:47 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sat Jun 24 09:43:37 2006
Subject: [freeside-commits] freeside/httemplate/edit part_svc.cgi,1.48,1.49
Message-ID: <20060624164147.6365EFC89EF@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv19993/httemplate/edit

Modified Files:
	part_svc.cgi 
Log Message:
Add the ability to link customer service definition fields to inventory
  classes, with an "automatic/manual" flag.  Add the ability for the web
  interface to maintain these links.  Start prettying up the service def.
  edit in preparation for Bigger Changes.


Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_svc.cgi,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- part_svc.cgi	31 Jan 2006 04:26:54 -0000	1.48
+++ part_svc.cgi	24 Jun 2006 16:41:44 -0000	1.49
@@ -38,28 +38,24 @@
 Disable new orders <INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>><BR>
 <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $hashref->{svcpart} %>">
 <BR>
-Services are items you offer to your customers.
-<UL><LI>svc_acct - Shell accounts, POP mailboxes, SLIP/PPP and ISDN accounts
+Service definitions are the templates for items you offer to your customers.
+<UL><LI>svc_acct - Accounts - anything with a username (Mailboxes, PPP accounts, shell accounts, etc.)
     <LI>svc_domain - Domains
     <LI>svc_forward - mail forwarding
     <LI>svc_www - Virtual domain website
-    <LI>svc_broadband - Broadband/High-speed Internet service
+    <LI>svc_broadband - Broadband/High-speed Internet service (always-on)
     <LI>svc_external - Externally-tracked service
 <!--   <LI>svc_charge - One-time charges (Partially unimplemented)
        <LI>svc_wo - Work orders (Partially unimplemented)
 -->
 </UL>
 For the selected table, you can give fields default or fixed (unchangable)
-values.  For example, a SLIP/PPP account may have a default (or perhaps fixed)
-<B>slipip</B> of <B>0.0.0.0</B>, while a POP mailbox will probably have a fixed
-blank <B>slipip</B> as well as a fixed shell something like <B>/bin/true</B> or
-<B>/usr/bin/passwd</B>.
+values, or select an inventory class to manually or automatically fill in
+that field.
 <BR><BR>
 
 <%
 
-my %vfields;
-
 #these might belong somewhere else for other user interfaces 
 #pry need to eventually create stuff that's shared amount UIs
 my $conf = new FS::Conf;
@@ -77,28 +73,42 @@
                      select_label => 'city',
                    },
     'username'  => {
-                      desc => 'Username',
-                      type => 'disabled',
+                     desc => 'Username',
+                     type => 'text',
+                     disable_default => 1,
+                     disable_fixed => 1,
+                   },
+    'quota'     => { 
+                     desc => '',
+                     type => 'text',
+                     disable_inventory => 1,
                    },
-    'quota'     => '',
     '_password' => 'Password',
     'gid'       => 'GID (when blank, defaults to UID)',
     'shell'     => {
-                     desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file, set to blank for no shell tracking)',
+                     #desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file, set to blank for no shell tracking)',
+                     desc =>'Shell ( set to blank for no shell tracking)',
                      type =>'select',
                      select_list => [ $conf->config('shells') ],
+                     disable_inventory => 1,
                    },
-    'finger'    => 'GECOS',
+    'finger'    => 'Real name (GECOS)',
     'domsvc'    => {
                      desc =>'svcnum from svc_domain',
                      type =>'select',
                      select_table => 'svc_domain',
                      select_key   => 'svcnum',
                      select_label => 'domain',
+                     disable_inventory => 1,
                    },
     'usergroup' => {
                      desc =>'RADIUS groups',
                      type =>'radius_usergroup_selector',
+                     disable_inventory => 1,
+                   },
+    'seconds'   => { desc => '',
+                     type => 'text',
+                     disable_inventory => 1,
                    },
   },
   'svc_domain' => {
@@ -132,6 +142,7 @@
   },
 );
 
+  my %vfields;
   foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
     my $self = "FS::$svcdb"->new;
     $vfields{$svcdb} = {};
@@ -149,6 +160,37 @@
       warn "\$vfields{$svcdb}->{$field} = $pvf";
     } #next $field
   } #next $svcdb
+
+  #code duplication w/ edit/part_svc.cgi, should move this hash to part_svc.pm
+  # and generalize the subs
+  # condition sub is tested to see whether to disable display of this choice
+  # params: ( $def, $layer, $field )  (see SUB below)
+  my $inv_sub = sub {
+    ref($_[0]) && (    $_[0]->{disable_inventory} 
+                    || $_[0]->{'type'} ne 'text'  )
+  };
+  tie my %flag, 'Tie::IxHash',
+    ''  => { 'desc' => 'No default', },
+    'D' => { 'desc' => 'Default',
+             'condition' =>
+               sub { ref($_[0]) && $_[0]->{disable_default} }, 
+           },
+    'F' => { 'desc' => 'Fixed (unchangeable)',
+             'condition' =>
+               sub { ref($_[0]) && $_[0]->{disable_fixed} }, 
+           },
+    'M' => { 'desc' => 'Manual selection from inventory',
+             'condition' => $inv_sub,
+           },
+    'A' => { 'desc' => 'Automatically fill in from inventory',
+             'condition' => $inv_sub,
+           },
+    'X' => { 'desc' => 'Excluded',
+             'condition' =>
+               sub { ! $vfields{$_[1]}->{$_[2]} },
+
+           },
+  ;
   
   my @dbs = $hashref->{svcdb}
              ? ( $hashref->{svcdb} )
@@ -174,8 +216,8 @@
       my @part_export =
         map { qsearch( 'part_export', {exporttype => $_ } ) }
           keys %{FS::part_export::export_info($layer)};
-      $html .= '<BR><BR>'. table().
-               table(). "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
+      $html .= '<BR><BR>'. table(). 
+               "<TR><TH COLSPAN=$columns>Exports</TH></TR><TR>";
       foreach my $part_export ( @part_export ) {
         $html .= '<TD><INPUT TYPE="checkbox"'.
                  ' NAME="exportnum'. $part_export->exportnum. '"  VALUE="1" ';
@@ -191,75 +233,176 @@
       }
       $html .= '</TR></TABLE><BR><BR>';
 
-      $html .=  table(). "<TH>Field</TH><TH COLSPAN=2>Modifier</TH>";
+      $html .= include('/elements/table-grid.html', 'cellpadding' => 4 ).
+               '<TR>'.
+                 '<TH CLASS="grid" BGCOLOR="#cccccc">Field</TH>'.
+                 '<TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=2>Modifier</TH>'.
+               '</TR>';
+
+      my $bgcolor1 = '#eeeeee';
+      my $bgcolor2 = '#ffffff';
+      my $bgcolor;
+
       #yucky kludge
       my @fields = defined( dbdef->table($layer) )
                       ? grep { $_ ne 'svcnum' } fields($layer)
                       : ();
       push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
       $part_svc->svcpart($clone) if $clone; #haha, undone below
+
+
       foreach my $field (@fields) {
+
         my $part_svc_column = $part_svc->part_svc_column($field);
         my $value = $part_svc_column->columnvalue;
         my $flag = $part_svc_column->columnflag;
         my $def = $defs{$layer}{$field};
         my $desc = ref($def) ? $def->{desc} : $def;
+
+        if ( $bgcolor eq $bgcolor1 ) {
+          $bgcolor = $bgcolor2;
+        } else {
+          $bgcolor = $bgcolor1;
+        }
         
-        $html .= "<TR><TD>$field";
+        $html .= qq!<TR><TD CLASS="grid" BGCOLOR="$bgcolor" ALIGN="right">!.
+                 $field;
         $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
         $html .=  "</TD>";
         $flag = '' if ref($def) && $def->{type} eq 'disabled';
-        $html .=
-          qq!<TD><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE=""!.
-          ' CHECKED'x($flag eq ''). ">Off</TD>".
-          '<TD>';
-        unless ( ref($def) && $def->{type} eq 'disabled' ) {
-          $html .= 
-            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="D"!.
-            ' CHECKED'x($flag eq 'D'). ">Default ".
-            qq!<INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="F"!.
-            ' CHECKED'x($flag eq 'F'). ">Fixed ";
-          $html .= '<BR>';
-        }
-        if ( ref($def) ) {
-          if ( $def->{type} eq 'select' ) {
-            $html .= qq!<SELECT NAME="${layer}__${field}">!;
-            $html .= '<OPTION> </OPTION>' unless $value;
-            if ( $def->{select_table} ) {
-              foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
-                my $rvalue = $record->getfield($def->{select_key});
-                $html .= qq!<OPTION VALUE="$rvalue"!.
-                         ( $rvalue==$value ? ' SELECTED>' : '>' ).
-                         $record->getfield($def->{select_label}). '</OPTION>';
-              } #next $record
-            } else { # select_list
-              foreach my $item ( @{$def->{select_list}} ) {
-                $html .= qq!<OPTION VALUE="$item"!.
-                         ( $item eq $value ? ' SELECTED>' : '>' ).
-                         $item. '</OPTION>';
-              } #next $item
-            } #endif
-            $html .= '</SELECT>';
-          } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
-            $html .= FS::svc_acct::radius_usergroup_selector(
-              [ split(',', $value) ], "${layer}__${field}" );
-          } elsif ( $def->{type} eq 'disabled' ) {
-            $html .=
-              qq!<INPUT TYPE="hidden" NAME="${layer}__${field}" VALUE="">!;
-          } else {
-            $html .= '<font color="#ff0000">unknown type'. $def->{type};
-          }
+
+        $html .= qq!<TD CLASS="grid" BGCOLOR="$bgcolor">!;
+
+        if ( ref($def) && $def->{type} eq 'disabled' ) {
+        
+          $html .= 'No default';
+
         } else {
-          $html .=
-            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value">!;
+
+          $html .= qq!<SELECT NAME="${layer}__${field}_flag"!.
+                      qq! onChange="${layer}__${field}_flag_changed(this)">!;
+
+          foreach my $f ( keys %flag ) {
+
+            #here is where the SUB from above is called, to skip some choices
+            next if $flag{$f}->{condition}
+                 && &{ $flag{$f}->{condition} }( $def, $layer, $field );
+
+            $html .= qq!<OPTION VALUE="$f"!.
+                     ' SELECTED'x($flag eq $f ).
+                     '>'. $flag{$f}->{desc};
+
+          }
+
+          $html .= '</SELECT>';
+
+          $html .= join("\n",
+            '<SCRIPT>',
+            "  function ${layer}__${field}_flag_changed(what) {",
+            '    var f = what.options[what.selectedIndex].value;',
+            '    if ( f == "" || f == "X" ) { //disable',
+            "      what.form.${layer}__${field}.disabled = true;".
+            "      what.form.${layer}__${field}.style.backgroundColor = '#dddddd';".
+            "      if ( what.form.${layer}__${field}_classnum ) {".
+            "        what.form.${layer}__${field}_classnum.disabled = true;".
+            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#dddddd';".
+            "      }".
+            '    } else if ( f == "D" || f == "F" ) { //enable, text box',
+            "      what.form.${layer}__${field}.disabled = false;".
+            "      what.form.${layer}__${field}.style.backgroundColor = '#ffffff';".
+            "      what.form.${layer}__${field}.style.display = '';".
+            "      if ( what.form.${layer}__${field}_classnum ) {".
+            "        what.form.${layer}__${field}_classnum.disabled = false;".
+            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#ffffff';".
+            "        what.form.${layer}__${field}_classnum.style.display = 'none';".
+            "      }".
+            '    } else if ( f == "M" || f == "A" ) { //enable, inventory',
+            "      what.form.${layer}__${field}.disabled = false;".
+            "      what.form.${layer}__${field}.style.backgroundColor = '#ffffff';".
+            "      what.form.${layer}__${field}.style.display = 'none';".
+            "      if ( what.form.${layer}__${field}_classnum ) {".
+            "        what.form.${layer}__${field}_classnum.disabled = false;".
+            "        what.form.${layer}__${field}_classnum.style.backgroundColor = '#ffffff';".
+            "        what.form.${layer}__${field}_classnum.style.display = '';".
+            "      }".
+            '    }',
+            '  }',
+            '</SCRIPT>',
+          );
+
         }
 
-        if($vfields{$layer}->{$field}) {
-          $html .= qq!<BR><INPUT TYPE="radio" NAME="${layer}__${field}_flag" VALUE="X"!.
-          ' CHECKED'x($flag eq 'X'). ">Excluded ";
+        $html .= qq!</TD><TD CLASS="grid" BGCOLOR="$bgcolor">!;
+
+        my $disabled = $flag ? ''
+                             : 'DISABLED STYLE="background-color: #dddddd"';
+
+        if ( ! ref($def) || $def->{type} eq 'text' ) {
+
+          my $nodisplay = ' STYLE="display:none"';
+          my $is_inv = ( $flag =~ /^[MA]$/ );
+
+          $html .=
+            qq!<INPUT TYPE="text" NAME="${layer}__${field}" VALUE="$value" !.
+            $disabled.
+            ( $is_inv ? $nodisplay : $disabled ).
+            '>';
+
+          $html .= include('/elements/select-table.html',
+                             'element_name' => "${layer}__${field}_classnum",
+                             'element_etc'  => ( $is_inv
+                                                   ? $disabled
+                                                   : $nodisplay
+                                               ),
+                             'table'        => 'inventory_class',
+                             'name_col'     => 'classname',
+                             'value'        => $value,
+                             'empty_label'  => 'Select inventory class',
+                          );
+
+        } elsif ( $def->{type} eq 'select' ) {
+
+          $html .= qq!<SELECT NAME="${layer}__${field}" $disabled>!;
+          $html .= '<OPTION> </OPTION>' unless $value;
+          if ( $def->{select_table} ) {
+            foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
+              my $rvalue = $record->getfield($def->{select_key});
+              $html .= qq!<OPTION VALUE="$rvalue"!.
+                       ( $rvalue==$value ? ' SELECTED>' : '>' ).
+                       $record->getfield($def->{select_label}). '</OPTION>';
+            } #next $record
+          } else { # select_list
+            foreach my $item ( @{$def->{select_list}} ) {
+              $html .= qq!<OPTION VALUE="$item"!.
+                       ( $item eq $value ? ' SELECTED>' : '>' ).
+                       $item. '</OPTION>';
+            } #next $item
+          } #endif
+          $html .= '</SELECT>';
+
+        } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
+
+          #XXX disable the RADIUS usergroup selector?  ugh it sure does need
+          #an overhaul, people have dum group problems because of it
+
+          $html .= FS::svc_acct::radius_usergroup_selector(
+            [ split(',', $value) ], "${layer}__${field}" );
+
+        } elsif ( $def->{type} eq 'disabled' ) {
+
+          $html .=
+            qq!<INPUT TYPE="hidden" NAME="${layer}__${field}" VALUE="">!;
+
+        } else {
+
+          $html .= '<font color="#ff0000">unknown type'. $def->{type};
+
         }
+
         $html .= "</TD></TR>\n";
-      }
+
+      } #foreach my $field (@fields) {
+
       $part_svc->svcpart('') if $clone; #undone
       $html .= "</TABLE>";
 

From ivan at wavetail.420.am  Sat Jun 24 09:41:46 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Sat Jun 24 09:43:38 2006
Subject: [freeside-commits] freeside/FS/FS part_svc.pm, 1.26,
	1.27 part_svc_column.pm, 1.3, 1.4
Message-ID: <20060624164146.5F567FC89E6@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv19993/FS/FS

Modified Files:
	part_svc.pm part_svc_column.pm 
Log Message:
Add the ability to link customer service definition fields to inventory
  classes, with an "automatic/manual" flag.  Add the ability for the web
  interface to maintain these links.  Start prettying up the service def.
  edit in preparation for Bigger Changes.


Index: part_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_svc.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- part_svc.pm	21 Nov 2005 15:24:39 -0000	1.26
+++ part_svc.pm	24 Jun 2006 16:41:44 -0000	1.27
@@ -11,7 +11,7 @@
 
 @ISA = qw(FS::Record);
 
-$DEBUG = 0;
+$DEBUG = 1;
 
 =head1 NAME
 
@@ -79,7 +79,7 @@
 
 =item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
 
-=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null, `D' for default, or `F' for fixed.  For virtual fields, can also be 'X' for excluded.
+=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null or empty (no default), `D' for default, `F' for fixed (unchangeable), `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
 
 =back
 
@@ -142,7 +142,8 @@
     } );
 
     my $flag = $self->getfield($svcdb.'__'.$field.'_flag');
-    if ( uc($flag) =~ /^([DFX])$/ ) {
+    #if ( uc($flag) =~ /^([DFMAX])$/ ) {
+    if ( uc($flag) =~ /^([A-Z])$/ ) { #part_svc_column will test it
       $part_svc_column->setfield('columnflag', $1);
       $part_svc_column->setfield('columnvalue',
         $self->getfield($svcdb.'__'.$field)
@@ -260,7 +261,8 @@
       } );
 
       my $flag = $new->getfield($svcdb.'__'.$field.'_flag');
-      if ( uc($flag) =~ /^([DFX])$/ ) {
+      #if ( uc($flag) =~ /^([DFMAX])$/ ) {
+      if ( uc($flag) =~ /^([A-Z])$/ ) { #part_svc_column will test it
         $part_svc_column->setfield('columnflag', $1);
         $part_svc_column->setfield('columnvalue',
           $new->getfield($svcdb.'__'.$field)
@@ -536,7 +538,16 @@
         map { my $svcdb = $_;
               my @fields = fields($svcdb);
               push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
-              map { ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' )  } @fields;
+
+              map {
+                    if ( $param->{ $svcdb.'__'.$_.'_flag' } =~ /^[MA]$/ ) {
+                      $param->{ $svcdb.'__'.$_ } =
+                        delete( $param->{ $svcdb.'__'.$_.'_classnum' } );
+                    }
+                    ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' );
+                  }
+                  @fields;
+
             } grep defined( dbdef->table($_) ),
                    qw( svc_acct svc_domain svc_forward svc_www svc_broadband )
       )

Index: part_svc_column.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_svc_column.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- part_svc_column.pm	26 Nov 2004 09:39:52 -0000	1.3
+++ part_svc_column.pm	24 Jun 2006 16:41:44 -0000	1.4
@@ -41,7 +41,7 @@
 
 =item columnvalue - default or fixed value for the column
 
-=item columnflag - null, D, F, X (virtual fields)
+=item columnflag - null or empty (no default), `D' for default, `F' for fixed (unchangeable), `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
 
 =back
 
@@ -91,10 +91,16 @@
   ;
   return $error if $error;
 
-  $self->columnflag =~ /^([DFX])$/
+  $self->columnflag =~ /^([DFMAX])$/
     or return "illegal columnflag ". $self->columnflag;
   $self->columnflag(uc($1));
 
+  if ( $self->columnflag =~ /^[MA]$/ ) {
+    $error =
+      $self->ut_foreign_key( 'columnvalue', 'inventory_class', 'classnum' );
+    return $error if $error;
+  }
+
   $self->SUPER::check;
 }
 

From ivan at wavetail.420.am  Tue Jun 27 07:19:19 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Tue Jun 27 07:19:26 2006
Subject: [freeside-commits] freeside/httemplate/docs index.html,1.12,1.13
Message-ID: <20060627141919.3CCF6FC8170@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/docs
In directory wavetail:/tmp/cvs-serv5167

Modified Files:
	index.html 
Log Message:
going to wikiland

Index: index.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/docs/index.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- index.html	8 Feb 2006 03:50:42 -0000	1.12
+++ index.html	27 Jun 2006 14:19:16 -0000	1.13
@@ -6,7 +6,7 @@
 <img src="overview-new.png">
 <h3>Installation and upgrades</h3>
 <ul>
-  <li><a href="install.html">New Installation</a>
+  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Installation">New Installation</a>
   <li><a href="install-rt.html">Installing integrated RT ticketing</a>
   <li><a href="upgrade9.html">Upgrading from 1.4.0 to 1.4.1</a>
   <li><a href="upgrade-1.4.2.html">Upgrading from 1.4.1 to 1.4.2</a>

From ivan at wavetail.420.am  Thu Jun 29 06:47:46 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 29 06:47:50 2006
Subject: [freeside-commits] freeside/httemplate/browse inventory_class.html,
	1.1, 1.2
Message-ID: <20060629134746.EED00FC8906@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail:/tmp/cvs-serv17801/httemplate/browse

Modified Files:
	inventory_class.html 
Log Message:
finish at least the automatic provisioning part

Index: inventory_class.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/inventory_class.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inventory_class.html	22 Apr 2006 00:58:38 -0000	1.1
+++ inventory_class.html	29 Jun 2006 13:47:44 -0000	1.2
@@ -8,7 +8,7 @@
 
 my %link = (
   'num_avail' => ';avail=1',
-  'num_used'  => ';avail=1',
+  'num_used'  => ';used=1',
   'num_total' => '',
 );
 

From ivan at wavetail.420.am  Thu Jun 29 06:47:46 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 29 06:47:51 2006
Subject: [freeside-commits] freeside/FS/FS svc_Common.pm, 1.31,
	1.32 inventory_class.pm, 1.1, 1.2
Message-ID: <20060629134746.EBE9CFC84EB@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv17801/FS/FS

Modified Files:
	svc_Common.pm inventory_class.pm 
Log Message:
finish at least the automatic provisioning part

Index: svc_Common.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_Common.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- svc_Common.pm	5 Dec 2005 19:01:04 -0000	1.31
+++ svc_Common.pm	29 Jun 2006 13:47:44 -0000	1.32
@@ -9,10 +9,12 @@
 use FS::part_svc;
 use FS::queue;
 use FS::cust_main;
+use FS::inventory_item;
+use FS::inventory_class;
 
 @ISA = qw( FS::cust_main_Mixin FS::Record );
 
-$DEBUG = 0;
+$DEBUG = 1;
 
 =head1 NAME
 
@@ -202,6 +204,12 @@
     $self->svcpart($cust_svc->svcpart);
   }
 
+  $error = $self->set_auto_inventory;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
   $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -297,7 +305,7 @@
   #new-style exports!
   unless ( $noexport_hack ) {
     foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-      my $error = $part_export->export_delete($self);
+      $error = $part_export->export_delete($self);
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         return "exporting to ". $part_export->exporttype.
@@ -306,11 +314,18 @@
     }
   }
 
-  return $error if $error;
+  $error = $self->return_inventory;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "error returning inventory: $error";
+  }
 
   my $cust_svc = $self->cust_svc;
   $error = $cust_svc->delete;
-  return $error if $error;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
@@ -338,7 +353,13 @@
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  my $error = $new->SUPER::replace($old);
+  my $error = $new->set_auto_inventory;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $error = $new->SUPER::replace($old);
   if ($error) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -409,7 +430,7 @@
 
 sub setfixed {
   my $self = shift;
-  $self->setx('F');
+  $self->setx('F', @_);
 }
 
 =item setdefault
@@ -422,20 +443,68 @@
 
 sub setdefault {
   my $self = shift;
-  $self->setx('D');
+  $self->setx('D', @_ );
+}
+
+=item set_default_and_fixed
+
+=cut
+
+sub set_default_and_fixed {
+  my $self = shift;
+  $self->setx( [ 'D', 'F' ], @_ );
 }
 
+=item setx FLAG | FLAG_ARRAYREF , [ CALLBACK_HASHREF ]
+
+Sets fields according to the passed in flag or arrayref of flags.
+
+Optionally, a hashref of field names and callback coderefs can be passed.
+If a coderef exists for a given field name, instead of setting the field,
+the coderef is called with the column value (part_svc_column.columnvalue)
+as the single parameter.
+
+=cut
+
 sub setx {
   my $self = shift;
   my $x = shift;
+  my @x = ref($x) ? @$x : ($x);
+  my %coderef = @_ ? shift : {};
 
-  my $error;
-
-  $error =
+  my $error =
     $self->ut_numbern('svcnum')
   ;
   return $error if $error;
 
+  my $part_svc = $self->part_svc;
+  return "Unkonwn svcpart" unless $part_svc;
+
+  #set default/fixed/whatever fields from part_svc
+
+  foreach my $part_svc_column (
+    grep { my $f = $_->columnflag; grep { $f eq $_ } @x } #columnflag in @x
+    $part_svc->all_part_svc_column
+  ) {
+
+    my $columnname  = $part_svc_column->columnname;
+    my $columnvalue = $part_svc_column->columnvalue;
+
+    if ( exists( $coderef{columnname} ) ) {
+      &{ $coderef{$columnname} }( $self, $columnvalue);
+    } else {
+      $self->setfield( $columnname, $columnvalue );
+    }
+
+  }
+
+ $part_svc;
+
+}
+
+sub part_svc {
+  my $self = shift;
+
   #get part_svc
   my $svcpart;
   if ( $self->get('svcpart') ) {
@@ -445,20 +514,129 @@
     return "Unknown svcnum" unless $cust_svc; 
     $svcpart = $cust_svc->svcpart;
   }
-  my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+
+  qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+
+}
+
+=item set_auto_inventory
+
+Sets any fields which auto-populate from inventory (see L<FS::part_svc>).
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub set_auto_inventory {
+  my $self = shift;
+
+  my $error =
+    $self->ut_numbern('svcnum')
+  ;
+  return $error if $error;
+
+  my $part_svc = $self->part_svc;
   return "Unkonwn svcpart" unless $part_svc;
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
   #set default/fixed/whatever fields from part_svc
   my $table = $self->table;
   foreach my $field ( grep { $_ ne 'svcnum' } $self->fields ) {
     my $part_svc_column = $part_svc->part_svc_column($field);
-    if ( $part_svc_column->columnflag eq $x ) {
-      $self->setfield( $field, $part_svc_column->columnvalue );
+    if ( $part_svc_column->columnflag eq 'A' && $self->$field() eq '' ) {
+
+      my $classnum = $part_svc_column->columnvalue;
+      my $inventory_item = qsearchs({
+        'table'     => 'inventory_item',
+        'hashref'   => { 'classnum' => $classnum, 
+                         'svcnum'   => '',
+                       },
+        'extra_sql' => 'LIMIT 1 FOR UPDATE',
+      });
+
+      unless ( $inventory_item ) {
+        $dbh->rollback if $oldAutoCommit;
+        my $inventory_class =
+          qsearchs('inventory_class', { 'classnum' => $classnum } );
+        return "Can't find inventory_class.classnum $classnum"
+          unless $inventory_class;
+        return "Out of ". $inventory_class->classname. "s\n"; #Lingua:: BS
+                                                              #for pluralizing
+      }
+
+      $inventory_item->svcnum( $self->svcnum );
+      my $ierror = $inventory_item->replace();
+      if ( $ierror ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "Error provisioning inventory: $ierror";
+        
+      }
+
+      $self->setfield( $field, $inventory_item->item );
+
     }
   }
 
- $part_svc;
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+ '';
+
+}
+
+=item return_inventory
+
+=cut
+
+sub return_inventory {
+  my $self = shift;
 
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $inventory_item ( $self->inventory_item ) {
+    $inventory_item->svcnum('');
+    my $error = $inventory_item->replace();
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error returning inventory: $error";
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+}
+
+=item inventory_item
+
+Returns the inventory items associated with this svc_ record, as
+FS::inventory_item objects (see L<FS::inventory_item>.
+
+=cut
+
+sub inventory_item {
+  my $self = shift;
+  qsearch({
+    'table'     => 'inventory_item',
+    'hashref'   => { 'svcnum' => $self->svcnum, },
+  });
 }
 
 =item cust_svc

Index: inventory_class.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/inventory_class.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inventory_class.pm	8 Mar 2006 10:05:00 -0000	1.1
+++ inventory_class.pm	29 Jun 2006 13:47:44 -0000	1.2
@@ -120,7 +120,7 @@
 
 sub num_sql {
   my( $self, $sql ) = @_;
-  my $sql = "AND $sql" if length($sql);
+  $sql = "AND $sql" if length($sql);
   my $statement =
     "SELECT COUNT(*) FROM inventory_item WHERE classnum = ? $sql";
   my $sth = dbh->prepare($statement) or die dbh->errstr. " preparing $statement";

From ivan at wavetail.420.am  Thu Jun 29 06:47:47 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 29 06:51:45 2006
Subject: [freeside-commits] freeside/httemplate/search inventory_item.html,
	1.2, 1.3
Message-ID: <20060629134747.870E7FC891C@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv17801/httemplate/search

Modified Files:
	inventory_item.html 
Log Message:
finish at least the automatic provisioning part

Index: inventory_item.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/inventory_item.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- inventory_item.html	8 Mar 2006 12:14:04 -0000	1.2
+++ inventory_item.html	29 Jun 2006 13:47:44 -0000	1.3
@@ -24,7 +24,30 @@
 my $count_query =
   "SELECT COUNT(*) FROM inventory_item WHERE classnum = $classnum $extra_sql";
 
+my $link = sub {
+  my $inventory_item = shift;
+  if ( $inventory_item->svcnum ) {
+    [ "${p}view/svc_acct.cgi?", 'svcnum' ];
+  } else {
+    '';
+  }
+};
+my $link_cust = sub {
+  my $inventory_item = shift;
+  if ( $inventory_item->custnum ) {
+    [ "${p}view/cust_main.cgi?", 'custnum' ];
+  } else {
+    '';
+  }
+};
+
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
 %><%= include( 'elements/search.html',
+
                  'title'       => $title,
 
                  #less lame to use Lingua:: something to pluralize
@@ -33,19 +56,52 @@
                  'query'       => {
                                     'table'   => 'inventory_item',
                                     'hashref' => { 'classnum' => $classnum },
+                                    'select'  => join(', ',
+                                        'inventory_item.*',
+                                        'cust_main.custnum',
+                                        FS::UI::Web::cust_sql_fields(),
+                                      ),
                                     'extra_sql' => $extra_sql,
+                                    'addl_from' => $addl_from,
                                   },
 
                  'count_query' => $count_query,
 
-                 # XXX proper full service/customer link ala svc_acct
-                 'header'      => [ '#', $inventory_class->classname, 'svcnum' ],
+                 'header'      => [
+                   '#',
+                   $inventory_class->classname,
+                   'Service',
+                   FS::UI::Web::cust_header(),
+                 ],
 
                  'fields'      => [
                    'itemnum',
                    'item',
-                   'svcnum', #XXX proper full service customer link ala svc_acct
+                   #'svcnum', #XXX proper full service customer link ala svc_acct
                              # "unallocated" ?  "available" ?
+                   sub {
+                     #this could be way more efficient with a mixin
+                     # like cust_main_Mixin that let us all all the methods
+                     # on data we already have...
+                     my $inventory_item = shift;
+                     my $cust_svc = $inventory_item->cust_svc;
+                     if ( $cust_svc ) {
+                       my($label, $value) = $cust_svc->label;
+                       "$label: $value";
+                     } else {
+                       '(available)';
+                     }
+                   },
+
+                   \&FS::UI::Web::cust_fields,
+
+                 ],
+
+                 'links'       => [
+                   '',
+                   '',
+                   $link,
+                   ( map { $link_cust } FS::UI::Web::cust_header() ),
                  ],
 
              )

From ivan at wavetail.420.am  Thu Jun 29 06:47:46 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 29 07:11:26 2006
Subject: [freeside-commits] freeside/httemplate/edit part_svc.cgi, 1.49,
	1.50 svc_acct.cgi, 1.36, 1.37 svc_broadband.cgi, 1.8,
	1.9 svc_domain.cgi, 1.11, 1.12 svc_external.cgi, 1.1,
	1.2 svc_forward.cgi, 1.16, 1.17 svc_www.cgi, 1.15, 1.16
Message-ID: <20060629134747.B75C7FC8173@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv17801/httemplate/edit

Modified Files:
	part_svc.cgi svc_acct.cgi svc_broadband.cgi svc_domain.cgi 
	svc_external.cgi svc_forward.cgi svc_www.cgi 
Log Message:
finish at least the automatic provisioning part

Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_domain.cgi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- svc_domain.cgi	14 May 2006 16:47:30 -0000	1.11
+++ svc_domain.cgi	29 Jun 2006 13:47:44 -0000	1.12
@@ -44,14 +44,7 @@
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_domain->setfield( $part_svc_column->columnname,
-                             $part_svc_column->columnvalue,
-                           );
-    }
+    $svc_domain->set_default_and_fixed;
 
   }
 

Index: svc_www.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_www.cgi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- svc_www.cgi	26 May 2005 19:15:32 -0000	1.15
+++ svc_www.cgi	29 Jun 2006 13:47:44 -0000	1.16
@@ -42,14 +42,7 @@
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_www->setfield( $part_svc_column->columnname,
-                          $part_svc_column->columnvalue,
-                        );
-    }
+    $svc_www->set_default_and_fixed;
 
   }
 }

Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_svc.cgi,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- part_svc.cgi	24 Jun 2006 16:41:44 -0000	1.49
+++ part_svc.cgi	29 Jun 2006 13:47:44 -0000	1.50
@@ -179,9 +179,10 @@
              'condition' =>
                sub { ref($_[0]) && $_[0]->{disable_fixed} }, 
            },
-    'M' => { 'desc' => 'Manual selection from inventory',
-             'condition' => $inv_sub,
-           },
+# need to template-ize httemplate/edit/svc_* first
+#    'M' => { 'desc' => 'Manual selection from inventory',
+#             'condition' => $inv_sub,
+#           },
     'A' => { 'desc' => 'Automatically fill in from inventory',
              'condition' => $inv_sub,
            },

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_acct.cgi,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- svc_acct.cgi	31 Jan 2006 04:26:54 -0000	1.36
+++ svc_acct.cgi	29 Jun 2006 13:47:44 -0000	1.37
@@ -68,18 +68,9 @@
     }
   }
 
-  #set fixed and default fields from part_svc
-  foreach my $part_svc_column (
-    grep { $_->columnflag } $part_svc->all_part_svc_column
-  ) {
-    if ( $part_svc_column->columnname eq 'usergroup' ) {
-      @groups = split(',', $part_svc_column->columnvalue);
-    } else {
-      $svc_acct->setfield( $part_svc_column->columnname,
-                           $part_svc_column->columnvalue,
-                         );
-    }
-  }
+  $svc_acct->set_default_and_fixed( {
+    'usergroup' => sub { @groups = split(',', shift ); },
+  } );
 
 }
 
@@ -274,7 +265,7 @@
 <% foreach my $xid (qw( uid gid )) { %>
 
   <%
-  if ( $part_svc->part_svc_column($xid)->columnflag eq 'F'
+  if ( $part_svc->part_svc_column($xid)->columnflag =~ /^[FA]$/
        || ! $conf->exists("svc_acct-edit_$xid")
      ) {
   %>
@@ -376,7 +367,7 @@
 <% } %>
 
 
-<% if ( $part_svc->part_svc_column('slipip')->columnflag eq 'F' ) { %>
+<% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { %>
 
   <INPUT TYPE="hidden" NAME="slipip" VALUE="<%= $svc_acct->slipip %>">
 
@@ -396,7 +387,7 @@
   my $a = $2;
 %>
 
-  <% if ( $part_svc->part_svc_column($r)->columnflag eq 'F' ) { %>
+  <% if ( $part_svc->part_svc_column($r)->columnflag =~ /^[FA]$/ ) { %>
 
     <INPUT TYPE="hidden" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>">
 

Index: svc_external.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_external.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- svc_external.cgi	23 Dec 2003 02:36:38 -0000	1.1
+++ svc_external.cgi	29 Jun 2006 13:47:44 -0000	1.2
@@ -40,14 +40,7 @@
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_external->setfield( $part_svc_column->columnname,
-                               $part_svc_column->columnvalue,
-                             );
-    }
+    $svc_external->set_default_and_fixed;
 
   }
 }

Index: svc_broadband.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_broadband.cgi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- svc_broadband.cgi	31 Jan 2006 04:26:54 -0000	1.8
+++ svc_broadband.cgi	29 Jun 2006 13:47:44 -0000	1.9
@@ -47,14 +47,7 @@
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_broadband->setfield( $part_svc_column->columnname,
-                                $part_svc_column->columnvalue,
-                              );
-    }
+    $svc_broadband->set_default_and_fixed;
 
   }
 }

Index: svc_forward.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_forward.cgi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- svc_forward.cgi	31 Jan 2006 04:26:54 -0000	1.16
+++ svc_forward.cgi	29 Jun 2006 13:47:44 -0000	1.17
@@ -44,14 +44,7 @@
 
     $svcnum='';
 
-    #set fixed and default fields from part_svc
-    foreach my $part_svc_column (
-      grep { $_->columnflag } $part_svc->all_part_svc_column
-    ) {
-      $svc_forward->setfield( $part_svc_column->columnname,
-                              $part_svc_column->columnvalue,
-                            );
-    }
+    $svc_forward->set_default_and_fixed;
   }
 
 }

From ivan at wavetail.420.am  Thu Jun 29 08:20:01 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 29 08:20:08 2006
Subject: [freeside-commits] freeside/httemplate/edit part_bill_event.cgi,
	1.29, 1.30
Message-ID: <20060629152001.800E7FC8926@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv19398

Modified Files:
	part_bill_event.cgi 
Log Message:
percentage late fees too

Index: part_bill_event.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_bill_event.cgi,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- part_bill_event.cgi	31 Jan 2006 11:02:54 -0000	1.29
+++ part_bill_event.cgi	29 Jun 2006 15:19:59 -0000	1.30
@@ -139,13 +139,21 @@
 tie my %events, 'Tie::IxHash',
 
   'fee' => {
-    'name'   => 'Late fee',
+    'name'   => 'Late fee (flat)',
     'code'   => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );',
     'html'   => 
       'Amount <INPUT TYPE="text" SIZE="7" NAME="charge" VALUE="%%%charge%%%">'.
       '<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="%%%reason%%%">',
     'weight' => 10,
   },
+  'fee_percent' => {
+    'name'   => 'Late fee (percentage)',
+    'code'   => '$cust_main->charge( sprintf(\'%.2f\', $cust_bill->owed * %%%percent%%% / 100 ), \'%%%reason%%%\' );',
+    'html'   => 
+      'Percent <INPUT TYPE="text" SIZE="2" NAME="percent" VALUE="%%%percent%%%">%'.
+      '<BR>Reason <INPUT TYPE="text" NAME="reason" VALUE="%%%reason%%%">',
+    'weight' => 10,
+  },
   'suspend' => {
     'name'   => 'Suspend',
     'code'   => '$cust_main->suspend();',

From ivan at wavetail.420.am  Thu Jun 29 08:45:54 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 29 08:46:01 2006
Subject: [freeside-commits] 
	freeside/FS/FS/part_export shellcommands.pm, 1.39, 1.39.2.1
Message-ID: <20060629154554.8D8DDFC8173@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail:/tmp/cvs-serv19916

Modified Files:
      Tag: FREESIDE_1_5_BRANCH
	shellcommands.pm 
Log Message:
small patch to set $new_finger from Tim Yardley

Index: shellcommands.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/shellcommands.pm,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- shellcommands.pm	1 Dec 2005 17:36:48 -0000	1.39
+++ shellcommands.pm	29 Jun 2006 15:45:52 -0000	1.39.2.1
@@ -257,7 +257,7 @@
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
-  $new_finger =~ /^(.*)\s+(\S+)$/ or $finger =~ /^((.*))$/;
+  $new_finger =~ /^(.*)\s+(\S+)$/ or $new_finger =~ /^((.*))$/;
   ($new_first, $new_last ) = ( $1, $2 );
   $new_first = shell_quote $new_first;
   $new_last = shell_quote $new_last;

From ivan at wavetail.420.am  Thu Jun 29 08:45:59 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Thu Jun 29 08:46:02 2006
Subject: [freeside-commits] 
	freeside/FS/FS/part_export shellcommands.pm, 1.39, 1.40
Message-ID: <20060629154559.DD724FC8173@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail:/tmp/cvs-serv19924

Modified Files:
	shellcommands.pm 
Log Message:
small patch to set $new_finger from Tim Yardley

Index: shellcommands.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/shellcommands.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- shellcommands.pm	1 Dec 2005 17:36:48 -0000	1.39
+++ shellcommands.pm	29 Jun 2006 15:45:57 -0000	1.40
@@ -257,7 +257,7 @@
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
-  $new_finger =~ /^(.*)\s+(\S+)$/ or $finger =~ /^((.*))$/;
+  $new_finger =~ /^(.*)\s+(\S+)$/ or $new_finger =~ /^((.*))$/;
   ($new_first, $new_last ) = ( $1, $2 );
   $new_first = shell_quote $new_first;
   $new_last = shell_quote $new_last;

From ivan at wavetail.420.am  Fri Jun 30 07:30:29 2006
From: ivan at wavetail.420.am (Ivan,,,)
Date: Fri Jun 30 07:30:36 2006
Subject: [freeside-commits] freeside/FS/bin freeside-adduser,1.10,1.11
Message-ID: <20060630143029.4B6A6FC82B0@wavetail.420.am>

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail:/tmp/cvs-serv12776

Modified Files:
	freeside-adduser 
Log Message:
checkin freeside-adduser with the -g flag!  sheesh

Index: freeside-adduser
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-adduser,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- freeside-adduser	13 Apr 2006 21:29:01 -0000	1.10
+++ freeside-adduser	30 Jun 2006 14:30:26 -0000	1.11
@@ -3,25 +3,25 @@
 # $Id$
 
 use strict;
-use vars qw($opt_h $opt_b $opt_c $opt_s);
+use vars qw($opt_h $opt_b $opt_c $opt_g);
 use Fcntl qw(:flock);
 use Getopt::Std;
 
 my $FREESIDE_CONF = "/usr/local/etc/freeside";
 
-getopts("bch:s:");
+getopts("bch:g:");
 die &usage if $opt_c && ! $opt_h;
 my $user = shift or die &usage;
 
-if ( -e "$FREESIDE_CONF/mapsecrets" ) {
-  open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
-    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-  while (<MAPSECRETS>) {
-    /^(\S+) / or die "unparsable line in mapsecrets: $_";
-    die "user $user already exists\n" if $user eq $1;
-  }
-  close MAPSECRETS;
-}
+#if ( -e "$FREESIDE_CONF/mapsecrets" ) {
+#  open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
+#    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+#  while (<MAPSECRETS>) {
+#    /^(\S+) / or die "unparsable line in mapsecrets: $_";
+#    die "user $user already exists\n" if $user eq $1;
+#  }
+#  close MAPSECRETS;
+#}
 
 if ( $opt_h ) {
   my @args = ( 'htpasswd' );
@@ -32,16 +32,49 @@
   system(@args) == 0 or die "htpasswd failed: $?";
 }
 
-my $secretfile = $opt_s || 'secrets';
+#my $secretfile = $opt_s || 'secrets';
+#
+#open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
+#  and flock(MAPSECRETS,LOCK_EX)
+#    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
+#print MAPSECRETS "$user $secretfile\n";
+#close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
 
-open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-  and flock(MAPSECRETS,LOCK_EX)
-    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-print MAPSECRETS "$user $secretfile\n";
-close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+###
+
+use FS::UID qw(adminsuidsetup);
+use FS::CurrentUser;
+use FS::access_user;
+use FS::access_usergroup;
+
+$FS::CurrentUser::upgrade_hack = 1;
+#adminsuidsetup $rootuser;
+adminsuidsetup $user;
+
+my $access_user = new FS::access_user {
+  'username'  => $user,
+  '_password' => 'notyet',
+  'first'     => 'Firstname', # $opt_f || 
+  'last'      => 'Lastname',  # $opt_l || 
+};
+my $au_error = $access_user->insert;
+die $au_error if $au_error;
+
+if ( $opt_g ) {
+
+  my $access_usergroup = new FS::access_usergroup {
+    'usernum'  => $access_user->usernum,
+    'groupnum' => $opt_g,
+  };
+  my $aug_error = $access_usergroup->insert;
+  die $aug_error if $aug_error;
+
+}
+
+###
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -s secretfile ] username"
+  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -g groupnum ] username"
 }
 
 =head1 NAME
@@ -50,7 +83,7 @@
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username
+  freeside-adduser [ -h htpasswd_file [ -c ] ] -g 1 username
 
 =head1 DESCRIPTION
 
@@ -61,10 +94,10 @@
 
   -c: Passed to htpasswd(1)
 
-  -s: Specify an alternate secret file
-
   -b: same as htpasswd(1), probably insecure, not recommended
 
+  -g: initial groupnum
+
 =head1 SEE ALSO
 
 L<htpasswd>(1), base Freeside documentation