X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fsvc_Common.html;h=0d9d36c0742d09dded1ce90985552b173084c010;hb=e710e07e4451b7c615fb477799dc64bf3490248c;hp=1cb1659f4f5a7eaf3016b731932c6c432af7e8ba;hpb=9e570867c27b5336f4fa701c84b70fd65791f87c;p=freeside.git

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 1cb1659f4..0d9d36c07 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -14,6 +14,13 @@
                    label_fixup($part_svc, $opt);
 
                    $svc_x->setfield('svcpart', $svcpart);
+
+                   if ( my $cb = $opt{'svc_error_callback'} ) {
+                     my $cust_pkg = $pkgnum
+                                      ? qsearchs('cust_pkg', {pkgnum=>$pkgnum})
+                                      : ''; #?
+                     &{ $cb }( $cgi,$svc_x, $part_svc,$cust_pkg, $fields,$opt);
+                   }
                  },
 
                  'edit_callback' => sub {
@@ -29,6 +36,13 @@
                    die "No part_svc entry!" unless $part_svc;
 
                    label_fixup($part_svc, $opt);
+                   
+                   if ( my $cb = $opt{'svc_edit_callback'} ) {
+                     my $cust_pkg = $pkgnum
+                                      ? qsearchs('cust_pkg', {pkgnum=>$pkgnum})
+                                      : ''; #?
+                     &{ $cb }( $cgi,$svc_x, $part_svc,$cust_pkg, $fields,$opt);
+                   }
                  },
 
                  'new_hashref_callback' => sub {
@@ -41,23 +55,23 @@
                  },
 
                  'new_callback' => sub {
-                    my( $cgi, $svc_x, $fields, $opt ) = @_;
+                   my( $cgi, $svc_x, $fields, $opt ) = @_;
 
-                    $part_svc = qsearchs( 'part_svc', { svcpart=>$svcpart });
-                    die "No part_svc entry!" unless $part_svc;
+                   $part_svc = qsearchs( 'part_svc', { svcpart=>$svcpart });
+                   die "No part_svc entry!" unless $part_svc;
 
-                    label_fixup($part_svc, $opt);
+                   label_fixup($part_svc, $opt);
 
-                    #$svcnum='';
+                   #$svcnum='';
 
-                    if ( my $cb = $opt{'svc_new_callback'} ) {
+                   if ( my $cb = $opt{'svc_new_callback'} ) {
                      my $cust_pkg = $pkgnum
-                                      ? qsearchs('cust_pkg', {pkgnum=>$pkgnum})
-                                      : ''; #?
-                      &{ $cb }( $cgi,$svc_x, $part_svc,$cust_pkg, $fields,$opt);
-                    }
+                                     ? qsearchs('cust_pkg', {pkgnum=>$pkgnum})
+                                     : ''; #?
+                     &{ $cb }( $cgi,$svc_x, $part_svc,$cust_pkg, $fields,$opt);
+                   }
 
-                    $svc_x->set_default_and_fixed;
+                   $svc_x->set_default_and_fixed;
 
                  },
 
@@ -79,6 +93,8 @@
                      $f->{'table'}       = 'inventory_item';
                      $f->{'name_col'}    = 'item'; 
                      $f->{'value_col'}   = 'item'; 
+                     $f->{'agent_virt'}  = 1;
+                     $f->{'agent_null'}  = 1;
                      $f->{'hashref'}     = {
                                             'classnum'=>$columndef->columnvalue,
                                             #'svcnum'  => '',
@@ -87,7 +103,20 @@
                      $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
+                                           };
                    }
 
                    if (    $f->{'type'} eq 'select-svc_pbx'
@@ -101,6 +130,15 @@
                            };
                    }
 
+                   if ( $f->{'field'} eq 'custnum' && $pkgnum ) {
+                     my $cust_pkg = qsearchs('cust_pkg', {'pkgnum' => $pkgnum});
+                     $object->set('custnum', $cust_pkg->custnum);
+                   }
+
+                   if ( my $cb = $opt{'svc_field_callback'} ) {
+                     &{ $cb }( $cgi, $object, $f);
+                   }
+
                  },
 
                  'html_init' => sub {