viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

lead capture improvements

Browse Source
This commit is contained in:
yuri
2019-08-05 16:45:16 +03:00
parent 06c8cbac52
commit 7a919dedfd
9 changed files with 167 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/Espo/Controllers/LeadCapture.php
View File

@@ -69,4 +69,11 @@ class LeadCapture extends \Espo\Core\Controllers\Record
return $this->getRecordService()->generateNewApiKeyForEntity($data->id)->getValueMap();
}
public function getActionSmtpAccountDataList()
{
if (!$this->getUser()->isAdmin()) throw new Forbidden();
return $this->getServiceFactory()->create('LeadCapture')->getSmtpAccountDataList();
}
}

4
application/Espo/Modules/Crm/Services/MassEmail.php
View File

@@ -590,8 +590,8 @@ class MassEmail extends \Espo\Services\Record
'useSmtp' => true,
'status' => 'Active',
'smtpIsForMassEmail' => true,
'emailAddress!=' => '',
'emailAddress!=' => null
['emailAddress!=' => ''],
['emailAddress!=' => null],
])->find();
foreach ($inboundEmailList as $inboundEmail) {

4
application/Espo/Resources/i18n/en_US/LeadCapture.json
View File

@@ -18,6 +18,9 @@
"exampleRequestUrl": "URL",
"exampleRequestPayload": "Payload",
"createLeadBeforeOptInConfirmation": "Create Lead before confirmation",
"skipOptInConfirmationIfSubscribed": "Skip confirmation if lead is already in target list",
"smtpAccount": "SMTP Account",
"inboundEmail": "Group Email Account",
"duplicateCheck": "Duplicate Check"
},
"links": {
@@ -25,6 +28,7 @@
"campaign": "Campaign",
"optInConfirmationEmailTemplate": "Opt-in confirmation email template",
"targetTeam": "Target Team",
"inboundEmail": "Group Email Account",
"logRecords": "Log"
},
"labels": {

3
application/Espo/Resources/layouts/LeadCapture/detail.json
View File

@@ -15,8 +15,9 @@
"label": "",
"rows": [
[{"name": "optInConfirmation", "inlineEditDisabled": true}, false],
[{"name": "createLeadBeforeOptInConfirmation"}, false],
[{"name": "createLeadBeforeOptInConfirmation"}, {"name": "skipOptInConfirmationIfSubscribed"}],
[{"name": "optInConfirmationEmailTemplate"}, {"name": "optInConfirmationLifetime"}],
[{"name": "smtpAccount"}, false],
[{"name": "optInConfirmationSuccessMessage", "fullWidth": true}]
]
}

32
application/Espo/Resources/metadata/clientDefs/LeadCapture.json
View File

@@ -72,6 +72,38 @@
]
}
},
"smtpAccount": {
"visible": {
"conditionGroup": [
{
"type": "isTrue",
"attribute": "optInConfirmation"
}
]
}
},
"skipOptInConfirmationIfSubscribed": {
"visible": {
"conditionGroup": [
{
"type": "and",
"value": [
{
"type": "isTrue",
"attribute": "optInConfirmation"
},
{
"type": "isNotEmpty",
"attribute": "targetListId",
"data": {
"field": "targetList"
}
}
]
}
]
}
},
"optInConfirmationEmailTemplate": {
"visible": {
"conditionGroup": [

15
application/Espo/Resources/metadata/entityDefs/LeadCapture.json
View File

@@ -63,6 +63,9 @@
"createLeadBeforeOptInConfirmation": {
"type": "bool"
},
"skipOptInConfirmationIfSubscribed": {
"type": "bool"
},
"leadSource": {
"type": "enum",
"view": "crm:views/opportunity/fields/lead-source",
@@ -94,6 +97,14 @@
"readOnly": true,
"seeMoreDisabled": true
},
"inboundEmail": {
"type": "link"
},
"smtpAccount": {
"type": "base",
"notStorable": true,
"view": "views/lead-capture/fields/smtp-account"
},
"createdAt": {
"type": "datetime",
"readOnly": true
@@ -132,6 +143,10 @@
"type": "belongsTo",
"entity": "Team"
},
"inboundEmail": {
"type": "belongsTo",
"entity": "InboundEmail"
},
"optInConfirmationEmailTemplate": {
"type": "belongsTo",
"entity": "EmailTemplate"

67
application/Espo/Services/LeadCapture.php
View File

@@ -164,6 +164,13 @@ class LeadCapture extends Record
if ($hasDuplicate) {
$this->logLeadCapture($leadCapture, $target, $data, false);
$isLogged = true;
if ($leadCapture->get('skipOptInConfirmationIfSubscribed') && $leadCapture->get('targetListId')) {
$isAlreadyOptedIn = $this->isTargetOptedIn($target, $leadCapture->get('targetListId'));
if ($isAlreadyOptedIn) {
return true;
}
}
}
if ($leadCapture->get('createLeadBeforeOptInConfirmation')) {
@@ -552,7 +559,38 @@ class LeadCapture extends Record
'isHtml' => $isHtml,
]);
$this->getMailSender()->send($email);
$smtpParams = null;
$inboundEmailId = $leadCapture->get('inboundEmailId');
if ($inboundEmailId) {
$inboundEmail = $this->getEntityManager()->getEntity('InboundEmail', $inboundEmailId);
if (!$inboundEmail) {
throw new Error("Lead Capture: Group Email Account {$inboundEmailId} is not available.");
}
if (
$inboundEmail->get('status') !== 'Active'
||
!$inboundEmail->get('useSmtp')
) {
throw new Error("Lead Capture: Group Email Account {$inboundEmailId} can't be used for Lead Capture.");
}
$inboundEmailService = $this->getServiceFactory()->create('InboundEmail');
$smtpParams = $inboundEmailService->getSmtpParamsFromAccount($inboundEmail);
if (!$smtpParams) {
throw new Error("Lead Capture: Group Email Account {$inboundEmailId} has no SMTP params.");
}
}
$sender = $this->getMailSender();
if ($smtpParams) {
$sender->useSmtp($smtpParams);
}
$sender->send($email);
return true;
}
@@ -598,4 +636,31 @@ class LeadCapture extends Record
'leadCaptureId' => $leadCapture->id,
];
}
public function getSmtpAccountDataList()
{
if (!$this->getUser()->isAdmin()) throw new Forbidden();
$dataList = [];
$inboundEmailList = $this->getEntityManager()->getRepository('InboundEmail')->where([
'useSmtp' => true,
'status' => 'Active',
['emailAddress!=' => ''],
['emailAddress!=' => null],
])->find();
foreach ($inboundEmailList as $inboundEmail) {
$item = (object) [];
$key = 'inboundEmail:' . $inboundEmail->id;
$item->key = $key;
$item->emailAddress = $inboundEmail->get('emailAddress');
$item->fromName = $inboundEmail->get('fromName');
$dataList[] = $item;
}
return $dataList;
}
}

4
client/modules/crm/src/views/mass-email/fields/smtp-account.js
View File

@@ -30,6 +30,8 @@ Espo.define('crm:views/mass-email/fields/smtp-account', 'views/fields/enum', fun
return Dep.extend({
dataUrl: 'MassEmail/action/smtpAccountDataList',
getAttributeList: function () {
return [this.name, 'inboundEmailId'];
},
@@ -81,7 +83,7 @@ Espo.define('crm:views/mass-email/fields/smtp-account', 'views/fields/enum', fun
Dep.prototype.setup.call(this);
if (this.getAcl().checkScope('MassEmail', 'create') || this.getAcl().checkScope('MassEmail', 'edit')) {
this.ajaxGetRequest('MassEmail/action/smtpAccountDataList').then(function (dataList) {
this.ajaxGetRequest(this.dataUrl).then(function (dataList) {
if (!dataList.length) return;
this.loadedOptionList = [];
this.loadedOptionTranslations = {};

36
client/src/views/lead-capture/fields/smtp-account.js Normal file
View File

@@ -0,0 +1,36 @@
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2019 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
define('views/lead-capture/fields/smtp-account', 'crm:views/mass-email/fields/smtp-account', function (Dep) {
return Dep.extend({
dataUrl: 'LeadCapture/action/smtpAccountDataList',
});
});