From 7f7ae841badd7401e49b0d76a8cab13f2b55b80b Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Fri, 7 Dec 2018 15:30:08 +0100
Subject: [PATCH] Miglioramenti minori

---
 plugins/exportFE/actions.php  |  5 -----
 plugins/exportFE/download.php |  5 +++++
 plugins/exportFE/edit.php     | 27 +++++++++++++++++++++++++--
 plugins/exportFE/init.php     |  2 ++
 plugins/exportFE/view.php     |  1 -
 5 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 plugins/exportFE/download.php

diff --git a/plugins/exportFE/actions.php b/plugins/exportFE/actions.php
index 8b1f458a2..79482b10b 100644
--- a/plugins/exportFE/actions.php
+++ b/plugins/exportFE/actions.php
@@ -1,6 +1,5 @@
 <?php
 
-include_once __DIR__.'/../../core.php';
 include_once __DIR__.'/init.php';
 
 switch (filter('op')) {
@@ -25,8 +24,4 @@ switch (filter('op')) {
         }
 
         break;
-
-    case 'download':
-        download($upload_dir.'/'.$fattura_pa->getFilename());
-        break;
 }
diff --git a/plugins/exportFE/download.php b/plugins/exportFE/download.php
new file mode 100644
index 000000000..deb4e8fb3
--- /dev/null
+++ b/plugins/exportFE/download.php
@@ -0,0 +1,5 @@
+<?php
+
+include_once __DIR__.'/init.php';
+
+download($upload_dir.'/'.$fattura_pa->getFilename());
diff --git a/plugins/exportFE/edit.php b/plugins/exportFE/edit.php
index 73200f4c8..3a5c73b36 100644
--- a/plugins/exportFE/edit.php
+++ b/plugins/exportFE/edit.php
@@ -1,6 +1,5 @@
 <?php
 
-include_once __DIR__.'/../../core.php';
 include_once __DIR__.'/init.php';
 
 use Plugins\ExportFE\FatturaElettronica;
@@ -25,6 +24,30 @@ if (!empty($fattura_pa)) {
     $generated = false;
 }
 
+// Campi obbligatori per il pagamento
+$pagamento = $database->fetchOne('SELECT * FROM `co_pagamenti` WHERE `id` = '.prepare($record['idpagamento']));
+$fields = [
+    'codice_modalita_pagamento_fe' => 'Codice di pagamento FE',
+];
+
+$missing = [];
+foreach ($fields as $key => $name) {
+    if (empty($pagamento[$key])) {
+        $missing[] = $name;
+    }
+}
+
+if (!empty($missing) && !$generated) {
+    echo '
+<div class="alert alert-warning">
+    <p><i class="fa fa-warning"></i> '.tr("Prima di procedere alla generazione della fattura elettronica completa i seguenti campi del tipo di pagamento: _FIELDS_", [
+        '_FIELDS_' => '<b>'.implode(', ', $missing).'</b>',
+    ]).'</p>
+</div>';
+
+    $disabled = true;
+}
+
 // Campi obbligatori per l'anagrafica Azienda
 $azienda = FatturaElettronica::getAzienda();
 $fields = [
@@ -118,7 +141,7 @@ echo '
 echo '
     <i class="fa fa-arrow-right fa-fw text-muted"></i>
 
-    <a href="'.ROOTDIR.'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.$id_record.'&op=download" class="btn btn-success btn-lg '.($generated ? '' : 'disabled').'" target="_blank" '.($generated ? '' : 'disabled').'>
+    <a href="'.ROOTDIR.'/plugins/exportFE/download.php?id_record='.$id_record.'" class="btn btn-success btn-lg '.($generated ? '' : 'disabled').'" target="_blank" '.($generated ? '' : 'disabled').'>
         <i class="fa fa-download"></i> '.tr('Scarica').'
     </a>
 
diff --git a/plugins/exportFE/init.php b/plugins/exportFE/init.php
index 5b7f5c3fd..fae8db0f4 100644
--- a/plugins/exportFE/init.php
+++ b/plugins/exportFE/init.php
@@ -1,5 +1,7 @@
 <?php
 
+include_once __DIR__.'/../../core.php';
+
 use Plugins\ExportFE\FatturaElettronica;
 
 try {
diff --git a/plugins/exportFE/view.php b/plugins/exportFE/view.php
index 609f49230..1f883a4cd 100644
--- a/plugins/exportFE/view.php
+++ b/plugins/exportFE/view.php
@@ -1,6 +1,5 @@
 <?php
 
-include_once __DIR__.'/../../core.php';
 include_once __DIR__.'/init.php';
 
 echo $fattura_pa;