X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=399431311e73bfb64d178540d8226bd9a91f88db;hb=f62a68016f32b443084705b0e7851497b308f81d;hp=1c188dc14956455e79ed0e15c09fd92a4314db62;hpb=b5dbd9e1bcbb701a20ed23e723b1e0105fd7c1a1;p=freeside.git

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 1c188dc14..399431311 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -15,7 +15,7 @@
 <INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospectnum %>">
 
 % if ( $custnum ) { 
-  Customer #<B><% $cust_main->display_custnum %></B> - 
+  <% mt('Customer #') |h %><B><% $cust_main->display_custnum %></B> - 
   <B><FONT COLOR="#<% $cust_main->statuscolor %>">
     <% ucfirst($cust_main->status) %>
   </FONT></B>
@@ -31,15 +31,6 @@
   <& cust_main/birthdate.html, $cust_main &>
 % }
 
-%# latitude and longitude
-% if ( $conf->exists('cust_main-require_censustract') ) {
-%   my ($latitude, $longitude) = $cust_main->service_coordinates;
-%   $latitude ||= $conf->config('company_latitude') || '';
-%   $longitude ||= $conf->config('company_longitude') || '';
-  <INPUT NAME="latitude" TYPE="hidden" VALUE="<% $latitude |h %>">
-  <INPUT NAME="longitude" TYPE="hidden" VALUE="<% $longitude |h %>">
-% }
-
 %# contact info
 
 %  my $same_checked = '';
@@ -51,14 +42,15 @@
 %    push @ship_style, 'background-color:#dddddd';
 %    foreach (
 %      qw( last first company address1 address2 city county state zip country
-%          daytime night fax )
+%          latitude longitude coord_auto
+%          daytime night fax mobile )
 %    ) {
 %      $cust_main->set("ship_$_", $cust_main->get($_) );
 %    }
 %  }
 
 <BR>
-<FONT SIZE="+1"><B>Billing address</B></FONT>
+<FONT CLASS="fsinnerbox-title"><% mt('Billing address') |h %></FONT>
 
 <& cust_main/contact.html,
              'cust_main'    => $cust_main,
@@ -73,7 +65,7 @@
 <SCRIPT>
 function bill_changed(what) {
   if ( what.form.same.checked ) {
-% for (qw( last first company address1 address2 city zip daytime night fax )) { 
+% for (qw( last first company address1 address2 city zip latitude longitude coord_auto daytime night fax mobile )) { 
     what.form.ship_<%$_%>.value = what.form.<%$_%>.value;
 % } 
 
@@ -103,7 +95,7 @@ function samechanged(what) {
   if ( what.checked ) {
     bill_changed(what);
 
-%   my @fields = qw( last first company address1 address2 city city_select county state zip country daytime night fax );
+%   my @fields = qw( last first company address1 address2 city city_select county state zip country latitude longitude daytime night fax mobile );
 %   for (@fields) { 
       what.form.ship_<%$_%>.disabled = true;
       what.form.ship_<%$_%>.style.backgroundColor = '#dddddd';
@@ -135,9 +127,9 @@ function samechanged(what) {
 </SCRIPT>
 
 <BR>
-<FONT SIZE="+1"><B><% mt('Service address') |h %></B></FONT>
+<FONT CLASS="fsinnerbox-title"><% mt('Service address') |h %></FONT>
 
-(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)" <%$same_checked%>><% mt('same as billing address') |h %>)
+<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)" <%$same_checked%>><% mt('same as billing address') |h %>
 <& cust_main/contact.html,
              'cust_main' => $cust_main,
              'pre'       => 'ship_',
@@ -146,17 +138,23 @@ function samechanged(what) {
              'style'     => \@ship_style
 &>
 
+<& cust_main/contacts_new.html,
+             'cust_main' => $cust_main,
+&>
+
 %# billing info
 <& cust_main/billing.html, $cust_main,
                'payinfo'        => $payinfo,
                'invoicing_list' => \@invoicing_list,
 &>
+<BR>
 
 % my $ro_comments = $conf->exists('cust_main-use_comments')?'':'readonly';
 % if (!$ro_comments || $cust_main->comments) {
 
-    <BR><% mt('Comments') |h %> 
-    <% &ntable("#cccccc") %>
+    <BR>
+    <FONT CLASS="fsinnerbox-title"><% mt('Comments') |h %></FONT>
+    <TABLE CLASS="fsinnerbox">
       <TR>
         <TD>
           <TEXTAREA NAME = "comments"
@@ -193,8 +191,8 @@ function samechanged(what) {
 
 %# cust_main/bottomfixup.js
 % foreach my $hidden (
-%    'payauto',
-%    'payinfo', 'payinfo1', 'payinfo2', 'paytype',
+%    'payauto', 'billday',
+%    'payinfo', 'payinfo1', 'payinfo2', 'payinfo3', 'paytype',
 %    'payname', 'paystate', 'exp_month', 'exp_year', 'paycvv',
 %    'paystart_month', 'paystart_year', 'payissue',
 %    'payip',
@@ -203,15 +201,16 @@ function samechanged(what) {
     <INPUT TYPE="hidden" NAME="<% $hidden %>" VALUE="">
 % } 
 
-<& cust_main/bottomfixup.html &>
+<& cust_main/bottomfixup.html, 'custnum' => $custnum &>
 
 <BR>
 <INPUT TYPE    = "button"
        NAME    = "submitButton"
        ID      = "submitButton"
-       VALUE   = "<% $custnum ?  "Apply Changes" : "Add Customer" %>"
+       VALUE   = "<% $custnum ?  emt("Apply changes") : emt("Add Customer") %>"
        onClick = "this.disabled=true; bottomfixup(this.form);"
 >
+<BR><BR>
 </FORM>
 
 <& /elements/footer.html &>
@@ -308,6 +307,8 @@ if ( $cgi->param('error') ) {
 
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
+  $cust_main->agentnum( $conf->config('default_agentnum') )
+    if $conf->exists('default_agentnum');
   $cust_main->otaker( &getotaker );
   $cust_main->referral_custnum( $cgi->param('referral_custnum') );
   @invoicing_list = ();
@@ -340,7 +341,7 @@ if ( $cgi->param('error') ) {
     my $cust_location = $qual->cust_location;
     $cust_location->dealternize;
     $cust_main->$_( $cust_location->$_ )
-      foreach qw( address1 address2 city county state zip country geocode );
+      foreach qw( address1 address2 city county state zip country latitude longitude coord_auto geocode );
 
     #locationnum -> package order
     $locationnum = $qual->locationnum;
@@ -366,7 +367,7 @@ my %keep = map { $_=>1 } qw( error tagnum lock_agentnum lock_pkgpart );
 $cgi->delete( grep !$keep{$_}, $cgi->param );
 
 my $title = $custnum ? 'Edit Customer' : 'Add Customer';
-$title = emt($title);
+$title = mt($title);
 $title .= ": ". $cust_main->name if $custnum;
 
 my $r = qq!<font color="#ff0000">*</font>&nbsp;!;