X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=7343a9d162c149172e5868cb41dc8b95050c9506;hb=df5e5198ba40fc583dafeaf2b9412735e09b0a27;hp=e3e812f19b23aa6d9a6608ca15a3eff22a375d15;hpb=7acc76e0ead0d88cb225c88016c778c8feb9a075;p=freeside.git
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index e3e812f19..7343a9d16 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -30,7 +30,6 @@
%# birthdate
% if ( $conf->config('national_id-country')
% || $conf->exists('cust_main-enable_birthdate')
-% || $conf->exists('cust_main-enable_spouse_birthdate')
% || $conf->exists('cust_main-enable_anniversary_date')
% )
% {
@@ -48,11 +47,13 @@
%#; padding-right:2px; vertical-align:top">
<% mt('Billing address') |h %>
-
+
<& cust_main/before_bill_location.html, $cust_main &>
<& /elements/location.html,
object => $cust_main->bill_location,
prefix => 'bill_',
+ enable_censustract => 1,
+ enable_district => 1,
enable_coords => 1,
&>
<& cust_main/after_bill_location.html, $cust_main &>
@@ -62,7 +63,6 @@
|
-%#; padding-left:2px; vertical-align:top">
<% mt('Service address') |h %>
><% mt('same as billing address') |h %>
-
- <& /elements/location.html,
- object => $cust_main->ship_location,
- prefix => 'ship_',
- enable_censustract => 1,
- enable_district => 1,
- enable_coords => 1,
- &>
-
-
+
+
+ <& cust_main/before_ship_location.html, $cust_main &>
+ <& /elements/location.html,
+ object => $cust_main->ship_location,
+ prefix => 'ship_',
+ enable_censustract => 1,
+ enable_district => 1,
+ enable_coords => 1,
+ &>
+% unless ($conf->exists('invoice-ship_address')) { #it's always on, so hide per-cust config
+
+ |
+
+ <% include('/elements/checkbox.html',
+ 'field' => 'invoice_ship_address',
+ 'value' => 'Y',
+ 'curr_value' => $cust_main->invoice_ship_address,
+ 'postfix' => emt('included on invoices'),
+ ) %>
+ |
+
+% }
+
+
|
@@ -94,19 +106,14 @@ function samechanged(what) {
%# document.getElementById('table_ship_location').style.visibility =
%# what.checked ? 'hidden' : 'visible';
var t1 = document.getElementById('table_ship_location');
- var t2 = document.getElementById('table_ship_location_blank');
if ( what.checked ) {
- t2.style.width = t1.clientWidth + 'px';
- t2.style.height = t1.clientHeight + 'px';
- t1.style.display = 'none';
- t2.style.display = '';
+ t1.style.visibility = 'hidden';
}
else {
- t2.style.display = 'none';
- t1.style.display = '';
+ t1.style.visibility = 'visible'
}
}
-samechanged(document.getElementById('same'));
+//samechanged(document.getElementById('same'));
@@ -210,6 +217,7 @@ my $prospectnum = '';
my $locationnum = '';
my $same = '';
+$m->comp('/elements/handle_uri_query', 'secure'=>1);
if ( $cgi->param('error') ) {
@@ -285,7 +293,8 @@ if ( $cgi->param('error') ) {
my( $query ) = $cgi->keywords;
$query =~ /^(\d+)$/;
$custnum=$1;
- $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+ $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+ or die "custnum $custnum not found";
if ( $cust_main->dbdef_table->column('paycvv')
&& length($cust_main->paycvv) ) {
my $paycvv = $cust_main->paycvv;
@@ -315,6 +324,8 @@ if ( $cgi->param('error') ) {
$stateid = '';
$payinfo = '';
+ $cgi->param('tagnum', FS::part_tag->default_tags);
+
if ( $cgi->param('qualnum') =~ /^(\d+)$/ ) {
my $qualnum = $1;
my $qual = qsearchs('qual', { 'qualnum' => $qualnum } )
@@ -353,14 +364,18 @@ if ( $cgi->param('error') ) {
my $countrydefault = $conf->config('countrydefault') || 'US';
my $statedefault = $conf->config('statedefault') || 'CA';
$cust_main->set('bill_location',
- FS::cust_location->new(
- { country => $countrydefault, state => $statedefault }
- )
+ FS::cust_location->new( {
+ country => $countrydefault,
+ state => $statedefault,
+ coord_auto => 'Y',
+ } )
);
$cust_main->set('ship_location',
- FS::cust_location->new(
- { country => $countrydefault, state => $statedefault }
- )
+ FS::cust_location->new( {
+ country => $countrydefault,
+ state => $statedefault,
+ coord_auto => 'Y',
+ } )
);
}
|