diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index 778f17a..ffc7d9b 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -133,10 +133,11 @@ class MovimentiController extends Controller 'Categoria'=>$movimento->Categoria, 'Tag'=>$movimento->Tag, 'Descrizione'=>$movimento->Descrizione, - 'Importo'=>$movimento->Importo + //'Importo'=>str_replace(".",",",$movimento->Importo), + 'Importo'=>$movimento->Importo, ]; } - return (new FastExcel($lista))->download('movimenti_al_'.date('d-m-Y').'.ods'); + return (new FastExcel($lista))->download('movimenti_al_'.date('d-m-Y').'.xls'); // return dd($movimenti); } @@ -282,6 +283,8 @@ class MovimentiController extends Controller ->whereYear('mov_data','=',$anno) ->where('mov_fk_categoria','=',$id) ->sum('mov_importo'); + + $coll[] = ['totale' => $movrow]; } @@ -317,13 +320,14 @@ class MovimentiController extends Controller ->where('mov_fk_categoria','=',$id) ->sum('mov_importo'); + //$coll[] = str_replace(".",",",$movrow); $coll[] = $movrow; } $row[]=array_combine($intestazione,array_merge(array($ncategoria),$coll)); unset($coll); } - return (new FastExcel($row))->download('report_al_'.date('d-m-Y').'.ods'); + return (new FastExcel($row))->download('report_al_'.date('d-m-Y').'.xls'); } public function apiList() diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index 76830be..f574d38 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -2,7 +2,7 @@ Riepilogo
  • - Spese/Incassi + Spese/Incassi