X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCron%2Fnotify.pm;h=0603e6bc43774f4ebe73945b3dd054634b99d738;hb=96f045fb93dc522c012cddcbba2ded3b2a30db35;hp=37106509415e455e76e64fc9cac62dc0d01300d8;hpb=b270bdf15e7ac5e9c47a127f82625da25ff16436;p=freeside.git

diff --git a/FS/FS/Cron/notify.pm b/FS/FS/Cron/notify.pm
index 371065094..0603e6bc4 100644
--- a/FS/FS/Cron/notify.pm
+++ b/FS/FS/Cron/notify.pm
@@ -30,7 +30,7 @@ sub notify_flat_delay {
       0 < ( select count(*) from part_pkg
               where cust_pkg.pkgpart = part_pkg.pkgpart
                 and part_pkg.plan = 'flat_delayed'
-                and 0 < ( select count (*) from part_pkg_option
+                and 0 < ( select count(*) from part_pkg_option
                             where part_pkg.pkgpart = part_pkg_option.pkgpart
                               and part_pkg_option.optionname = 'recur_notify'
                               and part_pkg_option.optionvalue > 0
@@ -42,6 +42,15 @@ sub notify_flat_delay {
                                 or  cust_pkg.expire > $time
                                   + cast(part_pkg_option.optionvalue as integer)
                                     * 86400
+END
+
+#/*                            and ( cust_pkg.adjourn is null
+#                                or  cust_pkg.adjourn > $time
+#-- Should notify suspended ones  + cast(part_pkg_option.optionvalue as integer)
+#                                    * 86400
+#*/
+
+  $where_pkg .= <<"END";
                                   )
                         )
           )