From 87661d51ce44b78c5b156f4ee7c52e75a9d38746 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 16 Sep 2001 12:45:35 +0000 Subject: [PATCH] fix oops in FS::cust_main_invoice::replace preventing package cancellation add toggle switch to cust_main searching to show/hide cancelled customers. hidecancelledcustomers config file is just which state it starts in. add signupurl config file to enable showing of the customer's signup URL on the view page. --- FS/FS/Record.pm | 5 +++-- FS/FS/cust_main_invoice.pm | 4 ++-- FS/FS/svc_acct.pm | 5 ++++- httemplate/docs/config.html | 1 + httemplate/index.html | 2 +- httemplate/search/cust_main.cgi | 25 +++++++++++++++++++------ httemplate/view/cust_main.cgi | 14 +++++++++++--- 7 files changed, 41 insertions(+), 15 deletions(-) diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index 578904ed3..333602c07 100644 --- a/FS/FS/Record.pm +++ b/FS/FS/Record.pm @@ -472,10 +472,11 @@ returns the error, otherwise returns false. sub replace { my ( $new, $old ) = ( shift, shift ); + warn "[debug][FS::Record] $new ->replace $old\n" if $DEBUG; my @diff = grep $new->getfield($_) ne $old->getfield($_), $old->fields; unless ( @diff ) { - carp "warning: records identical"; + carp "[warning][FS::Record] $new -> replace $old: records identical"; return ''; } @@ -993,7 +994,7 @@ sub DESTROY { return; } =head1 VERSION -$Id: Record.pm,v 1.28 2001-09-14 18:05:16 ivan Exp $ +$Id: Record.pm,v 1.29 2001-09-16 12:45:35 ivan Exp $ =head1 BUGS diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm index 61a8f7534..d6b4cd933 100644 --- a/FS/FS/cust_main_invoice.pm +++ b/FS/FS/cust_main_invoice.pm @@ -88,7 +88,7 @@ sub replace { return "Can't change custnum!" unless $old->custnum == $new->custnum; - $new->SUPER::replace; + $new->SUPER::replace($old); } @@ -172,7 +172,7 @@ sub address { =head1 VERSION -$Id: cust_main_invoice.pm,v 1.6 2001-08-12 00:06:33 ivan Exp $ +$Id: cust_main_invoice.pm,v 1.7 2001-09-16 12:45:35 ivan Exp $ =head1 BUGS diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm index e52cebf15..c6b65936a 100644 --- a/FS/FS/svc_acct.pm +++ b/FS/FS/svc_acct.pm @@ -397,6 +397,9 @@ sub delete { foreach my $cust_main_invoice ( qsearch( 'cust_main_invoice', { 'dest' => $self->svcnum } ) ) { + #next unless defined; #wtf is up with qsearch? + warn $cust_main_invoice; + next unless defined $cust_main_invoice; my %hash = $cust_main_invoice->hash; $hash{'dest'} = $self->email; my $new = new FS::cust_main_invoice \%hash; @@ -841,7 +844,7 @@ sub email { =head1 VERSION -$Id: svc_acct.pm,v 1.39 2001-09-14 19:54:22 ivan Exp $ +$Id: svc_acct.pm,v 1.40 2001-09-16 12:45:35 ivan Exp $ =head1 BUGS diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html index 84e9538f7..b985ebee9 100644 --- a/httemplate/docs/config.html +++ b/httemplate/docs/config.html @@ -89,6 +89,7 @@ All further configuration files and directories are located in
  • shellmachines - Your Linux and System V flavored shell (and mail) machines, one per line. This enables export of `/etc/passwd' and `/etc/shadow' files.
  • shells - Legal shells (think /etc/shells). You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords. A blank line specifies that an empty shell is permitted.
  • showpasswords - The existance of this file will allow unencrypted user passwords to be displayed. +
  • signupurl - if you are using customer-to-customer referrals, and you enter the URL of your signup server CGI, the customer view screen will display a customized link to the signup server with the appropriate customer as referral.
  • smtpmachine - SMTP relay for Freeside's outgoing mail.
  • soadefaultttl - SOA default TTL for new domains.
  • soaemail - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.' diff --git a/httemplate/index.html b/httemplate/index.html index 2fbc06221..c45997608 100644 --- a/httemplate/index.html +++ b/httemplate/index.html @@ -34,7 +34,7 @@
  • Browse