service refactor!

[freeside.git] / httemplate / edit / cust_main.cgi

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 57d4dac..896472d 100755 (executable)
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -17,6 +17,7 @@
 %my $error = '';
 %my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart);
 %my(@invoicing_list);
+%my $payinfo;
 %my $same = '';
 %if ( $cgi->param('error') ) {
 %  $error = $cgi->param('error');
@@ -36,6 +37,7 @@
 %  @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
 %  $same = $cgi->param('same');
 %  $cust_main->setfield('paid' => $cgi->param('paid')) if $cgi->param('paid');
+%  $payinfo = $cust_main->payinfo; # don't mask an entered value on errors
 %} elsif ( $cgi->keywords ) { #editing
 %  my( $query ) = $cgi->keywords;
 %  $query =~ /^(\d+)$/;
@@ -52,6 +54,7 @@
 %  $password = '';
 %  $popnum = 0;
 %  @invoicing_list = $cust_main->invoicing_list;
+%  $payinfo = $cust_main->paymask;
 %} else {
 %  $custnum='';
 %  $cust_main = new FS::cust_main ( {} );
@@ -62,6 +65,9 @@
 %  $password = '';
 %  $popnum = 0;
 %  @invoicing_list = ();
+%  push @invoicing_list, 'POST'
+%    unless $conf->exists('disablepostalinvoicedefault');
+%  $payinfo = '';
 %}
 %$cgi->delete_all();
 %
@@ -172,7 +178,8 @@
               'birthdate',
               $cust_main->birthdate,
               'Date of Birth',
-              $conf->config('date_format') || "%m/%d/%Y")
+              $conf->config('date_format') || "%m/%d/%Y",
+              1)
   %>
 
   </TABLE>
@@ -197,17 +204,19 @@ function bill_changed(what) {
     what.form.ship_<%$_%>.value = what.form.<%$_%>.value;
 % } 
 
-
     what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
+
+    function fix_ship_county() {
+      what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
+    }
+
     function fix_ship_state() {
       what.form.ship_state.selectedIndex = what.form.state.selectedIndex;
+      ship_state_changed(what.form.ship_state, fix_ship_county );
     }
+
     ship_country_changed(what.form.ship_country, fix_ship_state );
 
-    function fix_ship_county() {
-      what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
-    }
-    ship_state_changed(what.form.ship_state, fix_ship_county );
   }
 }
 function samechanged(what) {
@@ -235,7 +244,7 @@ function samechanged(what) {
 %  my $disabledselect = '';
 %  unless ( $cust_main->ship_last && $same ne 'Y' ) {
 %    $checked = 'CHECKED';
-%    $disabled = 'DISABLED style="background-color: #dddddd"';
+%    $disabled = 'DISABLED STYLE="background-color: #dddddd"';
 %    foreach (
 %      qw( last first company address1 address2 city county state zip country
 %          daytime night fax )
@@ -256,6 +265,7 @@ Service address
 <!-- billing info -->
 
 <% include( 'cust_main/billing.html', $cust_main,
+               'payinfo'        => $payinfo,
                'invoicing_list' => \@invoicing_list,
            )
 %>