From 814943fe9124b1c6b240f44186bfc5c47b0ae8b2 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 10 May 2019 16:59:15 -0400 Subject: [PATCH] Update for member side of cleaned leads needs to be tested --- models/admin/leads/index.php | 16 +++++++++------- setup/databaseScripts/create_database_V0.0.8.sql | 1 + setup/databaseScripts/update_database_V0.0.8.sql | 4 ++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/models/admin/leads/index.php b/models/admin/leads/index.php index 1f69847..9544e29 100644 --- a/models/admin/leads/index.php +++ b/models/admin/leads/index.php @@ -267,10 +267,14 @@ class GlmMembersAdmin_leads_index extends GlmDataLeadEntry WHERE mail_ok = $mail_ok)"; } if ( isset( $this->config['loggedInUser']['contactUser'] ) && !empty( $this->config['loggedInUser']['contactUser'] ) ) { - $where_parts[] = "T.lead_id IN ( - SELECT id - FROM " . GLM_MEMBERS_LEADS_PLUGIN_DB_PREFIX . "leads - WHERE member_ok = true)"; + if ( $mLeadCleanedAccess ) { + $where_parts[] = "T.cleaned = true"; + } else { + $where_parts[] = "T.lead_id IN ( + SELECT id + FROM " . GLM_MEMBERS_LEADS_PLUGIN_DB_PREFIX . "leads + WHERE member_ok = true)"; + } } else { $user_can_edit_leads = true; } @@ -570,9 +574,7 @@ class GlmMembersAdmin_leads_index extends GlmDataLeadEntry } } if ( !$user_can_edit_leads ) { - unset( - $out['source'] - ); + unset( $out['source'] ); } $interest_by_groups = array(); /* diff --git a/setup/databaseScripts/create_database_V0.0.8.sql b/setup/databaseScripts/create_database_V0.0.8.sql index cde36f2..81ecb13 100644 --- a/setup/databaseScripts/create_database_V0.0.8.sql +++ b/setup/databaseScripts/create_database_V0.0.8.sql @@ -62,6 +62,7 @@ CREATE TABLE {prefix}lead_entry ( user_trace_info TINYTEXT NULL, -- User IP address and other identifying network info (pos referrer) cleaned BOOLEAN NULL, -- Cleaned lead cleaned_imported BOOLEAN NULL, -- Cleaned lead - Imported + updated_date DATE NULL, -- Date this lead was updated PRIMARY KEY (id), INDEX (source_id), INDEX (lead_id), diff --git a/setup/databaseScripts/update_database_V0.0.8.sql b/setup/databaseScripts/update_database_V0.0.8.sql index 471f332..a00ad46 100644 --- a/setup/databaseScripts/update_database_V0.0.8.sql +++ b/setup/databaseScripts/update_database_V0.0.8.sql @@ -11,3 +11,7 @@ ALTER TABLE {prefix}lead_entry ADD COLUMN cleaned BOOLEAN NULL; ---- ALTER TABLE {prefix}lead_entry ADD COLUMN cleaned_imported BOOLEAN NULL; + +---- + +ALTER TABLE {prefix}lead_entry ADD COLUMN updated_date DATE NULL; -- 2.17.1