X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fsvc_Common.html;h=7ab08a355fe5722c8d30b7aa3e83074442ecb13c;hb=0eab7643459bbf8626b0e89240d2f5f9d8a957d8;hp=0955d49c6e8e1427bfef3b200770452c5b3b88dd;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 0955d49c6..7ab08a355 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -103,13 +103,27 @@
                      $f->{'extra_sql'}  .= ' OR svcnum = '. $object->svcnum
                        if $object->svcnum;
                      $f->{'extra_sql'}  .= ' ) ';
-                     $f->{'disable_empty'} = $object->svcnum ? 1 : 0,
+                     $f->{'disable_empty'} = $object->svcnum ? 1 : 0;
+                     if ( $f->{'field'} eq 'mac_addr' ) {
+                       $f->{'compare_sub'} = sub {
+                         my($a, $b) = @_;
+                         $a =~ s/[-: ]//g;
+                         $b =~ s/[-: ]//g;
+                         lc($a) eq lc($b);
+                       };
+                     }
                    } elsif ( $flag eq 'H' ) {
                      $f->{'type'}        = 'select-hardware_type';
                      $f->{'hashref'}     = {
                                             'classnum'=>$columndef->columnvalue
                                            };
-                     $f->{'empty_label'} = 'Select hardware type';
+
+                   } elsif ( $flag eq 'S' #selectable choice
+                               && $f->{type} !~ /^select-svc(-domain|_pbx)$/ ) {
+                     $f->{type}    = 'select';
+                     $f->{options} = [ split( /\s*,\s*/,
+                                                $columndef->columnvalue)
+                                     ];
                    }
 
                    if (    $f->{'type'} eq 'select-svc_pbx'
@@ -128,6 +142,10 @@
                      $object->set('custnum', $cust_pkg->custnum);
                    }
 
+                   if ( my $cb = $opt{'svc_field_callback'} ) {
+                     &{ $cb }( $cgi, $object, $f);
+                   }
+
                  },
 
                  'html_init' => sub {