X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprospect_main.html;h=6adb471f71ebdddc11e97c5e6a0b6a19b6240265;hb=aad287228dfbe5ef01be73ebaaa9a06dfbe11226;hp=fb675153296445cdd9e61c37c5a357c2f59fae17;hpb=9aee669886202be7035e6c6049fc71bc99dd3013;p=freeside.git

diff --git a/httemplate/edit/prospect_main.html b/httemplate/edit/prospect_main.html
index fb6751532..6adb471f7 100644
--- a/httemplate/edit/prospect_main.html
+++ b/httemplate/edit/prospect_main.html
@@ -11,6 +11,11 @@
                             'taxstatusnum'=> 'Tax status',
                           },
      'fields'          => [
+       { 'field'    => 'residential_commercial',
+         'type'     => 'radio',
+         'options'  => [ 'Residential', 'Commercial', ],
+         'onchange' => 'rescom_changed',
+       },
        { 'field'       => 'agentnum',
          'type'        => 'select-agent',
          'empty_label' => 'Select agent',
@@ -21,23 +26,21 @@
          'empty_label' => 'Select advertising source',
          'colspan'     => 7,
        },
-       { 'field'    => 'residential_commercial',
-         'type'     => 'radio',
-         'options'  => [ 'Residential', 'Commercial', ],
-         'onchange' => 'rescom_changed',
-       },
        { 'field'    => 'company',
          'type'     => 'text',
          'size'     => 50,
          'colspan'  => 7,
        },
-       { 'field'             => 'contactnum',
-         'type'              => 'contact',
-         'colspan'           => 7,
-         'o2m_table'      => 'contact',
-         'm2_label'       => 'Contact',
-         'm2_error_callback' => $m2_error_callback,
-
+       { 'field'                => 'contactnum',
+         'type'                 => 'contact',
+         'colspan'              => 7,
+         'prospectnum'          => $prospectnum,
+         'm2m_method'           => 'prospect_contact',
+         'm2m_dstcol'           => 'contactnum',
+         'm2_label'             => 'Contact',
+         'm2_error_callback'    => $m2_error_callback,
+         'include_opt_callback' => sub { 'for_prospect' => 1 },
+         'js_spawn_test'        => 'document.edit_topform.residential_commercial_Commercial.checked',
        },
        { 'field'         => 'locationnum',
          'type'          => 'select-cust_location',
@@ -50,6 +53,7 @@
        },
        { 'field'    => 'taxstatusnum',
          'type'     => 'select-tax_status',
+         'required' => 1,
          'empty_label'   => ' ',
        },
      ],
@@ -68,18 +72,25 @@ my $conf = new FS::Conf;
 
 my $prospectnum;
 if ( $cgi->param('error') ) {
-  $prospectnum = scalar($cgi->param('prospectnum'));
+  $cgi->param('prospectnum') =~ /^(\d*)$/ or die 'illegal prospectnum';
+  $prospectnum = $1;
 
   die "access denied"
     unless $curuser->access_right(($prospectnum ? 'Edit' : 'New'). ' prospect');
 
 } elsif ( $cgi->keywords ) { #editing
 
+  my($query) = $cgi->keywords;
+  $query =~ /^(\d+)$/ or die 'no prospectnum';
+  $prospectnum = $1;
+
   die "access denied"
     unless $curuser->access_right('Edit prospect');
 
 } else { #new prospect 
 
+  $prospectnum = '';
+
   die "access denied"
     unless $curuser->access_right('New prospect');
 
@@ -192,20 +203,20 @@ my $m2_error_callback = sub {
 
 #my @agentnums = $FS::CurrentUser::CurrentUser->agentnums;
 
-my $javascript = <<END;
+my $javascript = q|
   <SCRIPT TYPE="text/javascript">
     function rescom_changed() {
+
       var f = document.edit_topform;
-      var c = f.company;
       if        ( f.residential_commercial_Residential.checked ) {
-        c.disabled = true;
-        c.style.backgroundColor = '#dddddd';
+        $('#company_label').slideUp();
+        $('#company_input0').slideUp();
       } else if ( f.residential_commercial_Commercial.checked ) {
-        c.disabled = false;
-        c.style.backgroundColor = '#ffffff';
+        $('#company_label').slideDown();
+        $('#company_input0').slideDown();
       }
     }
   </SCRIPT>
-END
+|;
 
 </%init>