add cust_main.agent_custid (at least to schema and customer view, no manual editing...

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e23ae73..ce2d790 100644 (file)
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -394,6 +394,7 @@ sub tables_hashref {
       'columns' => [
         'custnum',  'serial',  '',     '', '', '', 
         'agentnum', 'int',  '',     '', '', '', 
+        'agent_custid', 'varchar', 'NULL', $char_d, '', '',
 #        'titlenum', 'int',  'NULL',   '', '', '', 
         'last',     'varchar', '',     $char_d, '', '', 
 #        'middle',   'varchar', 'NULL', $char_d, '', '', 
@@ -443,7 +444,7 @@ sub tables_hashref {
         'spool_cdr','char', 'NULL', 1, '', '', 
       ],
       'primary_key' => 'custnum',
-      'unique' => [],
+      'unique' => [ [ 'agentnum', 'agent_custid' ] ],
       #'index' => [ ['last'], ['company'] ],
       'index' => [ ['last'], [ 'company' ], [ 'referral_custnum' ],
                    [ 'daytime' ], [ 'night' ], [ 'fax' ], [ 'refnum' ],

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f1d969c..3f67c62 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1060,6 +1060,7 @@ sub check {
   my $error =
     $self->ut_numbern('custnum')
     || $self->ut_number('agentnum')
+    || $self->ut_textn('agent_custid')
     || $self->ut_number('refnum')
     || $self->ut_name('last')
     || $self->ut_name('first')

diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm
index b12cd62..e168865 100644 (file)
--- a/FS/FS/part_referral.pm
+++ b/FS/FS/part_referral.pm
@@ -2,7 +2,7 @@ package FS::part_referral;
 
 use strict;
 use vars qw( @ISA );
-use FS::Record qw(qsearchs);
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::agent;
 
 @ISA = qw( FS::Record );
@@ -120,6 +120,65 @@ sub agent {
 
 =back
 
+=head1 CLASS METHODS
+
+=over 4
+
+=item acl_agentnum_sql
+
+Returns an SQL fragment for searching for part_referral records allowed by the
+current users's agent ACLs (and "Edit global advertising sources" right).
+
+=cut
+
+sub acl_agentnum_sql {
+  #my $class = shift;
+
+  my $curuser = $FS::CurrentUser::CurrentUser;
+  my $sql = $curuser->agentnums_sql;
+  $sql = " ( $sql OR agentnum IS NULL ) "
+    if $curuser->access_right('Edit global advertising sources');
+
+  $sql;
+
+}
+
+=item all_part_referral
+
+Returns all part_referral records allowed by the current users's agent ACLs
+(and "Edit global advertising sources" right).
+
+=cut
+
+sub all_part_referral {
+  my $self = shift;
+
+  qsearch({
+    'table'     => 'part_referral',
+    'extra_sql' => ' WHERE '. $self->acl_agentnum_sql. ' ORDER BY refnum ',
+  });
+
+}
+
+=item num_part_referral
+
+Returns the number of part_referral records allowed by the current users's
+agent ACLs (and "Edit global advertising sources" right).
+
+=cut
+
+sub num_part_referral {
+  my $self = shift;
+
+  my $sth = dbh->prepare(
+    'SELECT COUNT(*) FROM part_referral WHERE '. $self->acl_agentnum_sql
+  ) or die dbh->errstr;
+  $sth->execute() or die $sth->errstr;
+  $sth->fetchrow_arrayref->[0];
+}
+
+=back
+
 =head1 BUGS
 
 The delete method is unimplemented.

diff --git a/README.1.7.0 b/README.1.7.0
index c82c8ad..24b89c9 100644 (file)
--- a/README.1.7.0
+++ b/README.1.7.0
@@ -34,6 +34,9 @@ Optional for better zip code report performance:
 CREATE INDEX cust_main16 on cust_main ( zip );
 CREATE INDEX cust_main17 on cust_main ( ship_zip );
 
+Optional if you're using the new agent cust ref#s:
+CREATE UNIQUE INDEX cust_main18 ON cust_main ( agentnum, agent_custid );
+
 Optional to eliminate harmless but noisy warnings:
 UPDATE cust_main_county SET exempt_amount = 0 WHERE exempt_amount IS NULL;
 

diff --git a/httemplate/browse/part_referral.html b/httemplate/browse/part_referral.html
index 6a9f700..4685931 100755 (executable)
--- a/httemplate/browse/part_referral.html
+++ b/httemplate/browse/part_referral.html
@@ -32,12 +32,7 @@ Where a customer heard about your service. Tracked for informational purposes.
     'Total'         =>   86400, # 60sec * 60min * 24hrs
   );
 
-  my $curuser = $FS::CurrentUser::CurrentUser;
-  my $extra_sql = $curuser->agentnums_sql;
-  $extra_sql .= ' OR agentnum IS NULL '
-    if $curuser->access_right('Edit global advertising sources');
-
-  $extra_sql = " WHERE $extra_sql";
+  $extra_sql = " WHERE ". FS::part_referral->acl_agentnum_sql;
 
   my $statement = "SELECT COUNT(*) FROM h_cust_main
                     WHERE history_action = 'insert'

diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 69e1205..742b359 100644 (file)
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -1,5 +1,6 @@
 <%
   my( $cust_main ) = @_;
+  my $conf = new FS::Conf;
 %>
 
 <%= ntable("#cccccc") %><TR><TD><%= &ntable("#cccccc",2) %>
@@ -25,8 +26,18 @@
     $agent = $agents[0];
   }
 
-  my @referrals = qsearch( 'part_referral', {} );
-  unless ( scalar(@referrals) == 1 ) {
+  if ( $cust_main->agent_custid ) {
+%>
+
+<TR>
+  <TD ALIGN="right">Agent customer ref#</TD>
+  <TD BGCOLOR="#ffffff"><%= $cust_main->agent_custid %></TD>
+</TR>
+
+<%
+  }
+
+  unless ( FS::part_referral->num_part_referral == 1 ) {
     my $referral = qsearchs('part_referral', {
       'refnum' => $cust_main->refnum
     } );