X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=a86c35cdd76834fa143ecefcb3350d43cec7ac41;hb=8e5fab2148c7dc492b9fffe271c3dcf8df55b01f;hp=9c2b38f9acb7fb5e60addf0ac56c3d9b69098911;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0;p=freeside.git
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 9c2b38f9a..a86c35cdd 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -1,122 +1,55 @@
-%
-% my( $cust_main ) = @_;
-% my $conf = new FS::Conf;
-%
+% my %which = (
+% '' => 'Billing',
+% 'ship_' => 'Service',
+% );
+% foreach my $which ( '', 'ship_' ) {
+% my $pre = $cust_main->get("${which}last") ? $which : '';
-
-Billing address
-<% ntable("#cccccc") %>| <% ntable("#cccccc",2) %>
- |
- | Contact name |
-
- <% $cust_main->last. ', '. $cust_main->first %>
- |
-% if ( $conf->exists('show_ss') ) {
-
- SS# |
- <% $cust_main->ss || ' ' %> |
-% }
-
-
-
- | Company |
- <% $cust_main->company %> |
-
-
- | Address |
- <% $cust_main->address1 %> |
-
-% if ( $cust_main->address2 ) {
-
-
- | |
- <% $cust_main->address2 %> |
-
-% }
-
-
- | City |
- <% $cust_main->city %> |
- State |
- <% state_label($cust_main->state, $cust_main->country) %> |
- Zip |
- <% $cust_main->zip %> |
-
-
- | Country |
- <% code2country($cust_main->country) %> |
-
-%
-% my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
-% ? 'Day Phone'
-% : FS::Msgcat::_gettext('daytime');
-% my $night_label = FS::Msgcat::_gettext('night') =~ /^(night)?$/
-% ? 'Night Phone'
-% : FS::Msgcat::_gettext('night');
-%
-
-
- | <% $daytime_label %> |
-
- <% include('/elements/phonenumber.html',
- $cust_main->daytime,
- 'callable'=>1
- )
- %>
- |
-
-
- | <% $night_label %> |
-
- <% include('/elements/phonenumber.html',
- $cust_main->night,
- 'callable'=>1
- )
- %>
- |
-
-
- | Fax |
-
- <% $cust_main->fax || ' ' %>
- |
-
-
-% if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-% my $pre = $cust_main->ship_last ? 'ship_' : '';
-%
-
-
-
-Service address
+<% $which{$which} %> address
<% ntable("#cccccc") %>| <% ntable("#cccccc",2) %>
|
| Contact name |
- <% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") %>
+ <% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") |h %>
|
+% if ( $which eq '' && $conf->exists('show_ss') ) {
+ SS# |
+ <% $cust_main->masked('ss') || ' ' %> |
+% }
| Company |
- <% $cust_main->get("${pre}company") %> |
+ <% $cust_main->get("${pre}company") |h %> |
| Address |
- <% $cust_main->get("${pre}address1") %> |
+ <% $cust_main->get("${pre}address1") |h %> |
+
% if ( $cust_main->get("${pre}address2") ) {
+% my $address2_label =
+% ( $conf->exists('cust_main-require_address2')
+% && ! ( $pre xor $cust_main->has_ship_address )
+% )
+% ? 'Unit #'
+% : ' ';
+
+
+ | <% $address2_label %> |
+ <% $cust_main->get("${pre}address2") |h %> |
+
-
- | |
- <% $cust_main->get("${pre}address2") %> |
-
% }
| City |
- <% $cust_main->get("${pre}city") %> |
+ <% $cust_main->get("${pre}city") |h %> |
+% if ( $cust_main->get("${pre}county") ) {
+ County |
+ <% $cust_main->get("${pre}county") |h %> |
+% }
State |
- <% $cust_main->get("${pre}state") %> |
+ <% state_label( $cust_main->get("${pre}state"), $cust_main->get("${pre}country") ) |h %> |
Zip |
<% $cust_main->get("${pre}zip") %> |
@@ -126,7 +59,7 @@ Service address
| <% $daytime_label %> |
-
+ |
<% include('/elements/phonenumber.html',
$cust_main->get("${pre}daytime"),
'callable'=>1
@@ -136,7 +69,7 @@ Service address
|
| <% $night_label %> |
-
+ |
<% include('/elements/phonenumber.html',
$cust_main->get("${pre}night"),
'callable'=>1
@@ -146,10 +79,44 @@ Service address
|
| Fax |
-
+ |
<% $cust_main->get("${pre}fax") || ' ' %>
|
+% if ( $which eq '' && $conf->exists('show_stateid') ) {
+
+ | <% $stateid_label %> |
+ <% $cust_main->masked('stateid') || ' ' %> |
+ <% $stateid_state_label %> |
+ <% $cust_main->stateid_state || ' ' %> |
+
+% }
+% if ( $which ne 'ship_' ) {
+
+% }
% }
+<% include('contacts_new.html', $cust_main) %>
+<%once>
+
+my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
+ ? 'Day Phone'
+ : FS::Msgcat::_gettext('daytime');
+my $night_label = FS::Msgcat::_gettext('night') =~ /^(night)?$/
+ ? 'Night Phone'
+ : FS::Msgcat::_gettext('night');
+my $stateid_label = FS::Msgcat::_gettext('stateid') =~ /^(stateid)?$/
+ ? 'Driver’s License'
+ : FS::Msgcat::_gettext('stateid');
+my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') =~ /^(stateid_state)?$/
+ ? 'Driver’s License State'
+ : FS::Msgcat::_gettext('stateid_state');
+
+
+<%init>
+
+my( $cust_main ) = @_;
+my $conf = new FS::Conf;
+
+