WIP Integrazioni delle ultime modifiche. #4

Merged
fbarachino merged 50 commits from dev into main 2025-10-21 14:31:06 +00:00
Showing only changes of commit b98a80aad0 - Show all commits

View File

@ -25,11 +25,12 @@
</thead> </thead>
<tbody> <tbody>
@foreach( $dataSpesa as $dato ) @foreach( $dataSpesa as $dato )
@if($dato->resoconto !='')
<tr> <tr>
<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y') }}">{{ $dato->cat_name }}</a> </td> <td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y') }}">{{ $dato->cat_name }}</a> </td>
<td>{{ $dato->resoconto }}</td> <td>{{ $dato->resoconto }}</td>
</tr> </tr>
@endif
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
@ -55,11 +56,12 @@
</thead> </thead>
<tbody> <tbody>
@foreach( $dataEntrate as $dato ) @foreach( $dataEntrate as $dato )
@if($dato->resoconto !='')
<tr> <tr>
<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y')}}">{{ $dato->cat_name }}</a> </td> <td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y')}}">{{ $dato->cat_name }}</a> </td>
<td>{{ $dato->resoconto }}</td> <td>{{ $dato->resoconto }}</td>
</tr> </tr>
@endif
@endforeach @endforeach
</tbody> </tbody>
</table> </table>