projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5c38d51
)
fix very strange "Undefined subroutine &FS::UI::Web::rooturl" with an explicit import...
author
ivan
<ivan>
Thu, 19 Apr 2007 20:18:05 +0000
(20:18 +0000)
committer
ivan
<ivan>
Thu, 19 Apr 2007 20:18:05 +0000
(20:18 +0000)
FS/FS/UI/Web.pm
patch
|
blob
|
history
htetc/handler.pl
patch
|
blob
|
history
httemplate/browse/part_svc.cgi
patch
|
blob
|
history
httemplate/elements/menu.html
patch
|
blob
|
history
httemplate/search/cust_svc.html
patch
|
blob
|
history
httemplate/view/cust_main/packages.html
patch
|
blob
|
history
diff --git
a/FS/FS/UI/Web.pm
b/FS/FS/UI/Web.pm
index
a05a667
..
43c4935
100644
(file)
--- a/
FS/FS/UI/Web.pm
+++ b/
FS/FS/UI/Web.pm
@@
-1,14
+1,18
@@
package FS::UI::Web;
use strict;
package FS::UI::Web;
use strict;
-use vars qw($DEBUG $me);
+use vars qw($DEBUG @ISA @EXPORT_OK $me);
+use Exporter;
+use Number::Format;
use FS::Conf;
use FS::Record qw(dbdef);
use FS::Conf;
use FS::Record qw(dbdef);
-use Number::Format;
#use vars qw(@ISA);
#use FS::UI
#@ISA = qw( FS::UI );
#use vars qw(@ISA);
#use FS::UI
#@ISA = qw( FS::UI );
+@ISA = qw( Exporter );
+
+@EXPORT_OK = qw( svc_url );
$DEBUG = 0;
$me = '[FS::UID::Web]';
$DEBUG = 0;
$me = '[FS::UID::Web]';
@@
-114,6
+118,7
@@
sub svc_url {
$url .= 'svcnum=' if $query =~ /^\d+(;|$)/ or $query eq '';
}
$url .= 'svcnum=' if $query =~ /^\d+(;|$)/ or $query eq '';
}
+ import FS::CGI 'rooturl'; #WTF! why is this necessary
my $return = rooturl(). "$opt{action}/$url$query";
$return = qq!<A HREF="$return">! if $opt{ahref};
my $return = rooturl(). "$opt{action}/$url$query";
$return = qq!<A HREF="$return">! if $opt{ahref};
diff --git
a/htetc/handler.pl
b/htetc/handler.pl
index
164da37
..
d467425
100644
(file)
--- a/
htetc/handler.pl
+++ b/
htetc/handler.pl
@@
-127,7
+127,7
@@
sub handler
use FS::Conf;
use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot
eidiot small_custview myexit http_header);
use FS::Conf;
use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot
eidiot small_custview myexit http_header);
- use FS::UI::Web;
+ use FS::UI::Web
qw(svc_url)
;
use FS::Msgcat qw(gettext geterror);
use FS::Misc qw( send_email send_fax states_hash counties state_label );
use FS::Report::Table::Monthly;
use FS::Msgcat qw(gettext geterror);
use FS::Misc qw( send_email send_fax states_hash counties state_label );
use FS::Report::Table::Monthly;
diff --git
a/httemplate/browse/part_svc.cgi
b/httemplate/browse/part_svc.cgi
index
92c0840
..
cce6af8
100755
(executable)
--- a/
httemplate/browse/part_svc.cgi
+++ b/
httemplate/browse/part_svc.cgi
@@
-100,7
+100,7
@@
function part_export_areyousure(href) {
<% $svcdb %></TD>
<TD ROWSPAN=<% $rowspan %> CLASS="grid" BGCOLOR="<% $bgcolor %>">
<% $svcdb %></TD>
<TD ROWSPAN=<% $rowspan %> CLASS="grid" BGCOLOR="<% $bgcolor %>">
- <FONT COLOR="#00CC00"><B><% $num_active_cust_svc{$part_svc->svcpart} %></B></FONT> <% $num_active_cust_svc{$part_svc->svcpart} ?
FS::UI::Web::
svc_url( 'ahref' => 1, 'm' => $m, 'action' => 'search', 'part_svc' => $part_svc, 'query' => "svcpart=". $part_svc->svcpart ) : '<A NAME="zero">' %>active</A>
+ <FONT COLOR="#00CC00"><B><% $num_active_cust_svc{$part_svc->svcpart} %></B></FONT> <% $num_active_cust_svc{$part_svc->svcpart} ? svc_url( 'ahref' => 1, 'm' => $m, 'action' => 'search', 'part_svc' => $part_svc, 'query' => "svcpart=". $part_svc->svcpart ) : '<A NAME="zero">' %>active</A>
% if ( $num_active_cust_svc{$part_svc->svcpart} ) {
<BR><FONT SIZE="-1">[ <A HREF="<%$p%>edit/bulk-cust_svc.html?svcpart=<% $part_svc->svcpart %>">change</A> ]</FONT>
% if ( $num_active_cust_svc{$part_svc->svcpart} ) {
<BR><FONT SIZE="-1">[ <A HREF="<%$p%>edit/bulk-cust_svc.html?svcpart=<% $part_svc->svcpart %>">change</A> ]</FONT>
diff --git
a/httemplate/elements/menu.html
b/httemplate/elements/menu.html
index
f58da9e
..
7ee34a9
100644
(file)
--- a/
httemplate/elements/menu.html
+++ b/
httemplate/elements/menu.html
@@
-120,14
+120,14
@@
foreach my $svcdb ( FS::part_svc->svc_tables() ) {
if scalar(@$sorts) > 1;
$report_svc{$title} =
if scalar(@$sorts) > 1;
$report_svc{$title} =
- [
FS::UI::Web::
svc_url( %svc_url, 'query' => "magic=all;sortby=$sort" ),
+ [ svc_url( %svc_url, 'query' => "magic=all;sortby=$sort" ),
'',
];
}
if ( $curuser->access_right('View/link unlinked services') ) {
$report_svc{"Unlinked $lcname"} =
'',
];
}
if ( $curuser->access_right('View/link unlinked services') ) {
$report_svc{"Unlinked $lcname"} =
- [
FS::UI::Web::
svc_url( %svc_url, 'query' => "magic=unlinked;sortby=". $sorts->[0] ),
+ [ svc_url( %svc_url, 'query' => "magic=unlinked;sortby=". $sorts->[0] ),
"Pre-Freeside $lcname without a customer record",
];
}
"Pre-Freeside $lcname without a customer record",
];
}
diff --git
a/httemplate/search/cust_svc.html
b/httemplate/search/cust_svc.html
index
6369b20
..
9a43a41
100644
(file)
--- a/
httemplate/search/cust_svc.html
+++ b/
httemplate/search/cust_svc.html
@@
-115,7
+115,7
@@
my $count_query = "SELECT COUNT(*) FROM cust_svc $addl_from $extra_sql";
my $link = sub {
my $cust_svc = shift;
my $link = sub {
my $cust_svc = shift;
- my $url =
FS::UI::Web::
svc_url(
+ my $url = svc_url(
'm' => $m,
'action' => 'view',
#'part_svc' => $cust_svc->part_svc,
'm' => $m,
'action' => 'view',
#'part_svc' => $cust_svc->part_svc,
diff --git
a/httemplate/view/cust_main/packages.html
b/httemplate/view/cust_main/packages.html
index
c569046
..
98acb86
100755
(executable)
--- a/
httemplate/view/cust_main/packages.html
+++ b/
httemplate/view/cust_main/packages.html
@@
-440,12
+440,12
@@
Current packages
% ) {
% $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart";
% } else {
% ) {
% $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart";
% } else {
-% $url =
FS::UI::Web::
svc_url(
-%
'm' => $m,
-%
'action' => 'edit',
-%
'part_svc' => $part_svc,
-%
'query' => $pkgnum_svcpart,
-%
);
+% $url = svc_url(
+% 'm' => $m,
+% 'action' => 'edit',
+% 'part_svc' => $part_svc,
+% 'query' => $pkgnum_svcpart,
+% );
% #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
% }
%
% #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
% }
%
@@
-522,7
+522,7
@@
Current packages
%sub pkg_link {
% my($action, $label, $cust_pkg) = @_;
% return '' unless $cust_pkg;
%sub pkg_link {
% my($action, $label, $cust_pkg) = @_;
% return '' unless $cust_pkg;
-% qq!<a href="$
{p}
$action.cgi?!. $cust_pkg->pkgnum. qq!">$label</a>!;
+% qq!<a href="$
p
$action.cgi?!. $cust_pkg->pkgnum. qq!">$label</a>!;
%}
%
%sub pkg_popup_link {
%}
%
%sub pkg_popup_link {