From: ivan <ivan>
Date: Tue, 22 Nov 2011 04:35:10 +0000 (+0000)
Subject: fix incorrect error message: Discount does not apply to setup fees, and package has... 
X-Git-Tag: freeside_2_3_1~141
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=d01b288624d883262266afe4775367a5e0e5a328

fix incorrect error message: Discount does not apply to setup fees, and package has no recurring, RT#15257
---

diff --git a/FS/FS/cust_pkg_discount.pm b/FS/FS/cust_pkg_discount.pm
index 015b6e388..a20794027 100644
--- a/FS/FS/cust_pkg_discount.pm
+++ b/FS/FS/cust_pkg_discount.pm
@@ -172,7 +172,7 @@ sub check {
   return $error if $error;
 
   return "Discount does not apply to setup fees, and package has no recurring"
-    if ! $self->discount->setup && ! $self->cust_pkg->part_pkg->freq;
+    if ! $self->discount->setup && $self->cust_pkg->part_pkg->freq =~ /^0/;
 
   $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;