X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fedit%2Fcust_main%2Fcontact.html;h=3ccee62e5c159babd2c0cac098fd511c7f5a9fba;hb=cf86f3223d1e30853f52c0f5a7a6331f27aed9cb;hp=58fee3291a08514973bd21ab0b8e15847e9d2571;hpb=ca87d33422b2d19d28773b6f2937cdb84863b124;p=freeside.git
diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html
index 58fee3291..3ccee62e5 100644
--- a/httemplate/edit/cust_main/contact.html
+++ b/httemplate/edit/cust_main/contact.html
@@ -25,43 +25,16 @@
-
- <%$r%>Address |
-
- >
- |
-
-
-
- |
-
- >
- |
-
-
-
- <%$r%>City |
-
- >
- |
- ><%$r%>County |
-
- <% include('select-county.html', %select_hash ) %>
- |
- <%$r%>State |
-
- <% include('select-state.html', %select_hash ) %>
- |
- <%$r%>Zip |
-
- >
- |
-
-
-
- <%$r%>Country |
- <% include('select-country.html', %select_hash ) %> |
-
+<% include('/elements/location.html',
+ 'prefix' => $pre,
+ 'object' => $cust_main,
+ 'onchange' => $onchange,
+ 'disabled' => $disabled,
+ 'same_checked' => $opt{'same_checked'},
+ 'geocode' => $opt{'geocode'},
+ 'censustract' => $opt{'censustract'},
+ )
+%>
<% $daytime_label %> |
@@ -90,11 +63,15 @@
<% $stateid_label %> |
> |
<% $stateid_state_label %> |
- <% include('select-state.html', 'state' => $cust_main->stateid_state,
- 'country' => $cust_main->country,
- 'prefix' => 'stateid_',
- 'onchange' => $onchange,
- 'disabled' => $disabled) %> |
+ <% include('/elements/select-state.html',
+ 'state' => $cust_main->stateid_state,
+ 'country' => $cust_main->country,
+ 'prefix' => 'stateid_',
+ 'onchange' => $onchange,
+ 'disabled' => $disabled,
+ )
+ %>
+ |
% } elsif ( !$pre ) {
@@ -107,7 +84,13 @@
<%init>
-my( $cust_main, $pre, $onchange, $disabled, %opt ) = @_;
+#my( $cust_main, $pre, $onchange, $disabled, %opt ) = @_;
+my %opt = @_;
+my $cust_main = $opt{'cust_main'};
+my $pre = $opt{'pre'};
+my $onchange = $opt{'onchange'};
+my $disabled = $opt{'disabled'};
+
my $conf = new FS::Conf;
foreach (qw(ss stateid)) {
@@ -128,6 +111,12 @@ $cust_main->set($pre.'state', $statedefault )
$cust_main->set('stateid_state', $cust_main->state )
unless $pre || $cust_main->get('stateid_state');
+$opt{geocode} ||= $cust_main->get('geocode');
+
+if ( $conf->exists('cust_main-require_censustract') ) {
+ $opt{censustract} ||= $cust_main->censustract;
+}
+
#my($county_html, $state_html, $country_html) =
# FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
# $cust_main->get($pre.'state'),
@@ -137,20 +126,6 @@ $cust_main->set('stateid_state', $cust_main->state )
# $disabled,
# );
-my %select_hash = (
- 'county' => $cust_main->get($pre.'county'),
- 'state' => $cust_main->get($pre.'state'),
- 'country' => $cust_main->get($pre.'country'),
- 'prefix' => $pre,
- 'onchange' => $onchange,
- 'disabled' => $disabled,
-);
-
-my @counties = counties( $cust_main->get($pre.'state'),
- $cust_main->get($pre.'country'),
- );
-my $county_style = scalar(@counties) > 1 ? '' : 'STYLE="visibility:hidden"';
-
my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
? 'Day Phone'
: FS::Msgcat::_gettext('daytime');