projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c771d59
)
adjust warnings on package date edit, #20689
author
Mark Wells
<mark@freeside.biz>
Wed, 20 Feb 2013 22:45:54 +0000
(14:45 -0800)
committer
Mark Wells
<mark@freeside.biz>
Wed, 20 Feb 2013 22:45:54 +0000
(14:45 -0800)
httemplate/misc/confirm-cust_pkg-edit_dates.html
patch
|
blob
|
history
diff --git
a/httemplate/misc/confirm-cust_pkg-edit_dates.html
b/httemplate/misc/confirm-cust_pkg-edit_dates.html
index
27b9a82
..
8e54852
100755
(executable)
--- a/
httemplate/misc/confirm-cust_pkg-edit_dates.html
+++ b/
httemplate/misc/confirm-cust_pkg-edit_dates.html
@@
-63,7
+63,7
@@
if ( $hash{'setup'} != $cust_pkg->get('setup') ) {
} else {
push @confirm, '';
}
} else {
push @confirm, '';
}
- } elsif ( $cust_pkg->get('setup') ) {
+ } elsif ( $
hash{'setup'} and !$
cust_pkg->get('setup') ) {
my $text = 'Add a setup date of [_1]';
$text .= ' to this and all its supplemental packages' if @supp_pkgs;
$text .= '.';
my $text = 'Add a setup date of [_1]';
$text .= ' to this and all its supplemental packages' if @supp_pkgs;
$text .= '.';
@@
-110,7
+110,7
@@
if ( $hash{'last_bill'} != $cust_pkg->get('last_bill') ) {
# Bill date change
if ( $hash{'bill'} != $cust_pkg->get('bill') ) {
my $bill = time2str($date_format, $hash{'bill'});
# Bill date change
if ( $hash{'bill'} != $cust_pkg->get('bill') ) {
my $bill = time2str($date_format, $hash{'bill'});
- $bill = 't
he current
day' if !$hash{'bill'}; # or 'the end of today'?...
+ $bill = 't
o
day' if !$hash{'bill'}; # or 'the end of today'?...
my $name = 'next bill date';
$name = 'end of the prepaid period' if $part_pkg->is_prepaid;
push @changes, mt('Set the [_1] to [_2].', $name, $bill);
my $name = 'next bill date';
$name = 'end of the prepaid period' if $part_pkg->is_prepaid;
push @changes, mt('Set the [_1] to [_2].', $name, $bill);
@@
-119,6
+119,12
@@
if ( $hash{'bill'} != $cust_pkg->get('bill') ) {
push @confirm,
mt('The customer will be charged for the interval from [_1] until now.',
$bill);
push @confirm,
mt('The customer will be charged for the interval from [_1] until now.',
$bill);
+ } elsif ( !$hash{'bill'} and ($hash{'last_bill'} or $hash{'setup'}) ) {
+ my $last_bill =
+ time2str($date_format, $hash{'last_bill'} || $hash{'setup'});
+ push @confirm,
+ mt('The customer will be charged for the interval from [_1] until now.',
+ $last_bill);
} else {
push @confirm, '';
}
} else {
push @confirm, '';
}