[freeside-commits] branch FREESIDE_3_BRANCH updated. e4a3eb292893c0efc15d2ee591fa2a05c31dbeff

Ivan ivan at 420.am
Wed Jan 7 22:37:46 PST 2015


The branch, FREESIDE_3_BRANCH has been updated
       via  e4a3eb292893c0efc15d2ee591fa2a05c31dbeff (commit)
      from  0d633515080e8c701d0ac43359c562f617e7529f (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 e4a3eb292893c0efc15d2ee591fa2a05c31dbeff
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 7 22:37:09 2015 -0800

    default to commercial new cusotomer, RT#22560

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 79b74c4..bb9046a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5831,6 +5831,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/top_misc.html b/httemplate/edit/cust_main/top_misc.html
index 41dd563..8f8a96a 100644
--- a/httemplate/edit/cust_main/top_misc.html
+++ b/httemplate/edit/cust_main/top_misc.html
@@ -83,6 +83,7 @@
   }
 
   <&| /elements/onload.js &>
+  rescom_changed(document.getElementById('residential_commercial_Residential'));
   agent_changed(document.getElementById('agentnum'))
   </&>
  
@@ -240,6 +241,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')
@@ -253,12 +256,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/top_misc.html |   12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list