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

diff --git a/httemplate/search/phone_inventory_provisioned.html b/httemplate/search/phone_inventory_provisioned.html
index 6302144f8..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,89 +7,80 @@
                                    '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 $did_order = shift;
-            my $lata = $did_order->lata;
-            $lata = $lata ? $lata->description : '';
-            $did_order->latanum . " - " . $lata;
-        },
-		sub { # Available
-		    my $latanum = shift->latanum;
-		    my @dids = qsearch('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,
-                                    }
-                          );
-		    return scalar(@dids);
-		},
-		sub { # Provisioned
-		    my $latanum = shift->latanum;
-		    my @dids = provisioned_dids($latanum);
-		    return scalar(@dids);
-		},
-		sub { # Have Usage
-		    my $latanum = shift->latanum;
-		    my @dids = provisioned_dids($latanum);
-
-            warn "have usage ".time;
-            return ''; # XXX disabled temporarily
-
-		    my $count = 0;
-		    foreach my $did ( @dids ) {
-                next unless $did->cust_svc;
-                my $svc_phone = $did->cust_svc->svc_x;
-                warn "inside loop ".time;
-                next unless $svc_phone;
-                my @cdrs = $svc_phone->get_cdrs;
-                $count++ if scalar(@cdrs);
-		    }
-		    $count;
-		},
+                                    },
+                                 'select'   => 'count(1) as cnt',
+                          });
+                    ($cnt) ? $cnt->cnt : '';
+                },
+                sub { # Provisioned
+                    my $latanum = shift->latanum;
+                    my $cnt = qsearchs({   'table'     => 'phone_avail',
+                        'hashref'   => { 'latanum' => $latanum,
+                                         'svcnum' => { op => '>',
+                                                        value => '0'
+                                                     },
+                                        },
+                        'select'    => 'count(1) as cnt'
+                    });
+                    ($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>
 
-warn "started @ ".time;
-
 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
 
-sub provisioned_dids {
-    my $latanum = shift;
-    qsearch({   'table' => 'phone_avail',
-	            'hashref' => { 'latanum' => $latanum, },
-	            'extra_sql' => ' and svcnum is not null ',
-	        });
-}
-
 </%init>