From 1c7653be970034ba6f93bc4fb67af12908182843 Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Wed, 24 Jul 2019 17:39:11 +0200
Subject: [PATCH] Miglioramenti vari importFE

---
 plugins/importFE/actions.php         | 54 ++++++++++++------
 plugins/importFE/edit.php            |  2 +-
 plugins/importFE/list.php            | 82 +++++++++++++++++-----------
 plugins/importFE/src/Interaction.php |  4 +-
 plugins/receiptFE/edit.php           |  2 +-
 plugins/receiptFE/list.php           |  2 +-
 6 files changed, 92 insertions(+), 54 deletions(-)

diff --git a/plugins/importFE/actions.php b/plugins/importFE/actions.php
index 61f420f61..9b2080998 100644
--- a/plugins/importFE/actions.php
+++ b/plugins/importFE/actions.php
@@ -25,32 +25,52 @@ switch (filter('op')) {
             $file = Interaction::getInvoiceFile($name);
         }
 
-        if (FatturaElettronica::isValid($file)) {
-            // Individuazione ID fisico
-            $files = Interaction::getFileList();
-            foreach ($files as $key => $value) {
-                if ($value['name'] == $file) {
-                    $index = $key;
+        try {
+            if (!FatturaElettronica::isValid($file)) {
+                echo json_encode([
+                    'already' => 1,
+                ]);
 
-                    break;
-                }
+                return;
             }
-
-            echo json_encode([
-                'id' => $index + 1,
-            ]);
-        } else {
-            echo json_encode([
-                'already' => 1,
-            ]);
+        } catch (Exception $e) {
         }
 
+        // Individuazione ID fisico
+        $files = Interaction::getFileList();
+        foreach ($files as $key => $value) {
+            if ($value['name'] == $file) {
+                $index = $key;
+
+                break;
+            }
+        }
+
+        echo json_encode([
+            'id' => $index + 1,
+        ]);
+
         break;
 
     case 'delete':
+        $file_id = get('file_id');
+
+        $files = Interaction::getFileList();
+        $file = $files[$file_id];
+
+        $directory = FatturaElettronica::getImportDirectory();
+        delete($directory.'/'.$file['name']);
+
+        break;
+    case 'download':
+        $file_id = get('file_id');
+
+        $files = Interaction::getFileList();
+        $file = $files[$file_id];
+
         $directory = FatturaElettronica::getImportDirectory();
 
-        delete($directory.'/'.get('name'));
+        download($directory.'/'.$file['name']);
 
         break;
 
diff --git a/plugins/importFE/edit.php b/plugins/importFE/edit.php
index 7bfba3085..30106d759 100644
--- a/plugins/importFE/edit.php
+++ b/plugins/importFE/edit.php
@@ -97,7 +97,7 @@ echo '
         
         <div class="pull-right">
             <button type="button" class="btn btn-warning" onclick="importAll(this)">
-                <i class="fa fa-download"></i> '.tr('Importa in sequenza').'
+                <i class="fa fa-cloud-download"></i> '.tr('Importa in sequenza').'
             </button>';
 
 // Ricerca automatica
diff --git a/plugins/importFE/list.php b/plugins/importFE/list.php
index 9aeaa2bf8..94963b63f 100644
--- a/plugins/importFE/list.php
+++ b/plugins/importFE/list.php
@@ -29,7 +29,7 @@ if (!empty($list)) {
         echo '
         <tr>';
 
-        if (file_exists($directory.'/'.$name)) {
+        if (!empty($element['file'])) {
             echo '
             <td>
                 <p>'.$name.'</p>
@@ -40,7 +40,7 @@ if (!empty($list)) {
             <td class="text-center">-</td>
             
             <td class="text-center">
-                <button type="button" class="btn btn-danger" onclick="delete_fe(this, \''.$name.'\')">
+                <button type="button" class="btn btn-danger" onclick="delete_fe(this, \''.$element['id'].'\')">
                     <i class="fa fa-trash"></i>
                 </button>';
         } else {
@@ -85,10 +85,17 @@ if (!empty($list)) {
                 </button>';
         }
 
+        if (file_exists($directory.'/'.$name)) {
+            echo '
+                <button type="button" class="btn btn-primary" onclick="download_fe(this, \''.$element['id'].'\')">
+                    <i class="fa fa-download"></i>
+                </button>';
+        }
+
         echo '
         
-                <button type="button" class="btn btn-warning" '.((!extension_loaded('openssl') && substr(strtolower($name), -4) == '.p7m') ? 'disabled' : '').' onclick="download(this, \''.$name.'\', \''.$data.'\')">
-                    <i class="fa fa-download"></i> '.tr('Importa').'
+                <button type="button" class="btn btn-warning" '.((!extension_loaded('openssl') && substr(strtolower($name), -4) == '.p7m') ? 'disabled' : '').' onclick="import_fe(this, \''.$name.'\', \''.$data.'\')">
+                    <i class="fa fa-cloud-download"></i> '.tr('Importa').'
                 </button>
             </td>
         </tr>';
@@ -104,7 +111,7 @@ if (!empty($list)) {
 
 echo '
 <script>
-function download(button, file, data_registrazione) {
+function import_fe(button, file, data_registrazione) {
     var restore = buttonLoading(button);
 
     $.ajax({
@@ -140,34 +147,6 @@ function download(button, file, data_registrazione) {
     });
 }
 
-function delete_fe(button, file) {
-    swal({
-        title: "'.tr('Rimuovere la fattura salvata localmente?').'",
-        html: "'.tr('Sarà possibile inserirla nuovamente nel gestionale attraverso il caricamento').'",
-        type: "error",
-        showCancelButton: true,
-        confirmButtonText: "'.tr('Sì').'"
-    }).then(function (result) {
-        var restore = buttonLoading(button);
-    
-        $.ajax({
-            url: globals.rootdir + "/actions.php",
-            type: "get",
-            data: {
-                id_module: globals.id_module,
-                id_plugin: '.$id_plugin.',
-                op: "delete",
-                name: file,
-            },
-            success: function(data) {
-                $("#list").load("'.$structure->fileurl('list.php').'?id_module='.$id_module.'&id_plugin='.$id_plugin.'", function() {
-                    buttonRestore(button, restore);
-                });
-            }
-        });
-    });
-}
-
 function process_fe(button, file) {
     swal({
         title: "'.tr('Segnare la fattura come processata?').'",
@@ -196,5 +175,42 @@ function process_fe(button, file) {
     });
 }
 
+function delete_fe(button, file_id) {
+    swal({
+        title: "'.tr('Rimuovere la fattura salvata localmente?').'",
+        html: "'.tr('Sarà possibile inserirla nuovamente nel gestionale attraverso il caricamento').'",
+        type: "error",
+        showCancelButton: true,
+        confirmButtonText: "'.tr('Sì').'"
+    }).then(function (result) {
+        var restore = buttonLoading(button);
+    
+        $.ajax({
+            url: globals.rootdir + "/actions.php",
+            type: "get",
+            data: {
+                id_module: globals.id_module,
+                id_plugin: '.$id_plugin.',
+                op: "delete",
+                file_id: file_id,
+            },
+            success: function(data) {
+                $("#list").load("'.$structure->fileurl('list.php').'?id_module='.$id_module.'&id_plugin='.$id_plugin.'", function() {
+                    buttonRestore(button, restore);
+                });
+            }
+        });
+    });
+}
+
+function download_fe(button, file_id) {
+    redirect(globals.rootdir + "/actions.php", {
+        id_module: globals.id_module,
+        id_plugin: '.$id_plugin.',
+        op: "download",
+        file_id: file_id,
+    }, "get", true);
+}
+
 start_local_datatables();
 </script>';
diff --git a/plugins/importFE/src/Interaction.php b/plugins/importFE/src/Interaction.php
index 060dd0eff..37a0639e0 100644
--- a/plugins/importFE/src/Interaction.php
+++ b/plugins/importFE/src/Interaction.php
@@ -50,12 +50,14 @@ class Interaction extends Services
         $directory = FatturaElettronica::getImportDirectory();
 
         $files = glob($directory.'/*.xml*');
-        foreach ($files as $file) {
+        foreach ($files as $id => $file) {
             $name = basename($file);
 
             if (!in_array($name, $names)) {
                 $list[] = [
+                    'id' => $id,
                     'name' => $name,
+                    'file' => true,
                 ];
             }
         }
diff --git a/plugins/receiptFE/edit.php b/plugins/receiptFE/edit.php
index a75d8ce44..9a4ce8cea 100644
--- a/plugins/receiptFE/edit.php
+++ b/plugins/receiptFE/edit.php
@@ -50,7 +50,7 @@ if (Interaction::isEnabled()) {
     echo '
         <div class="pull-right">
             <button type="button" class="btn btn-warning" onclick="importAll(this)">
-                <i class="fa fa-download"></i> '.tr('Importa tutte le ricevute').'
+                <i class="fa fa-cloud-download"></i> '.tr('Importa tutte le ricevute').'
             </button>
             
             <button type="button" class="btn btn-primary" onclick="search(this)">
diff --git a/plugins/receiptFE/list.php b/plugins/receiptFE/list.php
index 408bfa626..9e4c362e1 100644
--- a/plugins/receiptFE/list.php
+++ b/plugins/receiptFE/list.php
@@ -40,7 +40,7 @@ if (!empty($list)) {
 
         echo '
                 <button type="button" class="btn btn-warning" '.((!extension_loaded('openssl') and substr(strtolower($element), -4) == '.p7m') ? 'disabled' : '').' onclick="download(this, \''.$element.'\')">
-                    <i class="fa fa-download"></i> '.tr('Importa').'
+                    <i class="fa fa-cloud-download"></i> '.tr('Importa').'
                 </button>
             </td>
         </tr>';