X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=07629dcff5fbbeb91152e3da058ea77e54516f63;hb=e356f2ebb6564fe8d5333fc89bb4583ee3cd1fb1;hp=15c9f45b21f0ef04de0b6c5e0ff4cae501d06b53;hpb=c183de0b7e942672cafdc1c14a203e389ffd2c43;p=freeside.git

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 15c9f45b2..07629dcff 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <% include('/elements/header.html',
-      "Customer $action",
+      $title,
       '',
       ' onUnload="myclose()"' #hmm, in billing.html
 ) %>
@@ -45,9 +45,11 @@
 
 %  my $same_checked = '';
 %  my $ship_disabled = '';
+%  my @ship_style = ();
 %  unless ( $cust_main->ship_last && $same ne 'Y' ) {
 %    $same_checked = 'CHECKED';
-%    $ship_disabled = 'DISABLED STYLE="background-color: #dddddd"';
+%    $ship_disabled = 'DISABLED';
+%    push @ship_style, 'background-color:#dddddd';
 %    foreach (
 %      qw( last first company address1 address2 city county state zip country
 %          daytime night fax )
@@ -74,14 +76,20 @@
 function bill_changed(what) {
   if ( what.form.same.checked ) {
 % for (qw( last first company address1 address2 city zip daytime night fax )) { 
-
     what.form.ship_<%$_%>.value = what.form.<%$_%>.value;
 % } 
 
     what.form.ship_country.selectedIndex = what.form.country.selectedIndex;
 
+    function fix_ship_city() {
+      what.form.ship_city_select.selectedIndex = what.form.city_select.selectedIndex;
+      what.form.ship_city.style.display = what.form.city.style.display;
+      what.form.ship_city_select.style.display = what.form.city_select.style.display;
+    }
+
     function fix_ship_county() {
       what.form.ship_county.selectedIndex = what.form.county.selectedIndex;
+      ship_county_changed(what.form.ship_county, fix_ship_city );
     }
 
     function fix_ship_state() {
@@ -97,7 +105,8 @@ function samechanged(what) {
   if ( what.checked ) {
     bill_changed(what);
 
-%   for (qw( last first company address1 address2 city county state zip country daytime night fax )) { 
+%   my @fields = qw( last first company address1 address2 city city_select county state zip country daytime night fax );
+%   for (@fields) { 
       what.form.ship_<%$_%>.disabled = true;
       what.form.ship_<%$_%>.style.backgroundColor = '#dddddd';
 %   } 
@@ -111,7 +120,7 @@ function samechanged(what) {
 
   } else {
 
-%   for (qw( last first company address1 address2 city county state zip country daytime night fax )) { 
+%   for (@fields) { 
       what.form.ship_<%$_%>.disabled = false;
       what.form.ship_<%$_%>.style.backgroundColor = '#ffffff';
 %   } 
@@ -136,6 +145,7 @@ function samechanged(what) {
              'pre'       => 'ship_',
              'onchange'  => '',
              'disabled'  => $ship_disabled,
+             'style'     => \@ship_style
           )
 %>
 
@@ -169,6 +179,8 @@ function samechanged(what) {
 
     <% include('cust_main/first_pkg.html', $cust_main,
                  'pkgpart_svcpart' => $pkgpart_svcpart,
+                 'disable_empty'   =>
+                   scalar( $cgi->param('lock_pkgpart') =~ /^(\d+)$/ ),
                  #svc_acct
                  'username'        => $username,
                  'password'        => $password,
@@ -180,7 +192,7 @@ function samechanged(what) {
 
 % }
 
-<INPUT TYPE="hidden" NAME="otaker" VALUE="<% $cust_main->otaker %>">
+<INPUT TYPE="hidden" NAME="usernum" VALUE="<% $cust_main->usernum %>">
 
 %# cust_main/bottomfixup.js
 % foreach my $hidden (
@@ -297,14 +309,21 @@ if ( $cgi->param('error') ) {
   $stateid = '';
   $payinfo = '';
 
+  if ( $cgi->param('lock_pkgpart') =~ /^(\d+)$/ ) {
+    my $pkgpart = $1;
+    my $part_pkg = qsearchs('part_pkg', { 'pkgpart' => $pkgpart } )
+      or die "unknown pkgpart $pkgpart";
+    my $svcpart = $part_pkg->svcpart;
+    $pkgpart_svcpart = $pkgpart.'_'.$svcpart;
+  }
+
 }
 
-my $error = $cgi->param('error');
-$cgi->delete_all();
-$cgi->param('error', $error);
+my %keep = map { $_=>1 } qw( error tagnum lock_agentnum lock_pkgpart );
+$cgi->delete( grep !$keep{$_}, $cgi->param );
 
-my $action = $custnum ? 'Edit' : 'Add';
-$action .= ": ". $cust_main->name if $custnum;
+my $title = $custnum ? 'Edit Customer' : 'Add Customer';
+$title .= ": ". $cust_main->name if $custnum;
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;