diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-11-09 12:03:52 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-11-09 12:03:52 -0800 |
| commit | 0c04fc78f66d17a5736686757cd8f838715c8380 (patch) | |
| tree | 582834c1115e6e28c78974a4cd336bed89d23cd9 /httemplate | |
| parent | 9545a93c2cb4ee76c4226e0eacf9a6fb9c169adf (diff) | |
| parent | b668e94b7ed814217c9e4a9cfec6ed4df98e023a (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/edit/cust_main.cgi | 1 | ||||
| -rw-r--r-- | httemplate/edit/cust_main/before_ship_location.html | 13 | ||||
| -rw-r--r-- | httemplate/view/cust_main/contacts.html | 9 |
3 files changed, 22 insertions, 1 deletions
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index d597d0bc2..8a3d6f918 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -73,6 +73,7 @@ ><% mt('same as billing address') |h %> <DIV CLASS="fsinnerbox"> <TABLE ID="table_ship_location" WIDTH="100%"> + <& cust_main/before_ship_location.html, $cust_main &> <& /elements/location.html, object => $cust_main->ship_location, prefix => 'ship_', diff --git a/httemplate/edit/cust_main/before_ship_location.html b/httemplate/edit/cust_main/before_ship_location.html new file mode 100644 index 000000000..badb5e8cd --- /dev/null +++ b/httemplate/edit/cust_main/before_ship_location.html @@ -0,0 +1,13 @@ +% if ( length($cust_main->ship_company) or +% $conf->exists('show_ship_company') ) { + <& /elements/tr-input-text.html, + label => mt('Company'), + field => 'ship_company', + curr_value => $cust_main->ship_company, + colspan => 6, + &> +% } +<%init> +my $cust_main = shift; +my $conf = FS::Conf->new; +</%init> diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index 8fe3a9ebb..294b7babb 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -41,7 +41,14 @@ <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->company |h %></TD> </TR> % } -% } # if $this eq 'bill' +% } elsif ( $this eq 'ship' ) { +% if ( $cust_main->ship_company ) { # mostly obsolete these days... + <TR> + <TD ALIGN="right"><% mt('Company') |h %></TD> + <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->ship_company |h %></TD> + </TR> +% } +% } % # now the actual address <TR> <TD ALIGN="right"><% mt('Address') |h %></TD> |