X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=22a7b95848382a1d022999995ed1d038577efa2a;hb=d98e4631640eaaf28b4c022efedd49b640a283c6;hp=8fe3a9ebbe868a321af1809558a561ad8e31d3d4;hpb=b286638fd4cb875178b0247a04b2706a44cadf6f;p=freeside.git diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index 8fe3a9ebb..22a7b9584 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -13,23 +13,40 @@ (<% mt('same as billing') %>) % } +% if ( +% ($this eq 'ship') +% && $cust_main->invoice_ship_address +% && !$conf->exists('invoice-ship_address') #it's always on, so hide per-cust config +% ) { +(<% emt('included on invoices') %>) +% }
<% mt('Contact name') |h %> | -<% $cust_main->contact |h %> | +<% mt('Contact name') |h %> | +<% $cust_main->contact |h %> | % if ( $conf->exists('show_ss') ) { -<% mt('SS#') |h %> | -<% $conf->exists('unmask_ss') + | <% mt('SS#') |h %> | +<% $conf->exists('unmask_ss') ? $cust_main->ss : $cust_main->masked('ss') || ' ' %> | % }||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
<% mt('Spouse') |h %> | ++ <% join(', ', grep $_, + $cust_main->spouse_last, $cust_main->spouse_first) %> + | +||||||||||||||
<% mt('Email address(es)') |h %> | +<% mt('Email address(es)') |h %> | <% $cust_main->invoicing_list_emailonly_scalar || $no %> | @@ -37,15 +54,32 @@ % } % if ( $cust_main->company ) {|||||||||||||
<% mt('Company') |h %> | +<% $cust_main->company |h %> | +||||||||||||||
<% mt('Company') |h %> | -<% $cust_main->company |h %> | +<% $cust_main->ship_company |h %> | |||||||||||||
<% mt('Location ID') |h %> | +<% $location->locationname |h %> | +||||||||||||||
<% mt('Address') |h %> | -<% $location->address1 |h %> | +<% mt('Address') |h %> | +<% $location->address1 |h %> | ||||||||||||
<% $address2_label %> | -<% $location->address2 |h %> | +<% $address2_label %> | +<% $location->address2 |h %> | ||||||||||||
<% mt('City') |h %> | -<% $location->city |h %> | ++ | <% $location->city |h %>\ % if ( $location->county ) { - | <% mt('County') |h %> | -<% $location->county |h %> | + (<% $location->county |h %> county)\ % } -<% mt('State') |h %> | -<% state_label( $location->state, $location->country ) |h %> | -<% mt('Zip') |h %> | -<% $location->zip %> | +,<% state_label( $location->state, $location->country ) |h %> + <% $location->zip %> +||||||
<% mt('Country') |h %> | -<% code2country( $location->country ) %> | ++ | <% code2country( $location->country ) %> | ||||||||||||
<% $phone_label{$phone} %> | -+ | <% $phone_label{$phone} %> + | <& /elements/phonenumber.html, $cust_main->get($phone), callable => 1, @@ -106,7 +140,7 @@ | ||||||||||||
<% mt('Fax') |h %> | -+ | <% $cust_main->get('fax') || ' ' %> | |||||||||||||
<% $stateid_label %> | -<% $cust_main->masked('stateid') || ' ' %> | +<% $cust_main->masked('stateid') || ' ' %> | <% $stateid_state_label %> | -<% $cust_main->stateid_state || ' ' %> | +<% $cust_main->stateid_state || ' ' %> |