diff options
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/contact.html | 19 | ||||
| -rw-r--r-- | httemplate/elements/popup_link.html | 7 | ||||
| -rw-r--r-- | httemplate/elements/tr-fixed.html | 6 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-contact.html | 10 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-cust_location.html | 2 |
5 files changed, 34 insertions, 10 deletions
diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html index 979c26b49..ef74481c0 100644 --- a/httemplate/elements/contact.html +++ b/httemplate/elements/contact.html @@ -9,7 +9,7 @@ <SELECT NAME="<%$name%>_classnum" <% $onchange %>> <OPTION VALUE=""> % my $classnum = scalar($cgi->param($name.'_classnum')) -% || $contact->classnum; +% || $X_contact->classnum; % foreach my $contact_class (@contact_class) { <OPTION VALUE="<% $contact_class->classnum %>" <% ($contact_class->classnum == $classnum) ? 'SELECTED' : '' %> @@ -40,6 +40,8 @@ % } % } elsif ( $field eq 'emailaddress' ) { % $value = join(', ', map $_->emailaddress, $contact->contact_email); +% } elsif ( $field eq 'selfservice_access' || $field eq 'comment' ) { +% $value = $X_contact->get($field); % } else { % $value = $contact->get($field); % } @@ -100,10 +102,25 @@ if ( $opt{'onchange'} ) { my @contact_class = qsearch('contact_class', { 'disabled' => '' }); my $contact; +my $X_contact; if ( $curr_value ) { $contact = qsearchs('contact', { 'contactnum' => $curr_value } ); + if ( $opt{'custnum'} ) { + $X_contact = qsearchs('cust_contact', { + 'contactnum' => $curr_value, + 'custnum' => $opt{'custnum'}, + }); + } elsif ( $opt{'prospectnum'} ) { + $X_contact = qsearchs('prospect_contact', { + 'contactnum' => $curr_value, + 'prospectnum' => $opt{'prospectnum'}, + }); + } else { + die 'neither custnum nor prospectnum specified'; + } } else { $contact = new FS::contact {}; + $X_contact = new FS::cust_contact; #arbitrary, it could be prospect_contact } my %size = ( 'title' => 12 ); diff --git a/httemplate/elements/popup_link.html b/httemplate/elements/popup_link.html index e5f8c61ca..2b6b187e9 100644 --- a/httemplate/elements/popup_link.html +++ b/httemplate/elements/popup_link.html @@ -2,9 +2,9 @@ Example: - include('/elements/init_overlib.html') + <& /elements/init_overlib.html &> - include( '/elements/popup_link.html', { #hashref or a list, either way is fine + <& /elements/popup_link.html', { #hashref or a list, either way is fine #required 'action' => 'content.html', # uri for content of popup @@ -23,7 +23,8 @@ Example: 'aname' => "target", # link NAME= value, useful for #targets 'target' => '_parent', 'style' => 'css-attribute:value', - } ) + } + &> </%doc> % if ($params->{'action'} && $label) { diff --git a/httemplate/elements/tr-fixed.html b/httemplate/elements/tr-fixed.html index 6904e3b30..373c0ab3a 100644 --- a/httemplate/elements/tr-fixed.html +++ b/httemplate/elements/tr-fixed.html @@ -1,6 +1,6 @@ <% include('tr-td-label.html', @_ ) %> - <TD BGCOLOR="#dddddd" <% $style %>><% $value %></TD> + <TD BGCOLOR="#dddddd" <% $style %> <% $colspan %>><% $value %></TD> </TR> @@ -10,7 +10,9 @@ my %opt = @_; -my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : ''; +my $style = $opt{'cell_style'} ? ' STYLE="'. $opt{'cell_style'}. '" ' : ''; + +my $colspan = $opt{'colspan'} ? ' COLSPAN="'. $opt{'colspan'}. '" ' : ''; my $value = $opt{'formatted_value'} || $opt{'curr_value'} || $opt{'value'}; $value = $opt{'prefix'} . $value if defined($opt{'prefix'}); diff --git a/httemplate/elements/tr-select-contact.html b/httemplate/elements/tr-select-contact.html index e37d26d1b..0bfa8934c 100644 --- a/httemplate/elements/tr-select-contact.html +++ b/httemplate/elements/tr-select-contact.html @@ -138,8 +138,8 @@ if ( $cgi->param('error') ) { if ( length($opt{'curr_value'}) ) { $contactnum = $opt{'curr_value'}; } elsif ($prospect_main) { - my @cust_contact = $prospect_main->contact; - $contactnum = $cust_contact[0]->contactnum if scalar(@cust_contact)==1; + my @prospect_contact = $prospect_main->prospect_contact; + $contactnum = $prospect_contact[0]->contactnum if scalar(@cust_contact)==1; } else { #$cust_main $cgi->param('contactnum') =~ /^(\-?\d*)$/ or die "illegal contactnum"; $contactnum = $1; @@ -176,8 +176,10 @@ my $contact_sort = sub { }; my @contact; -push @contact, $cust_main->cust_contact if $cust_main; -push @contact, $prospect_main->contact if $prospect_main; +push @contact, map $_->contact, $cust_main->cust_contact + if $cust_main; +push @contact, map $_->contact, $prospect_main->prospect_contact + if $prospect_main; push @contact, $contact if !$cust_main && $contact && $contact->contactnum > 0 && ! grep { $_->contactnum == $contact->contactnum } @contact; diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html index abaaa5b42..7a5b43bb8 100644 --- a/httemplate/elements/tr-select-cust_location.html +++ b/httemplate/elements/tr-select-cust_location.html @@ -287,6 +287,8 @@ if ( $locationnum && $locationnum > 0 ) { $cust_location->coord_auto('Y'); my $location_sort = sub { + #enabled w/label_prefix _location # $a->locationname cmp $b->locationname + # or $a->country cmp $b->country or lc($a->city) cmp lc($b->city) or lc($a->address1) cmp lc($b->address1) |