Merge pull request #156 from marsante/sendInvoices

add: send mail function to invoices
MedShake · Feb 4, 2024 · 6684d23 · 6684d23
2 parents e3546ed + b7df192
commit 6684d23
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 3 deletions.
diff --git a/SHA256SUMS b/SHA256SUMS
@@ -1 +1 @@
-3ea88b81e74bb5f2313b6e611feccdd9303a7b15308159df41e23e19f2010f4e
+b3a127929889cdb0dc315c0cec0e6b1d705c0139ecf4b482491ea651000495e0
diff --git a/templates/base/patient/historiques/pht-ligne-reglement.html.twig b/templates/base/patient/historiques/pht-ligne-reglement.html.twig
@@ -64,6 +64,80 @@
           <i class="far fa-address-card fa-fw fa-lg text-success"></i>
         </button>
       {% endif %}
+      {# send #}
+        {% if config.smtpHost or config.apicryptSmtpHost or config.faxService %}
+          <div class="btn-group d-none d-lg-inline-flex">
+            <button type="button" class="btn btn-light btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Envoyer">
+              <i class="fas fa-paper-plane fa-fw"></i>
+            </button>
+            <ul class="dropdown-menu">
+              {% if config.smtpHost %}
+                <li>
+                  <a class="dropdown-item newMail" href="#" data-formtocall="baseSendMail" data-objetID="{{ cs.id }}" data-mailtype="ns">
+                    <i class="fas fa-at fa-fw text-muted mr-1"></i> Envoyer en clair
+                  </a>
+                </li>
+              {% endif %}
+              {% if config.apicryptAdresse %}
+                <li>
+                  <a class="dropdown-item newMail" href="#" data-formtocall="baseSendMailApicrypt" data-objetID="{{ cs.id }}" data-mailtype="apicrypt">
+                    <i class="fas fa-lock fa-fw text-muted mr-1"></i> Envoyer en apicrypt
+                  </a>
+                </li>
+              {% endif %}
+              {% if config.faxService %}
+                <li>
+                  <a class="dropdown-item newMail" href="#" data-formtocall="baseFax" data-objetID="{{ cs.id }}" data-mailtype="ecofax">
+                    <i class="fas fa-fax fa-fw text-muted mr-1"></i> Envoyer par fax
+                  </a>
+                </li>
+              {% endif %}
+              {% if config.optionGeActiverTransmissions == 'true' and config.transmissionsPeutCreer == 'true' %}
+                <li role="separator" class="dropdown-divider"></li>
+                <li>
+                  <a class="dropdown-item newTransmission" href="#" data-objetID="{{ cs.id }}">
+                    <i class="far fa-comments fa-fw text-muted mr-1"></i> Créer une transmission
+                  </a>
+                </li>
+              {% endif %}
+              {% if cs.sendMail > 0 %}
+                <li role="separator" class="dropdown-divider"></li>
+                <li>
+                  <a class="dropdown-item" href="{{ config.protocol }}{{ config.host }}{{ config.urlHostSuffixe }}/logs/historiqueMailSend/{{ cs.id }}/">
+                    <i class="fas fa-history fa-fw text-muted mr-1"></i> Historique des envois
+                  </a>
+                </li>
+              {% endif %}
+
+              {# relations avec mode d'envoi préféré #}
+              {% if page.voirCorrespondantsAvecEnvoiPrefere %}
+                <li role="separator" class="dropdown-divider"></li>
+                <li class="dropdown-header" title="Méthode d'envoi péféré">Correspondant</li>
+                {% for correspandant in page.correspondants %}
+                  {% if correspandant.preferedSendingMethod == 'APICRYPT' and correspandant.emailApicrypt and config.apicryptAdresse %}
+                    <li>
+                      <a class="dropdown-item newMail" href="#" data-formtocall="baseSendMailApicrypt" data-objetID="{{ cs.id }}" data-mailtype="apicrypt" data-correspondantID="{{ correspandant.peopleID }}" title="{{ correspandant.typeRelationTxt }} / envoi préféré par Apicrypt">
+                        <i class="fas fa-lock fa-fw text-muted mr-1"></i><span>{{ correspandant.identiteUsuelle }}</span>
+                      </a>
+                    </li>
+                  {% elseif correspandant.preferedSendingMethod == 'FAX' and correspandant.faxPro and config.faxService %}
+                    <li>
+                      <a class="dropdown-item newMail" href="#" data-formtocall="baseFax" data-objetID="{{ cs.id }}" data-mailtype="ecofax" data-correspondantID="{{ correspandant.peopleID }}" title="{{ correspandant.typeRelationTxt }} / envoi préféré par Fax">
+                        <i class="fas fa-fax fa-fw text-muted mr-1"></i><span >{{ correspandant.identiteUsuelle }}</span>
+                      </a>
+                    </li>
+                  {% endif %}
+                {% endfor %}
+              {% endif %}
+
+            </ul>
+          </div>
+        {% endif %}
+        {% if cs.sendMail > 0 %}
+          <a class="btn btn-light btn-sm d-none d-lg-inline-block" role="button" href="{{ config.protocol }}{{ config.host }}{{ config.urlHostSuffixe }}/logs/historiqueMailSend/{{ cs.id }}/" title="Envoyé par mail - voir historique">
+            <i class="fas fa-envelope fa-fw"></i>
+          </a>
+        {% endif %}
       {# option #}
       <div class="btn-group">
         <button type="button" class="btn btn-light btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

diff --git a/upgrade/base/sqlInstall.sql b/upgrade/base/sqlInstall.sql
@@ -1270,7 +1270,7 @@ INSERT IGNORE INTO `prescriptions` (`cat`, `label`, `description`, `fromID`, `to
 
 -- system
 INSERT IGNORE INTO `system` (`name`, `groupe`, `value`) VALUES
-('base', 'module', 'v8.0.6'),
+('base', 'module', 'v8.1.0'),
 ('state', 'system', 'normal');
 
 -- univtags_type

diff --git a/upgrade/base/sqlUpgrade_v8.0.6_v8.1.0.sql b/upgrade/base/sqlUpgrade_v8.0.6_v8.1.0.sql
@@ -0,0 +1,2 @@
+-- Mise à jour n° de version
+UPDATE `system` SET `value`='v8.1.0' WHERE `name`='base' and `groupe`='module';
diff --git a/versionMedShakeEHR-base.txt b/versionMedShakeEHR-base.txt
@@ -1 +1 @@
-v8.0.6
+v8.1.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		3ea88b81e74bb5f2313b6e611feccdd9303a7b15308159df41e23e19f2010f4e
		b3a127929889cdb0dc315c0cec0e6b1d705c0139ecf4b482491ea651000495e0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- Mise à jour n° de version
		UPDATE `system` SET `value`='v8.1.0' WHERE `name`='base' and `groupe`='module';