[freeside-commits] branch FREESIDE_3_BRANCH updated. e549e88c134121259da8c57c6f56f398320e0929

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  e549e88c134121259da8c57c6f56f398320e0929 (commit)
      from  1370d9061f191fa7e62e89e128263f7c128ee8f1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e549e88c134121259da8c57c6f56f398320e0929
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Thu Apr 4 10:59:48 2019 -0400

    RT# 75357 - Prospects can now be disabled
    
    Conflicts:
            httemplate/edit/prospect_main.html

diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm
index a6b593d56..7557e7706 100644
--- a/FS/FS/prospect_main.pm
+++ b/FS/FS/prospect_main.pm
@@ -427,7 +427,7 @@ sub search {
   # here is the agent virtualization
   push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
 
-  my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
+  my $extra_sql = scalar(@where) ? ' WHERE prospect_main.custnum IS NULL AND '. join(' AND ', @where) : '';
 
   my $count_query = "SELECT COUNT(*) FROM prospect_main $extra_sql";
   
diff --git a/httemplate/edit/prospect_main.html b/httemplate/edit/prospect_main.html
index da5c6ce37..9340493b4 100644
--- a/httemplate/edit/prospect_main.html
+++ b/httemplate/edit/prospect_main.html
@@ -1,7 +1,22 @@
+<SCRIPT>
+  function checkPasswordValidation(fieldid)  {
+    var validationResult = document.getElementById(fieldid+'_result').innerHTML;
+    if (validationResult.match(/Password valid!/)) {
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+</SCRIPT>
+
+<& '/elements/validate_password_js.html', &>
+
 <% include('elements/edit.html',
      'name_singular'   => 'prospect',
      'table'           => 'prospect_main',
      'labels'          => { 'prospectnum' => 'Prospect',
+                            'disabled'    => 'Disabled',
                             'agentnum'    => 'Agent',
                             'refnum'      => 'Advertising source',
                             'company'     => 'Company',
@@ -24,6 +39,10 @@
          'options'  => [ 'Residential', 'Commercial', ],
          'onchange' => 'rescom_changed',
        },
+       { 'field'    => 'disabled',
+         'type'     => 'checkbox',
+         'value'    => 'Y',
+       },
        { 'field'    => 'company',
          'type'     => 'text',
          'size'     => 50,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/prospect_main.pm             |  2 +-
 httemplate/edit/prospect_main.html | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)