From 833547365c4418946c1c270f43928164d51cf531 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 21 Jan 2004 22:10:05 +0000 Subject: clean up all temp files! --- FS/FS/cust_bill.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index 9f1d7a6fc..60eaac6d9 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -1109,9 +1109,7 @@ sub print_ps { open(POSTSCRIPT, "<$file.ps") or die "can't open $file.ps (probable error in LaTeX template): $!\n"; - #rm $file.dvi $file.log $file.aux - unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps"); - #unlink("$file.dvi", "$file.log", "$file.aux"); + unlink("$file.dvi", "$file.log", "$file.aux", "$file.ps", "$file.tex"); my $ps = ''; while () { @@ -1154,7 +1152,7 @@ sub print_pdf { open(PDF, "<$file.pdf") or die "can't open $file.pdf (probably error in LaTeX tempalte: $!\n"; - unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf"); + unlink("$file.dvi", "$file.log", "$file.aux", "$file.pdf", "$file.tex"); my $pdf = ''; while () { -- cgit v1.2.1 From eef42f43c02b386ed7a0b1ce9911964bb94d3e96 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 21 Jan 2004 23:45:03 +0000 Subject: fix newline problem in dump --- httemplate/misc/dump.cgi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/httemplate/misc/dump.cgi b/httemplate/misc/dump.cgi index 2c7dfc455..dc1323bb3 100644 --- a/httemplate/misc/dump.cgi +++ b/httemplate/misc/dump.cgi @@ -13,7 +13,7 @@ http_header('Content-Type' => 'text/plain' ); while () { - chomp; -%><%= $_ %><% } - close DUMP; + print $_; + } + close DUMP; %> -- cgit v1.2.1 From 9163d831264988af6065139c7531d59a1bb29c10 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 22 Jan 2004 00:11:01 +0000 Subject: report cancellation errors properly --- httemplate/misc/cust_main-cancel.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi index 526e128a4..257c3384f 100755 --- a/httemplate/misc/cust_main-cancel.cgi +++ b/httemplate/misc/cust_main-cancel.cgi @@ -7,8 +7,8 @@ my $custnum = $1; my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ); -my $error = $cust_main->cancel; -eidiot($error) if $error; +my @errors = $cust_main->cancel; +eidiot(join(' / ', @errors)) if scalar(@errors); #print $cgi->redirect($p. "view/cust_main.cgi?". $cust_main->custnum); print $cgi->redirect($p); -- cgit v1.2.1 From 30a64bab3009967a4c530c44c49df2ab4681fef1 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 22 Jan 2004 00:21:25 +0000 Subject: fix cancel method --- FS/FS/cust_main.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 86962ce61..6ca32871d 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -1016,7 +1016,7 @@ Always returns a list: an empty list on success or a list of errors. sub cancel { my $self = shift; - grep { $_->cancel(@_) } $self->ncancelled_pkgs; + grep { $_ } map { $_->cancel(@_) } $self->ncancelled_pkgs; } =item agent -- cgit v1.2.1 From c6d6af63486146b83095818513c3c11bdb21360d Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 23 Jan 2004 00:49:36 +0000 Subject: update ideas about package splitup --- debian/control | 61 ++++++++++++++-------------------------------------------- 1 file changed, 14 insertions(+), 47 deletions(-) diff --git a/debian/control b/debian/control index de2820d83..d7873b228 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Standards-Version: 3.5.2 Package: freeside Architecture: any Depends: freeside-lib -Recommends: freeside-doc, freeside-ui-web, libterm-query-perl -Suggests: freeside-passwd-server, freeside-signup-server, freeside-session-server, freeside-selfservice-server +Recommends: freeside-doc, freeside-ui-web +Suggests: freeside-selfservice-server Description: Billing and administration package for ISPs. Freeside is a billing and account administration package for ISPs. It stores customer information in an SQL database, and will update UNIX passwd and @@ -30,63 +30,30 @@ Description: Freeside libraries and extension API This package contains the libraries which implement the business logic and backend functions of Freeside, a billing and account administration package for ISPs. This package also contains the manual pages for the library API. + (? like a libmodule-perl package) Package: freeside-ui-web Architecture: all -Depends: libstring-approx-perl, freeside-lib, libapache-mod-perl|apache-perl +Depends: libhtml-mason-perl, libstring-approx-perl, freeside-lib, libapache-mod-perl|apache-perl Suggests: libapache-mod-ssl|apache-ssl Description: Easy-to-use web interface for Freeside This package contains the web interface for Freeside, a billing and account administration package for ISPs. This is what sales or support folks will typically use to add new accounts, edit exiting accounts and so on. -Package: freeside-passwd-server -Architecture: all -Depends: freeside-lib -Description: Freeside password server - This component of Freeside, a billing and account administration package for - ISPs, - -Package: freeside-passwd-client -Architecture: all -Depends: -Description: - - -Package: freeside-signup-server -Architecture: all -Depends: freeside-lib -Description: - - -Package: freeside-signup-client -Architecture: all -Depends: -Description: - - -Package: freeside-signup-client-webui -Architecture: all -Depends: freeside-signup-client-lib, httpd -Description: - - -Package: freeside-session-server +Package: freeside-selfservice-server Architecture: all -Depends: freeside-lib +Depends: freeside-lib, libnet-ssh-perl, ssh Description: - + This package contains the server side of the customer self-service interface. + It is installed on a private backend machine, and opens an outgoing ssh + connection to one or more public web server(s). -Package: freeside-session-client +Package: freeside-selfservice-client Architecture: all -Depends: ssh -Description: - - -Package: freeside-selfservice-server -Architecture: all -Depends: +Depends: libstorable-perl, libhttp-browserdetect-perl, libbusiness-creditcard-perl, ssh Description: - - + This package contains the client side of the customer self-service interface. + It is typically installed on a public webserver and interfaces with + freeside-selfservice-server installed on a private backend machine. -- cgit v1.2.1 From 85be0d954dbe4a2c86841a37dc6a4df690dd5142 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 23 Jan 2004 02:53:12 +0000 Subject: fix state default and set min year to this year, patch from , thanks! --- httemplate/edit/cust_main.cgi | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index 1909b5438..bfe4a2d4f 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -191,8 +191,10 @@ END my $countrydefault = $conf->config('countrydefault') || 'US'; $cust_main->country( $countrydefault ) unless $cust_main->country; -$cust_main->state( $conf->config('statedefault') || 'CA' ) - unless $cust_main->state || $cust_main->country ne 'US'; +my $statedefault = $conf->config('statedefault') + || ($countrydefault eq 'US' ? 'CA' : ''); +$cust_main->state( $statedefault ) + unless $cust_main->state || $cust_main->country ne $countrydefault; my($county_html, $state_html, $country_html) = FS::cust_main_county::regionselector( $cust_main->county, @@ -343,7 +345,9 @@ sub expselect { $return .= ">$_"; } $return .= qq!/