diff --git a/.gitignore b/.gitignore index eb003b0..a395359 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ /node_modules /public/hot /public/storage +/public/EC +/public/*.xlsx +/public/*.xls /storage/*.key /vendor .env diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index 6e019ff..a94df77 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -266,30 +266,25 @@ class MovimentiController extends Controller } } - public function importEC_ING() + public function importEC_ING(Request $request) { - $collection = (new FastExcel)->import('file1.xlsx', function ($line){ - if($line['Data valuta']) - { - return Movimenti::insEntrata([ - 'mov_data'=>$this->dateFormat(0,$line['Data valuta']), - 'mov_fk_categoria'=>1, - 'mov_descrizione'=>$line['Descrizione operazione'], - 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))), - 'mov_fk_tags'=>1, - 'userid'=>1, - ] - ); - } - /* - * "Data contabile" => "29/03/2023" - "Data valuta" => "29/03/2023" - "Causale" => "PAGAMENTI DIVERSI" - "Descrizione operazione" => "Addebito SDD CORE Scad. 29/03/2023 Imp. 5.99 Creditor id. IT46ZZZ0000013970161009 ILIAD Id Mandato ILIAD-FR9HXO-1 Debitore FLAVIO BARACHINO E PAOLA BRENTARI Rif ▶" - "Importo" => "€ -5,99" - */ - //dd($line); - }); + if ($request->hasFile('filename')) + { + $filename=$request->file('filename')->store('EC'); + // dd($filename); Documenti/xyz.xls + Movimenti::importEstrattoIng($filename); + + return redirect(Route('movimenti')); + } + else { + return 'Nessun File trovato'; + + } + } + + public function importFile() + { + return view('conti.import'); } diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php index 78066bc..43b1883 100644 --- a/app/Models/Movimenti.php +++ b/app/Models/Movimenti.php @@ -5,6 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; +use Rap2hpoutre\FastExcel\FastExcel; class Movimenti extends Model { @@ -143,8 +144,37 @@ class Movimenti extends Model public static function importEstrattoIng($filename) { - + //$file = str_replace('/EC/','',$filename); + $inputPath='/var/www/html/bubofamily/public/storage/'.$filename; + $outputPath='/var/www/html/bubofamily/public/'.$filename; + rename($inputPath,$outputPath); + + $collection = (new FastExcel)->import($filename, function ($line){ + if($line['Data valuta']) + { + Movimenti::insEntrata([ + 'mov_data'=>Movimenti::dateFormat(0,$line['Data valuta']), + 'mov_fk_categoria'=>1, + 'mov_descrizione'=>$line['Descrizione operazione'], + 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))), + 'mov_fk_tags'=>1, + 'userid'=>1, + ]); + } + + }); + //dd($outputPath); + } + + private static function dateFormat($type,$string) + { + if($type) + { + list($year,$month,$day) = explode('-',$string); + return $day.'/'.$month.'/'.$year; + } else { + list($day,$month,$year) =explode('/',$string); + return $year.'-'.$month.'-'.$day; + } } - } - diff --git a/public/.~lock.file1.xlsx# b/public/.~lock.file1.xlsx# deleted file mode 100644 index aeea00e..0000000 --- a/public/.~lock.file1.xlsx# +++ /dev/null @@ -1 +0,0 @@ -,flavio,fblaptop,03.04.2023 16:36,file:///home/flavio/.config/libreoffice/4; \ No newline at end of file diff --git a/public/file1.xlsx b/public/file1.xlsx deleted file mode 100644 index 802f8f9..0000000 Binary files a/public/file1.xlsx and /dev/null differ diff --git a/public/file1_old.xlsx b/public/file1_old.xlsx deleted file mode 100644 index 65f6539..0000000 Binary files a/public/file1_old.xlsx and /dev/null differ diff --git a/public/movimenti_al_12-02-2022.ods b/public/movimenti_al_12-02-2022.ods deleted file mode 100644 index cb1dafb..0000000 Binary files a/public/movimenti_al_12-02-2022.ods and /dev/null differ diff --git a/public/movimenti_al_12-02-2022.xls b/public/movimenti_al_12-02-2022.xls deleted file mode 100644 index f1a8679..0000000 Binary files a/public/movimenti_al_12-02-2022.xls and /dev/null differ diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index 4806920..0c7dbb9 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -31,7 +31,10 @@ Report Annuale Movimenti
  • - Esporta tutti i movimenti + Esporta tutti i movimenti +
    • +
  • + Importa Estratto ING
    • diff --git a/resources/views/conti/import.blade.php b/resources/views/conti/import.blade.php new file mode 100644 index 0000000..1b42b9f --- /dev/null +++ b/resources/views/conti/import.blade.php @@ -0,0 +1,26 @@ +@extends('admin') +@section('content') +
    +
    +

    Importazione Estratto conto ING

    +
    +
    +
    + +
    +
    +
    + @csrf +
    + + +
    +
    + +
    +
    +
    +
    +
    + + @endsection \ No newline at end of file diff --git a/routes/admin.php b/routes/admin.php index cb4dfac..c303ef3 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -66,8 +66,8 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('movimenti/report/movimentibycat', [MovimentiController::class,'listMovbyCat']); Route::get('movdocs', [DocumentiController::class,'fileForm'])->name('documenti'); Route::post('movdocs', [DocumentiController::class,'storeFile']); - Route::get('movimenti/import', [MovimentiController::class,'importEC_ING']); - + Route::get('movimenti/import', [MovimentiController::class,'importFile'])->name('importING'); + Route::post('movimenti/import', [MovimentiController::class,'importEC_ING']); # Automobili Route::get('auto', [AutoController::class, 'index'])->name('auto_list'); Route::get('auto/new', [AutoController::class, 'newAuto'])->name('auto_new');