[freeside-commits] branch master updated. bd070d61afd640efdc7e659945badb04d99658a7

Ivan ivan at 420.am
Wed Jan 7 22:36:26 PST 2015


The branch, master has been updated
       via  bd070d61afd640efdc7e659945badb04d99658a7 (commit)
      from  3e34c2485163893b390e70bf9a5f357b32e57e21 (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 bd070d61afd640efdc7e659945badb04d99658a7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 7 22:36:25 2015 -0800

    default to commercial new cusotomer, RT#22560

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 90b11a0..2a11e5e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5845,6 +5845,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cust_main-default_commercial',
+    'section'     => 'UI',
+    'description' => 'Default for new customers is commercial rather than residential.',
+    'type'        => 'checkbox',
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
diff --git a/httemplate/edit/cust_main/basics.html b/httemplate/edit/cust_main/basics.html
index 91868d4..3cf354b 100644
--- a/httemplate/edit/cust_main/basics.html
+++ b/httemplate/edit/cust_main/basics.html
@@ -83,6 +83,7 @@
   }
 
   <&| /elements/onload.js &>
+  rescom_changed(document.getElementById('residential_commercial_Residential'));
   agent_changed(document.getElementById('agentnum'))
   </&>
  
@@ -247,6 +248,8 @@ my( $cust_main, %opt ) = @_;
 
 my $custnum = $opt{'custnum'};
 
+my $conf = new FS::Conf;
+
 if ( $cgi->param('error') ) {
   $cust_main->set('residential_commercial',
     ($cgi->param('residential_commercial') eq 'Commercial')
@@ -260,12 +263,13 @@ if ( $cgi->param('error') ) {
       : 'Residential'
   );
 } else { #new customer
-  #config to default to commercial and/or disable residential when someone needs
-  $cust_main->set('residential_commercial', 'Residential');
+  $cust_main->set('residential_commercial',
+    $conf->exists('cust_main-default_commercial')
+      ? 'Commercial'
+      : 'Residential'
+  );
 }
 
-my $conf = new FS::Conf;
-
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my $r = qq!<font color="#ff0000">*</font> !;

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

Summary of changes:
 FS/FS/Conf.pm                         |    7 +++++++
 httemplate/edit/cust_main/basics.html |   12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list