Merge branch 'patch-18' of https://github.com/gjones2/Freeside

[freeside.git] / httemplate / edit / elements / svc_Common.html

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 2e27f85..d46d1cb 100644 (file)
--- 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,13 +36,13 @@
                    die "No part_svc entry!" unless $part_svc;
 
                    label_fixup($part_svc, $opt);
-                  
-                  if ( my $cb = $opt{'svc_edit_callback'} ) {
+                   
+                   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);
-                    }
+                     &{ $cb }( $cgi,$svc_x, $part_svc,$cust_pkg, $fields,$opt);
+                   }
                  },
 
                  'new_hashref_callback' => sub {
@@ -48,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;
 
                  },
 
@@ -81,22 +88,18 @@
                    } elsif ( $flag eq 'A' ) {
                      $f->{'type'} = 'hidden';
                    } elsif ( $flag eq 'M' ) {
+                     $f->{'type'} = 'select-inventory_item';
                      $f->{'empty_label'} = 'Select inventory item';
-                     $f->{'type'}        = 'select-table';
-                     $f->{'table'}       = 'inventory_item';
-                     $f->{'name_col'}    = 'item'; 
-                     $f->{'value_col'}   = 'item'; 
-                     $f->{'agent_virt'}  = 1;
-                     $f->{'agent_null'}  = 1;
+                     $f->{'extra_sql'} = 'WHERE ( svcnum IS NULL ' .
+                        ($object->svcnum && ' OR svcnum = '.$object->svcnum) .
+                        ')';
+                     $f->{'classnum'} = $columndef->columnvalue;
+                     $f->{'disable_empty'} = $object->svcnum ? 1 : 0;
+                   } elsif ( $flag eq 'H' ) {
+                     $f->{'type'}        = 'select-hardware_type';
                      $f->{'hashref'}     = {
-                                            'classnum'=>$columndef->columnvalue,
-                                            #'svcnum'  => '',
+                                            'classnum'=>$columndef->columnvalue
                                            };
-                     $f->{'extra_sql'}   = 'AND ( svcnum IS NULL ';
-                     $f->{'extra_sql'}  .= ' OR svcnum = '. $object->svcnum
-                       if $object->svcnum;
-                     $f->{'extra_sql'}  .= ' ) ';
-                     $f->{'disable_empty'} = $object->svcnum ? 1 : 0,
                    }
 
                    if (    $f->{'type'} eq 'select-svc_pbx'
@@ -115,6 +118,10 @@
                      $object->set('custnum', $cust_pkg->custnum);
                    }
 
+                   if ( my $cb = $opt{'svc_field_callback'} ) {
+                     &{ $cb }( $cgi, $object, $f);
+                   }
+
                  },
 
                  'html_init' => sub {