slambert/Thanasoft-Hytha
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: slambert:3a05613b60ef2f1e61199f3a3b09a6b1bbf3245e
Branches Tags
slambert:production
slambert:production-dv-thanato
slambert:production-hfc
slambert:branch-add-tva
..
compare: slambert:de0ed31ccbaa6a0401d413756bfc7a3d0dd4103d
Branches Tags
slambert:production-dv-thanato
slambert:production-hfc
slambert:production
slambert:branch-add-tva

No commits in common. "3a05613b60ef2f1e61199f3a3b09a6b1bbf3245e" and "de0ed31ccbaa6a0401d413756bfc7a3d0dd4103d" have entirely different histories.
3a05613b60 ... de0ed31ccb

4 changed files with 10 additions and 11 deletions
Show Stats Expand all files Collapse all files

3
gestion/lib/Constants/BddConstant.php
View File

@ -13,7 +13,4 @@ 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";
} }

4
gestion/lib/Controller/InvoiceController.php
View File

@ -116,8 +116,10 @@ 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 = BddConstant::DEFAULT_INVOICE_CC_EMAIL; $appAdminEmail = $this->gestionRepository->getUserEmailByNextcloudId(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
if ($appAdminEmail) {
$message->setCc([$appAdminEmail]); $message->setCc([$appAdminEmail]);
}
$this->mailer->send($message); $this->mailer->send($message);
$this->gestionRepository->setFactureSentDate($factureId); $this->gestionRepository->setFactureSentDate($factureId);

6
gestion/lib/Controller/PageController.php
View File

@ -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 = BddConstant::DEFAULT_ATTESTATION_CC_EMAIL; $appAdminEmail = $this->myDb->getUserEmailByNextcloudId(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
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) {

4
gestion/lib/Db/Bdd.php
View File

@ -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 LOWER(group_user.gid) = ? AND WHERE group_user.gid = ? AND
thanato.fk_user_uuid IS NULL; thanato.fk_user_uuid IS NULL;
"; ";
return $this->execSQL($sql,[strtolower(BddConstant::DEFAULT_THANATOS_GROUP_NAME)]); return $this->execSQL($sql,[BddConstant::DEFAULT_THANATOS_GROUP_NAME]);
} }
public function doDevisIdsListIdsBelongsToTheSameClientFacturationGroup(array $devisIds){ public function doDevisIdsListIdsBelongsToTheSameClientFacturationGroup(array $devisIds){