fbarachino/bubofamily
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Sistemato permessi

Browse Source
This commit is contained in:
Amministratore 2024-05-25 09:04:55 +00:00
parent 0155be2654
commit 53c984c315
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Movimenti.php
View File

@ -193,11 +193,7 @@ JOIN categories as c ON a.mov_fk_categoria=c.id';
list($giorno,$mese,$anno) = explode('/',$line['Data valuta']); list($giorno,$mese,$anno) = explode('/',$line['Data valuta']);
$data="$anno-$mese-$giorno"; $data="$anno-$mese-$giorno";
self::insEntrata([ self::insEntrata([
<<<<<<< HEAD
'mov_data'=>$data,
=======
'mov_data'=>self::dateFormat(0,$line['Data valuta']), 'mov_data'=>self::dateFormat(0,$line['Data valuta']),
>>>>>>> devel
'mov_fk_categoria'=>1, 'mov_fk_categoria'=>1,
'mov_descrizione'=>$line['Descrizione operazione'], 'mov_descrizione'=>$line['Descrizione operazione'],
'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))), 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))),

4
resources/views/layouts/dashboard.blade.php
View File

@ -12,7 +12,7 @@
@section('content') @section('content')
<div class="row"> <div class="row">
@hasanyrole('user|admin') @can('conti')
<div class="col-lg-3 col-md-8 draggable"> <div class="col-lg-3 col-md-8 draggable">
<div class="info-box bg-success"> <div class="info-box bg-success">
@ -69,7 +69,7 @@
</div> </div>
</div> </div>
</div> </div>
@endhasanyrole @endcan
</div> </div>
@can('tasks') @can('tasks')