[freeside-commits] branch FREESIDE_3_BRANCH updated. 9954eac1ec11d4bf1d6e7925895ce675fcdc6e22
Jonathan Prykop
jonathan at 420.am
Thu Feb 12 11:49:59 PST 2015
The branch, FREESIDE_3_BRANCH has been updated
via 9954eac1ec11d4bf1d6e7925895ce675fcdc6e22 (commit)
via 6e3c1b8915c39e82a9a1ac48acc5b0c360daadb7 (commit)
via 7215be1e51349bdfeed60d6e2f42587a4928f393 (commit)
from 342e1472c53f4718b6600fe52be3068f2caba61a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9954eac1ec11d4bf1d6e7925895ce675fcdc6e22
Merge: 6e3c1b8 342e147
Author: Jonathan Prykop <jonathan at freeside.biz>
Date: Thu Feb 12 13:30:03 2015 -0600
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
commit 6e3c1b8915c39e82a9a1ac48acc5b0c360daadb7
Author: Jonathan Prykop <jonathan at freeside.biz>
Date: Wed Feb 11 16:07:58 2015 -0600
RT#30586: Discounts for ACH
diff --git a/FS/FS/part_event/Action/pkg_discount.pm b/FS/FS/part_event/Action/pkg_discount.pm
index 04a3a0f..592e044 100644
--- a/FS/FS/part_event/Action/pkg_discount.pm
+++ b/FS/FS/part_event/Action/pkg_discount.pm
@@ -3,7 +3,7 @@ package FS::part_event::Action::pkg_discount;
use strict;
use base qw( FS::part_event::Action );
-sub description { "Discount active customer packages"; }
+sub description { "Discount unsuspended customer packages (monthly recurring only)"; }
sub eventtable_hashref {
{ 'cust_main' => 1 };
@@ -41,10 +41,12 @@ sub do_action {
my $cust_main = $self->cust_main($object);
my %if_pkgpart = map { $_=>1 } split(/\s*,\s*/, $self->option('if_pkgpart') );
- my @cust_pkg = grep { $if_pkgpart{ $_->pkgpart } && $_->part_pkg->freq
+ my $allpkgs = (keys %if_pkgpart) ? 0 : 1;
+ my @cust_pkg = grep { ( $allpkgs || $if_pkgpart{ $_->pkgpart } )
+ && $_->part_pkg->freq
#can remove after fixing discount bug with non-monthly pkgs
&& ( $_->part_pkg->freq =~ /^\d+$/) }
- $cust_main->active_pkgs;
+ $cust_main->unsuspended_pkgs;
return 'No qualifying packages' unless @cust_pkg;
my $gotit = 0;
commit 7215be1e51349bdfeed60d6e2f42587a4928f393
Author: Jonathan Prykop <jonathan at freeside.biz>
Date: Thu Feb 5 16:23:39 2015 -0600
RT#30586: Discounts for ACH
diff --git a/FS/FS/part_event/Action/pkg_discount.pm b/FS/FS/part_event/Action/pkg_discount.pm
new file mode 100644
index 0000000..04a3a0f
--- /dev/null
+++ b/FS/FS/part_event/Action/pkg_discount.pm
@@ -0,0 +1,97 @@
+package FS::part_event::Action::pkg_discount;
+
+use strict;
+use base qw( FS::part_event::Action );
+
+sub description { "Discount active customer packages"; }
+
+sub eventtable_hashref {
+ { 'cust_main' => 1 };
+}
+
+sub event_stage { 'pre-bill'; }
+
+sub option_fields {
+ (
+ 'if_pkgpart' => { 'label' => 'Only packages',
+ 'type' => 'select-table',
+ 'table' => 'part_pkg',
+ 'name_col' => 'pkg',
+ #can tweak after fixing discount bug with non-monthly recurring pkgs
+ 'extra_sql' => q(AND freq NOT LIKE '0%' AND freq NOT LIKE '%d' AND freq NOT LIKE '%h' AND freq NOT LIKE '%w'),
+ 'multiple' => 1,
+ },
+ 'discountnum' => { 'label' => 'Discount',
+ 'type' => 'select-table', #we don't handle the select-discount create a discount case
+ 'table' => 'discount',
+ 'name_col' => 'description', #well, method
+ 'order_by' => 'ORDER BY discountnum', #requied because name_col is a method
+ 'hashref' => { 'disabled' => '',
+ 'months' => { op=>'!=', value=>'0' },
+ },
+ 'disable_empty' => 1,
+ },
+ );
+}
+
+#lots of false laziness with referral_pkg_discount
+#but also lots of doing it differently...and better???
+sub do_action {
+ my( $self, $object, $cust_event ) = @_;
+
+ my $cust_main = $self->cust_main($object);
+ my %if_pkgpart = map { $_=>1 } split(/\s*,\s*/, $self->option('if_pkgpart') );
+ my @cust_pkg = grep { $if_pkgpart{ $_->pkgpart } && $_->part_pkg->freq
+ #can remove after fixing discount bug with non-monthly pkgs
+ && ( $_->part_pkg->freq =~ /^\d+$/) }
+ $cust_main->active_pkgs;
+ return 'No qualifying packages' unless @cust_pkg;
+
+ my $gotit = 0;
+ foreach my $cust_pkg (@cust_pkg) {
+
+ my @cust_pkg_discount = $cust_pkg->cust_pkg_discount_active;
+
+ #our logic here only makes sense insomuch as you can't have multiple discounts
+ die "Unexpected multiple discounts, contact developers"
+ if scalar(@cust_pkg_discount) > 1;
+
+ my @my_cust_pkg_discount =
+ grep { $_->discountnum == $self->option('discountnum') } @cust_pkg_discount;
+
+ if ( @my_cust_pkg_discount ) { #reset the existing one instead
+
+ $gotit = 1;
+
+ #it's already got this discount and discount never expires--great, move on
+ next unless $cust_pkg_discount[0]->discount->months;
+
+ #reset the discount
+ my $error = $cust_pkg_discount[0]->decrement_months_used( $cust_pkg_discount[0]->months_used );
+ die "Error extending discount: $error\n" if $error;
+
+ } elsif ( @cust_pkg_discount ) {
+
+ #can't currently discount an already discounted package,
+ #but maybe we can discount a different package
+ next;
+
+ } else { #normal case, create a new one
+
+ $gotit = 1;
+ my $cust_pkg_discount = new FS::cust_pkg_discount {
+ 'pkgnum' => $cust_pkg->pkgnum,
+ 'discountnum' => $self->option('discountnum'),
+ 'months_used' => 0
+ };
+ my $error = $cust_pkg_discount->insert;
+ die "Error discounting package: $error\n" if $error;
+
+ }
+ }
+
+ return $gotit ? '' : 'Discount not applied due to existing discounts';
+
+}
+
+1;
diff --git a/FS/FS/part_event/Condition/nopostal.pm b/FS/FS/part_event/Condition/nopostal.pm
new file mode 100644
index 0000000..b95cd5c
--- /dev/null
+++ b/FS/FS/part_event/Condition/nopostal.pm
@@ -0,0 +1,26 @@
+package FS::part_event::Condition::nopostal;
+use base qw( FS::part_event::Condition );
+use strict;
+
+sub description {
+ 'Customer does not receive a postal mail invoice';
+}
+
+sub condition {
+ my( $self, $object ) = @_;
+ my $cust_main = $self->cust_main($object);
+
+ scalar( grep { $_ eq 'POST' } $cust_main->invoicing_list ) ? 0 : 1;
+}
+
+sub condition_sql {
+ my( $self, $table ) = @_;
+
+ " NOT EXISTS( SELECT 1 FROM cust_main_invoice
+ WHERE cust_main_invoice.custnum = cust_main.custnum
+ AND cust_main_invoice.dest = 'POST'
+ )
+ ";
+}
+
+1;
-----------------------------------------------------------------------
Summary of changes:
FS/FS/part_event/Action/pkg_discount.pm | 99 ++++++++++++++++++++
.../Condition/{postal.pm => nopostal.pm} | 8 +-
2 files changed, 103 insertions(+), 4 deletions(-)
create mode 100644 FS/FS/part_event/Action/pkg_discount.pm
copy FS/FS/part_event/Condition/{postal.pm => nopostal.pm} (62%)
More information about the freeside-commits
mailing list