X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fcust_main_note-import.cgi;h=2e7dc8b655c6fb4274f7c3a59aaa5e82a9f154d6;hp=07b922f6c7dca729123544ab6267f87398d34a79;hb=7d80f005462758e0271215240cdf99a9336f03dd;hpb=587f0384fb03179f6b504daeada93e193d2ea27f

diff --git a/httemplate/misc/cust_main_note-import.cgi b/httemplate/misc/cust_main_note-import.cgi
index 07b922f6c..2e7dc8b65 100644
--- a/httemplate/misc/cust_main_note-import.cgi
+++ b/httemplate/misc/cust_main_note-import.cgi
@@ -39,24 +39,22 @@
     custnum_obj.style.backgroundColor = '#dddddd';
 
 
-    //alert('search for custnum ' + custnum + ', row#' + searchrow );
+    function search_custnum_update(customers) {
 
-    function search_custnum_update(name) {
-
-      var name = eval('(' + name + ')' );
+      var customerArray = eval('(' + customers + ')');
 
       custnum_obj.disabled = false;
       custnum_obj.style.backgroundColor = '#ffffff';
 
-      if ( name.length > 0 ) {
-        //alert('custnum found: ' + name);
+      if ( customerArray.length == 0 )  {
+        custnum_obj.value = 'Not found';
+        custnum_obj.style.color = '#ff0000';
+      } else if ( customerArray.length >= 5 ) {
+	    var name = customerArray[1];
         opt(customer_select,custnum,name,'#000000');
         customer_select.selectedIndex = customer_select.length - 1;
         custnum_obj.value = custnum;
         name_obj.value = name;
-      } else {
-        custnum_obj.value = 'Not found';
-        custnum_obj.style.color = '#ff0000';
       }
 
     }
@@ -108,6 +106,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,11 +117,11 @@
        <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>) ) {
-%      chomp $line;
+%      $line =~ s/(\S*)\s*$/$1/;
 %      $line =~ s/^(.*)(#!).*/$1/;
 %
 %      $csv->parse($line) or die "can't parse line: " . $csv->error_input();
@@ -138,7 +137,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(
@@ -162,7 +164,7 @@
              <OPTION VALUE="">---</OPTION>
 %      my $i=0;
 %      foreach (@cust_main) {
-             <OPTION <% $i ? '' : 'SELECTED' %> VALUE="<% $_->custnum %>"><% $_->name %></OPTION>
+             <OPTION <% $i ? '' : 'SELECTED' %> VALUE="<% $_->custnum %>"><% $_->name |h %></OPTION>
 %        $i++;
 %      }
            </SELECT>
@@ -170,15 +172,15 @@
                var customer_select<% $row %> = document.getElementById("cust_select<% $row %>");
                customer_select<% $row %>.onchange = select_customer;
              </SCRIPT>
-           <INPUT TYPE="hidden" NAME="name<% $row %>" ID="name<% $row %>" VALUE="<% $i ? $cust_main[0]->name : '' %>">
+           <INPUT TYPE="hidden" NAME="name<% $row %>" ID="name<% $row %>" VALUE="<% $i ? $cust_main[0]->name : '' |h %>">
          </TD>
          <TD>
-           <% $first %>
-           <INPUT TYPE="hidden" NAME="first<% $row %>" VALUE="<% $first %>">
+           <% $first |h %>
+           <INPUT TYPE="hidden" NAME="first<% $row %>" VALUE="<% $first |h %>">
          </TD>
          <TD>
-           <% $last %>
-           <INPUT TYPE="hidden" NAME="last<% $row %>" VALUE="<% $last %>">
+           <% $last |h %>
+           <INPUT TYPE="hidden" NAME="last<% $row %>" VALUE="<% $last |h %>">
          </TD>
          <TD>
            <% $note %>
@@ -198,3 +200,10 @@
 </FORM>
 </BODY>
 </HTML>
+
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Import');
+
+</%init>