support importing customer notes by agent_custid

3 files changed, 19 insertions, 2 deletions

diff --git a/httemplate/misc/cust_main_note-import.cgi b/httemplate/misc/cust_main_note-import.cgi
index b93c5c1cc..8a94ae4d4 100644
--- a/httemplate/misc/cust_main_note-import.cgi
+++ b/httemplate/misc/cust_main_note-import.cgi
@@ -108,6 +108,7 @@
 %  my $fh = $cgi->upload('csvfile');
 %  my $csv = new Text::CSV_XS;
 %  my $skip_fuzzies = $cgi->param('fuzzies') ? 0 : 1;
+%  my $use_agent_custid = $cgi->param('use_agent_custid') ? 1 : 0;
 %
 %  if ( defined($fh) ) {
      <TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0>
@@ -118,7 +119,7 @@
        <TH>First</TH>
        <TH>Note to be added</TH>
      </TR>
-%    my $agentnum   => scalar($cgi->param('agentnum')),
+%    my $agentnum = scalar($cgi->param('agentnum'));
 %    my $line;
 %    my $row = 0;
 %    while ( defined($line=<$fh>) ) {
@@ -138,7 +139,10 @@
 %      next unless ( $last || $first || $note );
 %      my @cust_main = ();
 %      warn "searching for: $last, $first" if ($first || $last);
-%      if ($custnum) {
+%      if ($agentnum && $custnum && $use_agent_custid) {
+%        @cust_main = qsearch('cust_main', { 'agent'        => $agentnum,
+%                                             'agent_custid' => $custnum   } );
+%      } elsif ($custnum) { # && !use_agent_custid
 %        @cust_main = qsearch('cust_main', { 'custnum' => $custnum });
 %      } else {
 %        @cust_main = FS::cust_main::smart_search(
diff --git a/httemplate/misc/cust_main_note-import.html b/httemplate/misc/cust_main_note-import.html
index d8fefa732..cc1645d2e 100644
--- a/httemplate/misc/cust_main_note-import.html
+++ b/httemplate/misc/cust_main_note-import.html
@@ -13,6 +13,13 @@ Anything after the character sequence #! is ignored.
 
 <% &ntable("#cccccc") %>
 
+<% include('/elements/tr-select-agent.html',
+              #'curr_value' => '', #$agentnum,
+              'label'       => "<B>Agent</B>",
+              'empty_label' => 'Select agent',
+           )
+%>
+
 <TR>
   <TH ALIGN="right">CSV filename</TH>
   <TD><INPUT TYPE="file" NAME="csvfile"></TD>
@@ -22,6 +29,11 @@ Anything after the character sequence #! is ignored.
   <TD><INPUT TYPE="checkbox" NAME="fuzzies"></TD>
 </TR>
 
+<TR>
+  <TH ALIGN="right">custnum is reseller's customer number</TH>
+  <TD><INPUT TYPE="checkbox" NAME="use_agent_custid"></TD>
+</TR>
+
 </TABLE>
 <BR><BR>
 
diff --git a/httemplate/misc/process/cust_main_note-import.cgi b/httemplate/misc/process/cust_main_note-import.cgi
index 6aa8b1d37..ec96f2349 100644
--- a/httemplate/misc/process/cust_main_note-import.cgi
+++ b/httemplate/misc/process/cust_main_note-import.cgi
@@ -26,6 +26,7 @@ The following items <% $op eq 'Preview' ? 'would be' : 'were' %> imported.  (See
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Import');
 
+$FS::cust_main::import=1;  # the customer records are already in the database
 my $date = time;
 my $otaker = $FS::CurrentUser::CurrentUser->username;
 my $csv = new Text::CSV_XS;