projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
search
/
phone_avail.html
diff --git
a/httemplate/search/phone_avail.html
b/httemplate/search/phone_avail.html
index
8dec7b2
..
faf3544
100644
(file)
--- a/
httemplate/search/phone_avail.html
+++ b/
httemplate/search/phone_avail.html
@@
-1,9
+1,9
@@
-<
% include( 'elements/search.html'
,
+<
& elements/search.html
,
'title' => 'Phone Number (DID) Search Results',
'name_singular' => 'phone number',
'query' => {
'table' => 'phone_avail',
'title' => 'Phone Number (DID) Search Results',
'name_singular' => 'phone number',
'query' => {
'table' => 'phone_avail',
- 'hashref' =>
{}
,
+ 'hashref' =>
$hashref
,
'select' => join(', ',
'phone_avail.*',
'cust_main.custnum',
'select' => join(', ',
'phone_avail.*',
'cust_main.custnum',
@@
-81,8
+81,8
@@
FS::UI::Web::cust_styles(),
'',
],
FS::UI::Web::cust_styles(),
'',
],
- )
-
%
>
+
+
&
>
<%init>
die "access denied"
<%init>
die "access denied"
@@
-125,9
+125,14
@@
my $search = scalar(@search)
my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '.
#' LEFT JOIN part_svc USING ( svcpart ) '.
' LEFT JOIN cust_pkg USING ( pkgnum ) '.
my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '.
#' LEFT JOIN part_svc USING ( svcpart ) '.
' LEFT JOIN cust_pkg USING ( pkgnum ) '.
-
' LEFT JOIN cust_main USING ( custnum ) '
;
+
FS::UI::Web::join_cust_main('cust_pkg', 'cust_pkg')
;
my $count_query = "SELECT COUNT(*) FROM phone_avail $search"; #$addl_from?
my $count_query = "SELECT COUNT(*) FROM phone_avail $search"; #$addl_from?
+# All of these relationships are left joined in the many-to-one direction,
+# so including $addl_from won't affect the count. Logic!
+
+my $hashref = {};
+$hashref->{'ordernum'} = $1 if $cgi->param('ordernum') =~ /^(\d+)$/;
my $link_cust = sub {
my $phone_avail = shift;
my $link_cust = sub {
my $phone_avail = shift;