diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index a94df77..aa726ef 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -271,7 +271,6 @@ class MovimentiController extends Controller if ($request->hasFile('filename')) { $filename=$request->file('filename')->store('EC'); - // dd($filename); Documenti/xyz.xls Movimenti::importEstrattoIng($filename); return redirect(Route('movimenti')); @@ -282,10 +281,30 @@ class MovimentiController extends Controller } } + public function importEC_CR(Request $request) + { + if ($request->hasFile('filename')) + { + $filename=$request->file('filename')->store('EC'); + Movimenti::importEstrattoCR($filename); + + return redirect(Route('movimenti')); + } + else { + return 'Nessun File trovato'; + + } + } + public function importFile() { return view('conti.import'); } + public function importFileCR() + { + return view('conti.importCR'); + } + } diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php index 43b1883..76d7f17 100644 --- a/app/Models/Movimenti.php +++ b/app/Models/Movimenti.php @@ -166,6 +166,45 @@ class Movimenti extends Model //dd($outputPath); } + public static function importEstrattoCR($filename) + { + //$file = str_replace('/EC/','',$filename); + $inputPath='/var/www/html/bubofamily/public/storage/'.$filename; + $outputPath='/var/www/html/bubofamily/public/'.$filename.'.csv'; + rename($inputPath,$outputPath); + + $collection = (new FastExcel)->configureCsv(';')->import($filename.'.csv', function ($line){ + if($line['VALUTA']) + { + if($line['DARE']<>'') + { + $dati=[ + 'mov_data'=>Movimenti::dateFormat(0,$line['VALUTA']), + 'mov_fk_categoria'=>1, + 'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'], + 'mov_importo'=>'-'.trim(str_replace(',','.',(str_replace('.','',$line['DARE'])))), + 'mov_fk_tags'=>1, + 'userid'=>1, + ]; + } + if($line['AVERE']<>'') + { + $dati=[ + 'mov_data'=>Movimenti::dateFormat(0,$line['VALUTA']), + 'mov_fk_categoria'=>1, + 'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'], + 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',$line['AVERE'])))), + 'mov_fk_tags'=>1, + 'userid'=>1, + ]; + } + Movimenti::insEntrata($dati); + // dd($dati); + } + + }); + //dd($outputPath); + } private static function dateFormat($type,$string) { if($type) diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index 0c7dbb9..6d9d2a7 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -36,6 +36,9 @@
  • Importa Estratto ING
  • +
  • + Importa Estratto CR +
  • diff --git a/resources/views/conti/importCR.blade.php b/resources/views/conti/importCR.blade.php new file mode 100644 index 0000000..2c2b482 --- /dev/null +++ b/resources/views/conti/importCR.blade.php @@ -0,0 +1,26 @@ +@extends('admin') +@section('content') +
    +
    +

    Importazione Estratto conto Cassa Rurale

    +
    +
    +
    + +
    +
    +
    + @csrf +
    + + +
    +
    + +
    +
    +
    +
    +
    + + @endsection \ No newline at end of file diff --git a/routes/admin.php b/routes/admin.php index c303ef3..73404e9 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -68,6 +68,8 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('movdocs', [DocumentiController::class,'storeFile']); Route::get('movimenti/import', [MovimentiController::class,'importFile'])->name('importING'); Route::post('movimenti/import', [MovimentiController::class,'importEC_ING']); + Route::get('movimenti/importcr', [MovimentiController::class,'importFileCR'])->name('importCR'); + Route::post('movimenti/importcr', [MovimentiController::class,'importEC_CR']); # Automobili Route::get('auto', [AutoController::class, 'index'])->name('auto_list'); Route::get('auto/new', [AutoController::class, 'newAuto'])->name('auto_new');