fix inventory item links to non-svc_acct services, RT#7010

[freeside.git] / httemplate / search / inventory_item.html

diff --git a/httemplate/search/inventory_item.html b/httemplate/search/inventory_item.html
index 1e7bdd9..55fef94 100644 (file)
--- a/httemplate/search/inventory_item.html
+++ b/httemplate/search/inventory_item.html
@@ -6,9 +6,10 @@
 
                  'query'       => {
                                     'table'   => 'inventory_item',
-                                    'hashref' => { 'classnum' => $classnum },
+                                    'hashref' => {},
                                     'select'  => join(', ',
                                         'inventory_item.*',
+                                        'part_svc.svcdb',
                                         'cust_main.custnum',
                                         FS::UI::Web::cust_sql_fields(),
                                       ),
@@ -77,8 +78,9 @@ die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my $classnum = $cgi->param('classnum');
-$classnum =~ /^(\d+)$/ or eidiot "illegal classnum $classnum";
+$classnum =~ /^(\d+)$/ or errorpage("illegal classnum $classnum");
 $classnum = $1;
+my $extra_sql = "WHERE inventory_item.classnum = $classnum ";
 
 my $inventory_class = qsearchs( {
   'table'     => 'inventory_class',
@@ -88,22 +90,30 @@ my $inventory_class = qsearchs( {
 my $title = $inventory_class->classname. ' Inventory';
 
 #little false laziness with SQL fragments in inventory_class.pm
-my $extra_sql = '';
 if ( $cgi->param('avail') ) {
-  $extra_sql = 'AND ( svcnum IS NULL OR svcnum = 0 )';
+  $extra_sql .= ' AND ( svcnum IS NULL OR svcnum = 0 )';
   $title .= ' - Available';
 } elsif ( $cgi->param('used') ) {
-  $extra_sql = 'AND svcnum IS NOT NULL AND svcnum > 0';
+  $extra_sql .= ' AND svcnum IS NOT NULL AND svcnum > 0';
   $title .= ' - In use';
 }
 
 my $count_query =
-  "SELECT COUNT(*) FROM inventory_item WHERE classnum = $classnum $extra_sql";
+  "SELECT COUNT(*) FROM inventory_item $extra_sql";
 
 my $link = sub {
   my $inventory_item = shift;
   if ( $inventory_item->svcnum ) {
-    [ "${p}view/svc_acct.cgi?", 'svcnum' ];
+
+    #[ "${p}view/svc_acct.cgi?", 'svcnum' ];
+    my $url = svc_url(
+      'm'      => $m,
+      'action' => 'view',
+      #'svcdb'  => $inventory_item->cust_svc->part_svc->svcdb,
+      'svcdb'  => $inventory_item->svcdb, #we have it from the joined search
+      'query'  => '',
+    );
+    [ $url, 'svcnum' ];
   } else {
     '';
   }