From 2066bf9d3ebb4e53c49ab8b4b447c4eb88e425a4 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 30 Jul 2001 10:41:44 +0000 Subject: [PATCH] shipping address additions --- FS/FS/Record.pm | 36 +++++++++++- FS/FS/cust_main.pm | 92 +++++++++++++++++++++++++++---- httemplate/search/cust_main.cgi | 119 +++++++++++++--------------------------- httemplate/view/cust_main.cgi | 27 ++++----- 4 files changed, 167 insertions(+), 107 deletions(-) diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index 646a57607..82f590f94 100644 --- a/FS/FS/Record.pm +++ b/FS/FS/Record.pm @@ -74,6 +74,7 @@ FS::Record - Database record objects $value = $record->ut_alphan('column'); $value = $record->ut_phonen('column'); $value = $record->ut_anythingn('column'); + $value = $record->ut_name('column'); $dbdef = reload_dbdef; $dbdef = reload_dbdef "/non/standard/filename"; @@ -789,8 +790,37 @@ sub ut_domain { ''; } +=item ut_name COLUMN + +Check/untaint proper names; allows alphanumerics, spaces and the following +punctuation: , . - ' + +May not be null. + +=cut + +sub ut_name { + my( $self, $field ) = @_; + $self->getfield($field) =~ /^([\w \,\.\-\']+)$/ + or return "Illegal (name) $field: ". $self->getfield($field); + $self->setfield($field,$1); + ''; +} + +=item ut_zip COLUMN + +Check/untaint zip codes. + =cut +sub ut_zip { + my( $self, $field ) = @_; + $self->getfield($field) =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/ + or return "Illegal (zip) $field: ". $self->getfield($field); + $self->setfield($field,$1); + ''; +} + =item ut_anything COLUMN Untaints arbitrary data. Be careful. @@ -919,7 +949,7 @@ sub DESTROY { return; } =head1 VERSION -$Id: Record.pm,v 1.18 2001-07-30 07:33:08 ivan Exp $ +$Id: Record.pm,v 1.19 2001-07-30 10:41:44 ivan Exp $ =head1 BUGS @@ -949,7 +979,7 @@ The ut_money method assumes money has two decimal digits. The Pg money kludge in the new method only strips `$'. -The ut_phonen method assumes US-style phone numbers. +The ut_phonen method only checks US-style phone numbers. The _quote function should probably use ut_float instead of a regex. @@ -962,6 +992,8 @@ As of 1.14, DBI fetchall_hashref( {} ) doesn't set fetchrow_hashref NAME_lc, or allow it to be set. Working around it is ugly any way around - DBI should be fixed. (only affects RDBMS which return uppercase column names) +ut_zip should take an optional country like ut_phone. + =head1 SEE ALSO L, L, L diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 2d7dae41f..e6b7531c4 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -149,6 +149,32 @@ FS::Record. The following fields are currently supported: =item fax - phone (optional) +=item ship_first - name + +=item ship_last - name + +=item ship_company - (optional) + +=item ship_address1 + +=item ship_address2 - (optional) + +=item ship_city + +=item ship_county - (optional, see L) + +=item ship_state - (see L) + +=item ship_zip + +=item ship_country - (see L) + +=item ship_daytime - phone (optional) + +=item ship_night - phone (optional) + +=item ship_fax - phone (optional) + =item payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L and sets billing type to BILL) =item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L) @@ -386,6 +412,8 @@ sub check { $self->ut_numbern('custnum') || $self->ut_number('agentnum') || $self->ut_number('refnum') + || $self->ut_name('last') + || $self->ut_name('first') || $self->ut_textn('company') || $self->ut_text('address1') || $self->ut_textn('address2') @@ -404,14 +432,6 @@ sub check { return "Unknown referral" unless qsearchs( 'part_referral', { 'refnum' => $self->refnum } ); - $self->getfield('last') =~ /^([\w \,\.\-\']+)$/ - or return "Illegal last name: ". $self->getfield('last'); - $self->setfield('last',$1); - - $self->first =~ /^([\w \,\.\-\']+)$/ - or return "Illegal first name: ". $self->first; - $self->first($1); - if ( $self->ss eq '' ) { $self->ss(''); } else { @@ -441,12 +461,60 @@ sub check { $self->ut_phonen('daytime', $self->country) || $self->ut_phonen('night', $self->country) || $self->ut_phonen('fax', $self->country) + || $self->ut_zip('zip', $self->country) ; return $error if $error; - $self->zip =~ /^\s*(\w[\w\-\s]{2,8}\w)\s*$/ - or return "Illegal zip: ". $self->zip; - $self->zip($1); + if ( defined $self->dbdef_table->column('ship_last') ) { + if ( grep { $self->getfield($_) ne $self->getfield("ship_$_") } + qw( last first company address1 address2 city county state zip + country daytime night fax ) + ) # if any address fields differ + { + my $error = + $self->ut_name('ship_last') + || $self->ut_name('ship_first') + || $self->ut_textn('ship_company') + || $self->ut_text('ship_address1') + || $self->ut_textn('ship_address2') + || $self->ut_text('ship_city') + || $self->ut_textn('ship_county') + || $self->ut_textn('ship_state') + ; + return $error if $error; + + #false laziness with above + $self->ship_country =~ /^(\w\w)$/ + or return "Illegal ship_country: ". $self->ship_country; + $self->ship_country($1); + unless ( qsearchs('cust_main_county', { + 'country' => $self->ship_country, + 'state' => '', + } ) ) { + return "Unknown ship_state/ship_county/ship_country: ". + $self->ship_state. "/". $self->ship_county. "/". $self->ship_country + unless qsearchs('cust_main_county',{ + 'state' => $self->ship_state, + 'county' => $self->ship_county, + 'country' => $self->ship_country, + } ); + } + #eofalse + + $error = + $self->ut_phonen('ship_daytime', $self->ship_country) + || $self->ut_phonen('ship_night', $self->ship_country) + || $self->ut_phonen('ship_fax', $self->ship_country) + || $self->ut_zip('ship_zip', $self->ship_country) + ; + return $error if $error; + + } else { # ship_ info eq billing info, so don't store dup info in database + $self->setfield("ship_$_", '') + foreach qw( last first company address1 address2 city county state zip + country daytime night fax ); + } + } $self->payby =~ /^(CARD|BILL|COMP|PREPAY)$/ or return "Illegal payby: ". $self->payby; @@ -1125,7 +1193,7 @@ sub check_invoicing_list { =head1 VERSION -$Id: cust_main.pm,v 1.14 2001-06-03 10:51:54 ivan Exp $ +$Id: cust_main.pm,v 1.15 2001-07-30 10:41:44 ivan Exp $ =head1 BUGS diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi index 844bb98b8..86bca1fcf 100755 --- a/httemplate/search/cust_main.cgi +++ b/httemplate/search/cust_main.cgi @@ -1,81 +1,5 @@ <% -# -# $Id: cust_main.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $ -# -# Usage: post form to: -# http://server.name/path/cust_main.cgi -# -# ivan@voicenet.com 96-dec-12 -# -# rewrite ivan@sisd.com 98-mar-4 -# -# now does browsing too ivan@sisd.com 98-mar-6 -# -# Changes to allow page to work at a relative position in server -# bmccane@maxbaud.net 98-apr-3 -# -# display total, use FS::CGI ivan@sisd.com 98-jul-17 -# -# $Log: cust_main.cgi,v $ -# Revision 1.1 2001-07-30 07:36:04 ivan -# templates!!! -# -# Revision 1.17 2001/04/23 16:07:54 ivan -# fix -# Insecure dependency in eval while running with -T switch at /usr/local/lib/site_perl/FS/Record.pm line 202. -# -# Revision 1.16 2001/02/07 19:45:45 ivan -# tyop -# -# Revision 1.15 2000/07/17 16:45:41 ivan -# first shot at invoice browsing and some other cleanups -# -# Revision 1.14 1999/08/12 04:45:21 ivan -# typo - missed a paren -# -# Revision 1.13 1999/08/12 04:32:21 ivan -# hidecancelledcustomers -# -# Revision 1.12 1999/07/17 10:38:52 ivan -# scott nelson noticed this mod_perl-triggered bug and -# gave me a great bugreport at the last rhythmethod -# -# Revision 1.11 1999/04/09 04:22:34 ivan -# also table() -# -# Revision 1.10 1999/04/09 03:52:55 ivan -# explicit & for table/itable/ntable -# -# Revision 1.9 1999/02/28 00:03:55 ivan -# removed misleading comments -# -# Revision 1.8 1999/02/07 09:59:36 ivan -# more mod_perl fixes, and bugfixes Peter Wemm sent via email -# -# Revision 1.7 1999/01/25 12:19:11 ivan -# yet more mod_perl stuff -# -# Revision 1.6 1999/01/19 05:14:12 ivan -# for mod_perl: no more top-level my() variables; use vars instead -# also the last s/create/new/; -# -# Revision 1.5 1999/01/18 09:41:37 ivan -# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl -# (good idea anyway) -# -# Revision 1.4 1998/12/30 00:57:50 ivan -# bug -# -# Revision 1.3 1998/12/17 09:41:08 ivan -# s/CGI::(Base|Request)/CGI.pm/; -# -# Revision 1.2 1998/11/12 08:10:22 ivan -# CGI.pm instead of CGI-modules -# relative URLs using popurl -# got rid of lots of little tables -# s/agrep/String::Approx/; -# bubble up packages and services and link (slow) -# +# use strict; #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby ); @@ -85,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser); use IO::Handle; use String::Approx qw(amatch); use FS::UID qw(cgisuidsetup); -use FS::Record qw(qsearch qsearchs); +use FS::Record qw(qsearch qsearchs dbdef); use FS::CGI qw(header menubar eidiot popurl table); use FS::cust_main; use FS::cust_svc; @@ -137,8 +61,18 @@ if ( scalar(@cust_main) == 1 ) { )), "$total matching customers found
", &table(), < - Contact name - Company + (bill) name + company +END + +if ( defined dbdef->table('cust_main')->column('ship_last') ) { + print <(service) name + company +END +} + +print <Packages Services @@ -171,6 +105,17 @@ END $last, $first $company END + if ( defined dbdef->table('cust_main')->column('ship_last') ) { + my($ship_last,$ship_first,$ship_company)=( + $cust_main->ship_last || $cust_main->getfield('last'), + $cust_main->ship_last ? $cust_main->ship_first : $cust_main->first, + $cust_main->ship_last ? $cust_main->ship_company : $cust_main->company, + ); +print <$ship_last, $ship_first + $ship_company +END + } my($n1)=''; foreach ( @{$all_pkgs{$custnum}} ) { @@ -250,11 +195,16 @@ sub lastsearch { push @cust_main, qsearch('cust_main',{'last'=>$last}); + push @cust_main, qsearch('cust_main',{'ship_last'=>$last}) + if defined dbdef->table('cust_main')->column('ship_last'); + } else { my(%last); my(@all_last)=map $_->getfield('last'), qsearch('cust_main',{}); + push @all_last, grep $_, map $_->getfield('ship_last'), qsearch('cust_main',{}) + if defined dbdef->table('cust_main')->column('ship_last'); if ($last_type{'Fuzzy'}) { foreach ( amatch($last, [ qw(i) ], @all_last) ) { $last{$_}++; @@ -266,6 +216,8 @@ sub lastsearch { foreach ( keys %last ) { push @cust_main, qsearch('cust_main',{'last'=>$_}); + push @cust_main, qsearch('cust_main',{'ship_last'=>$_}) + if defined dbdef->table('cust_main')->column('ship_last'); } } @@ -290,10 +242,15 @@ sub companysearch { push @cust_main, qsearch('cust_main',{'company'=>$company}); + push @cust_main, qsearch('cust_main',{'ship_company'=>$company}) + if defined dbdef->table('cust_main')->column('ship_last'); + } else { my(%company); my(@all_company)=map $_->company, qsearch('cust_main',{}); + push @all_company, grep $_, map $_->getfield('ship_company'), qsearch('cust_main',{}) + if defined dbdef->table('cust_main')->column('ship_last'); if ($company_type{'Fuzzy'}) { foreach ( amatch($company, [ qw(i) ], @all_company ) ) { @@ -306,6 +263,8 @@ sub companysearch { foreach ( keys %company ) { push @cust_main, qsearch('cust_main',{'company'=>$_}); + push @cust_main, qsearch('cust_main',{'ship_company'=>$_}) + if defined dbdef->table('cust_main')->column('ship_last'); } } diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 6c260bb7d..752896847 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -1,6 +1,7 @@ - <% +# +use strict; use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral @packages $package @history @bills $bill @credits $credit $balance $item @agents @referrals @invoicing_list $n1 $conf ); @@ -94,36 +95,36 @@ print ''; &ntable("#cccccc",2), 'Contact name', '', - $cust_main->get("${$pre}last"), ', ', $cust_main->get("${$pre}first"), + $cust_main->get("${pre}last"), ', ', $cust_main->get("${pre}first"), '', 'Company', - $cust_main->get("${$pre}company"), + $cust_main->get("${pre}company"), '', 'Address', - $cust_main->get("${$pre}address1"), + $cust_main->get("${pre}address1"), '', ; print ' ', - $cust_main->get("${$pre}address2"), '' - if $cust_main->get("${$pre}address2"); + $cust_main->get("${pre}address2"), '' + if $cust_main->get("${pre}address2"); print 'City', - $cust_main->get("${$pre}city"), + $cust_main->get("${pre}city"), 'State', - $cust_main->get("${$pre}state"), + $cust_main->get("${pre}state"), 'Zip', - $cust_main->get("${$pre}zip"), '', + $cust_main->get("${pre}zip"), '', 'Country', - $cust_main->get("${$pre}country"), + $cust_main->get("${pre}country"), '', ; print 'Day Phone', '', - $cust_main->get("${$pre}daytime") || ' ', '', + $cust_main->get("${pre}daytime") || ' ', '', 'Night Phone'. '', - $cust_main->get("${$pre}night") || ' ', '', + $cust_main->get("${pre}night") || ' ', '', 'Fax', - $cust_main->get("${$pre}fax") || ' ', '', + $cust_main->get("${pre}fax") || ' ', '', '', "" ; -- 2.11.0