[freeside-commits] freeside/FS/FS Schema.pm, 1.187, 1.188 discount.pm, NONE, 1.1 cust_pkg_discount.pm, NONE, 1.1 Mason.pm, 1.26, 1.27 part_pkg.pm, 1.100, 1.101 AccessRight.pm, 1.47, 1.48
Ivan,,,
ivan at wavetail.420.am
Fri Jan 29 23:38:34 PST 2010
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv5851/FS/FS
Modified Files:
Schema.pm Mason.pm part_pkg.pm AccessRight.pm
Added Files:
discount.pm cust_pkg_discount.pm
Log Message:
discounts, RT#6679
Index: Mason.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Mason.pm 25 Jan 2010 17:41:31 -0000 1.26
+++ Mason.pm 30 Jan 2010 07:38:31 -0000 1.27
@@ -227,6 +227,7 @@
use FS::prospect_main;
use FS::contact;
use FS::svc_pbx;
+ use FS::discount;
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
--- NEW FILE: cust_pkg_discount.pm ---
package FS::cust_pkg_discount;
use strict;
use base qw( FS::Record );
use FS::Record; # qw( qsearch qsearchs );
use FS::cust_pkg;
use FS::discount;
=head1 NAME
FS::cust_pkg_discount - Object methods for cust_pkg_discount records
=head1 SYNOPSIS
use FS::cust_pkg_discount;
$record = new FS::cust_pkg_discount \%hash;
$record = new FS::cust_pkg_discount { 'column' => 'value' };
$error = $record->insert;
$error = $new_record->replace($old_record);
$error = $record->delete;
$error = $record->check;
=head1 DESCRIPTION
An FS::cust_pkg_discount object represents the application of a discount to a
customer package. FS::cust_pkg_discount inherits from FS::Record. The
following fields are currently supported:
=over 4
=item pkgdiscountnum
primary key
=item pkgnum
Customer package (see L<FS::cust_pkg>)
=item discountnum
Discount (see L<FS::discount>)
=item months_used
months_used
=item end_date
end_date
=item otaker
otaker
=back
=head1 METHODS
=over 4
=item new HASHREF
Creates a new discount application. To add the record to the database, see
L<"insert">.
Note that this stores the hash reference, not a distinct copy of the hash it
points to. You can ask the object for a copy with the I<hash> method.
=cut
# the new method can be inherited from FS::Record, if a table method is defined
sub table { 'cust_pkg_discount'; }
=item insert
Adds this record to the database. If there is an error, returns the error,
otherwise returns false.
=cut
# the insert method can be inherited from FS::Record
=item delete
Delete this record from the database.
=cut
# the delete method can be inherited from FS::Record
=item replace OLD_RECORD
Replaces the OLD_RECORD with this one in the database. If there is an error,
returns the error, otherwise returns false.
=cut
# the replace method can be inherited from FS::Record
=item check
Checks all fields to make sure this is a valid discount applciation. If there
is an error, returns the error, otherwise returns false. Called by the insert
and replace methods.
=cut
# the check method should currently be supplied - FS::Record contains some
# data checking routines
sub check {
my $self = shift;
my $error =
$self->ut_numbern('pkgdiscountnum')
|| $self->ut_foreign_key('pkgnum', 'cust_pkg', 'pkgnum')
|| $self->ut_foreign_key('discountnum', 'discount', 'discountnum' )
|| $self->ut_float('months_used') #actually decimal, but this will do
|| $self->ut_numbern('end_date')
|| $self->ut_text('otaker')
;
return $error if $error;
$self->SUPER::check;
}
=back
=head1 BUGS
=head1 SEE ALSO
L<FS::discount>, L<FS::cust_pkg>, L<FS::Record>, schema.html from the base documentation.
=cut
1;
Index: part_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg.pm,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- part_pkg.pm 19 Dec 2009 19:10:44 -0000 1.100
+++ part_pkg.pm 30 Jan 2010 07:38:31 -0000 1.101
@@ -767,6 +767,7 @@
}
}
+sub can_discount { 0; }
sub freqs_href {
#method, class method or sub? #my $self = shift;
Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- Schema.pm 25 Jan 2010 22:17:14 -0000 1.187
+++ Schema.pm 30 Jan 2010 07:38:31 -0000 1.188
@@ -1309,6 +1309,35 @@
'index' => [ [ 'pkgnum' ], [ 'reasonnum' ], ['action'], ],
},
+ 'cust_pkg_discount' => {
+ 'columns' => [
+ 'pkgdiscountnum', 'serial', '', '', '', '',
+ 'pkgnum', 'int', '', '', '', '',
+ 'discountnum', 'int', '', '', '', '',
+ 'months_used', 'decimal', 'NULL', '', '', '',
+ 'end_date', @date_type, '', '',
+ 'otaker', 'varchar', '', 32, '', '',
+ ],
+ 'primary_key' => 'pkgdiscountnum',
+ 'unique' => [],
+ 'index' => [ [ 'pkgnum' ], [ 'discountnum' ] ],
+ },
+
+ 'discount' => {
+ 'columns' => [
+ 'discountnum', 'serial', '', '', '', '',
+ #'agentnum', 'int', 'NULL', '', '', '',
+ 'name', 'varchar', 'NULL', $char_d, '', '',
+ 'amount', @money_type, '', '',
+ 'percent', 'decimal', '', '', '', '',
+ 'months', 'decimal', 'NULL', '', '', '',
+ 'disabled', 'char', 'NULL', 1, '', '',
+ ],
+ 'primary_key' => 'discountnum',
+ 'unique' => [],
+ 'index' => [], # [ 'agentnum' ], ],
+ },
+
'cust_refund' => {
'columns' => [
'refundnum', 'serial', '', '', '', '',
--- NEW FILE: discount.pm ---
package FS::discount;
use strict;
use base qw( FS::Record );
use FS::Record qw( qsearch qsearchs );
=head1 NAME
FS::discount - Object methods for discount records
=head1 SYNOPSIS
use FS::discount;
$record = new FS::discount \%hash;
$record = new FS::discount { 'column' => 'value' };
$error = $record->insert;
$error = $new_record->replace($old_record);
$error = $record->delete;
$error = $record->check;
=head1 DESCRIPTION
An FS::discount object represents a discount definition. FS::discount inherits
from FS::Record. The following fields are currently supported:
=over 4
=item discountnum
primary key
=item name
name
=item amount
amount
=item percent
percent
=item months
months
=item disabled
disabled
=back
=head1 METHODS
=over 4
=item new HASHREF
Creates a new discount. To add the discount to the database, see L<"insert">.
Note that this stores the hash reference, not a distinct copy of the hash it
points to. You can ask the object for a copy with the I<hash> method.
=cut
# the new method can be inherited from FS::Record, if a table method is defined
sub table { 'discount'; }
=item insert
Adds this record to the database. If there is an error, returns the error,
otherwise returns false.
=cut
# the insert method can be inherited from FS::Record
=item delete
Delete this record from the database.
=cut
# the delete method can be inherited from FS::Record
=item replace OLD_RECORD
Replaces the OLD_RECORD with this one in the database. If there is an error,
returns the error, otherwise returns false.
=cut
# the replace method can be inherited from FS::Record
=item check
Checks all fields to make sure this is a valid discount. If there is
an error, returns the error, otherwise returns false. Called by the insert
and replace methods.
=cut
# the check method should currently be supplied - FS::Record contains some
# data checking routines
sub check {
my $self = shift;
my $error =
$self->ut_numbern('discountnum')
|| $self->ut_textn('name')
|| $self->ut_money('amount')
|| $self->ut_float('percent') #actually decimal, but this will do
|| $self->ut_floatn('months') #actually decimal, but this will do
|| $self->ut_enum('disabled', [ '', 'Y' ])
;
return $error if $error;
$self->SUPER::check;
}
=item description
Returns a text description incorporating the amount, percent and months fields.
=cut
sub description {
my $self = shift;
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
my $desc = '';
$desc .= $money_char. sprintf('%.2f/month ', $self->amount)
if $self->amount > 0;
$desc .= $self->percent. '% '
if $self->percent > 0;
$desc .= 'for '. $self->months. ' months' if $self->months;
$desc;
}
=back
=head1 BUGS
=head1 SEE ALSO
L<FS::cust_pkg_discount>, L<FS::Record>, schema.html from the base documentation.
=cut
1;
Index: AccessRight.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/AccessRight.pm,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- AccessRight.pm 29 Dec 2009 01:00:30 -0000 1.47
+++ AccessRight.pm 30 Jan 2010 07:38:31 -0000 1.48
@@ -126,6 +126,8 @@
'Change customer package',
'Bulk change customer packages',
'Edit customer package dates',
+ 'Discount customer package', #NEW
+ 'Custom discount customer package', #NEW
'Customize customer package',
'Suspend customer package',
'Suspend customer package later',
More information about the freeside-commits
mailing list