Skip to content
Snippets Groups Projects
Verified Commit 6088e051 authored by Damien's avatar Damien
Browse files

FEAT #13464 TIME 0:45 Get attach in email

parent ddcb25f5
No related branches found
No related tags found
No related merge requests found
......@@ -8,52 +8,42 @@
<type show="true" with_chrono="true" attach_in_mail="true" icon="R" sign="true">
<id>response_project</id>
<label>_RESPONSE_PROJECT</label>
<process_mode/>
</type>
<type show="true" with_chrono="true" with_delay="60" icon="TR" sign="false">
<id>transmission</id>
<label>Transmission</label>
<process_mode/>
</type>
<type show="false" with_chrono="true" attach_in_mail="true" icon="" sign="false" select_in_reconciliation="true">
<id>signed_response</id>
<label>_SIGNED_RESPONSE</label>
<process_mode/>
</type>
<type show="true" with_chrono="false" icon="PJ" sign="false" select_in_reconciliation="true">
<id>simple_attachment</id>
<label>_A_PJ</label>
<process_mode/>
</type>
<type show="true" with_chrono="false" icon="" sign="false">
<id>incoming_mail_attachment</id>
<label>_INCOMING_PJ</label>
<process_mode/>
</type>
<type show="true" with_chrono="false" get_chrono="response_project" icon="BE" sign="true">
<id>waybill</id>
<label>_WAYBILL</label>
<process_mode/>
</type>
<type show="false" with_chrono="true" icon="FC" sign="false">
<id>routing</id>
<label>_ROUTING</label>
<process_mode/>
</type>
<type show="true" with_chrono="true" icon="DS" sign="true">
<id>outgoing_mail</id>
<label>_OUTGOING_MAIL</label>
<process_mode/>
</type>
<type show="false" with_chrono="false" icon="" sign="false">
<id>converted_pdf</id>
<label>_CONVERTED_PDF</label>
<process_mode/>
</type>
<type show="false" with_chrono="false" icon="" sign="false">
<id>print_folder</id>
<label>_PRINT_FOLDER</label>
<process_mode/>
</type>
</attachment_types>
<contact_check>
......
......@@ -108,11 +108,12 @@ abstract class AttachmentModelAbstract
foreach ($attachmentTypesXML->type as $value) {
$label = defined((string) $value->label) ? constant((string) $value->label) : (string) $value->label;
$types[(string) $value->id] = [
'label' => $label,
'icon' => (string)$value['icon'],
'sign' => (empty($value['sign']) || (string)$value['sign'] == 'true') ? true : false,
'chrono' => (empty($value['with_chrono']) || (string)$value['with_chrono'] == 'true') ? true : false,
'show' => (empty($value->attributes()->show) || (string)$value->attributes()->show == 'true') ? true : false
'label' => $label,
'icon' => (string)$value['icon'],
'sign' => (empty($value['sign']) || (string)$value['sign'] == 'true') ? true : false,
'chrono' => (empty($value['with_chrono']) || (string)$value['with_chrono'] == 'true') ? true : false,
'attachInMail' => (!empty($value['attach_in_mail']) && (string)$value['attach_in_mail'] == 'true') ? true : false,
'show' => (empty($value->attributes()->show) || (string)$value->attributes()->show == 'true') ? true : false
];
}
}
......
......@@ -432,6 +432,7 @@ class EmailController
'chrono' => $attachment['identifier'],
'label' => $attachment['title'],
'typeLabel' => $attachmentTypes[$attachment['attachment_type']]['label'],
'attachInMail' => $attachmentTypes[$attachment['attachment_type']]['attachInMail'],
'convertedDocument' => $convertedDocument,
'creator' => UserModel::getLabelledUserById(['login' => $attachment['typist']]),
'format' => $attachment['format'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment