X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htdocs%2Fedit%2Fpart_pkg.cgi;h=f7ade88c8a7cbef635bd2504fa1c87845af5d3f5;hb=6178bdb5a08527e9c64deb05fab6b836af869695;hp=7fd029b032aadf2f8ab23a95156cd5214c06f40c;hpb=8e3b1af0e9651fd02ebd10562f17f5e0c787d434;p=freeside.git diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi index 7fd029b03..f7ade88c8 100755 --- a/htdocs/edit/part_pkg.cgi +++ b/htdocs/edit/part_pkg.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: part_pkg.cgi,v 1.5 1998-11-21 07:12:26 ivan Exp $ +# $Id: part_pkg.cgi,v 1.9 1999-02-07 09:59:19 ivan Exp $ # # part_pkg.cgi: Add/Edit package (output form) # @@ -13,7 +13,21 @@ # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12 # # $Log: part_pkg.cgi,v $ -# Revision 1.5 1998-11-21 07:12:26 ivan +# Revision 1.9 1999-02-07 09:59:19 ivan +# more mod_perl fixes, and bugfixes Peter Wemm sent via email +# +# Revision 1.8 1999/01/19 05:13:39 ivan +# for mod_perl: no more top-level my() variables; use vars instead +# also the last s/create/new/; +# +# Revision 1.7 1999/01/18 09:41:29 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.6 1998/12/17 06:17:05 ivan +# fix double // in relative URLs, s/CGI::Base/CGI/; +# +# Revision 1.5 1998/11/21 07:12:26 ivan # *** empty log message *** # # Revision 1.4 1998/11/21 07:11:08 ivan @@ -27,16 +41,17 @@ # use strict; +use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count ); use CGI; use CGI::Carp qw(fatalsToBrowser); use FS::UID qw(cgisuidsetup); -use FS::Record qw(qsearch qsearchs); +use FS::Record qw(qsearch qsearchs fields); use FS::part_pkg; use FS::part_svc; use FS::pkg_svc; use FS::CGI qw(header menubar popurl); -my($cgi) = new CGI; +$cgi = new CGI; &cgisuidsetup($cgi); @@ -51,26 +66,37 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) { $cgi->param('pkgnum', ''); } -my($part_pkg,$action); -my($query) = $cgi->keywords; +($query) = $cgi->keywords; +$action = ''; +$part_pkg = ''; +if ( $cgi->param('error') ) { + $part_pkg = new FS::part_pkg ( { + map { $_, scalar($cgi->param($_)) } fields('part_pkg') + } ); +} if ( $cgi->param('clone') ) { $action='Custom Pricing'; my $old_part_pkg = qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } ); - $part_pkg = $old_part_pkg->clone; -} elsif ( $query =~ /^(\d+)$/ ) { - $action='Edit'; - $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1}); + $part_pkg ||= $old_part_pkg->clone; +} elsif ( $query && $query =~ /^(\d+)$/ ) { + $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1}); } else { - $action='Add'; - $part_pkg=create FS::part_pkg {}; + $part_pkg ||= new FS::part_pkg {}; } -my($hashref)=$part_pkg->hashref; +$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add'; +$hashref = $part_pkg->hashref; -print $cgi->header, header("$action Package Definition", menubar( +print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar( 'Main Menu' => popurl(2), - 'View all packages' => popurl(2). '/browse/part_pkg.cgi', -)), '