X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fphone_inventory_provisioned.html;h=b3efdbd77fa70ee41a7c67f85909e917de8c51b6;hp=57eb6763b7f2dab800ad72bb2849a41e8d546efc;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=f0749e294656ac2615edaa59bbdb850eb3d20544

diff --git a/httemplate/search/phone_inventory_provisioned.html b/httemplate/search/phone_inventory_provisioned.html
index 57eb6763b..b3efdbd77 100644
--- a/httemplate/search/phone_inventory_provisioned.html
+++ b/httemplate/search/phone_inventory_provisioned.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
               'title'         => 'LATA Search Results',
               'name_singular' => 'LATA',
               'query'         => {
@@ -7,32 +7,34 @@
                                    'select'  => 'distinct latanum',
                                  },
               'count_query'   => 'SELECT COUNT(distinct latanum) FROM phone_avail',
-              'header'        => [ 'LATA',
-				   'Available',
-				   'Provisioned',
-				   'Have Usage',
+              'header'        => [ 
+                                   '#',
+                                   'LATA',
+                                   'Available',
+                                   'Provisioned',
+                                   'Have Usage',
                                  ],
               'fields'        => [
-        sub { # LATA
-            my $phone_avail = shift;
-            my $lata = $phone_avail->lata;
-            $lata = $lata ? $lata->description : '';
-            $phone_avail->latanum . " - " . $lata;
-        },
-		sub { # Available
-		    my $latanum = shift->latanum;
-		    my $cnt = qsearchs({ 'table'    => 'phone_avail',
+                'latanum',
+                sub { # LATA Description
+                    my $phone_avail = shift;
+                    return '' unless $phone_avail->lata;
+                    $phone_avail->lata->description;
+                },
+                sub { # Available
+                    my $latanum = shift->latanum;
+                    my $cnt = qsearchs({ 'table'    => 'phone_avail',
                                  'hashref'  => 
                                     { 'svcnum' => '',
                                       'latanum' => $latanum,
                                     },
                                  'select'   => 'count(1) as cnt',
                           });
-		    ($cnt) ? $cnt->cnt : '';
-		},
-		sub { # Provisioned
-		    my $latanum = shift->latanum;
-            my $cnt = qsearchs({   'table'     => 'phone_avail',
+                    ($cnt) ? $cnt->cnt : '';
+                },
+                sub { # Provisioned
+                    my $latanum = shift->latanum;
+                    my $cnt = qsearchs({   'table'     => 'phone_avail',
                         'hashref'   => { 'latanum' => $latanum,
                                          'svcnum' => { op => '>',
                                                         value => '0'
@@ -40,52 +42,44 @@
                                         },
                         'select'    => 'count(1) as cnt'
                     });
-		    ($cnt) ? $cnt->cnt : '';
-		},
-		sub { # Have Usage
-            my $phone_avail = shift;
-            return '' unless $phone_avail->latanum;
-            my $latanum = $phone_avail->latanum;
-		    my $count = 0;
-            my $sql = "select count(1) from cdr where src in 
-                (select phonenum from svc_phone where svcnum in (
-                    select svcnum from phone_avail where latanum = $latanum
-                        and svcnum is not null) )
-                or charged_party in (select phonenum from svc_phone where
-                    svcnum in (select svcnum from phone_avail where
-                        latanum = $latanum and svcnum is not null) )";
-            my $c = $phone_avail->scalar_sql($sql);
-            $count++ if $c > 0;
-		    $count;
-		},
+                    ($cnt) ? $cnt->cnt : '';
+                },
+                sub { # Have Usage
+                    my $phone_avail = shift;
+                    return '' unless $phone_avail->lata;
+                    $phone_avail->lata->have_usage;
+                },
               ],
-              'align'         => 'lccc',
+              'align'         => 'rlrrr',
               'links'         => [
                 '',
                 '',
                 '',
                 '',
+                '',
               ],
               'color' => [ 
                            '',
                            '',
                            '',
                            '',
+                           '',
                          ],
               'style' => [ 
                            '',
                            '',
                            '',
                            '',
+                           '',
                          ],
-      )
-%>
+      
+&>
 <%init>
 
 die "access denied"
   unless ( $FS::CurrentUser::CurrentUser->access_right('List inventory')
-	 && $FS::CurrentUser::CurrentUser->access_right('List services')
-	 );
+         && $FS::CurrentUser::CurrentUser->access_right('List services')
+         );
 
 # XXX: agent virtualize