From a0555ee4d36a97228a7e50a34d9cfb018c8f60ea Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Sat, 28 Sep 2019 10:43:41 +0200
Subject: [PATCH] Bugfix

---
 bug.php           | 11 ++++++-----
 update/2_4_11.sql |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bug.php b/bug.php
index a6251c4e4..8d62f8733 100644
--- a/bug.php
+++ b/bug.php
@@ -1,17 +1,18 @@
 <?php
 
+use Modules\Emails\Account;
 use Notifications\EmailNotification;
 
 include_once __DIR__.'/core.php';
 
-$mail = new EmailNotification();
+$account = Account::where('predefined', true)->first();
 $bug_email = 'info@openstamanager.com';
 
 $user = Auth::user();
 
 if (filter('op') == 'send') {
     // Preparazione email
-    $mail = new Mail();
+    $mail = new EmailNotification();
 
     // Destinatario
     $mail->AddAddress($bug_email);
@@ -77,13 +78,13 @@ $pageTitle = tr('Bug');
 
 include_once App::filepath('include|custom|', 'top.php');
 
-if (empty($mail['from_address']) || empty($mail['server'])) {
+if (empty($account['from_address']) || empty($account['server'])) {
     echo '
 <div class="alert alert-warning">
     <i class="fa fa-warning"></i>
     <b>'.tr('Attenzione!').'</b> '.tr('Per utilizzare correttamente il modulo di segnalazione bug devi configurare alcuni parametri riguardanti le impostazione delle email').'.
 
-    '.Modules::link('Account email', $mail['id'], tr('Correggi account'), null, 'class="btn btn-warning pull-right"').'
+    '.Modules::link('Account email', $account['id'], tr('Correggi account'), null, 'class="btn btn-warning pull-right"').'
     <div class="clearfix"></div>
 </div>';
 }
@@ -101,7 +102,7 @@ echo '
             <table class="table table-bordered table-condensed table-striped table-hover">
                 <tr>
                     <th width="150" class="text-right">'.tr('Da').':</th>
-                    <td>'.$mail['from_address'].'</td>
+                    <td>'.$account['from_address'].'</td>
                 </tr>
 
                 <!-- A -->
diff --git a/update/2_4_11.sql b/update/2_4_11.sql
index cb66b628d..d6e2d3058 100644
--- a/update/2_4_11.sql
+++ b/update/2_4_11.sql
@@ -471,6 +471,8 @@ HAVING 2=2
 ORDER BY `co_documenti`.`data` DESC, CAST(`co_documenti`.`numero_esterno` AS UNSIGNED) DESC' WHERE `name` = 'Fatture di vendita';
 
 UPDATE `zz_views` SET `query` = 'righe.totale' WHERE `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Fatture di vendita') AND `name` = 'Totale';
+UPDATE `zz_views` SET `query` = 'IF(`email`.`id_email` IS NOT NULL, ''fa fa-envelope text-success'', '''')' WHERE `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Fatture di vendita') AND `name` = 'icon_Inviata';
+UPDATE `zz_views` SET `query` = 'IF(`email`.`id_email` IS NOT NULL, ''Inviata via email'', '''')' WHERE `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Fatture di vendita') AND `name` = 'icon_title_Inviata';
 
 -- Ottimizzazione Fatture di acquisto
 UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `co_documenti`