Compare commits
4 Commits
de0ed31ccb
...
3a05613b60
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a05613b60 | ||
|
|
1f03b91871 | ||
|
|
760902963b | ||
|
|
21e8ee8d67 |
@ -13,4 +13,7 @@ abstract class BddConstant
|
|||||||
const ISLEAVEPROPERTYONVCALENDAR = "ISLEAVE";
|
const ISLEAVEPROPERTYONVCALENDAR = "ISLEAVE";
|
||||||
|
|
||||||
const DEFAULT_THANATOS_GROUP_NAME = "Thanatos";
|
const DEFAULT_THANATOS_GROUP_NAME = "Thanatos";
|
||||||
|
|
||||||
|
const DEFAULT_ATTESTATION_CC_EMAIL = "attestation@h-f-c.info";
|
||||||
|
const DEFAULT_INVOICE_CC_EMAIL = "attestation@h-f-c.info";
|
||||||
}
|
}
|
||||||
@ -116,10 +116,8 @@ class InvoiceController extends Controller
|
|||||||
"<p> Vous trouverez en pièce jointe la facture des soins de " . $factureDate . ".</p>".
|
"<p> Vous trouverez en pièce jointe la facture des soins de " . $factureDate . ".</p>".
|
||||||
$signature
|
$signature
|
||||||
);
|
);
|
||||||
$appAdminEmail = $this->gestionRepository->getUserEmailByNextcloudId(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
|
$appAdminEmail = BddConstant::DEFAULT_INVOICE_CC_EMAIL;
|
||||||
if ($appAdminEmail) {
|
|
||||||
$message->setCc([$appAdminEmail]);
|
$message->setCc([$appAdminEmail]);
|
||||||
}
|
|
||||||
|
|
||||||
$this->mailer->send($message);
|
$this->mailer->send($message);
|
||||||
$this->gestionRepository->setFactureSentDate($factureId);
|
$this->gestionRepository->setFactureSentDate($factureId);
|
||||||
|
|||||||
@ -1616,17 +1616,17 @@ class PageController extends Controller {
|
|||||||
$message->attach($content);
|
$message->attach($content);
|
||||||
$message->setSubject($subject);
|
$message->setSubject($subject);
|
||||||
$body_text = $addName ? ($body." de ".$devis['defunt_nom'] ) : $body;
|
$body_text = $addName ? ($body." de ".$devis['defunt_nom'] ) : $body;
|
||||||
|
$cautionText = "MERCI DE NE PAS REPONDRE A CET EMAIL.";
|
||||||
$signature = $this->mailerService->getFooterContent($this->getUserNameForEmailSignature());
|
$signature = $this->mailerService->getFooterContent($this->getUserNameForEmailSignature());
|
||||||
$message->setHtmlBody(
|
$message->setHtmlBody(
|
||||||
"<p>Bonjour.</p>".
|
"<p>Bonjour.</p>".
|
||||||
"<p>$body_text</p>".
|
"<p>$body_text</p>".
|
||||||
|
"<p>$cautionText</p>".
|
||||||
$signature
|
$signature
|
||||||
);
|
);
|
||||||
|
|
||||||
$appAdminEmail = $this->myDb->getUserEmailByNextcloudId(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
|
$appAdminEmail = BddConstant::DEFAULT_ATTESTATION_CC_EMAIL;
|
||||||
if ($appAdminEmail) {
|
|
||||||
$message->setCc([$appAdminEmail]);
|
$message->setCc([$appAdminEmail]);
|
||||||
}
|
|
||||||
$this->mailer->send($message);
|
$this->mailer->send($message);
|
||||||
return new DataResponse("", 200, ['Content-Type' => 'application/json']);
|
return new DataResponse("", 200, ['Content-Type' => 'application/json']);
|
||||||
// } catch (Exception $e) {
|
// } catch (Exception $e) {
|
||||||
|
|||||||
@ -4458,11 +4458,11 @@ COMMENTAIRES: ".$comment;
|
|||||||
FROM ".self::DEFAULT_TABLE_PREFIX."users as users
|
FROM ".self::DEFAULT_TABLE_PREFIX."users as users
|
||||||
JOIN .".self::DEFAULT_TABLE_PREFIX."group_user group_user ON users.uid = group_user.uid
|
JOIN .".self::DEFAULT_TABLE_PREFIX."group_user group_user ON users.uid = group_user.uid
|
||||||
LEFT JOIN ".$this->tableprefix."thanato as thanato on users.uid = thanato.fk_user_uuid
|
LEFT JOIN ".$this->tableprefix."thanato as thanato on users.uid = thanato.fk_user_uuid
|
||||||
WHERE group_user.gid = ? AND
|
WHERE LOWER(group_user.gid) = ? AND
|
||||||
thanato.fk_user_uuid IS NULL;
|
thanato.fk_user_uuid IS NULL;
|
||||||
";
|
";
|
||||||
|
|
||||||
return $this->execSQL($sql,[BddConstant::DEFAULT_THANATOS_GROUP_NAME]);
|
return $this->execSQL($sql,[strtolower(BddConstant::DEFAULT_THANATOS_GROUP_NAME)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function doDevisIdsListIdsBelongsToTheSameClientFacturationGroup(array $devisIds){
|
public function doDevisIdsListIdsBelongsToTheSameClientFacturationGroup(array $devisIds){
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user