From dfe18a92acfb091dca8fdd79e329616bfc1af323 Mon Sep 17 00:00:00 2001 From: Nick Logan Date: Fri, 3 Nov 2017 17:46:29 +0000 Subject: [PATCH] RT# 74452 - address code format change request - Wrap at col 80 for new code - Use the more familiar destructive search-and-replace instead of the non-destructive inline search and replace (s///r) from 5.14. - Explicitly return. --- FS/FS/part_event/Condition/has_referral_custnum.pm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/FS/FS/part_event/Condition/has_referral_custnum.pm b/FS/FS/part_event/Condition/has_referral_custnum.pm index 564c6524b..007ce4548 100644 --- a/FS/FS/part_event/Condition/has_referral_custnum.pm +++ b/FS/FS/part_event/Condition/has_referral_custnum.pm @@ -1,6 +1,5 @@ package FS::part_event::Condition::has_referral_custnum; -use v5.14; use strict; use FS::cust_main; @@ -61,14 +60,19 @@ sub condition { sub condition_sql { my( $class, $table, %opt ) = @_; - my $age = $class->condition_sql_option_age_from('age', $opt{'time'}); - my $balance_sql = FS::cust_main->balance_sql( $age ) =~ s/cust_main.custnum/cust_main.referral_custnum/r; - my $balance_date_sql = FS::cust_main->balance_date_sql =~ s/cust_main.custnum/cust_main.referral_custnum/r; - my $active_sql = FS::cust_main->active_sql =~ s/cust_main.custnum/cust_main.referral_custnum/r; + my $age = $class->condition_sql_option_age_from('age', $opt{'time'}); + my $balance_sql = FS::cust_main->balance_sql( $age ); + my $balance_date_sql = FS::cust_main->balance_date_sql; + my $active_sql = FS::cust_main->active_sql; + $balance_sql =~ s/cust_main.custnum/cust_main.referral_custnum/; + $balance_date_sql =~ s/cust_main.custnum/cust_main.referral_custnum/; + $active_sql =~ s/cust_main.custnum/cust_main.referral_custnum/; my $sql = "cust_main.referral_custnum IS NOT NULL". - " AND ( ". $class->condition_sql_option('active') . " IS NULL OR $active_sql )". - " AND ( $balance_date_sql <= $balance_sql )"; + " AND (".$class->condition_sql_option('active')." IS NULL OR $active_sql)". + " AND ($balance_date_sql <= $balance_sql)"; + + return $sql; } 1; -- 2.11.0