From 49d37cfcbe366b28de81944ebe28e4f768942ec1 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 29 Nov 2007 23:51:37 +0000 Subject: [PATCH] fix dates going all wacky on errors, when you're asked to confirm a date move into the past --- httemplate/edit/REAL_cust_pkg.cgi | 284 +++++++++++++----------------- httemplate/edit/process/REAL_cust_pkg.cgi | 5 - 2 files changed, 126 insertions(+), 163 deletions(-) diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi index 99a3f3098..fe6984673 100755 --- a/httemplate/edit/REAL_cust_pkg.cgi +++ b/httemplate/edit/REAL_cust_pkg.cgi @@ -1,77 +1,9 @@ -% -% -%my $error =''; -%my $pkgnum = ''; -%my($susp,$adjourn,$cancel,$expire, $pkg, $comment, $setup, $bill, $otaker); -% -%my( $cust_pkg, $part_pkg ); -% -%if ( $cgi->param('error') ) { -% $error = $cgi->param('error'); -% $pkgnum = $cgi->param('pkgnum'); -% if ( $error eq '_bill_areyousure' ) { -% my $bill = $cgi->param('bill'); -% $error = "You are attempting to set the next bill date to $bill, which is -% in the past. This will charge the customer for the interval -% from $bill until now. Are you sure you want to do this? ". -% ''; -% } -% -% $susp = $cgi->param('susp'); -% $adjourn = $cgi->param('adjourn'); -% $cancel = $cgi->param('cancel'); -% $expire = $cgi->param('expire'); -% $pkg = $cgi->param('pkg'); -% $comment = $cgi->param('comment'); -% $setup = $cgi->param('setup'); -% $bill = $cgi->param('bill'); -% $otaker = $cgi->param('otaker'); -% -% #get package record -% $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); -% die "No package!" unless $cust_pkg; -% $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')}); -% -%} else { -% my($query) = $cgi->keywords; -% $query =~ /^(\d+)$/ or die "no pkgnum"; -% $pkgnum = $1; -% -% #get package record -% $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); -% die "No package!" unless $cust_pkg; -% $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')}); -% -% ($susp,$adjourn,$cancel,$expire)=( -% $cust_pkg->getfield('susp'), -% $cust_pkg->getfield('adjourn'), -% $cust_pkg->getfield('cancel'), -% $cust_pkg->getfield('expire'), -% ); -% ($pkg,$comment)=($part_pkg->getfield('pkg'),$part_pkg->getfield('comment')); -% ($setup,$bill)=($cust_pkg->getfield('setup'),$cust_pkg->getfield('bill')); -% $otaker = $cust_pkg->getfield('otaker'); -%} -% -%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'))); -% $cust_pkg->last_bill(str2time($cgi->param('last_bill'))); -%} -% -%#my $custnum = $cust_pkg->getfield('custnum'); -% - - <% include("/elements/header.html",'Customer package - Edit dates') %> -% + %#, menubar( %# "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum", %# 'Main Menu' => popurl(2) %#)); -% - @@ -80,130 +12,166 @@
-% if ( $error ) { +% if ( $error ) { Error: <% $error %> % } -% -% -%#my $format = "%c %z (%Z)"; -%my $format = "%m/%d/%Y %T %z (%Z)"; -% -%#false laziness w/view/cust_main/packages.html -%#my( $billed_or_prepaid, -%my( $last_bill_or_renewed, $next_bill_or_prepaid_until ); -%unless ( $part_pkg->is_prepaid ) { -% #$billed_or_prepaid = 'billed'; -% $last_bill_or_renewed = 'Last bill'; -% $next_bill_or_prepaid_until = 'Next bill'; -%} else { -% #$billed_or_prepaid = 'prepaid'; -% $last_bill_or_renewed = 'Renewed'; -% $next_bill_or_prepaid_until = 'Prepaid until'; -%} -% -% - <% ntable("#cccccc",2) %> Package number - <% $pkgnum %> + <% $cust_pkg->pkgnum %> Package - <% $pkg %> + <% $cust_pkg->pkg %> Comment - <% $comment %> + <% $cust_pkg->comment %> Order taker - <% $otaker %> + <% $cust_pkg->otaker %> - - Setup date - - "> - - - + <& .row_edit, cust_pkg=>$cust_pkg, column=>'setup', label=>'Setup' &> + <& .row_edit, cust_pkg=>$cust_pkg, column=>'last_bill', label=>$last_bill_or_renewed &> + <& .row_edit, cust_pkg=>$cust_pkg, column=>'bill', label=>$next_bill_or_prepaid_until &> + <& .row_edit, cust_pkg=>$cust_pkg, column=>'adjourn', label=>'Adjournment', note=>'(will suspend this package when the date is reached)' &> + <& .row_display, cust_pkg=>$cust_pkg, column=>'susp', label=>'Suspension' &> + + <& .row_edit, cust_pkg=>$cust_pkg, column=>'expire', label=>'Expiration', note=>'(will cancel this package when the date is reached)' &> + <& .row_display, cust_pkg=>$cust_pkg, column=>'cancel', label=>'Cancellation' &> + +<%def .row_edit> +<%args> + $cust_pkg + $column + $label + $note => '' + +% my $value = $cust_pkg->get($column); +% $value = $value ? time2str($format, $value) : ""; - <% $last_bill_or_renewed %> date + <% $label %> date - "> - + + +% if ( $note ) { +
<% $note %> +% } - - <% $next_bill_or_prepaid_until %> date - - "> - - - - - Adjournment date - - "> - -
(will suspend this package when the date is reached) - - -% if ( $susp ) { - + + + + +<%def .row_display> +<%args> + $cust_pkg + $column + $label + +% if ( $cust_pkg->get($column) ) { - Suspension date - <% time2str($format, $susp) %> + <% $label %> date + <% time2str($format,$cust_pkg->get($column)) %> % } + + - - Expiration date - - "> - -
(will cancel this package when the date is reached) - - -% if ( $cancel ) { +
+ +
- - Cancellation date - <% time2str($format, $cancel) %> - -% } +<% include('/elements/footer.html') %> +<%once> - +#my $format = "%c %z (%Z)"; +my $format = "%m/%d/%Y %T %z (%Z)"; - -
- - - diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi index 9255672c0..ec951c86c 100755 --- a/httemplate/edit/process/REAL_cust_pkg.cgi +++ b/httemplate/edit/process/REAL_cust_pkg.cgi @@ -1,5 +1,3 @@ -% -% %my $pkgnum = $cgi->param('pkgnum') or die; %my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); %my %hash = $old->hash; @@ -31,6 +29,3 @@ % print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum". % "#cust_pkg$pkgnum" ); %} -% -% - -- 2.11.0