From 9410e9f656b950a9d4b383a3992fa50bb7a270db Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 15 Oct 2001 14:58:03 +0000 Subject: [PATCH] date editing --- FS/FS/cust_pkg.pm | 11 +++-- htetc/global.asa | 6 ++- htetc/handler.pl | 6 ++- httemplate/edit/REAL_cust_pkg.cgi | 81 +++++++++++++++++++++++++++++++ httemplate/edit/process/REAL_cust_pkg.cgi | 20 ++++++++ httemplate/view/cust_pkg.cgi | 27 +++++++++-- 6 files changed, 140 insertions(+), 11 deletions(-) create mode 100755 httemplate/edit/REAL_cust_pkg.cgi create mode 100755 httemplate/edit/process/REAL_cust_pkg.cgi diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index cbf4ae50d..069ac8cf7 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -157,9 +157,12 @@ sub replace { #return "Can't (yet?) change pkgpart!" if $old->pkgpart != $new->pkgpart; return "Can't change otaker!" if $old->otaker ne $new->otaker; - return "Can't change setup once it exists!" - if $old->getfield('setup') && - $old->getfield('setup') != $new->getfield('setup'); + + #allow this *sigh* + #return "Can't change setup once it exists!" + # if $old->getfield('setup') && + # $old->getfield('setup') != $new->getfield('setup'); + #some logic for bill, susp, cancel? $new->SUPER::replace($old); @@ -585,7 +588,7 @@ sub order { =head1 VERSION -$Id: cust_pkg.pm,v 1.10 2001-10-15 12:16:42 ivan Exp $ +$Id: cust_pkg.pm,v 1.11 2001-10-15 14:58:03 ivan Exp $ =head1 BUGS diff --git a/htetc/global.asa b/htetc/global.asa index cb2a28037..c3393ad67 100644 --- a/htetc/global.asa +++ b/htetc/global.asa @@ -3,12 +3,16 @@ use vars qw( $cgi $p ); use CGI; #use CGI::Carp qw(fatalsToBrowser); use HTML::Entities; +use Date::Format; +use Date::Parse; use FS::UID qw(cgisuidsetup dbh); use FS::Record qw(qsearch qsearchs fields); use FS::part_svc; use FS::part_pkg; use FS::pkg_svc; -use FS::CGI qw(header menubar popurl table); +use FS::cust_pkg; +use FS::cust_svc; +use FS::CGI qw(header menubar popurl table ntable); sub Script_OnStart { $cgi = new CGI; diff --git a/htetc/handler.pl b/htetc/handler.pl index a06ebb180..d747fe464 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -57,12 +57,16 @@ sub handler use vars qw( $cgi $p ); use CGI; #use CGI::Carp qw(fatalsToBrowser); + use Date::Format; + use Date::Parse; use FS::UID qw(cgisuidsetup); use FS::Record qw(qsearch qsearchs fields); use FS::part_svc; use FS::part_pkg; use FS::pkg_svc; - use FS::CGI qw(header menubar popurl table); + use FS::cust_pkg; + use FS::cust_svc; + use FS::CGI qw(header menubar popurl table ntable); $cgi = new CGI; &cgisuidsetup($cgi); diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi new file mode 100755 index 000000000..8ea0e084d --- /dev/null +++ b/httemplate/edit/REAL_cust_pkg.cgi @@ -0,0 +1,81 @@ +<% +# + +my $error =''; +my $pkgnum = ''; +if ( $cgi->param('error') ) { + $error = $cgi->param('error'); + $pkgnum = $cgi->param('pkgnum'); +} else { + my($query) = $cgi->keywords; + $query =~ /^(\d+)$/ or die "no pkgnum"; + $pkgnum = $1; +} + +#get package record +my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); +die "No package!" unless $cust_pkg; +my $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')}); + +if ( $error ) { + #$cust_pkg->$_(str2time($cgi->param($_)) foreach qw(setup bill); + $cust_pkg->setup(str2time($cgi->param('setup'))); + $cust_pkg->bill(str2time($cgi->param('bill'))); +} + +#my $custnum = $cust_pkg->getfield('custnum'); +print header('Package Edit'); #, menubar( +# "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum", +# 'Main Menu' => popurl(2) +#)); + +#print info +my($susp,$cancel,$expire)=( + $cust_pkg->getfield('susp'), + $cust_pkg->getfield('cancel'), + $cust_pkg->getfield('expire'), +); +my($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment')); +my($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill')); +my $otaker = $cust_pkg->getfield('otaker'); + +print '
', qq!!; + +print qq!Error: $error! + if $error; + +print &ntable("#cccccc"), '', &ntable("#cccccc",2), + 'Package number', + $pkgnum, '', + 'Package', + $pkg, '', + 'Comment', + $comment, '', + 'Order taker', + $otaker, '', + 'Setup date'. + '', + 'Next bill date', + '', +; + +print 'Suspension date', + time2str("%D",$susp), '' + if $susp; + +print 'Expiration date', + time2str("%D",$expire), '' + if $expire; + +print 'Cancellation date', + time2str("%D",$cancel), '' + if $cancel; + +%> +'. +
+
+ + diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi new file mode 100755 index 000000000..4f33f6b38 --- /dev/null +++ b/httemplate/edit/process/REAL_cust_pkg.cgi @@ -0,0 +1,20 @@ +<% +# + +my $pkgnum = $cgi->param('pkgnum') or die; +my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); +my %hash = $old->hash; +$hash{'setup'} = $cgi->param('setup') ? str2time($cgi->param('setup')) : ''; +$hash{'bill'} = $cgi->param('bill') ? str2time($cgi->param('bill')) : ''; +my $new = new FS::cust_pkg \%hash; + +my $error = $new->replace($old); + +if ( $error ) { + $cgi->param('error', $error); + print $cgi->redirect(popurl(2). "REAL_cust_pkg.cgi?". $cgi->query_string ); +} else { + print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $pkgnum); +} + +%> diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi index b354318d4..6dd1d2455 100755 --- a/httemplate/view/cust_pkg.cgi +++ b/httemplate/view/cust_pkg.cgi @@ -1,5 +1,5 @@ <% -# +# use strict; use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg @@ -50,13 +50,30 @@ print $cgi->header( '-expires' => 'now' ), header('Package View', menubar( ($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill')); $otaker = $cust_pkg->getfield('otaker'); +print < +function areyousure(href) { + if (confirm("Permanantly delete included services and cancel this package?") == true) + window.location.href = href; +} + +END + print "Package information"; print ' (unsuspend)' if ( $susp && ! $cancel ); + '">unsuspend)' + if ( $susp && ! $cancel ); + print ' (suspend)' unless ( $susp || $cancel ); -print ' (cancel)' unless $cancel; + '">suspend)' + unless ( $susp || $cancel ); + +print ' (cancel)' + unless $cancel; + +print ' (edit dates)'; print &ntable("#cccccc"), '', &ntable("#cccccc",2), 'Package number', -- 2.11.0