diff options
| author | levinse <levinse> | 2011-04-25 04:37:41 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2011-04-25 04:37:41 +0000 |
| commit | ee953407088b8f71cf671aeb88fa6f227a4f109c (patch) | |
| tree | 739a3a10606e7df3f18c88441251ec6f239de781 | |
| parent | 1d15c6930650f2cceb13f7ae9da4acea5213643f (diff) | |
add waive setup fee upon package order feature, RT12568
| -rw-r--r-- | FS/FS/AccessRight.pm | 1 | ||||
| -rw-r--r-- | FS/FS/Schema.pm | 1 | ||||
| -rw-r--r-- | FS/FS/cust_main/Billing.pm | 13 | ||||
| -rw-r--r-- | FS/FS/cust_pkg.pm | 3 | ||||
| -rw-r--r-- | httemplate/edit/process/quick-cust_pkg.cgi | 1 | ||||
| -rw-r--r-- | httemplate/misc/order_pkg.html | 7 |
6 files changed, 21 insertions, 5 deletions
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm index aa59e7dbd..c3aeb2dcd 100644 --- a/FS/FS/AccessRight.pm +++ b/FS/FS/AccessRight.pm @@ -144,6 +144,7 @@ tie my %rights, 'Tie::IxHash', 'Edit customer package invoice details', #NEW 'Edit customer package comments', #NEW 'Qualify service', #NEW + 'Waive setup fee', #NEW ], ### diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index deb3995d2..983edec46 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -1443,6 +1443,7 @@ sub tables_hashref { 'no_auto', 'char', 'NULL', 1, '', '', 'quantity', 'int', 'NULL', '', '', '', 'agent_pkgid', 'int', 'NULL', '', '', '', + 'waive_setup', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'pkgnum', 'unique' => [], diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index b710f3326..1bf7b02a7 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -846,13 +846,16 @@ sub _make_lines { { warn " bill setup\n" if $DEBUG > 1; - $lineitems++; - $setup = eval { $cust_pkg->calc_setup( $time, \@details ) }; - return "$@ running calc_setup for $cust_pkg\n" - if $@; + unless ( $cust_pkg->waive_setup ) { + $lineitems++; + + $setup = eval { $cust_pkg->calc_setup( $time, \@details ) }; + return "$@ running calc_setup for $cust_pkg\n" + if $@; - $unitsetup = $cust_pkg->part_pkg->unit_setup || $setup; #XXX uuh + $unitsetup = $cust_pkg->part_pkg->unit_setup || $setup; #XXX uuh + } $cust_pkg->setfield('setup', $time) unless $cust_pkg->setup; diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 13a3b6eb7..6c985cf19 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -194,6 +194,8 @@ Previous pkgpart Previous locationnum +=item waive_setup + =back Note: setup, last_bill, bill, adjourn, susp, expire, cancel and change_date @@ -594,6 +596,7 @@ sub check { || $self->ut_numbern('adjourn') || $self->ut_numbern('expire') || $self->ut_enum('no_auto', [ '', 'Y' ]) + || $self->ut_enum('waive_setup', [ '', 'Y' ]) || $self->ut_numbern('agent_pkgid') ; return $error if $error; diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi index a6449b880..bf5087c5e 100644 --- a/httemplate/edit/process/quick-cust_pkg.cgi +++ b/httemplate/edit/process/quick-cust_pkg.cgi @@ -95,6 +95,7 @@ my $cust_pkg = new FS::cust_pkg { ? parse_datetime($cgi->param('contract_end')) : '' ), + 'waive_setup' => ( $cgi->param('waive_setup') eq 'Y' ? 'Y' : '' ), #'discountnum_disabled' => scalar($cgi->param('discountnum_disabled')), }; diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index 964441aa8..4f511cc36 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -64,6 +64,13 @@ %> % } +% if ( $curuser->access_right('Waive setup fee') ) { + <TR> + <TH ALIGN="right">Waive setup fee </TH> + <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="waive_setup" VALUE="Y"></TD> + </TR> +% } + % if ( $conf->exists('pkg_referral') ) { <% include('/elements/tr-select-part_referral.html', 'curr_value' => scalar( $cgi->param('refnum') ), #get rid of empty_label first# || $cust_main->refnum, |