summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/edit/process/change-cust_pkg.html14
-rwxr-xr-xhttemplate/misc/change_pkg.cgi10
2 files changed, 23 insertions, 1 deletions
diff --git a/httemplate/edit/process/change-cust_pkg.html b/httemplate/edit/process/change-cust_pkg.html
index 046a9795c..3d50a134e 100644
--- a/httemplate/edit/process/change-cust_pkg.html
+++ b/httemplate/edit/process/change-cust_pkg.html
@@ -40,6 +40,16 @@ if ( $cgi->param('locationnum') == -1 ) {
$change{'cust_location'} = $cust_location;
}
+if ( $cgi->param('setup_discountnum') =~ /^(-?\d+)$/ ) {
+ if ( $1 == -2 ) {
+ $change{waive_setup} = 'Y';
+ } else {
+ $change{setup_discountnum} = $1;
+ $change{setup_discountnum_amount} = $cgi->param('setup_discountnum_amount');
+ $change{setup_discountnum_percent} = $cgi->param('setup_discountnum_percent');
+ }
+}
+
my $error;
my $now = time;
if (defined($cgi->param('contract_end'))) {
@@ -68,7 +78,9 @@ unless ($error) {
$change_to->pkgpart == $change{'pkgpart'} and
$change_to->locationnum == $change{'locationnum'} and
$change_to->quantity == $change{'quantity'} and
- $change_to->contract_end == $change{'contract_end'}
+ $change_to->contract_end == $change{'contract_end'} and
+ $change_to->waive_setup == $change{'waive_setup'} and
+ !$usagechanged
) {
%change = ( 'cust_pkg' => $change_to );
}
diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index e74747e82..13fc05016 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -72,6 +72,16 @@
</TABLE>
</BR>
+% my $discount_cust_pkg = $curuser->access_right('Discount customer package');
+% my $waive_setup_fee = $curuser->access_right('Waive setup fee');
+%
+% if ( $discount_cust_pkg || $waive_setup_fee ) {
+ <FONT CLASS="fsinnerbox-title"><% mt('Discounting') |h %></FONT>
+ <% ntable("#cccccc") %>
+ <& /elements/tr-select-pkg-discount.html, disable_recur => 1, &>
+ </TABLE><BR>
+
+% }
<FONT CLASS="fsinnerbox-title"><% mt('Location') |h %></FONT>
<% ntable('#cccccc') %>