Merge pull request Evarisk#1103 from nicolas-eoxia/add_param_showUrlO…

…fLastGeneratedDocument Evarisk#1102 [Lib] add: parameter entity for showUrlOfLastGeneratedDocument
nicolas-eoxia · Oct 11, 2024 · 0c12749 · 0c12749
2 parents 29da1f7 + 3687783
commit 0c12749
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/class/saturnedocuments.class.php b/class/saturnedocuments.class.php
@@ -265,16 +265,14 @@ public function generateDocument(string $modele, Translate $outputlangs, int $hi
      * @param  string    $moduleNameLowerCase Module name in lowercase
      * @param  string    $fileDir             File directory
      * @param  string    $fileType            Type of file
+     * @param  int       $entity              Entity
      * @return array|int $result              Array of document or -1 if not found
      */
-    public function getLastDocument(string $moduleNameLowerCase = '', string $fileDir = '', string $fileType = '')
+    public function getLastDocument(string $moduleNameLowerCase = '', string $fileDir = '', string $fileType = '', int $entity = 1)
     {
-        global $conf;
-
         require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
-        $uploadDir = $conf->$moduleNameLowerCase->multidir_output[$conf->entity ?? 1];
-        $fileDir   = $uploadDir . '/' . $fileDir;
+        $fileDir   = DOL_DATA_ROOT . '/' . ($entity > 1 ? $entity . '/' : '') . $moduleNameLowerCase . '/' . $fileDir;
         $fileList  = dol_dir_list($fileDir, 'files', 0, '(\.' . $fileType .  ')', '', 'date', 'SORT_DESC', 1);
         if (count($fileList)) {
             $result = $fileList[0];
@@ -292,14 +290,15 @@ public function getLastDocument(string $moduleNameLowerCase = '', string $fileDi
      * @param  string $fileDir             File directory
      * @param  string $fileType            Type of file
      * @param  string $icon                Icon for download button
+     * @param  int    $entity              Entity
      * @return string                      String of html button
      */
-    public function showUrlOfLastGeneratedDocument(string $moduleNameLowerCase = '', string $fileDir = '', string $fileType = '', string $icon = 'fa-file-word'): string
+    public function showUrlOfLastGeneratedDocument(string $moduleNameLowerCase = '', string $fileDir = '', string $fileType = '', string $icon = 'fa-file-word', int $entity = 1): string
     {
         global $langs;
 
         $out      = '';
-        $document = $this->getLastDocument($moduleNameLowerCase, $fileDir, $fileType);
+        $document = $this->getLastDocument($moduleNameLowerCase, $fileDir, $fileType, $entity);
         if (is_array($document)) {
             $documentUrl = DOL_URL_ROOT . '/document.php';
             $fileUrl     = $documentUrl . '?modulepart=' . $moduleNameLowerCase . '&file=' . urlencode($fileDir . '/' . $document['name']);