From feae88c4ffecf7bd419340270a30023a0a1636a6 Mon Sep 17 00:00:00 2001
From: Flavio Barachino <flavio.barachino@gmail.com>
Date: Thu, 16 Oct 2025 11:52:04 +0200
Subject: [PATCH] modifica funzione di export

---
 app/Http/Controllers/MovimentiController.php                  | 3 ++-
 app/Models/Movimenti.php                                      | 2 +-
 .../migrations/2022_02_04_134245_create_movimentis_table.php  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php
index 94a6bb8..c4f5810 100644
--- a/app/Http/Controllers/MovimentiController.php
+++ b/app/Http/Controllers/MovimentiController.php
@@ -119,7 +119,8 @@ class MovimentiController extends Controller
                 'Categoria'=>$movimento->Categoria,
                 'Tag'=>$movimento->Tag,
                 'Descrizione'=>$movimento->Descrizione,
-                'Importo'=>$movimento->Importo,
+                'Importo_dare'=>$movimento->Importo_dare,
+                'Importo_avere'=>$movimento->Importo_avere,
                 'Conto'=>$movimento->Conto,
             ];
         }
diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php
index b937e37..cb09cf0 100644
--- a/app/Models/Movimenti.php
+++ b/app/Models/Movimenti.php
@@ -144,7 +144,7 @@ public function ContoA()
         ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
         ->join('tags','movimentis.mov_fk_tags','=','tags.id')
         ->join('contos','movimentis.conto_id','=','contos.id')
-        ->selectRaw('mov_data AS Data,cat_name AS Categoria,tag_name AS Tag,NomeConto AS Conto, mov_descrizione AS Descrizione,mov_importo AS Importo')
+        ->selectRaw('mov_data AS Data,cat_name AS Categoria,tag_name AS Tag,NomeConto AS Conto, mov_descrizione AS Descrizione,mov_importo_dare AS Importo_dare, mov_importo_avere AS Importo_averes')
         ->orderBy('Data','asc')
         ->get();
     }
diff --git a/database/migrations/2022_02_04_134245_create_movimentis_table.php b/database/migrations/2022_02_04_134245_create_movimentis_table.php
index 9228e59..986a8f6 100644
--- a/database/migrations/2022_02_04_134245_create_movimentis_table.php
+++ b/database/migrations/2022_02_04_134245_create_movimentis_table.php
@@ -20,8 +20,8 @@ class CreateMovimentisTable extends Migration
             $table->unsignedBigInteger('mov_fk_categoria');
             $table->foreign('mov_fk_categoria')->references('id')->on('categories');
             $table->longText('mov_descrizione');
-            $table->decimal('mov_importo_dare',8,2)->nullable();
-            $table->decimal('mov_importo_avere',8,2)->nullable();
+            $table->decimal('mov_importo_dare',8,2)->nullable()->default(0.00);
+            $table->decimal('mov_importo_avere',8,2)->nullable()->default(0.00);
             $table->unsignedBigInteger('mov_inserito_da');
             $table->foreign('mov_inserito_da')->references('id')->on('users');
             $table->unsignedBigInteger('mov_fk_tags');