fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in feature/PMC-41 (pull request #6696)

Browse Source 
PMC-41

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Ronald Quenta
2018-11-26 19:48:11 +00:00
committed by Julio Cesar Laura Avendaño
parent f40bf729a4 ab77c13432
commit 6ebe8a6526
8 changed files with 457 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -47,7 +47,8 @@
"ralouphie/getallheaders": "^2.0",
"smarty/smarty": "2.6.30",
"pdepend/pdepend": "@stable",
"chumper/zipper": "^1.0"
"chumper/zipper": "^1.0",
"php-imap/php-imap": "^3.0"
},
"require-dev": {
"fzaninotto/faker": "^1.7",

2
workflow/engine/bin/actionsByEmailEmailResponse.php Normal file
View File

@@ -0,0 +1,2 @@
<?php
require_once("cron.php");

7
workflow/engine/bin/cron_single.php
View File

@@ -1,6 +1,7 @@
<?php
use Illuminate\Foundation\Http\Kernel;
use ProcessMaker\BusinessModel\ActionsByEmail\ResponseReader;
require_once __DIR__ . '/../../../gulliver/system/class.g.php';
require_once __DIR__ . '/../../../bootstrap/autoload.php';
@@ -146,7 +147,8 @@ try {
} else {
eprintln('WARNING! No server info found!', 'red');
}
//load Processmaker translations
Bootstrap::LoadTranslationObject(SYS_LANG);
//DB
$phpCode = '';
@@ -254,6 +256,9 @@ try {
case 'sendnotificationscron':
sendNotifications();
break;
case 'actionsByEmailEmailResponse':
(new ResponseReader)->actionsByEmailEmailResponse();
break;
}
} catch (Exception $e) {
$token = strtotime("now");

116
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker (Branch 3.3.1)\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-10-23 16:48:05\n"
"PO-Revision-Date: 2018-11-23 20:16:26\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -1705,6 +1705,24 @@ msgstr "The answer has been submitted. Thank you."
msgid "Please add your comments above this section. Don't modify or delete this section."
msgstr "Please add your comments above this section. Don't modify or delete this section."
# TRANSLATION
# LABEL/ID_ABE_CASE_NOTE_ANSWER
#: LABEL/ID_ABE_CASE_NOTE_ANSWER
msgid "Answer: {optionLabel}"
msgstr "Answer: {optionLabel}"
# TRANSLATION
# LABEL/ID_ABE_CASE_NOTE_COMMENT
#: LABEL/ID_ABE_CASE_NOTE_COMMENT
msgid "Comment: {emailBody}"
msgstr "Comment: {emailBody}"
# TRANSLATION
# LABEL/ID_ABE_CASE_NOTE_HEADER
#: LABEL/ID_ABE_CASE_NOTE_HEADER
msgid "{emailAccount} has completed a task from Actions by Email."
msgstr "{emailAccount} has completed a task from Actions by Email."
# TRANSLATION
# LABEL/ID_ABE_FORM_ALREADY_FILLED
#: LABEL/ID_ABE_FORM_ALREADY_FILLED
@@ -1717,6 +1735,54 @@ msgstr "The form has already been filled and sent."
msgid "The information was submitted. Thank you."
msgstr "The information was submitted. Thank you."
# TRANSLATION
# LABEL/ID_ABE_LOG_ALREADY_ROUTED
#: LABEL/ID_ABE_LOG_ALREADY_ROUTED
msgid "The case was identified correctly but it was already routed."
msgstr "The case was identified correctly but it was already routed."
# TRANSLATION
# LABEL/ID_ABE_LOG_CANNOT_BE_IDENTIFIED
#: LABEL/ID_ABE_LOG_CANNOT_BE_IDENTIFIED
msgid "The case cannot be identified."
msgstr "The case cannot be identified."
# TRANSLATION
# LABEL/ID_ABE_LOG_CANNOT_READ
#: LABEL/ID_ABE_LOG_CANNOT_READ
msgid "The application cannot read the email receiver account."
msgstr "The application cannot read the email receiver account."
# TRANSLATION
# LABEL/ID_ABE_LOG_PROCESSED_OK
#: LABEL/ID_ABE_LOG_PROCESSED_OK
msgid "The answer was processed correctly."
msgstr "The answer was processed correctly."
# TRANSLATION
# LABEL/ID_ABE_LOG_ROUTING_FAILED
#: LABEL/ID_ABE_LOG_ROUTING_FAILED
msgid "The case was identified correctly but the routing process has failed."
msgstr "The case was identified correctly but the routing process has failed."
# TRANSLATION
# LABEL/ID_ABE_RESPONSE_ALREADY_ROUTED
#: LABEL/ID_ABE_RESPONSE_ALREADY_ROUTED
msgid "Your answer cannot be processed because the case was already routed or is no longer assigned to you."
msgstr "Your answer cannot be processed because the case was already routed or is no longer assigned to you."
# TRANSLATION
# LABEL/ID_ABE_RESPONSE_CANNOT_BE_IDENTIFIED
#: LABEL/ID_ABE_RESPONSE_CANNOT_BE_IDENTIFIED
msgid "Your answer cannot be processed, please try again and make sure to keep the subject code untouched."
msgstr "Your answer cannot be processed, please try again and make sure to keep the subject code untouched."
# TRANSLATION
# LABEL/ID_ABE_RESPONSE_ROUTING_FAILED
#: LABEL/ID_ABE_RESPONSE_ROUTING_FAILED
msgid "Your answer cannot be processed because there is an error in the flow definition, please notify to this issue to the system administrator."
msgstr "Your answer cannot be processed because there is an error in the flow definition, please notify to this issue to the system administrator."
# TRANSLATION
# LABEL/ID_ABE_RESPONSE_SENT
#: LABEL/ID_ABE_RESPONSE_SENT
@@ -13625,6 +13691,12 @@ msgstr "Execute a trigger when a case is deleted"
msgid "Please press the \"Generate Link\" button."
msgstr "Please press the \"Generate Link\" button."
# TRANSLATION
# LABEL/ID_MAFE_660cfca112471f69246e9942f5e8afd1
#: LABEL/ID_MAFE_660cfca112471f69246e9942f5e8afd1
msgid "Store email body in"
msgstr "Store email body in"
# TRANSLATION
# LABEL/ID_MAFE_66285b36f894a5439af5a98e3e1a36d2
#: LABEL/ID_MAFE_66285b36f894a5439af5a98e3e1a36d2
@@ -14555,6 +14627,12 @@ msgstr "January"
msgid "[LABEL/ID_MAFE_86fd9a7abc9f357e7fa206b2d42ec5ba] Destination Path"
msgstr "Destination Path"
# TRANSLATION
# LABEL/ID_MAFE_8738321e65db027ee6476c0ab12d8cd5
#: LABEL/ID_MAFE_8738321e65db027ee6476c0ab12d8cd5
msgid "Store option in"
msgstr "Store option in"
# TRANSLATION
# LABEL/ID_MAFE_87557f11575c0ad78e4e28abedc13b6e
#: LABEL/ID_MAFE_87557f11575c0ad78e4e28abedc13b6e
@@ -15365,6 +15443,12 @@ msgstr "Properties"
msgid "[LABEL/ID_MAFE_9fced129522f128b2445a41fb0b6ef9f] checkbox"
msgstr "checkbox"
# TRANSLATION
# LABEL/ID_MAFE_a036226d97d1d0d725d494a1431f322c
#: LABEL/ID_MAFE_a036226d97d1d0d725d494a1431f322c
msgid "Receiver account"
msgstr "Receiver account"
# TRANSLATION
# LABEL/ID_MAFE_a05ac4341235111bd2cba5c3c105ba81
#: LABEL/ID_MAFE_a05ac4341235111bd2cba5c3c105ba81
@@ -17915,6 +17999,12 @@ msgstr "Users"
msgid "validate"
msgstr "validate"
# TRANSLATION
# LABEL/ID_MAFE_fa2b5b7c9bccd35e42cb74042690a091
#: LABEL/ID_MAFE_fa2b5b7c9bccd35e42cb74042690a091
msgid "Email response"
msgstr "Email response"
# TRANSLATION
# LABEL/ID_MAFE_fa3c608c8fc755543f0d37afd6a42651
#: LABEL/ID_MAFE_fa3c608c8fc755543f0d37afd6a42651
@@ -25961,18 +26051,6 @@ msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini"
msgid "The file has not been attached because the extension is not allowed or because the content doesn't correspond."
msgstr "The file has not been attached because the extension is not allowed or because the content doesn't correspond."
# TRANSLATION
# LABEL/ID_UPLOAD_INVALID_DOC_MAX_FILESIZE
#: LABEL/ID_UPLOAD_INVALID_DOC_MAX_FILESIZE
msgid "File size exceeds the allowable limit of {0}"
msgstr "File size exceeds the allowable limit of {0}"
# TRANSLATION
# LABEL/ID_UPLOAD_INVALID_DOC_TYPE_FILE
#: LABEL/ID_UPLOAD_INVALID_DOC_TYPE_FILE
msgid "Invalid file format, please upload a file with one of the following formats {0}"
msgstr "Invalid file format, please upload a file with one of the following formats {0}"
# TRANSLATION
# LABEL/ID_UPLOAD_ERR_NO_FILE
#: LABEL/ID_UPLOAD_ERR_NO_FILE
@@ -26021,6 +26099,18 @@ msgstr "Upload from file"
msgid "Upload image"
msgstr "Upload image"
# TRANSLATION
# LABEL/ID_UPLOAD_INVALID_DOC_MAX_FILESIZE
#: LABEL/ID_UPLOAD_INVALID_DOC_MAX_FILESIZE
msgid "File size exceeds the allowable limit of {0}"
msgstr "File size exceeds the allowable limit of {0}"
# TRANSLATION
# LABEL/ID_UPLOAD_INVALID_DOC_TYPE_FILE
#: LABEL/ID_UPLOAD_INVALID_DOC_TYPE_FILE
msgid "Invalid file format, please upload a file with one of the following formats {0}"
msgstr "Invalid file format, please upload a file with one of the following formats {0}"
# TRANSLATION
# LABEL/ID_UPLOAD_LANGUAGE
#: LABEL/ID_UPLOAD_LANGUAGE

11
workflow/engine/data/mysql/insert.sql
View File

@@ -57085,6 +57085,17 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_ABE_FORM_ALREADY_FILLED','en','The form has already been filled and sent.','2017-06-09') ,
( 'LABEL','ID_ABE_INFORMATION_SUBMITTED','en','The information was submitted. Thank you.','2017-06-19') ,
( 'LABEL','ID_ABE_RESPONSE_SENT','en','The response has already been sent.','2017-06-19') ,
( 'LABEL','ID_ABE_RESPONSE_CANNOT_BE_IDENTIFIED','en','Your answer cannot be processed, please try again and make sure to keep the subject code untouched.','2018-11-20') ,
( 'LABEL','ID_ABE_RESPONSE_ALREADY_ROUTED','en','Your answer cannot be processed because the case was already routed or is no longer assigned to you.','2018-11-20') ,
( 'LABEL','ID_ABE_RESPONSE_ROUTING_FAILED','en','Your answer cannot be processed because there is an error in the flow definition, please notify to this issue to the system administrator.','2018-11-20') ,
( 'LABEL','ID_ABE_CASE_NOTE_ANSWER','en','Answer: {optionLabel}','2018-11-20') ,
( 'LABEL','ID_ABE_CASE_NOTE_COMMENT','en','Comment: {emailBody}','2018-11-20') ,
( 'LABEL','ID_ABE_CASE_NOTE_HEADER','en','{emailAccount} has completed a task from Actions by Email.','2018-11-20') ,
( 'LABEL','ID_ABE_LOG_CANNOT_READ','en','The application cannot read the email receiver account.','2018-11-20') ,
( 'LABEL','ID_ABE_LOG_PROCESSED_OK','en','The answer was processed correctly.','2018-11-20') ,
( 'LABEL','ID_ABE_LOG_CANNOT_BE_IDENTIFIED','en','The case cannot be identified.','2018-11-20') ,
( 'LABEL','ID_ABE_LOG_ALREADY_ROUTED','en','The case was identified correctly but it was already routed.','2018-11-20') ,
( 'LABEL','ID_ABE_LOG_ROUTING_FAILED','en','The case was identified correctly but the routing process has failed.','2018-11-20') ,
( 'LABEL','ID_ACCEPT','en','Accept','2014-01-15') ,
( 'LABEL','ID_ACCESS_DENIED','en','Access Denied!','2015-12-03') ,
( 'LABEL','ID_ACCOUNT','en','Account','2014-01-15') ,

308
workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail/ResponseReader.php Normal file
View File

File diff suppressed because it is too large Load Diff

5
workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php
View File

@@ -154,6 +154,11 @@ class ActionsByEmail extends Api
$arrayData = $filesManager->addProcessFilesManager($proId, $userUid, $data);
@copy(PATH_TPL . 'actionsByEmail' . PATH_SEP . 'actionsByEmail.html', $path . 'actionsByEmail.html');
}
if (!file_exists($path . 'actionsByEmailErrorReply.html')) {
$data = array('prf_content' => '', 'prf_filename' => 'actionsByEmailErrorReply.html', 'prf_path' => 'templates');
$arrayData = $filesManager->addProcessFilesManager($proId, $userUid, $data);
@copy(PATH_TPL . 'actionsByEmail' . PATH_SEP . 'actionsByEmailErrorReply.html', $path . 'actionsByEmailErrorReply.html');
}
}
$directory = dir($path);

20
workflow/engine/templates/actionsByEmail/actionsByEmailErrorReply.html Normal file
View File

@@ -0,0 +1,20 @@
<table style="background-color: white; font-family: Arial,Helvetica,sans-serif; color: black; font-size: 11px; text-align: left;"
cellpadding="10" cellspacing="0" width="100%">
<tr>
<td style="font-size: 14px;"><strong>ACTIONS BY EMAIL</strong></td>
</tr>
<tr>
<td style="vertical-align:middle;">
<hr>
<br/>
@#ACTIONS_BY_EMAIL_ERROR_MESSAGE
<br/>
<br/>
<hr>
<strong>This is an automated email, please do not replay to it.</strong>
<br/>
<a href="http://www.processmaker.com" style="color:#c40000;">www.processmaker.com</a>
<br/>
</td>
</tr>
</table>