X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-payby.html;h=a976b77cf9a7d912a85c34e15bb09e3f944b607b;hb=d4114381c5d95e8acd0d0fc2bbc2b3528bde2ecf;hp=3f19cb952db6d9e6a0b9a93a82ed408431e94a88;hpb=bd39db7a960f64d6a19e714aa8d74ccab1fd04c5;p=freeside.git

diff --git a/httemplate/elements/select-payby.html b/httemplate/elements/select-payby.html
index 3f19cb952..a976b77cf 100644
--- a/httemplate/elements/select-payby.html
+++ b/httemplate/elements/select-payby.html
@@ -3,12 +3,14 @@
         <% $onchange %>
 >
 
-% unless ( $opt{'multiple'} ) {
-    <OPTION VALUE="" <% '' eq $value ? 'SELECTED' : '' %> >all
+% unless ( $opt{'multiple'} || $opt{'disable_empty'} ) {
+    <OPTION VALUE="" <% '' eq $value ? 'SELECTED' : '' %> ><% mt('all') |h %> 
 % }
 
 % foreach my $option ( keys %{ $opt{'paybys'} } ) { 
-%   my $sel = ( ref($value) && $value->{$option} ) || $option eq $value;
+%   my $sel = $opt{'all_selected'}
+%               || ( ref($value) && $value->{$option} )
+%               || $option eq $value;
 
     <OPTION VALUE="<% $option %>"
             <% $sel ? 'SELECTED' : '' %>
@@ -24,8 +26,6 @@ my %opt = @_;
 
 my $method = 'payby';
 $method = 'cust_payby'  if $opt{'payby_type'} eq 'cust';
-#$method = 'event_payby' if $opt{'payby_type'} eq 'event';
-#$method = 'pay_payby'   if $opt{'payby_type'} eq 'pay';
 
 unless ( $opt{'paybys'} ) {
   tie %{ $opt{'paybys'} }, 'Tie::IxHash', FS::payby->$method();