X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2FREAL_cust_pkg.cgi;h=166a3b7ea064bd07bb3cda9586e08d75a7490e81;hb=06fb1346ff8076a84f743fa07de31852942e144f;hp=18d4415c6d63db3c3052afa153df829b80bb8bce;hpb=06a85a88bfdb0d3fc79ee055eb8327658dfe63ab;p=freeside.git
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 18d4415c6..166a3b7ea 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -46,6 +46,7 @@
<% $cust_pkg->otaker %> |
+ <& .row_display, cust_pkg=>$cust_pkg, column=>'order_date', label=>'Order' &>
% if ( $cust_pkg->setup && ! $cust_pkg->start_date ) {
<& .row_display, cust_pkg=>$cust_pkg, column=>'start_date', label=>'Start' &>
% } else {
@@ -55,12 +56,17 @@
<& .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_display, 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' &>
+%#if ( $cust_pkg->contract_end or $part_pkg->option('contract_end_months',1) ) {
+ <& .row_edit, cust_pkg=>$cust_pkg, column=>'contract_end',label=>'Contract end' &>
+%#}
+ <& .row_display, 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_display, cust_pkg=>$cust_pkg, column=>'resume', label=>'Resumption', note=> '(will unsuspend this package when the date is reached' &>
<& .row_display, 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
@@ -124,20 +130,23 @@
-
+
<% include('/elements/footer.html') %>
+<%shared>
+
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+my $format = $date_format. ' %T'; # %z (%Z)';
+%shared>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Edit customer package dates');
-my $conf = new FS::Conf;
-my $date_format = $conf->config('date_format') || '%m/%d/%Y';
-
-my $format = $date_format. ' %T %z (%Z)';
my $error = '';
my( $pkgnum, $cust_pkg );
@@ -166,10 +175,17 @@ if ( $cgi->param('error') ) {
if ( $errors{'_setup_areyousure'} ) {
push @errors,
"You are attempting to remove the setup date. This will re-charge the
- customer for the setup fee. Are you sure you want to do this? ".
+ customer for the setup fee. Are you sure you want to do this? ".
'';
}
+ if ( $errors{'_setupadd_areyousure'} ) {
+ push @errors,
+ "You are attempting to add a setup date. This will prevent charging the
+ customer for the setup fee. Are you sure you want to do this? ".
+ '';
+ }
+
if ( $errors{'_start'} ) {
push @errors,
"You are attempting to add a start date to a package that has already
@@ -184,9 +200,9 @@ if ( $cgi->param('error') ) {
$cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
die "No package!" unless $cust_pkg;
- foreach my $col (qw( setup last_bill bill adjourn expire )) {
+ foreach my $col (qw( start_date setup last_bill bill )) {
my $value = $cgi->param($col);
- $cust_pkg->set( $col, $value ? str2time($value) : '' );
+ $cust_pkg->set( $col, $value ? parse_datetime($value) : '' );
}
} else {