);
if ( $self->discountnum ) {
- #XXX new/custom discount case
- my $cust_pkg_discount = new FS::cust_pkg_discount {
- 'pkgnum' => $self->pkgnum,
- 'discountnum' => $self->discountnum,
- 'months_used' => 0,
- 'end_date' => '', #XXX
- 'otaker' => $self->otaker,
- };
- my $error = $cust_pkg_discount->insert;
+ my $error = $self->insert_discount();
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
$cust_pkg_reason->insert;
}
+=item insert_discount
+
+Associates this package with a discount (see L<FS::cust_pkg_discount>, possibly
+inserting a new discount on the fly (see L<FS::discount>).
+
+Available options are:
+
+=over 4
+
+=item discountnum
+
+=back
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub insert_discount {
+ #my ($self, %options) = @_;
+ my $self = shift;
+
+ my $cust_pkg_discount = new FS::cust_pkg_discount {
+ 'pkgnum' => $self->pkgnum,
+ 'discountnum' => $self->discountnum,
+ 'months_used' => 0,
+ 'end_date' => '', #XXX
+ 'otaker' => $self->otaker,
+ #for the create a new discount case
+ '_type' => $self->discountnum__type,
+ 'amount' => $self->discountnum_amount,
+ 'percent' => $self->discountnum_percent,
+ 'months' => $self->discountnum_months,
+ #'disabled' => $self->discountnum_disabled,
+ };
+
+ $cust_pkg_discount->insert;
+}
+
=item set_usage USAGE_VALUE_HASHREF
USAGE_VALUE_HASHREF is a hashref of svc_acct usage columns and the amounts
use strict;
use base qw( FS::Record );
-use FS::Record qw( qsearchs ); # qsearch );
+use FS::Record qw( dbh qsearchs ); # qsearch );
use FS::cust_pkg;
use FS::discount;
=cut
-# the insert method can be inherited from FS::Record
+sub insert {
+ #my( $self, %options ) = @_;
+ my $self = shift;
+
+ local $SIG{HUP} = 'IGNORE';
+ local $SIG{INT} = 'IGNORE';
+ local $SIG{QUIT} = 'IGNORE';
+ local $SIG{TERM} = 'IGNORE';
+ local $SIG{TSTP} = 'IGNORE';
+ local $SIG{PIPE} = 'IGNORE';
+
+ my $oldAutoCommit = $FS::UID::AutoCommit;
+ local $FS::UID::AutoCommit = 0;
+ my $dbh = dbh;
+
+ if ( $self->discountnum == -1 ) {
+ my $discount = new FS::discount {
+ '_type' => $self->_type,
+ 'amount' => $self->amount,
+ 'percent' => $self->percent,
+ 'months' => $self->months,
+ 'disabled' => 'Y',
+ };
+ my $error = $discount->insert;
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error;
+ }
+ $self->discountnum($discount->discountnum);
+ }
+
+ my $error = $self->SUPER::insert; #(@_); #(%options);
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error;
+ }
+
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+ '';
+
+}
=item delete
sub check {
my $self = shift;
+ if ( $self->_type eq 'Select discount type' ) {
+ return 'Please select a discount type';
+ } elsif ( $self->_type eq 'Amount' ) {
+ $self->percent('0');
+ return 'Amount must be greater than 0' unless $self->amount > 0;
+ } elsif ( $self->_type eq 'Percentage' ) {
+ $self->amount('0.00');
+ return 'Percentage must be greater than 0' unless $self->percent > 0;
+ }
+
my $error =
$self->ut_numbern('discountnum')
|| $self->ut_textn('name')
die "error discounting: $error" if $error;
$amount *= $months;
+ $amount = sprintf('%.2f', $amount);
#add details on discount to invoice
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
+ $months = sprintf('%.2f', $months) if $months =~ /\./;
my $d = 'Includes ';
$d .= $discount->name. ' ' if $discount->name;
$d .= 'discount of '. $discount->description_short;
- $d .= " for $months month". ( $months>1 ? 's' : '' );
+ $d .= " for $months month". ( $months!=1 ? 's' : '' );
$d .= ": $money_char$amount" if $months != 1 || $discount->percent;
push @$details, $d;
<% include('/elements/tr-select-discount.html',
'empty_label' => ( $pkgdiscountnum ? '' : 'Select discount' ),
- 'onchange' => 'enable_discount_pkg',
+ 'onchange' => 'enable_discount_pkg()',
+ 'cgi' => $cgi,
)
%>
'_type' => 'Type ',
'amount' => 'Amount ',
'percent' => 'Percentage ',
- 'months' => '# of Months',
+ 'months' => 'Duration (months)',
},
'viewall_dir' => 'browse',
'new_callback' => $new_callback,
<% include( 'elements/process.html',
'table' => 'discount',
'viewall_dir' => 'browse',
- 'precheck_callback' => $precheck_callback,
)
%>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-my $precheck_callback = sub {
- my( $cgi ) = @_;
-
- if ( $cgi->param('_type') eq 'Select discount type' ) {
- return 'Please select a discount type';
- } elsif ( $cgi->param('_type') eq 'Amount' ) {
- $cgi->param('percent', '0');
- return 'Amount must be greater than 0' unless $cgi->param('amount') > 0;
- } elsif ( $cgi->param('_type') eq 'Percentage' ) {
- $cgi->param('amount', '0.00');
- return 'Percentage must be greater than 0' unless $cgi->param('percent') > 0;
- }
-
- '';
-};
-
</%init>
$cgi->param('locationnum') =~ /^(\-?\d*)$/
or die 'illegal locationnum '. $cgi->param('locationnum');
my $locationnum = $1;
+$cgi->param('discountnum') =~ /^(\-?\d*)$/
+ or die 'illegal discountnum '. $cgi->param('discountnum');
+my $discountnum = $1;
+
my $cust_pkg = new FS::cust_pkg {
- 'custnum' => $custnum,
- 'pkgpart' => $pkgpart,
- 'start_date' => ( scalar($cgi->param('start_date'))
- ? str2time($cgi->param('start_date'))
- : ''
- ),
- 'discountnum' => scalar($cgi->param('discountnum')),
- 'refnum' => $refnum,
- 'locationnum' => $locationnum,
+ 'custnum' => $custnum,
+ 'pkgpart' => $pkgpart,
+ 'start_date' => ( scalar($cgi->param('start_date'))
+ ? str2time($cgi->param('start_date'))
+ : ''
+ ),
+ 'refnum' => $refnum,
+ 'locationnum' => $locationnum,
+ 'discountnum' => $discountnum,
+ #for the create a new discount case
+ 'discountnum__type' => scalar($cgi->param('discountnum__type')),
+ 'discountnum_amount' => scalar($cgi->param('discountnum_amount')),
+ 'discountnum_percent' => scalar($cgi->param('discountnum_percent')),
+ 'discountnum_months' => scalar($cgi->param('discountnum_months')),
+ #'discountnum_disabled' => scalar($cgi->param('discountnum_disabled')),
};
my %opt = ( 'cust_pkg' => $cust_pkg );
% } else {
<TR>
- <TD ALIGN="right"><% $opt{'label'} || '<B>Discount</B>' %></TD>
+ <TD ALIGN="right" WIDTH="176"><% $opt{'label'} || '<B>Discount</B>' %></TD>
<TD <% $colspan %>>
<% include( '/elements/select-discount.html',
'curr_value' => $discountnum,
- 'onchange' => $name.'_changed',
+ 'onchange' => $onchange,
%opt,
)
%>
% # a weird kind of false laziness w/edit/discount.html
- <INPUT TYPE="hidden" NAME="<% $name %>_disabled" VALUE="Y">
+% # <INPUT TYPE="hidden" NAME="<% $name %>_disabled" VALUE="Y">
<% include( '/elements/tr-select.html',
'field' => $name. '__type',
'id' => $name. '__type',
'options' => \@_type_options,
- #XXX 'curr_value' =>
- 'onchange' => '_type_changed',
+ 'curr_value' => scalar($cgi->param($name.'__type')),
+ 'onchange' => $name.'__type_changed',
'colspan' => $opt{'colspan'},
)
%>
<% include( '/elements/tr-input-money.html',
- 'label' => '<B>Discount Amount</B>',
+ 'label' => '<B>Discount Amount </B>',
'field' => $name. '_amount',
'id' => $name. '_amount',
'default' => '0.00',
- #XXX 'curr_value' =>
+ 'curr_value' => scalar($cgi->param($name.'_amount')),
'colspan' => $opt{'colspan'},
)
%>
'field' => $name. '_percent',
'id' => $name. '_percent',
'default' => '0',
- #XXX 'curr_value' =>
+ 'curr_value' => scalar($cgi->param($name.'_percent')),
'colspan' => $opt{'colspan'},
)
%>
<% include( '/elements/tr-input-text.html',
- 'label' => '<B>Discount # of Months</B>',
+ 'label' => '<B>Discount duration (months)</B>',
'field' => $name. '_months',
'id' => $name. '_months',
'size' => 2,
'postfix' => qq(<FONT SIZE="-1" ID="${name}_months_postfix"><I>(blank for non-expiring discount)</I></FONT>),
- #XXX 'curr_value' =>
+ 'curr_value' => scalar($cgi->param($name.'_months')),
'colspan' => $opt{'colspan'},
)
%>
% #XXX save visibility settings for amount, percent :/
<% $ge %>('<% $name %>_amount_label0').style.display = 'none';
<% $ge %>('<% $name %>_amount_label0').style.visibility = 'hidden';
- <% $ge %>('<% $name %>_amount').style.display = 'none';
- <% $ge %>('<% $name %>_amount').style.visibility = 'hidden';
+ <% $ge %>('<% $name %>_amount_input0').style.display = 'none';
+ <% $ge %>('<% $name %>_amount_input0').style.visibility = 'hidden';
<% $ge %>('<% $name %>_amount_input0').style.display = 'none';
<% $ge %>('<% $name %>_amount_input0').style.visibility = 'hidden';
<% $ge %>('<% $name %>_percent_label0').style.display = 'none';
<% $ge %>('<% $name %>_percent_label0').style.visibility = 'hidden';
- <% $ge %>('<% $name %>_percent').style.display = 'none';
- <% $ge %>('<% $name %>_percent').style.visibility = 'hidden';
+ <% $ge %>('<% $name %>_percent_input0').style.display = 'none';
+ <% $ge %>('<% $name %>_percent_input0').style.visibility = 'hidden';
<% $ge %>('<% $name %>_percent_input0').style.display = 'none';
<% $ge %>('<% $name %>_percent_input0').style.visibility = 'hidden';
}
function <% $name %>__type_changed(what) {
- var _type = what.options[what.selectedIndex].value;
+ var <% $name %>__type = what.options[what.selectedIndex].value;
if ( <% $name %>__type == '<% $select %>' ) {
<% $ge %>('<% $name %>_amount_label0').style.display = 'none';
} else if ( <% $name %>__type == 'Amount' ) {
<% $ge %>('<% $name %>_amount_label0').style.display = '';
<% $ge %>('<% $name %>_amount_label0').style.visibility = '';
- <% $ge %>('<% $name %>_amount').style.display = '';
- <% $ge %>('<% $name %>_amount').style.visibility = '';
+ <% $ge %>('<% $name %>_amount_input0').style.display = '';
+ <% $ge %>('<% $name %>_amount_input0').style.visibility = '';
<% $ge %>('<% $name %>_percent_label0').style.display = 'none';
<% $ge %>('<% $name %>_percent_label0').style.visibility = 'hidden';
- <% $ge %>('<% $name %>_percent').style.display = 'none';
- <% $ge %>('<% $name %>_percent').style.visibility = 'hidden';
+ <% $ge %>('<% $name %>_percent_input0').style.display = 'none';
+ <% $ge %>('<% $name %>_percent_input0').style.visibility = 'hidden';
} else if ( <% $name %>__type == 'Percentage' ) {
<% $ge %>('<% $name %>_amount_label0').style.display = 'none';
<% $ge %>('<% $name %>_amount_label0').style.visibility = 'hidden';
- <% $ge %>('<% $name %>_amount').style.display = 'none';
- <% $ge %>('<% $name %>_amount').style.visibility = 'hidden';
+ <% $ge %>('<% $name %>_amount_input0').style.display = 'none';
+ <% $ge %>('<% $name %>_amount_input0').style.visibility = 'hidden';
<% $ge %>('<% $name %>_percent_label0').style.display = '';
<% $ge %>('<% $name %>_percent_label0').style.visibility = '';
- <% $ge %>('<% $name %>_percent').style.display = '';
- <% $ge %>('<% $name %>_percent').style.visibility = '';
+ <% $ge %>('<% $name %>_percent_input0').style.display = '';
+ <% $ge %>('<% $name %>_percent_input0').style.visibility = '';
}
}
+ <% $name %>_changed(<% $ge %>('<% $name %>'));
+
</SCRIPT>
% }
<%init>
my %opt = @_;
+my $cgi = $opt{'cgi'};
my $discountnum = $opt{'curr_value'} || $opt{'value'};
$opt{'discount'} ||= [ qsearch( 'discount', { disabled=>'' } ) ];
my $colspan = $opt{'colspan'} ? 'COLSPAN="'.$opt{'colspan'}.'"' : '';
+my $onchange = ( $opt{'onchange'} ? delete($opt{'onchange'}).';' : '' ).
+ $name.'_changed(this);';
+
</%init>
% if ( $curuser->access_right('Discount customer package') ) {
<% include('/elements/tr-select-discount.html',
'element_etc' => 'DISABLED',
+ 'colspan' => 7,
+ 'cgi' => $cgi,
)
%>
% }
'cust_main' => $cust_main,
'closetext' => 'Close',
'width' => 763,
- 'height' => 408,
+ 'height' => 476,
)
%>
<%init>
my $discount = $cust_pkg_discount->discount;
my $label = '<B>Discount</B>: '. $discount->description;
- $label .= ' ('. ( $discount->months - $cust_pkg_discount->months_used ).
- ' months remaining)'
- if $discount->months;
+ if ( $discount->months ) {
+ my $remaining = $discount->months - $cust_pkg_discount->months_used;
+ $remaining = sprintf('%.2f', $remaining) if $remaining =~ /\./;
+ $label .= " ($remaining months remaining)"
+ }
$label .= ' <FONT SIZE="-1">('.
'<A HREF="../misc/delete-cust_pkg_discount.html?'.
projects / freeside.git / commitdiff