fix binding token dispositivo, Fix contabilità e creazione del servizio con nuove viste,Nuova Mappa dispositivi, fix filtri prima nota

app/DataTables/AttivitaDataTableEditor.php

@@ -117,6 +117,11 @@ class AttivitaDataTableEditor extends DataTablesEditor
       'descrizione' => 'Spese per utenze (Luce, Acqua, Gas, Telefono)',
       'colore' => '#dc3545',
     ]);
+    $model->categorie_contabili()->create([
+      'nome' => 'Staff',
+      'descrizione' => 'Spese per staff',
+      'colore' => '#dc3545',
+    ]);
 
     return $model;
   }

app/DataTables/ChiusuraServizioDataTable.php

@@ -0,0 +1,124 @@
+<?php
+
+namespace App\DataTables;
+
+use App\Models\ChiusuraServizio;
+use Illuminate\Database\Eloquent\Builder as QueryBuilder;
+use Yajra\DataTables\EloquentDataTable;
+use Yajra\DataTables\Html\Builder as HtmlBuilder;
+use Yajra\DataTables\Html\Button;
+use Yajra\DataTables\Html\Column;
+use Yajra\DataTables\Html\Editor\Editor;
+use Yajra\DataTables\Html\Editor\Fields;
+use Yajra\DataTables\Services\DataTable;
+use Illuminate\Support\Facades\Auth;
+
+class ChiusuraServizioDataTable extends DataTable
+{
+    public function __construct(){
+        $this->dataTableVariable = 'dataTable_chiusura_servizio';
+    }
+    /**
+     * Build the DataTable class.
+     *
+     * @param QueryBuilder<ChiusuraServizio> $query Results from query() method.
+     */
+    public function dataTable(QueryBuilder $query): EloquentDataTable
+    {
+        return (new EloquentDataTable($query))
+            ->addColumn('action', function($query){
+                return view('chiusura_servizio.menu', ['entity' => $query]);
+            })
+            ->addColumn('user_id_display', function($query){
+                if($query->user->id == Auth::user()->id){
+                    return view('_partials.badge', ['success' => 'Tu']);
+                }else{
+                    return view('_partials.badge', ['info' => $query->user->name]);
+                }
+            })
+            ->addColumn('info_display', function($query){
+                if (empty($query->info)) {
+                    return '—';
+                }
+                $info = is_array($query->info) ? $query->info : json_decode($query->info ?? '[]', true);
+                $incasso = (float) ($info['incasso'] ?? 0);
+                return '€ ' . number_format($incasso, 2, ',', '.');
+            })
+            ->setRowId('id');
+    }
+
+    /**
+     * Get the query source of dataTable.
+     *
+     * @return QueryBuilder<ChiusuraServizio>
+     */
+    public function query(ChiusuraServizio $model): QueryBuilder
+    {
+        return $model->newQuery()->where('attivita_id', $this->attivita_id)->orderBy('chiusura_at', 'desc');
+    }
+
+    /**
+     * Optional method if you want to use the html builder.
+     */
+    public function html(): HtmlBuilder
+    {
+        $buttons = [];            
+        if(Auth::user()->can('create-chiusura-servizio')){
+            array_push($buttons, Button::make('create')
+                ->editor('editor')
+                ->className('btn btn-sm btn-primary mb-4')
+                ->formTitle('Crea nuova chiusura di servizio')
+                ->text('<i class="fas fa-plus"></i> Nuova chiusura di servizio'));
+        }
+        return $this->builder()
+                    ->setTableId($this->dataTableVariable)
+                    ->columns($this->getColumns())
+                    ->minifiedAjax()
+                    ->orderBy(1)
+                    ->selectStyleSingle()
+                    ->language(asset('assets/Italian.json'))
+                    ->dom(count($buttons) == 0 ? 'rtip' : 'Bfrtip')
+                    ->responsive(true)
+                    ->buttons($buttons)
+                    ->initComplete("function(settings, json){
+                        initComplete_chiusura_servizio();
+                    }")
+                    ->editor(
+                        Editor::make()
+                            ->fields([
+                                Fields\Hidden::make('attivita_id')->label('Attività')->default($this->attivita_id),
+                                Fields\Hidden::make('user_id')->label('Utente')->default(Auth::user()->id),
+                                Fields\DateTime::make('chiusura_at')->label('Data e ora della chiusura')->default(now()),
+                                Fields\Text::make('note')->label('Note'),
+                            ])
+                    );
+    }
+
+    /**
+     * Get the dataTable columns definition.
+     */
+    public function getColumns(): array
+    {
+        return [
+            Column::make('chiusura_at')->title('Data e ora della chiusura')->addClass('text-center')->responsivePriority(1),
+            Column::make('note')->title('Note')->responsivePriority(2),
+            Column::make('user_id')->title('Utente')->data('user_id_display')->addClass('text-center')->responsivePriority(1),
+            Column::make('info')->title('Snapshot')->data('info_display')->addClass('text-center')->responsivePriority(1),
+            Column::computed('action')
+                  ->addClass('text-center')
+                  ->title('')
+                  ->exportable(false)
+                  ->printable(false)
+                  ->width('10%')
+                  ->responsivePriority(1),
+        ];
+    }
+
+    /**
+     * Get the filename for export.
+     */
+    protected function filename(): string
+    {
+        return 'ChiusuraServizio_' . date('YmdHis');
+    }
+}

app/DataTables/ChiusuraServizioDataTableEditor.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\DataTables;
+
+use App\Models\ChiusuraServizio;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Validation\Rule;
+use Yajra\DataTables\DataTablesEditor;
+use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
+
+
+class ChiusuraServizioDataTableEditor extends DataTablesEditor
+{
+  protected $model = ChiusuraServizio::class;
+
+  protected $messages = [
+    'attivita_id.required' => 'La attività è richiesta',
+    'chiusura_at.required' => 'La data e ora della chiusura sono richieste',
+    'note.required' => 'La note è richiesta',
+    'user_id.required' => 'L\'utente è richiesto',
+  ];
+
+  /**
+  * Get create action validation rules.
+  *
+  * @return array
+  */
+  public function createRules(): array
+  {
+    return [
+      'attivita_id'  => 'required',
+      'chiusura_at' => 'required|date',
+      'user_id' => 'required',
+      'note' => 'nullable',
+    ];
+  }
+
+  public function createMessages(): array{
+    return $this->messages;
+  }
+
+  /**
+  * Get edit action validation rules.
+  *
+  * @param Model $model
+  * @return array
+  */
+  public function editRules(Model $model): array
+  {
+    return [
+      'attivita_id'  => 'required',
+      'chiusura_at' => 'required|date',
+      'note' => 'nullable',
+      'info' => 'nullable',
+    ];
+  }
+
+  public function editMessages(): array{
+    return $this->messages;
+  }
+
+  /**
+  * Get remove action validation rules.
+  *
+  * @param Model $model
+  * @return array
+  */
+  public function removeRules(Model $model): array
+  {
+    return [];
+  }
+
+  public function creating(Model $model, array $data): array
+  {
+    return $data;
+  }
+
+  public function updating(Model $model, array $data): array
+  {
+    return $data;
+  }
+  public function messages(): array
+  {
+    return $this->messages;
+  }
+
+}

app/DataTables/MetodoPagamentoDataTable.php

@@ -38,6 +38,13 @@ class MetodoPagamentoDataTable extends DataTable
             ->addColumn('is_pubblico_display', function($entity){
                 return view('_partials.available', ['available' => $entity->is_pubblico]);
             })
+            ->addColumn('escludi_contabilita_display', function($entity){
+                if($entity->escludi_contabilita){
+                    return view('_partials.badge', ['error' => 'Si']);
+                }else{
+                    return view('_partials.badge', ['success' => 'No']);
+                }
+            })
             ->setRowId('id');
     }
 
@@ -82,10 +89,11 @@ class MetodoPagamentoDataTable extends DataTable
                         Editor::make()
                             ->fields([
                                 Fields\Hidden::make('attivita_id')->label('Attività')->default($this->attivita_id),
+                                Fields\Boolean::make('is_attivo')->label('Attivo')->default(true),
                                 Fields\Select2::make('tipo')->label('Tipo')->options(MetodoPagamento::getTipiPagamento()->sortBy('label')->pluck('value' ,'label')),
                                 Fields\Text::make('nome')->label('Nome'),
                                 Fields\Text::make('descrizione')->label('Descrizione'),
-                                Fields\Boolean::make('is_attivo')->label('Attivo')->default(true),
+                                Fields\Boolean::make('escludi_contabilita')->label('Escludi dalla contabilità')->default(false),
                                 Fields\Boolean::make('is_pubblico')->label('Pubblico')->default(false),
                                 Fields\Text::make('key')->label('Key'),
                                 Fields\Text::make('secret')->label('Secret'),
@@ -108,6 +116,7 @@ class MetodoPagamentoDataTable extends DataTable
             Column::make('is_attivo')->data('is_attivo_display')->title('Attivo')->addClass('text-center w-10')->responsivePriority(1)->width('10%'),
             Column::make('is_pubblico')->data('is_pubblico_display')->title('Pubblico')->addClass('text-center w-10')->responsivePriority(2)->width('10%'),
             Column::make('nome')->title('Nome')->responsivePriority(1),
+            Column::make('escludi_contabilita')->data('escludi_contabilita_display')->title('Escludi dalla contabilità')->addClass('text-center')->responsivePriority(3),
             Column::make('descrizione')->title('Descrizione')->responsivePriority(2),
             Column::computed('action')->title('')->width('10%')->addClass('text-center')->responsivePriority(1),   
         ];

app/DataTables/PrimaNotaDataTable.php

@@ -104,8 +104,9 @@ class PrimaNotaDataTable extends DataTable
                 return Carbon::parse($entity->created_at)->format('d/m/Y H:i');
             })
             ->addColumn('categoria_contabile_id_display', function($entity){
-              return '<span class="badge" style="background-color: '.$entity->categoria_contabile?->colore.';">'.$entity->categoria_contabile?->nome.'</span>';
-            })
+            //   return '<span class="badge" style="background-color: '.$entity->categoria_contabile?->colore.';">'.$entity->categoria_contabile?->nome.'</span>';
+            return view('_partials.badge', ['entity' => $entity]);
+        })
             ->rawColumns(['categoria_contabile_id_display'])
             ->setRowId('id');
     }
@@ -117,11 +118,14 @@ class PrimaNotaDataTable extends DataTable
      */
     public function query(PrimaNota $model): QueryBuilder
     {
-        if($this->attivita_id){
-            return $model->newQuery()->where('attivita_id', $this->attivita_id)->orderBy('created_at', 'desc');
-        }else{
+        if (!$this->attivita_id) {
             return $model->newQuery()->whereRaw('1 = 0');
         }
+
+        return $model->newQuery()
+            ->where('attivita_id', $this->attivita_id)
+            ->conFiltriIndice()
+            ->orderBy('created_at', 'desc');
     }
 
     /**
@@ -171,7 +175,12 @@ class PrimaNotaDataTable extends DataTable
         return $this->builder()
                     ->setTableId($this->dataTableVariable)
                     ->columns($this->getColumns())
-                    ->minifiedAjax()
+                    ->minifiedAjax('', '
+                        data.data_inizio = $("#filtro_data_inizio").val();
+                        data.data_fine = $("#filtro_data_fine").val();
+                        data.categoria_contabile_id = $("#categoria_contabile_id").val();
+                        data.tipo_movimento = $("#tipo_movimento").val();
+                    ')
                     ->language(asset('assets/Italian.json'))
                     // ->dom('<"py-2"<"head-label text-center"><"dt-action-buttons"B>><"d-flex justify-content-between align-items-center row mb-2"<"col-sm-12 col-md-6"l><"col-sm-12 col-md-6"f>>t<"d-flex justify-content-between row"<"col-sm-12 col-md-6"i><"col-sm-12 col-md-6"p>>')
                     ->dom(count($buttons) == 0 ? 'Prtip' : 'PBfrtip')

app/DataTables/PuntoVenditaDataTable.php

@@ -45,22 +45,23 @@ class PuntoVenditaDataTable extends DataTable
             })
             ->addColumn('abbinato_display', function($entity){
                 $token = $entity->binding_token;
-                $tu = $entity->binding_token && 
-                request()->cookie('binding_token') && 
-                \Illuminate\Support\Facades\Hash::check($entity->binding_token, request()->cookie('binding_token'));
+                $tu = ($entity->binding_token === request()->cookie('binding_token'))&& request()->cookie('binding_token') != null;
 
                 switch(true){
                 
-                    case (isset($token) && $token != null && $tu == false):
+                    case (isset($token) && $token != null && $tu == false && $entity->occupato == true):
                         return view('_partials.badge', ['success' => 'Abbinato']);
                         break;
                     case ($tu == true):
                         return view('_partials.badge', ['success' => 'Tu']);
                         break;
 
-                    case ($token == null):
+                    case ($token == null || $entity->occupato == false):
                         return view('_partials.badge', ['error' => 'Non abbinato']);
                         break;
+                    default:
+                        return view('_partials.badge', ['error' => 'Stato sconosciuto']);
+                        break;
                 }
                 // $txt = '<span class="badge bg-label-success">*</span>';
                 // $userToken = request()->cookie('binding_token');

app/Http/Controllers/BilancioController.php

@@ -6,7 +6,9 @@ use App\Models\Attivita;
 use App\Models\PrimaNota;
 use App\Models\Pagamento;
 use App\Models\RigaOrdine;
+use App\Services\Bilancio\BilancioServizioService;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\Middleware;
 use Carbon\Carbon;
 use Carbon\CarbonPeriod;
 
@@ -30,148 +32,30 @@ class BilancioController extends Controller
         ];
     }
 
-    public function oggi(Request $request)
+    public function oggi(Request $request, BilancioServizioService $bilancioServizio)
     {
-        $attivitaId = session()->get('attivita_attuale');
-        $dayStart = now()->startOfDay();
-        $dayEnd = now()->endOfDay();
-
+        $attivitaId = (int) session()->get('attivita_attuale');
         $attivita = Attivita::find($attivitaId);
+        $period = $bilancioServizio->currentPeriod($attivitaId);
+        $periodStart = $period['start'];
+        $periodEnd = $period['end'];
+        $ultimaChiusuraAt = $period['ultimaChiusuraAt'];
 
-        $righeOrdiniOggi = RigaOrdine::query()
-            ->with(['piatto.cucina', 'ordine'])
-            ->whereHas('ordine', function ($query) use ($attivitaId, $dayStart, $dayEnd) {
-                $query
-                    ->where('attivita_id', $attivitaId)
-                    ->whereBetween('created_at', [$dayStart, $dayEnd]);
-            })
-            ->get();
-
-        $righeIncassiOggi = RigaOrdine::query()
-            ->with(['piatto.cucina', 'ordine'])
-            ->whereHas('ordine.pagamenti', function ($query) use ($attivitaId, $dayStart, $dayEnd) {
-                $query
-                    ->where('attivita_id', $attivitaId)
-                    ->whereBetween('created_at', [$dayStart, $dayEnd]);
-            })
-            ->get();
-
-        $righeOggi = $righeOrdiniOggi
-            ->concat($righeIncassiOggi)
-            ->unique('id')
-            ->values();
-
-        $cucineRows = $righeOggi
-            ->groupBy(function ($riga) {
-                return $riga->piatto?->cucina_id ?: 0;
-            })
-            ->map(function ($items, $cucinaId) {
-                $first = $items->first();
-                $cucinaNome = $first?->piatto?->cucina?->nome ?? ('Cucina #' . $cucinaId);
-
-                $piatti = $items
-                    ->groupBy('piatto_id')
-                    ->map(function ($piattoItems) {
-                        $firstPiatto = $piattoItems->first();
-                        $quantita = (int) $piattoItems->sum(function ($r) {
-                            return (int) ($r->quantita ?? 0);
-                        });
-                        $totale = (float) $piattoItems->sum(function ($r) {
-                            return ((float) ($r->quantita ?? 0)) * ((float) ($r->prezzo ?? 0));
-                        });
-
-                        return [
-                            'nome' => $firstPiatto?->piatto?->nome ?? 'Piatto',
-                            'quantita' => $quantita,
-                            'totale' => $totale,
-                        ];
-                    })
-                    ->sortByDesc('quantita')
-                    ->values();
-
-                $totQuantita = (int) $piatti->sum('quantita');
-                $totImporto = (float) $piatti->sum('totale');
-
-                return [
-                    'id' => $cucinaId,
-                    'nome' => $cucinaNome,
-                    'piatti' => $piatti,
-                    'tot_quantita' => $totQuantita,
-                    'tot_importo' => $totImporto,
-                ];
-            })
-            ->sortByDesc('tot_quantita')
-            ->values();
-
-        $pagamentiOggi = Pagamento::query()
-            ->with(['metodo_pagamento', 'ordine.righe_ordine.piatto.cucina'])
-            ->where('attivita_id', $attivitaId)
-            ->whereBetween('created_at', [$dayStart, $dayEnd])
-            ->get();
-
-        $paymentSummary = $pagamentiOggi
-            ->groupBy(function ($pagamento) {
-                return $pagamento->metodo_pagamento?->nome
-                    ?? $pagamento->metodo_pagamento?->tipo
-                    ?? 'N/D';
-            })
-            ->map(function ($items, $metodo) {
-                return [
-                    'metodo' => (string) $metodo,
-                    'count' => $items->count(),
-                    'totale' => (float) $items->sum(function ($p) {
-                        return (float) ($p->importo ?? 0);
-                    }),
-                ];
-            })
-            ->sortByDesc('totale')
-            ->values();
-
-        $totaleIncassoOggi = (float) $pagamentiOggi->sum(function ($p) {
-            return (float) ($p->importo ?? 0);
-        });
-
-        $hourLabels = collect(range(0, 23))->map(function ($h) {
-            return str_pad((string) $h, 2, '0', STR_PAD_LEFT);
-        })->values();
-
-        $heatmapSeries = $cucineRows->map(function ($cucinaRow) use ($pagamentiOggi) {
-            $cucinaNome = (string) ($cucinaRow['nome'] ?? 'Cucina');
-            $cucinaId = (int) ($cucinaRow['id'] ?? 0);
-            $data = [];
-            foreach (range(0, 23) as $h) {
-                $hourTotal = (int) $pagamentiOggi
-                    ->filter(function ($pagamento) use ($h) {
-                        return !empty($pagamento->created_at) && (int) $pagamento->created_at->format('H') === $h;
-                    })
-                    ->sum(function ($pagamento) use ($cucinaId) {
-                        if (empty($pagamento->ordine)) {
-                            return 0;
-                        }
-                        return (int) $pagamento->ordine->righe_ordine->sum(function ($riga) use ($cucinaId) {
-                            $rigaCucinaId = (int) ($riga->piatto?->cucina_id ?? 0);
-                            if ($rigaCucinaId !== $cucinaId) {
-                                return 0;
-                            }
-                            return (int) ($riga->quantita ?? 0);
-                        });
-                    });
-                $data[] = $hourTotal;
-            }
-            return [
-                'name' => $cucinaNome,
-                'data' => $data,
-            ];
-        })->values();
+        $report = $bilancioServizio->forPeriod($attivitaId, $periodStart, $periodEnd);
 
         return view('bilancio.oggi', [
             'attivita' => $attivita,
-            'oggiLabel' => now()->format('d/m/Y'),
-            'cucineRows' => $cucineRows,
-            'paymentSummary' => $paymentSummary,
-            'totaleIncassoOggi' => $totaleIncassoOggi,
-            'heatmapHourLabels' => $hourLabels,
-            'heatmapSeries' => $heatmapSeries,
+            'periodoStart' => $periodStart,
+            'periodoEnd' => $periodEnd,
+            'ultimaChiusuraAt' => $ultimaChiusuraAt,
+            'periodoLabel' => $bilancioServizio->periodoLabel($periodStart, $periodEnd, $ultimaChiusuraAt),
+            'cucineRows' => $report['cucineRows'],
+            'paymentSummary' => $report['paymentSummary'],
+            'totaleIncassoOggi' => $report['totaleIncasso'],
+            'totaleTransazioniOggi' => $report['totaleTransazioni'],
+            'totPiattiOrdinati' => $report['totPiattiOrdinati'],
+            'heatmapHourLabels' => $report['heatmapHourLabels'],
+            'heatmapSeries' => $report['heatmapSeries'],
         ]);
     }
 

app/Http/Controllers/CarrelloController.php

@@ -436,6 +436,19 @@ class CarrelloController extends Controller
                     $ordine->save();
                     return back()->with('error', 'Pagamento con contanti non riuscito. '.$pagamentoResult['message']);
                 }
+
+            case MetodoPagamento::STAFF:
+                $pagamentoResult = app('\App\Services\Paga\Staff')->paga($pagamento);
+                
+                if($pagamentoResult['result'] === true){
+                    $ordine->update(['stato' => Ordine::PAGATO]);
+                    return redirect()->route('punto-vendita.show', ['punto_vendita_id' => $ordine->dispositivo_id])->with('success', 'Pagamento con staff riuscito.');
+                }else{
+                    $ordine->stato = Ordine::CARRELLO;
+                    $ordine->save();
+                    return back()->with('error', 'Pagamento con staff non riuscito. '.$pagamentoResult['message']);
+                }
+                break;
             default:
                 $ordine->stato = Ordine::CARRELLO;
                 $ordine->save();

app/Http/Controllers/ChiusuraServizioController.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\Attivita;
+use App\Models\ChiusuraServizio;
+use App\DataTables\ChiusuraServizioDataTable;
+use App\DataTables\ChiusuraServizioDataTableEditor;
+use App\Services\Bilancio\BilancioServizioService;
+use Carbon\Carbon;
+use Illuminate\Routing\Controllers\Middleware;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+
+class ChiusuraServizioController extends Controller
+{
+  public static $permission_group = "Chiusura Servizio";
+  public static $permissions = [
+    'view-chiusura-servizio' => 'Vedi',
+    'create-chiusura-servizio' => 'Crea',
+    'edit-chiusura-servizio' => 'Modifica',
+    'delete-chiusura-servizio' => 'Elimina',
+  ];
+
+  public static function middleware(): array
+  {
+    return [
+      new Middleware('permission:view-chiusura-servizio', only: ['index', 'show']),
+      new Middleware('permission:create-chiusura-servizio', only: ['chiudi_servizio']),
+      new Middleware('permission:create-chiusura-servizio|edit-chiusura-servizio|delete-chiusura-servizio', only: ['store', 'update', 'destroy']),
+    ];
+  }
+
+  public function index(ChiusuraServizioDataTable $dataTable)
+  {
+      $dataTable->attivita_id = Session::get('attivita_attuale');
+        return $dataTable->render('chiusura_servizio.index');
+  }
+
+  public function store(ChiusuraServizioDataTableEditor $editor){
+      $request = request();
+      $input = $request->all();
+      if($request->has('action')){
+          switch($input['action']){
+              case 'create':
+                  if(!Auth::user()->can('create-chiusura-servizio')) return;
+                  break;
+              case 'edit':
+                  if(!Auth::user()->can('edit-chiusura-servizio')) return;
+                  break;
+              case 'delete':
+                  if(!Auth::user()->can('delete-chiusura-servizio')) return;
+                  break;
+          }
+      }
+      return $editor->process($request);
+  }
+
+  public function show(Request $request, BilancioServizioService $bilancioServizio)
+  {
+    $chiusura = ChiusuraServizio::query()
+      ->with(['user', 'attivita'])
+      ->where('attivita_id', Session::get('attivita_attuale'))
+      ->find($request->get('chiusura_servizio_id'));
+
+    if (!$chiusura) {
+      return redirect()->route('chiusura-servizio.index')->with('error', 'Chiusura non trovata');
+    }
+
+    $snapshot = is_array($chiusura->info) ? $chiusura->info : (json_decode($chiusura->info ?? '[]', true) ?: []);
+    $periodoDa = !empty($snapshot['periodo']['da']) ? Carbon::parse($snapshot['periodo']['da']) : null;
+    $periodoA = !empty($snapshot['periodo']['a'])
+      ? Carbon::parse($snapshot['periodo']['a'])
+      : $chiusura->chiusura_at;
+
+    $heatmap = $bilancioServizio->heatmapFromSnapshot(
+      (int) $chiusura->attivita_id,
+      $snapshot,
+      $periodoDa,
+      $periodoA
+    );
+
+    return view('chiusura_servizio.show', [
+      'chiusura' => $chiusura,
+      'snapshot' => $snapshot,
+      'periodoDa' => $periodoDa,
+      'periodoA' => $periodoA,
+      'paymentSummary' => collect($snapshot['pagamenti_per_metodo'] ?? []),
+      'cucineRows' => $bilancioServizio->cucineWithOrario($snapshot, $heatmap['heatmapSeries']),
+      'totaleIncasso' => (float) ($snapshot['incasso'] ?? 0),
+      'totaleTransazioni' => (int) ($snapshot['transazioni'] ?? 0),
+      'totPiattiOrdinati' => (int) ($snapshot['piatti_ordinati'] ?? 0),
+      'heatmapHourLabels' => $heatmap['heatmapHourLabels'],
+    ]);
+  }
+
+  public function chiudi_servizio(Request $request, BilancioServizioService $bilancioServizio)
+  {
+    if (!Auth::user()->can('create-chiusura-servizio')) {
+      return redirect()->back()->with('error', 'Non autorizzato');
+    }
+
+    $attivitaId = (int) ($request->input('attivita_id') ?: Session::get('attivita_attuale'));
+    $attivita = Attivita::find($attivitaId);
+    if (!$attivita) {
+      return redirect()->back()->with('error', 'Attività non trovata');
+    }
+
+    $chiusuraAt = now();
+    $periodStart = $bilancioServizio->periodStartForAttivita($attivitaId, $chiusuraAt);
+
+    ChiusuraServizio::create([
+      'attivita_id' => $attivitaId,
+      'user_id' => Auth::id(),
+      'chiusura_at' => $chiusuraAt,
+      'note' => $request->input('note', 'Chiusura servizio'),
+      'info' => $bilancioServizio->buildSnapshot($attivitaId, $periodStart, $chiusuraAt),
+    ]);
+
+    return redirect()->back()->with('success', 'Servizio chiuso con successo');
+  }
+}

app/Http/Controllers/MappaDispositiviController.php

@@ -10,6 +10,7 @@ use App\DataTables\DispositivoDataTable;
 use App\DataTables\DispositivoDataTableEditor;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Routing\Controllers\Middleware;
 
 class MappaDispositiviController extends Controller
 {
@@ -31,17 +32,19 @@ class MappaDispositiviController extends Controller
     
     public function index(DispositivoDataTable $dataTable)
     {
-        $response = $dataTable->render('mappa_dispositivi.index');
-
-        // Passiamo i dati per la topografica SOLO quando stiamo rendendo HTML.
-        // In AJAX (DataTables) qui arriva una JsonResponse.
-        if ($response instanceof \Illuminate\View\View) {
-            $topologyByAttivita = self::buildTopologyByAttivita();
-
-            return $response->with('topologyByAttivita', $topologyByAttivita);
+        if (request()->ajax()) {
+            return $dataTable->ajax();
         }
 
-        return $response;
+        return view('mappa_dispositivi.index', [
+            'dispositiviByTipo' => self::buildDispositiviByTipo(),
+            'tipiDispositivo' => Dispositivo::getTipoDispositivo(),
+            'attivitaList' => Attivita::query()
+                ->where('is_attiva', true)
+                ->orderBy('nome')
+                ->where('user_id', Auth::user()->id)
+                ->get(['id', 'nome']),
+        ]);
     }
 
     public function store(DispositivoDataTableEditor $editor)
@@ -69,6 +72,56 @@ class MappaDispositiviController extends Controller
         return view('mappa_dispositivi.show', ['dispositivo' => $dispositivo]);
     }
 
+    /**
+     * Elenco dispositivi raggruppati per tipologia (tab mappa).
+     */
+    public static function buildDispositiviByTipo(): array
+    {
+        $tipi = Dispositivo::getTipoDispositivo()->keys()->all();
+        $grouped = array_fill_keys($tipi, []);
+        $grouped['_altro'] = [];
+
+        $attivitaAttiveIds = Attivita::query()
+            ->where('is_attiva', true)
+            ->pluck('id');
+
+        $devices = Dispositivo::query()
+            ->with('attivita:id,nome')
+            ->where(function ($q) use ($attivitaAttiveIds) {
+                $q->whereIn('attivita_id', $attivitaAttiveIds)
+                    ->orWhereNull('attivita_id');
+            })
+            ->orderBy('nome')
+            ->get(['id', 'nome', 'ubicazione', 'tipo', 'is_attivo', 'occupato', 'attivita_id']);
+
+        foreach ($devices as $device) {
+            $tipo = $device->tipo ?? '_altro';
+            $bucket = isset($grouped[$tipo]) ? $tipo : '_altro';
+            $grouped[$bucket][] = self::serializeDispositivoMappa($device);
+        }
+
+        return $grouped;
+    }
+
+    private static function serializeDispositivoMappa(Dispositivo $device): array
+    {
+        return [
+            'id' => (int) $device->id,
+            'nome' => (string) $device->nome,
+            'tipo' => $device->tipo !== null ? (string) $device->tipo : null,
+            'ubicazione' => $device->ubicazione !== null ? (string) $device->ubicazione : null,
+            'is_attivo' => (bool) $device->is_attivo,
+            'occupato' => (bool) $device->occupato,
+            'attivita_id' => $device->attivita_id !== null ? (int) $device->attivita_id : null,
+            'attivita_nome' => $device->attivita?->nome,
+            'is_punto_vendita' => in_array($device->tipo, [
+                Dispositivo::CASSA,
+                Dispositivo::KIOSK,
+                Dispositivo::CAMERIERE,
+            ], true),
+        ];
+    }
+
     /**
      * Bozza mappa: contenitore = attività → punto vendita (cassa/kiosk/cameriere) + cucine → stampante.
      */

app/Http/Controllers/PrimaNotaController.php

@@ -4,10 +4,11 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\Models\PrimaNota;
+use App\Models\Categoriacontabile;
 use App\DataTables\PrimaNotaDataTable;
 use App\DataTables\PrimaNotaDataTableEditor;
 use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
+use Illuminate\Routing\Controllers\Middleware;
 
 class PrimaNotaController extends Controller
 { 
@@ -22,28 +23,52 @@ class PrimaNotaController extends Controller
     public static function middleware(): array
     {
         return [
-            new Middleware('permission:view-primanota', only: ['index']),
+            new Middleware('permission:view-primanota', only: ['index', 'statistiche']),
             new Middleware('permission:create-primanota|edit-primanota|delete-primanota', only: ['store', 'update', 'destroy']),
         ];
     }
 
     public function index(PrimaNotaDataTable $dataTable)
     {
-        $dataTable->attivita_id = session()->get('attivita_attuale');
-        
-        $statistiche['totale_operazioni'] = PrimaNota::where('attivita_id', session()->get('attivita_attuale'))
-        ->where('created_at', '>=', Carbon::now()->startOfDay())
-        ->count();
-        $statistiche['importo_entrate'] = PrimaNota::where('attivita_id', session()->get('attivita_attuale'))
-        ->where('tipo_movimento', 'entrata')
-        ->where('created_at', '>=', Carbon::now()->startOfDay())
-        ->sum('importo');
-        $statistiche['importo_uscite'] = PrimaNota::where('attivita_id', session()->get('attivita_attuale'))
-        ->where('tipo_movimento', 'uscita')
-        ->where('created_at', '>=', Carbon::now()->startOfDay())
-        ->sum('importo');
-        $statistiche['saldo'] = $statistiche['importo_entrate'] - $statistiche['importo_uscite'];
-        return $dataTable->render('prima_nota.index', compact('statistiche'));
+        $attivitaId = session()->get('attivita_attuale');
+        $dataTable->attivita_id = $attivitaId;
+
+        $statistiche = $attivitaId
+            ? PrimaNota::statisticheFiltrate($attivitaId)
+            : [
+                'totale_operazioni' => 0,
+                'importo_entrate' => 0,
+                'importo_uscite' => 0,
+                'saldo' => 0,
+            ];
+
+        $categorie = Categoriacontabile::where('attivita_id', $attivitaId)
+            ->where('is_attiva', true)
+            ->orderBy('nome')
+            ->get();
+
+        return $dataTable->render('prima_nota.index', compact('statistiche', 'categorie'));
+    }
+
+    public function statistiche(Request $request)
+    {
+        $attivitaId = session()->get('attivita_attuale');
+
+        if (!$attivitaId) {
+            return response()->json([
+                'totale_operazioni' => 0,
+                'importo_entrate' => 0,
+                'importo_uscite' => 0,
+                'saldo' => 0,
+            ]);
+        }
+
+        return response()->json(
+            PrimaNota::statisticheFiltrate(
+                $attivitaId,
+                $request->only(['data_inizio', 'data_fine', 'categoria_contabile_id', 'tipo_movimento'])
+            )
+        );
     }
 
     public function store(PrimaNotaDataTableEditor $editor)

app/Http/Controllers/PuntoVenditaController.php

@@ -14,7 +14,6 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Hash;
 
 class PuntoVenditaController extends Controller
 {
@@ -30,7 +29,7 @@ class PuntoVenditaController extends Controller
     {
         return [
             new Middleware('permission:view-punto_vendita', only: ['index', 'dettagli_punto_vendita', 'dettagli']),
-            new Middleware('permission:create-punto_vendita|edit-punto_vendita|delete-punto_vendita', only: ['store', 'update', 'destroy', 'edit']),
+            new Middleware('permission:create-punto_vendita|edit-punto_vendita|delete-punto_vendita', only: ['store', 'update', 'destroy', 'edit', 'associa_cucina']),
         ];
     }
     
@@ -64,16 +63,73 @@ class PuntoVenditaController extends Controller
         return view('punto_vendita.edit', ['puntoVendita' => $puntoVendita]);
     }
 
+    public function update(Request $request)
+    {
+        $puntoVendita = Dispositivo::find($request->get('punto_vendita_id'));
+
+        if(!$puntoVendita){
+            return redirect()->route('punto-vendita.index')
+            ->with('error', 'Punto di vendita non trovato');
+        }
+
+        if(Auth::user()->can('edit-punto_vendita')){
+
+        $validated = $request->validate([
+            'nome' => 'sometimes|required',
+            'tipo' => 'sometimes|required',
+            'attivita_id' => 'sometimes|required|exists:attivita,id',
+            'licenza' => 'sometimes|nullable',
+            'url_stampante' => 'sometimes|nullable',
+            'ubicazione' => 'sometimes|nullable',
+            'note' => 'sometimes|nullable',
+            'is_attivo' => 'boolean',
+            'pin_sblocco' => 'sometimes|nullable',
+            'data_apertura_dispositivo' => 'nullable|date',
+            'data_chiusura_dispositivo' => 'nullable|date',
+            'endpoint_id' => 'sometimes|nullable|exists:endpoint,id',
+        ],[
+            'nome.required' => 'Il nome è richiesto',
+            'tipo.required' => 'Il tipo è richiesto',
+            'attivita_id.required' => 'La attività è richiesta',
+            'licenza.required' => 'La licenza è richiesta',
+            'url_stampante.required' => 'L\'URL della stampante è richiesta',
+            'ubicazione.required' => 'L\'ubicazione è richiesta',
+            'pin_sblocco.required' => 'Il pin di sblocco è richiesto',
+            'data_apertura_dispositivo.required' => 'La data di apertura del dispositivo è richiesta',
+            'data_chiusura_dispositivo.required' => 'La data di chiusura del dispositivo è richiesta',
+            'data_apertura_dispositivo.date' => 'La data di apertura del dispositivo deve essere una data valida',
+            'data_chiusura_dispositivo.date' => 'La data di chiusura del dispositivo deve essere una data valida',
+            'is_attivo.boolean' => 'Indicare una delle due opzioni',
+            'pin_sblocco.string' => 'Il pin di sblocco deve essere una stringa',
+            'pin_sblocco.required' => 'Il pin di sblocco è richiesto',
+            'pin_sblocco.min' => 'Il pin di sblocco deve essere lungo almeno 4 caratteri',
+            'pin_sblocco.max' => 'Il pin di sblocco deve essere lungo al massimo 4 caratteri',
+            'pin_sblocco.regex' => 'Il pin di sblocco deve contenere solo numeri',
+            'pin_sblocco.unique' => 'Il pin di sblocco deve essere unico',
+        ]);
+
+            $puntoVendita->update($validated);
+            return response()->json(['success' => true, 'message' => 'Punto di vendita aggiornato con successo']);
+        }else{
+            return response()->json(['success' => false, 'message' => 'Non hai il permesso di accedere a questo punto di vendita']);
+        }
+    }
+
     public function associa_cucina(Request $request)
     {
         $puntoVendita = Dispositivo::find($request->get('punto_vendita_id'));
         if(!$puntoVendita){
             return response()->json(['success' => false, 'message' => 'Punto di vendita non trovato']);
         }
+
+        if(Auth::user()->can('edit-punto_vendita')){
         $cucine_ids = $request->get('cucine_ids');
         $puntoVendita->hasCucine()->sync($cucine_ids);
 
         return response()->json(['success' => true, 'message' => 'Cucine associate con successo']);
+        }else{
+            return response()->json(['success' => false, 'message' => 'Non hai il permesso di accedere a questo punto di vendita']);
+        }
     }
 
     public function store(PuntoVenditaDataTableEditor $editor)
@@ -109,30 +165,54 @@ class PuntoVenditaController extends Controller
             ->with('error', 'Punto di vendita non trovato');
         }
 
+        //se non esiste il binding_token nel DB, lo crea
         if($puntoVendita->binding_token == '' || $puntoVendita->binding_token == null ){
             // $puntoVendita->binding_token = Str::random(32);
-            $puntoVendita->binding_token = Hash::make(Str::random(32));
+            $puntoVendita->binding_token = Str::random(32);
             $puntoVendita->save();
         }
-// dd(Cookie::get('binding_token'));
-        /*
-            Questo blocco di codice gestisce il controllo e l'impostazione del cookie 'binding_token' per il dispositivo.
-
-            Se esiste già un cookie 'binding_token', verifica che il suo valore coincida con il binding_token memorizzato per il punto vendita:
-              - Se NON coincidono, rimuove il cookie e mostra un errore: "Token di binding non valido. Si sta accedendo da un altro dispositivo."
-            Se NON esiste il cookie, lo imposta con il valore del binding_token del punto vendita.
-
-            Questo serve a garantire che ogni dispositivo rimanga "associato" al suo token, impedendo accessi da device diversi senza il corretto re-binding.
-        */
-        if(Cookie::has('binding_token')){
-            if(Hash::check(Cookie::get('binding_token'), Hash::make($puntoVendita->binding_token))){
-                // dd('A' , Cookie::get('binding_token') , $puntoVendita->binding_token);
-                Cookie::queue(Cookie::forget('binding_token'));
-                return redirect()->back()->with('error', 'Token di binding non valido. Si sta accedendo da un altro dispositivo.');
-            }
-        }else{
-            Cookie::queue('binding_token', Hash::make($puntoVendita->binding_token));
-            // Cookie::queue('binding_token', $puntoVendita->binding_token);
+
+        // if(Cookie::has('binding_token')){
+        //     if(Cookie::get('binding_token') != $puntoVendita->binding_token  && $puntoVendita->occupato == true){
+        //     return redirect()->back()->with('error', 'Dispositivo già associato. Dissociare per potervi accedere.');
+        //     }
+        // }elseif(Cookie::has('binding_token') && $puntoVendita->occupato == false){
+        //     Cookie::queue('binding_token', $puntoVendita->binding_token);
+        //     $puntoVendita->occupato = true;
+        //     $puntoVendita->save();
+        // }
+
+        switch(true){
+            // nessun cookie e il dispositivo non è occupato ACCEDI
+            case (!Cookie::has('binding_token') && $puntoVendita->occupato == false):
+                Cookie::queue('binding_token', $puntoVendita->binding_token);
+                $puntoVendita->occupato = true;
+                $puntoVendita->save();
+            break;
+
+            //nessun cookie e il dispositivo è occupato 01 NON ACCEDI
+            case (!Cookie::has('binding_token') && $puntoVendita->occupato == true):
+                return redirect()->back()->with('error', 'Dispositivo già occupato. Dissociare per potervi accedere.');
+            break;
+            //cookie esiste e dispositivo non è occupato 10 ACCEDI
+            case (Cookie::has('binding_token') && $puntoVendita->occupato == false):
+                if(Cookie::get('binding_token') == $puntoVendita->binding_token){
+                    $puntoVendita->occupato = true;
+                    $puntoVendita->save();
+                    break;
+                }else{
+                    return redirect()->back()->with('error', 'Dispositivo già occupato. Dissociare per potervi accedere.');
+                }
+            break;
+            // cookie esiste e dispositivo è occupato 11 ACCEDI SE SEI TU
+            case (Cookie::has('binding_token') && $puntoVendita->occupato == true):
+                if(Cookie::get('binding_token') == $puntoVendita->binding_token){
+                    break;
+                }else{
+                    return redirect()->back()->with('error', 'Dispositivo già occupato. Dissociare per potervi accedere.');
+                }
+            break;
+
         }
   
    
@@ -191,6 +271,7 @@ class PuntoVenditaController extends Controller
         Cookie::queue(Cookie::forget('binding_token'));
 
         $puntoVendita->binding_token = null;
+        $puntoVendita->occupato = false;
         $puntoVendita->save();
 
         return response()->json(['success' => true, 'message' => 'Disassociazione completata']);

app/Models/AbstractModels/AbstractChiusuraServizio.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * Model object generated by: Skipper (http://www.skipper18.com)
+ * Do not modify this file manually.
+ */
+
+namespace App\Models\AbstractModels;
+
+abstract class AbstractChiusuraServizio extends \Illuminate\Foundation\Auth\User
+{
+    /**  
+     * The table associated with the model.
+     * 
+     * @var string
+     */
+    protected $table = 'chiusura_servizio';
+    
+    /**  
+     * Primary key type.
+     * 
+     * @var string
+     */
+    protected $keyType = 'bigInteger';
+    
+    /**  
+     * The model's default values for attributes.
+     * 
+     * @var array
+     */
+    // protected $attributes = ['is_gruppo' => 0];
+    
+    /**  
+     * The attributes that should be cast to native types.
+     * 
+     * @var array
+     */
+    protected $casts = [
+        'id' => 'integer',
+        'attivita_id' => 'integer',
+        'chiusura_at' => 'datetime',
+        'note' => 'string',
+        'user_id' => 'integer',
+        'info' => 'json',
+        'created_at' => 'datetime',
+        'updated_at' => 'datetime'
+    ];
+    
+    /**  
+     * The attributes that are mass assignable.
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'attivita_id',
+        'chiusura_at',
+        'note',
+        'user_id',
+        'info',
+        'created_at',
+        'updated_at'
+    ];
+    
+    public function attivita()
+    {
+        return $this->belongsTo('\App\Models\Attivita', 'attivita_id', 'id');
+    }
+
+    public function user()
+    {
+        return $this->belongsTo('\App\Models\User', 'user_id', 'id');
+    }
+}

app/Models/AbstractModels/AbstractDispositivo.php

@@ -51,6 +51,7 @@ abstract class AbstractDispositivo extends \Illuminate\Foundation\Auth\User
         'data_apertura_dispositivo' => 'datetime',
         'data_chiusura_dispositivo' => 'datetime',
         'cucina_id' => 'integer',
+        'occupato' => 'boolean',
         'created_at' => 'datetime',
         'updated_at' => 'datetime'
     ];
@@ -77,6 +78,7 @@ abstract class AbstractDispositivo extends \Illuminate\Foundation\Auth\User
         'data_apertura_dispositivo',
         'data_chiusura_dispositivo',
         'cucina_id',
+        'occupato',
         'created_at',
         'updated_at'
     ];

app/Models/AbstractModels/AbstractMetodoPagamento.php

@@ -38,6 +38,7 @@ abstract class AbstractMetodoPagamento extends \Illuminate\Foundation\Auth\User
         'id' => 'integer',  
         'attivita_id' => 'integer',
         'nome' => 'string',
+        'escludi_contabilita' => 'boolean',
         'descrizione' => 'string',
         'is_attivo' => 'boolean',
         'is_pubblico' => 'boolean',
@@ -58,6 +59,7 @@ abstract class AbstractMetodoPagamento extends \Illuminate\Foundation\Auth\User
         'id',
         'attivita_id',
         'nome',
+        'escludi_contabilita',
         'descrizione',
         'is_attivo',
         'is_pubblico',

app/Models/Categoriacontabile.php

@@ -3,8 +3,14 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Session;
 
 class Categoriacontabile extends \App\Models\AbstractModels\AbstractCategoriacontabile
 {
-    //
+    public static function vendita(){
+        return self::where('attivita_id', session('attivita_attuale'))->where('is_attiva', true)->where('nome', 'Vendita')->first();
+    }
+    public static function staff(){
+        return self::where('attivita_id', session('attivita_attuale'))->where('is_attiva', true)->where('nome', 'Staff')->first();
+    }
 }

app/Models/ChiusuraServizio.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ChiusuraServizio extends \App\Models\AbstractModels\AbstractChiusuraServizio
+{
+    //
+}

app/Models/Dispositivo.php

@@ -26,7 +26,7 @@ public static function getTipoDispositivo(){
         ],
         self::CASSA => [
             'label' => 'Cassa',
-            'icon' => 'bx bx-cash',
+            'icon' => 'bx bx-store',
             'value' => self::CASSA,
         ],
         self::KIOSK => [
@@ -41,7 +41,7 @@ public static function getTipoDispositivo(){
         ],
         self::MONITOR => [
             'label' => 'Monitor',
-            'icon' => 'bx bx-monitor',
+            'icon' => 'bx bx-tv',
             'value' => self::MONITOR,
         ],
         self::BACHECA => [
@@ -114,14 +114,29 @@ public static function findByBindingCookieToken(?string $cookieToken): ?self
         return null;
     }
 
-    return self::query()
-        ->whereNotNull('binding_token')
-        ->get()
-        ->first(function (self $dispositivo) use ($cookieToken) {
-            return Hash::check((string) $dispositivo->binding_token, $cookieToken);
-        });
+        return self::query()
+            ->whereNotNull('binding_token')
+            ->where('binding_token', $cookieToken)
+            ->where('occupato', true)
+            ->first();
 }
 
+///EX
+// public static function findByBindingCookieToken(?string $cookieToken): ?self
+// {
+//     if (!$cookieToken) {
+//         return null;
+//     }
+
+//     return self::query()
+//         ->whereNotNull('binding_token')
+//         ->get()
+//         ->first(function (self $dispositivo) use ($cookieToken) {
+//             return Hash::check((string) $dispositivo->binding_token, $cookieToken);
+//         });
+// }
+///EX
+
 public function cucine()
 {
     return $this->belongsToMany('\App\Models\Cucina', 'dispositivo_has_cucina', 'dispositivo_id', 'cucina_id');

app/Models/MetodoPagamento.php

@@ -19,71 +19,78 @@ class MetodoPagamento extends \App\Models\AbstractModels\AbstractMetodoPagamento
     const CUPON = 'cupon';
     const SEGRESTA_WALLET = 'segresta_wallet';
     const POS = 'pos';
+    const STAFF = 'staff';
 
 
     public static function getTipiPagamento()
     {
         return collect([
-            self::CARTA_DI_CREDITO => [
-                'label' => 'Carta di credito',
-                'value' => self::CARTA_DI_CREDITO,
-                'icon' => 'bx-credit-card',
-            ],
-            self::CARTA_DI_DEBITO => [
-                'label' => 'Carta di debito',
-                'value' => self::CARTA_DI_DEBITO,
-                'icon' => 'bx-credit-card',
-            ],
-            self::BONIFICO => [
-                'label' => 'Bonifico',
-                'value' => self::BONIFICO,
-                'icon' => 'bx-transfer',
-            ],
-            self::PAYPAL => [
-                'label' => 'Paypal',
-                'value' => self::PAYPAL,
-                'icon' => 'bxl-paypal',
-            ],
-            self::STRIPE => [
-                'label' => 'Stripe',
-                'value' => self::STRIPE,
-                'icon' => 'bx-credit-card',
-            ],
+            // self::APPLE_PAY => [
+            //     'label' => 'Apple Pay',
+            //     'value' => self::APPLE_PAY,
+            //     'icon' => 'bx-mobile',
+            // ],
+            // self::BONIFICO => [
+            //     'label' => 'Bonifico',
+            //     'value' => self::BONIFICO,
+            //     'icon' => 'bx-transfer',
+            // ],
+            // self::CARTA_DI_CREDITO => [
+            //     'label' => 'Carta di credito',
+            //     'value' => self::CARTA_DI_CREDITO,
+            //     'icon' => 'bx-credit-card',
+            // ],
+            // self::CARTA_DI_DEBITO => [
+            //     'label' => 'Carta di debito',
+            //     'value' => self::CARTA_DI_DEBITO,
+            //     'icon' => 'bx-credit-card',
+            // ],
             self::CONTANTI => [
                 'label' => 'Contanti',
                 'value' => self::CONTANTI,
                 'icon' => 'bx-money',
             ],
-            self::CREDITO => [
-                'label' => 'Credito',
-                'value' => self::CREDITO,
-                'icon' => 'bx-wallet',
-            ],
-            self::APPLE_PAY => [
-                'label' => 'Apple Pay',
-                'value' => self::APPLE_PAY,
-                'icon' => 'bx-mobile',
-            ],
-            self::GOOGLE_PAY => [
-                'label' => 'Google Pay',
-                'value' => self::GOOGLE_PAY,
-                'icon' => 'bx-mobile',
-            ],
+            // self::CREDITO => [
+            //     'label' => 'Credito',
+            //     'value' => self::CREDITO,
+            //     'icon' => 'bx-wallet',
+            // ],
             self::CUPON => [
                 'label' => 'Cupon',
                 'value' => self::CUPON,
                 'icon' => 'bx-purchase-tag',
             ],
+            // self::GOOGLE_PAY => [
+            //     'label' => 'Google Pay',
+            //     'value' => self::GOOGLE_PAY,
+            //     'icon' => 'bx-mobile',
+            // ],
+            // self::PAYPAL => [
+            //     'label' => 'Paypal',
+            //     'value' => self::PAYPAL,
+            //     'icon' => 'bxl-paypal',
+            // ],
+            self::POS => [
+                'label' => 'POS',
+                'value' => self::POS,
+                'icon' => 'bx-credit-card',
+            ],
             self::SEGRESTA_WALLET => [
                 'label' => 'Segresta Wallet',
                 'value' => self::SEGRESTA_WALLET,
                 'icon' => 'bx-wallet',
             ],
-            self::POS => [
-                'label' => 'POS',
-                'value' => self::POS,
-                'icon' => 'bx-credit-card',
+            self::STAFF => [
+                'label' => 'Staff',
+                'value' => self::STAFF,
+                'icon' => 'bx-user',
             ],
+            // self::STRIPE => [
+            //     'label' => 'Stripe',
+            //     'value' => self::STRIPE,
+            //     'icon' => 'bx-credit-card',
+            // ],
+       
         ]);
     }
 

app/Models/Pagamento.php

@@ -13,6 +13,7 @@ class Pagamento extends \App\Models\AbstractModels\AbstractPagamento
     const ANNULLATO = 'annullato';
     const RIFIUTATO = 'rifiutato';
     const ERRORE = 'errore';
+    const REGISTRATO = 'registrato';
 
     public static function getStati()
     {

app/Models/PrimaNota.php

@@ -11,6 +11,53 @@ class PrimaNota extends \App\Models\AbstractModels\AbstractPrimaNota
     const USCITA = 'uscita';
     const STORNO = 'storno';
     const NOTA_CREDITO = 'nota_credito';
+    const STAFF = 'staff';
+    const NO_CONTABILE = 'no_contabile';
+
+    public function scopeConFiltriIndice($query, ?array $filtri = null)
+    {
+        $filtri = $filtri ?? request()->only([
+            'data_inizio',
+            'data_fine',
+            'categoria_contabile_id',
+            'tipo_movimento',
+        ]);
+
+        if (!empty($filtri['data_inizio'])) {
+            $query->whereDate('created_at', '>=', $filtri['data_inizio']);
+        }
+
+        if (!empty($filtri['data_fine'])) {
+            $query->whereDate('created_at', '<=', $filtri['data_fine']);
+        }
+
+        if (!empty($filtri['categoria_contabile_id'])) {
+            $query->where('categoria_contabile_id', $filtri['categoria_contabile_id']);
+        }
+
+        if (!empty($filtri['tipo_movimento'])) {
+            $query->where('tipo_movimento', $filtri['tipo_movimento']);
+        }
+
+        return $query;
+    }
+
+    public static function statisticheFiltrate(int $attivitaId, ?array $filtri = null): array
+    {
+        $base = static::query()
+            ->where('attivita_id', $attivitaId)
+            ->conFiltriIndice($filtri);
+
+        $importoEntrate = (clone $base)->where('tipo_movimento', self::ENTRATA)->sum('importo');
+        $importoUscite = (clone $base)->where('tipo_movimento', self::USCITA)->sum('importo');
+
+        return [
+            'totale_operazioni' => (clone $base)->count(),
+            'importo_entrate' => $importoEntrate,
+            'importo_uscite' => $importoUscite,
+            'saldo' => $importoEntrate - $importoUscite,
+        ];
+    }
 
     public static function getTipiMovimento()
     {
@@ -23,13 +70,21 @@ class PrimaNota extends \App\Models\AbstractModels\AbstractPrimaNota
                 'label' => 'Uscita',
                 'value' => self::USCITA,
             ],
-            self::STORNO => [
-                'label' => 'Storno',
-                'value' => self::STORNO,
-            ],
-            self::NOTA_CREDITO => [
-                'label' => 'Nota credito',
-                'value' => self::NOTA_CREDITO,
+            // self::STORNO => [
+            //     'label' => 'Storno',
+            //     'value' => self::STORNO,
+            // ],
+            // self::NOTA_CREDITO => [
+            //     'label' => 'Nota credito',
+            //     'value' => self::NOTA_CREDITO,
+            // ],
+            // self::STAFF => [
+            //     'label' => 'Staff',
+            //     'value' => self::STAFF,
+            // ],
+            self::NO_CONTABILE => [
+                'label' => 'Non contabilizzati',
+                'value' => self::NO_CONTABILE,
             ],
         ]);
     }

app/Observers/PagamentoObserver.php

@@ -4,6 +4,8 @@ namespace App\Observers;
 
 use App\Models\Pagamento;
 use App\Models\PrimaNota;
+use App\Models\CategoriaContabile;
+use App\Models\MetodoPagamento;
 use Illuminate\Support\Facades\Log;
 
 class PagamentoObserver
@@ -16,10 +18,24 @@ class PagamentoObserver
             'attivita_id' => $pagamento->attivita_id,
             'pagamento_id' => $pagamento->id,
             'importo' => $pagamento->importo,
-            'tipo_movimento' => PrimaNota::ENTRATA,
+            // 'tipo_movimento' => PrimaNota::ENTRATA,
             'causale' => $pagamento->causale,
+            // 'categoria_contabile_id' => $pagamento->metodo_pagamento->tipo == MetodoPagamento::STAFF ? CategoriaContabile::STAFF : CategoriaContabile::VENDITA,
             'ordine_id' => $pagamento->ordine_id,
         ]);
+        //Assegna categoria contabile
+        if($pagamento->metodo_pagamento->tipo == MetodoPagamento::STAFF){
+            $primaNota->categoria_contabile_id = CategoriaContabile::staff()->id??null;
+        }else{
+            $primaNota->categoria_contabile_id = CategoriaContabile::vendita()->id??null;
+        }
+        //Assegna tipo movimento
+        if($pagamento->metodo_pagamento->escludi_contabilita){
+            $primaNota->tipo_movimento = PrimaNota::NO_CONTABILE;
+        }else{
+            $primaNota->tipo_movimento = PrimaNota::ENTRATA;
+        }
+
         $primaNota->save();
     }
 

app/Services/Bilancio/BilancioServizioService.php

@@ -0,0 +1,276 @@
+<?php
+
+namespace App\Services\Bilancio;
+
+use App\Models\ChiusuraServizio;
+use App\Models\Pagamento;
+use App\Models\RigaOrdine;
+use Carbon\Carbon;
+
+class BilancioServizioService
+{
+    /**
+     * Inizio del servizio corrente: ultima chiusura registrata, altrimenti inizio giornata.
+     */
+    public function periodStartForAttivita(int $attivitaId, ?Carbon $reference = null): Carbon
+    {
+        $lastChiusura = $this->lastChiusuraAt($attivitaId);
+
+        if ($lastChiusura) {
+            return $lastChiusura->copy();
+        }
+
+        return ($reference ?? now())->copy()->startOfDay();
+    }
+
+    public function lastChiusuraAt(int $attivitaId): ?Carbon
+    {
+        $ultimaChiusura = ChiusuraServizio::query()
+            ->where('attivita_id', $attivitaId)
+            ->orderByDesc('chiusura_at')
+            ->value('chiusura_at');
+
+        return $ultimaChiusura ? Carbon::parse($ultimaChiusura) : null;
+    }
+
+    /**
+     * @return array{start: Carbon, end: Carbon, ultimaChiusuraAt: ?Carbon}
+     */
+    public function currentPeriod(int $attivitaId, ?Carbon $reference = null): array
+    {
+        $end = ($reference ?? now())->copy();
+        $ultimaChiusuraAt = $this->lastChiusuraAt($attivitaId);
+        $start = $ultimaChiusuraAt
+            ? $ultimaChiusuraAt->copy()
+            : $end->copy()->startOfDay();
+
+        return [
+            'start' => $start,
+            'end' => $end,
+            'ultimaChiusuraAt' => $ultimaChiusuraAt,
+        ];
+    }
+
+    /**
+     * Totali e breakdown per un intervallo temporale (stessa logica di bilancio servizio).
+     */
+    public function forPeriod(int $attivitaId, Carbon $start, Carbon $end): array
+    {
+        $righeOrdini = RigaOrdine::query()
+            ->with(['piatto.cucina', 'ordine'])
+            ->whereHas('ordine', function ($query) use ($attivitaId, $start, $end) {
+                $query
+                    ->where('attivita_id', $attivitaId)
+                    ->whereBetween('created_at', [$start, $end]);
+            })
+            ->get();
+
+        $righeIncassi = RigaOrdine::query()
+            ->with(['piatto.cucina', 'ordine'])
+            ->whereHas('ordine.pagamenti', function ($query) use ($attivitaId, $start, $end) {
+                $query
+                    ->where('attivita_id', $attivitaId)
+                    ->whereBetween('created_at', [$start, $end]);
+            })
+            ->get();
+
+        $righe = $righeOrdini
+            ->concat($righeIncassi)
+            ->unique('id')
+            ->values();
+
+        $cucineRows = $righe
+            ->groupBy(fn ($riga) => $riga->piatto?->cucina_id ?: 0)
+            ->map(function ($items, $cucinaId) {
+                $first = $items->first();
+                $cucinaNome = $first?->piatto?->cucina?->nome ?? ('Cucina #' . $cucinaId);
+
+                $piatti = $items
+                    ->groupBy('piatto_id')
+                    ->map(function ($piattoItems) {
+                        $firstPiatto = $piattoItems->first();
+                        $quantita = (int) $piattoItems->sum(fn ($r) => (int) ($r->quantita ?? 0));
+                        $totale = (float) $piattoItems->sum(fn ($r) => ((float) ($r->quantita ?? 0)) * ((float) ($r->prezzo ?? 0)));
+
+                        return [
+                            'nome' => $firstPiatto?->piatto?->nome ?? 'Piatto',
+                            'quantita' => $quantita,
+                            'totale' => $totale,
+                        ];
+                    })
+                    ->sortByDesc('quantita')
+                    ->values();
+
+                return [
+                    'id' => (int) $cucinaId,
+                    'nome' => $cucinaNome,
+                    'piatti' => $piatti,
+                    'tot_quantita' => (int) $piatti->sum('quantita'),
+                    'tot_importo' => (float) $piatti->sum('totale'),
+                ];
+            })
+            ->sortByDesc('tot_quantita')
+            ->values();
+
+        $pagamenti = Pagamento::query()
+            ->with(['metodo_pagamento', 'ordine.righe_ordine.piatto.cucina'])
+            ->where('attivita_id', $attivitaId)
+            ->whereBetween('created_at', [$start, $end])
+            ->get();
+
+        $paymentSummary = $pagamenti
+            ->groupBy(fn ($pagamento) => $pagamento->metodo_pagamento?->nome
+                ?? $pagamento->metodo_pagamento?->tipo
+                ?? 'N/D')
+            ->map(function ($items, $metodo) {
+                return [
+                    'metodo' => (string) $metodo,
+                    'count' => $items->count(),
+                    'totale' => (float) $items->sum(fn ($p) => (float) ($p->importo ?? 0)),
+                ];
+            })
+            ->sortByDesc('totale')
+            ->values();
+
+        $totaleIncasso = (float) $pagamenti->sum(fn ($p) => (float) ($p->importo ?? 0));
+        $totaleTransazioni = $pagamenti->count();
+        $totPiattiOrdinati = (int) $cucineRows->sum('tot_quantita');
+
+        $hourLabels = collect(range(0, 23))->map(fn ($h) => str_pad((string) $h, 2, '0', STR_PAD_LEFT))->values();
+
+        $heatmapSeries = $cucineRows->map(function ($cucinaRow) use ($pagamenti) {
+            $cucinaId = (int) ($cucinaRow['id'] ?? 0);
+            $data = [];
+            foreach (range(0, 23) as $h) {
+                $hourTotal = (int) $pagamenti
+                    ->filter(fn ($pagamento) => !empty($pagamento->created_at) && (int) $pagamento->created_at->format('H') === $h)
+                    ->sum(function ($pagamento) use ($cucinaId) {
+                        if (empty($pagamento->ordine)) {
+                            return 0;
+                        }
+
+                        return (int) $pagamento->ordine->righe_ordine->sum(function ($riga) use ($cucinaId) {
+                            if ((int) ($riga->piatto?->cucina_id ?? 0) !== $cucinaId) {
+                                return 0;
+                            }
+
+                            return (int) ($riga->quantita ?? 0);
+                        });
+                    });
+                $data[] = $hourTotal;
+            }
+
+            return [
+                'name' => (string) ($cucinaRow['nome'] ?? 'Cucina'),
+                'data' => $data,
+            ];
+        })->values();
+
+        return [
+            'periodStart' => $start,
+            'periodEnd' => $end,
+            'cucineRows' => $cucineRows,
+            'paymentSummary' => $paymentSummary,
+            'totaleIncasso' => $totaleIncasso,
+            'totaleTransazioni' => $totaleTransazioni,
+            'totPiattiOrdinati' => $totPiattiOrdinati,
+            'heatmapHourLabels' => $hourLabels,
+            'heatmapSeries' => $heatmapSeries,
+        ];
+    }
+
+    /**
+     * Snapshot JSON da salvare in chiusura_servizio.info (audit del segmento chiuso).
+     */
+    public function buildSnapshot(int $attivitaId, Carbon $start, Carbon $end): array
+    {
+        $report = $this->forPeriod($attivitaId, $start, $end);
+
+        return [
+            'periodo' => [
+                'da' => $start->toIso8601String(),
+                'a' => $end->toIso8601String(),
+            ],
+            'incasso' => $report['totaleIncasso'],
+            'transazioni' => $report['totaleTransazioni'],
+            'piatti_ordinati' => $report['totPiattiOrdinati'],
+            'pagamenti_per_metodo' => $report['paymentSummary']->values()->all(),
+            'cucine' => $report['cucineRows']->values()->map(function ($cucina, $index) use ($report) {
+                $orario = $report['heatmapSeries']->get($index);
+
+                return [
+                    'nome' => $cucina['nome'],
+                    'tot_quantita' => $cucina['tot_quantita'],
+                    'tot_importo' => $cucina['tot_importo'],
+                    'piatti' => $cucina['piatti']->values()->all(),
+                    'ordini_per_ora' => $orario['data'] ?? [],
+                ];
+            })->all(),
+            'heatmap_hour_labels' => $report['heatmapHourLabels']->values()->all(),
+            'heatmap_series' => $report['heatmapSeries']->values()->all(),
+            'generato_at' => now()->toIso8601String(),
+        ];
+    }
+
+    /**
+     * Arricchisce le cucine dello snapshot con ordini orari (fallback da heatmap_series).
+     */
+    public function cucineWithOrario(array $snapshot, $heatmapSeries): \Illuminate\Support\Collection
+    {
+        $series = collect($heatmapSeries);
+
+        return collect($snapshot['cucine'] ?? [])->values()->map(function ($cucina, $index) use ($series) {
+            if (!empty($cucina['ordini_per_ora'])) {
+                return $cucina;
+            }
+
+            $orario = $series->get($index) ?? $series->firstWhere('name', $cucina['nome'] ?? '');
+            $cucina['ordini_per_ora'] = $orario['data'] ?? [];
+
+            return $cucina;
+        });
+    }
+
+    /**
+     * Heatmap dallo snapshot; per chiusure precedenti senza dati, ricalcolo sul periodo.
+     *
+     * @return array{heatmapHourLabels: \Illuminate\Support\Collection, heatmapSeries: \Illuminate\Support\Collection}
+     */
+    public function heatmapFromSnapshot(int $attivitaId, array $snapshot, ?Carbon $periodoDa, ?Carbon $periodoA): array
+    {
+        $series = collect($snapshot['heatmap_series'] ?? []);
+        $labels = collect($snapshot['heatmap_hour_labels'] ?? []);
+
+        if ($series->isNotEmpty()) {
+            return [
+                'heatmapHourLabels' => $labels,
+                'heatmapSeries' => $series,
+            ];
+        }
+
+        if (!$periodoDa || !$periodoA) {
+            return [
+                'heatmapHourLabels' => collect(),
+                'heatmapSeries' => collect(),
+            ];
+        }
+
+        $report = $this->forPeriod($attivitaId, $periodoDa, $periodoA);
+
+        return [
+            'heatmapHourLabels' => $report['heatmapHourLabels'],
+            'heatmapSeries' => $report['heatmapSeries'],
+        ];
+    }
+
+    public function periodoLabel(Carbon $start, Carbon $end, ?Carbon $lastChiusura = null): string
+    {
+        $range = $start->format('d/m/Y H:i') . ' → ' . $end->format('d/m/Y H:i');
+
+        if ($lastChiusura) {
+            return 'Servizio in corso · dal ' . $lastChiusura->format('d/m/Y H:i') . ' · adesso';
+        }
+
+        return 'Servizio in corso · ' . $range;
+    }
+}

app/Services/Paga/Staff.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Services\Paga;
+
+use App\Models\MetodoPagamento;
+use App\Models\Pagamento;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+
+class Staff
+{
+    public function __construct(){
+
+    }
+
+    public function paga($pagamento){
+        //Pagamento registrato
+        // $pagamento->stato = Pagamento::REGISTRATO;
+        $pagamento->stato = Pagamento::PAGATO; //lascio pagato per non bloccare stampe scontrini
+        $pagamento->save();
+        return [
+            'result' => true,
+            'message' => 'Pagamento con contanti registrato.',
+        ];
+    }
+}

database/migrations/2026_06_18_153607_campo_occupato_in_dispositivo.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('dispositivo', function (Blueprint $table) {
+            $table->boolean('occupato')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('dispositivo', function (Blueprint $table) {
+            $table->dropColumn('occupato');
+        });
+    }
+};

database/migrations/2026_06_18_164218_contabilizzare_metodo_di_pagamento.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('metodo_pagamento', function (Blueprint $table) {
+            $table->boolean('escludi_contabilita')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('metodo_pagamento', function (Blueprint $table) {
+            $table->dropColumn('escludi_contabilita');
+        });
+    }
+};

database/migrations/2026_06_19_005802_chiusura_servizio.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('chiusura_servizio', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('attivita_id')->unsigned()->nullable();
+            $table->dateTime('chiusura_at');
+            $table->string('note')->nullable();
+            $table->bigInteger('user_id')->unsigned()->nullable();
+            $table->json('info')->nullable();
+            $table->timestamps();
+            $table->foreign('attivita_id')->references('id')->on('attivita')->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('chiusura_servizio');
+    }
+};

database/seeders/CategoriaContabileSeed.php

@@ -103,6 +103,10 @@ class CategoriaContabileSeed extends Seeder
                 'nome' => 'Offerte',
                 'descrizione' => 'Offerte',
                 'colore' => '#ffc107', // Giallo
+            ],
+            ['nome' => 'Staff',
+            'descrizione' => 'Spese per staff',
+            'colore' => '#dc3545', // Rosso (uscite generali)
             ],      
             
         ];

resources/menu/verticalMenu.json

@@ -125,8 +125,31 @@
           "name": "Bilancio",
           "icon": "menu-icon icon-base bx bx-chart",
           "slug": "bilancio.index",
-          "url": "admin/bilancio",
-          "can": "permission:view-bilancio"
+          "url": "",
+          "can": "permission:view-bilancio",
+          "submenu": [
+            {
+              "name": "Oggi",
+              "icon": "menu-icon icon-base bx bx-chart",
+              "slug": "bilancio.oggi",
+              "url": "admin/bilancio/oggi",
+              "can": "permission:view-bilancio-oggi"
+            },
+            {
+              "name": "Annuale",
+              "icon": "menu-icon icon-base bx bx-calendar",
+                "slug": "bilancio.annuale",
+              "url": "admin/bilancio",
+              "can": "permission:view-bilancio"
+            },
+            {
+              "name": "Storico chiusure",
+              "icon": "menu-icon icon-base bx bx-history",
+              "slug": "chiusura-servizio.index",
+              "url": "admin/chiusura-servizio",
+              "can": "permission:view-chiusura-servizio"
+            }
+          ]
         },
         {
           "name": "Report",
@@ -157,7 +180,7 @@
           "url": "admin/saltacoda"
         },
         {
-          "name": "Operatore",
+          "name": "Pass",
           "icon": "menu-icon icon-base bx bx-user",
           "slug": "punto_operatore.index",
           "url": "admin/punto-operatore",

resources/views/_partials/badge.blade.php

@@ -22,4 +22,12 @@
 <span class="px-3 py-1 alert alert-dark ms-2">
     {{ $dark }}
 </span>
-@endif
+@endif
+
+@if(isset($entity))
+<span class="badge" style="background-color: {{ $entity->categoria_contabile?->colore }};">{{ $entity->categoria_contabile?->nome }}</span>
+
+    @if($entity->tipo_movimento == \App\Models\PrimaNota::NO_CONTABILE)
+        <span class="badge ms-2 badge-info text-bg-info">NC</span>
+    @endif
+@endif

resources/views/bilancio/oggi.blade.php

@@ -1,10 +1,11 @@
 @php
+use Illuminate\Support\Facades\Auth;
 $configData = Helper::appClasses();
 @endphp
 
 @extends('layouts/layoutMaster')
 
-@section('title', 'Bilancio oggi')
+@section('title', 'Bilancio servizio')
 
 @section('vendor-style')
 @vite([
@@ -19,138 +20,227 @@ $configData = Helper::appClasses();
 @endsection
 
 @section('pageTitle')
-<div class="d-flex flex-column">
-  <h4 class="mb-1">
-    <i class="bx bx-chart"></i> Bilancio di oggi
-    <span class="text-muted text-primary fs-6 fw-normal"> di {{ $attivita?->nome ?? 'Attivita' }}</span>
-  </h4>
-  <small class="text-muted">Data riferimento: {{ $oggiLabel ?? now()->format('d/m/Y') }}</small>
+<div class="d-flex flex-wrap justify-content-between align-items-start gap-2">
+  <div class="d-flex flex-column">
+    <h4 class="mb-1">
+      <i class="bx bx-chart"></i> Bilancio servizio
+      <span class="text-muted fs-6 fw-normal">· {{ $attivita?->nome ?? 'Attività' }}</span>
+    </h4>
+    <small class="text-muted">{{ $periodoLabel ?? ('Servizio in corso · ' . now()->format('d/m/Y H:i')) }}</small>
+  </div>
 </div>
 @endsection
 
 @section('content')
 <style>
-  .kpi-amount {
-    font-size: 1.6rem;
+  .servizio-kpi-value {
+    font-size: 1.75rem;
     font-weight: 700;
+    line-height: 1.2;
+  }
+
+  .servizio-kpi-label {
+    font-size: .8rem;
+    text-transform: uppercase;
+    letter-spacing: .04em;
+    color: var(--bs-secondary-color);
   }
 
-  .metodo-row:last-child {
+  .servizio-metodo-row:last-child {
     border-bottom: 0 !important;
   }
 </style>
 
-@if(session('status'))
-  <div class="alert alert-success">
-    {{ session('status') }}
-  </div>
-@endif
-
-<div class="row g-4 mt-1">
-  <div class="col-xl-8">
-    <div class="card">
-      <div class="card-header d-flex justify-content-between align-items-center">
-        <h5 class="mb-0">Cucine e piatti ordinati</h5>
-        <small class="text-muted">Ordinati per numero ordinazioni</small>
+@include('_partials.status')
+
+<div class="card mt-1 mb-0 border-start border-3 border-info">
+  <div class="card-body py-3 d-flex flex-wrap align-items-center gap-3">
+    <div class="avatar avatar-sm">
+      <span class="avatar-initial rounded bg-label-info">
+        <i class="bx bx-time-five"></i>
+      </span>
+    </div>
+    <div>
+      <div class="fw-semibold">Servizio in corso</div>
+      <div class="text-muted small">
+        @if(!empty($ultimaChiusuraAt))
+          Dal <strong>{{ $ultimaChiusuraAt->format('d/m/Y H:i') }}</strong>
+          <!-- al <strong>{{ ($periodoEnd ?? now())->format('d/m/Y H:i') }}</strong> -->
+          <small class="d-block mt-1">(ultima chiusura registrata)</small>
+        @else
+          Dal <strong>{{ ($periodoStart ?? now()->startOfDay())->format('d/m/Y H:i') }}</strong>
+          <!-- al <strong>{{ ($periodoEnd ?? now())->format('d/m/Y H:i') }}</strong> -->
+          <span class="d-block mt-1">Nessuna chiusura precedente: conteggio dall'inizio giornata.</span>
+        @endif
       </div>
+    </div>
+  </div>
+</div>
+
+{{-- KPI principali --}}
+<div class="row g-3 mt-1">
+  <div class="col-md-4">
+    <div class="card h-100 border-start border-4 border-primary">
       <div class="card-body">
-        <div class="accordion" id="accordionCucineOggi">
-          @forelse(($cucineRows ?? collect()) as $index => $cucina)
-            @php
-              $itemId = 'cucina-' . $index;
-              $headingId = 'heading-' . $itemId;
-              $collapseId = 'collapse-' . $itemId;
-            @endphp
-            <div class="accordion-item">
-              <h2 class="accordion-header" id="{{ $headingId }}">
-                <button class="accordion-button {{ $loop->first ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#{{ $collapseId }}" aria-expanded="{{ $loop->first ? 'true' : 'false' }}" aria-controls="{{ $collapseId }}">
-                  <div class="w-100 d-flex justify-content-between align-items-center pe-2">
-                    <span class="fw-semibold">{{ $cucina['nome'] }}</span>
-                    <span class="text-muted small">
-                      Tot. ordinazioni: <strong>{{ number_format((int) $cucina['tot_quantita'], 0, ',', '.') }}</strong>
-                      &nbsp;|&nbsp; Tot. cucina: <strong>EUR {{ number_format((float) $cucina['tot_importo'], 2, ',', '.') }}</strong>
-                    </span>
-                  </div>
-                </button>
-              </h2>
-              <div id="{{ $collapseId }}" class="accordion-collapse collapse {{ $loop->first ? 'show' : '' }}" aria-labelledby="{{ $headingId }}" data-bs-parent="#accordionCucineOggi">
-                <div class="accordion-body p-0">
-                  <div class="table-responsive">
-                    <table class="table table-sm mb-0">
-                      <thead>
-                        <tr>
-                          <th>Piatto</th>
-                          <th class="text-end">Ordinazioni</th>
-                          <th class="text-end">Totale piatto</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        @forelse($cucina['piatti'] as $piatto)
-                          <tr>
-                            <td>{{ $piatto['nome'] }}</td>
-                            <td class="text-end">{{ number_format((int) $piatto['quantita'], 0, ',', '.') }}</td>
-                            <td class="text-end">EUR {{ number_format((float) $piatto['totale'], 2, ',', '.') }}</td>
-                          </tr>
-                        @empty
-                          <tr>
-                            <td colspan="3" class="text-muted">Nessun piatto ordinato oggi.</td>
-                          </tr>
-                        @endforelse
-                      </tbody>
-                    </table>
-                  </div>
-                </div>
-              </div>
-            </div>
-          @empty
-            <div class="alert alert-warning mb-0">
-              Nessuna cucina con ordinazioni per oggi.
-            </div>
-          @endforelse
+        <div class="servizio-kpi-label mb-1">Incasso</div>
+        <div class="servizio-kpi-value text-primary">
+          € {{ number_format((float) ($totaleIncassoOggi ?? 0), 2, ',', '.') }}
         </div>
       </div>
     </div>
   </div>
-
-  <div class="col-xl-4">
+  <div class="col-md-4">
     <div class="card h-100">
-      <div class="card-header d-flex justify-content-between align-items-center">
-        <h5 class="mb-0">Sintesi pagamenti</h5>
-        <span class="badge bg-label-primary">Oggi</span>
-      </div>
       <div class="card-body">
-        <div class="mb-3">
-          <div class="text-muted small">Totale incasso</div>
-          <div class="kpi-amount">EUR {{ number_format((float) ($totaleIncassoOggi ?? 0), 2, ',', '.') }}</div>
+        <div class="servizio-kpi-label mb-1">Transazioni</div>
+        <div class="servizio-kpi-value">
+          {{ number_format((int) ($totaleTransazioniOggi ?? 0), 0, ',', '.') }}
         </div>
-
-        <div class="list-group list-group-flush">
-          @forelse(($paymentSummary ?? collect()) as $row)
-            <div class="list-group-item px-0 metodo-row border-bottom">
-              <div class="d-flex justify-content-between align-items-center">
-                <div>
-                  <div class="fw-semibold">{{ $row['metodo'] }}</div>
-                  <small class="text-muted">{{ number_format((int) $row['count'], 0, ',', '.') }} transazioni</small>
-                </div>
-                <div class="fw-semibold">EUR {{ number_format((float) $row['totale'], 2, ',', '.') }}</div>
-              </div>
-            </div>
-          @empty
-            <div class="text-muted">Nessun pagamento registrato oggi.</div>
-          @endforelse
+      </div>
+    </div>
+  </div>
+  <div class="col-md-4">
+    <div class="card h-100">
+      <div class="card-body">
+        <div class="servizio-kpi-label mb-1">Piatti ordinati</div>
+        <div class="servizio-kpi-value">
+          {{ number_format((int) ($totPiattiOrdinati ?? 0), 0, ',', '.') }}
         </div>
       </div>
     </div>
   </div>
+</div>
 
-  <div class="col-12">
-    <div class="card">
-      <div class="card-header d-flex justify-content-between align-items-center">
-        <h5 class="mb-0">Heatmap oraria del giorno - Cucine</h5>
-        <small class="text-muted">Incrocio ora e cucina per ordinazioni</small>
+{{-- Pagamenti per metodo --}}
+<div class="card mt-4">
+  <div class="card-header">
+    <h5 class="mb-0">Pagamenti per metodo</h5>
+  </div>
+  <div class="card-body p-0">
+    @forelse(($paymentSummary ?? collect()) as $row)
+      <div class="d-flex justify-content-between align-items-center px-4 py-3 border-bottom servizio-metodo-row">
+        <div>
+          <div class="fw-semibold">{{ $row['metodo'] }}</div>
+          <small class="text-muted">
+            {{ number_format((int) $row['count'], 0, ',', '.') }}
+            {{ (int) $row['count'] === 1 ? 'transazione' : 'transazioni' }}
+          </small>
+        </div>
+        <div class="fs-5 fw-semibold">
+          € {{ number_format((float) $row['totale'], 2, ',', '.') }}
+        </div>
       </div>
-      <div class="card-body">
-        <div id="heatmap-incassi-oggi" style="min-height: 360px;"></div>
+    @empty
+      <div class="p-4 text-muted">Nessun pagamento registrato in questo periodo.</div>
+    @endforelse
+  </div>
+</div>
+
+{{-- Dettagli (secondo piano) --}}
+<div class="card mt-4">
+  <div class="card-header">
+    <button
+      class="btn btn-sm btn-label-primary"
+      type="button"
+      data-bs-toggle="collapse"
+      data-bs-target="#servizioDettagli"
+      aria-expanded="false"
+      aria-controls="servizioDettagli"
+    >
+      <i class="bx bx-chevron-down me-1"></i> Mostra dettagli (cucine e andamento orario)
+    </button>
+    @if(Auth::user()->can('create-chiusura-servizio') && \App\Models\ChiusuraServizio::where('attivita_id', $attivita->id)->where('chiusura_at', '>=', now()->subHours(1))->count() == 0)
+    <form
+      id="form-chiudi-servizio"
+      method="POST"
+      action="{{ route('chiusura-servizio.chiudi-servizio') }}"
+      class="btn btn-sm  d-inline-flex align-items-center"
+    >
+      @csrf
+      <button type="button" class="btn btn-warning" id="btn-chiudi-servizio">
+        <i class="bx bx-lock-alt me-1"></i> Chiudi servizio
+      </button>
+    </form>
+  @endcan
+  </div>
+  <div class="collapse" id="servizioDettagli">
+    <div class="card-body border-top">
+      <ul class="nav nav-tabs mb-3" role="tablist">
+        <li class="nav-item" role="presentation">
+          <button class="nav-link active" type="button" data-bs-toggle="tab" data-bs-target="#servizio-tab-cucine" role="tab">
+            Cucine e piatti
+          </button>
+        </li>
+        <li class="nav-item" role="presentation">
+          <button class="nav-link" type="button" data-bs-toggle="tab" data-bs-target="#servizio-tab-heatmap" role="tab" id="servizio-tab-heatmap-btn">
+            Andamento orario
+          </button>
+        </li>
+      </ul>
+
+      <div class="tab-content">
+        <div class="tab-pane fade show active" id="servizio-tab-cucine" role="tabpanel">
+          <div class="accordion" id="accordionCucineOggi">
+            @forelse(($cucineRows ?? collect()) as $index => $cucina)
+              @php
+                $itemId = 'cucina-' . $index;
+                $headingId = 'heading-' . $itemId;
+                $collapseId = 'collapse-' . $itemId;
+              @endphp
+              <div class="accordion-item">
+                <h2 class="accordion-header" id="{{ $headingId }}">
+                  <button
+                    class="accordion-button collapsed"
+                    type="button"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#{{ $collapseId }}"
+                    aria-expanded="false"
+                    aria-controls="{{ $collapseId }}"
+                  >
+                    <div class="w-100 d-flex flex-wrap justify-content-between align-items-center gap-2 pe-2">
+                      <span class="fw-semibold">{{ $cucina['nome'] }}</span>
+                      <span class="text-muted small">
+                        {{ number_format((int) $cucina['tot_quantita'], 0, ',', '.') }} ord.
+                        · € {{ number_format((float) $cucina['tot_importo'], 2, ',', '.') }}
+                      </span>
+                    </div>
+                  </button>
+                </h2>
+                <div id="{{ $collapseId }}" class="accordion-collapse collapse" aria-labelledby="{{ $headingId }}" data-bs-parent="#accordionCucineOggi">
+                  <div class="accordion-body p-0">
+                    <div class="table-responsive">
+                      <table class="table table-sm mb-0">
+                        <thead>
+                          <tr>
+                            <th>Piatto</th>
+                            <th class="text-end">Qtà</th>
+                            <th class="text-end">Totale</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          @foreach($cucina['piatti'] as $piatto)
+                            <tr>
+                              <td>{{ $piatto['nome'] }}</td>
+                              <td class="text-end">{{ number_format((int) $piatto['quantita'], 0, ',', '.') }}</td>
+                              <td class="text-end">€ {{ number_format((float) $piatto['totale'], 2, ',', '.') }}</td>
+                            </tr>
+                          @endforeach
+                        </tbody>
+                      </table>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            @empty
+              <div class="alert alert-warning mb-0">Nessuna cucina con ordinazioni in questo periodo.</div>
+            @endforelse
+          </div>
+        </div>
+
+        <div class="tab-pane fade" id="servizio-tab-heatmap" role="tabpanel">
+          <p class="text-muted small mb-3">Ordinazioni per ora e cucina.</p>
+          <div id="heatmap-incassi-oggi" style="min-height: 320px;"></div>
+        </div>
       </div>
     </div>
   </div>
@@ -160,52 +250,193 @@ $configData = Helper::appClasses();
 @section('page-script')
 <script>
   document.addEventListener('DOMContentLoaded', function () {
+    const chiudiBtn = document.getElementById('btn-chiudi-servizio');
+    const chiudiForm = document.getElementById('form-chiudi-servizio');
+
+    if (chiudiBtn && chiudiForm) {
+      chiudiBtn.addEventListener('click', function () {
+        Swal.fire({
+          title: 'Chiudere il servizio?',
+          html: [
+            'Verrà registrata la chiusura del servizio corrente con uno <strong>snapshot</strong> dei totali',
+            '(incasso, transazioni, pagamenti per metodo, cucine e piatti).',
+            '<br><br>',
+            'Il prossimo servizio partirà da questo momento.',
+            '<br><br>',
+            '<span class="text-muted">Le vendite non vengono bloccate: i nuovi ordini saranno conteggiati nel servizio successivo.</span>'
+          ].join(' '),
+          icon: 'warning',
+          showCancelButton: true,
+          confirmButtonText: 'Sì, chiudi servizio',
+          cancelButtonText: 'Annulla',
+          customClass: {
+            confirmButton: 'btn btn-warning me-2',
+            cancelButton: 'btn btn-label-secondary'
+          },
+          buttonsStyling: false
+        }).then(function (result) {
+          if (result.isConfirmed) {
+            chiudiForm.submit();
+          }
+        });
+      });
+    }
+
     if (typeof ApexCharts === 'undefined') {
       return;
     }
 
     const heatmapSeries = @json($heatmapSeries ?? []);
     const hourLabels = @json($heatmapHourLabels ?? []);
+    let heatmapChart = null;
+
+    function isDarkTheme() {
+      const theme = document.documentElement.getAttribute('data-bs-theme');
+      if (theme === 'dark') {
+        return true;
+      }
+      if (theme === 'light') {
+        return false;
+      }
+      return window.matchMedia('(prefers-color-scheme: dark)').matches;
+    }
+
+    function getThemeColors() {
+      const css = getComputedStyle(document.documentElement);
+      return {
+        labelColor: (css.getPropertyValue('--bs-secondary-color') || '#6c757d').trim(),
+        borderColor: (css.getPropertyValue('--bs-border-color') || '#e9ecef').trim(),
+        emptyColor: (css.getPropertyValue('--bs-tertiary-bg') || css.getPropertyValue('--bs-border-color') || '#e9ecef').trim()
+      };
+    }
+
+    function getHeatmapColorScale(dark, emptyColor) {
+      if (dark) {
+        return [
+          { from: 0, to: 0, color: emptyColor, name: 'Nessuna ordinazione' },
+          { from: 1, to: 5, color: '#434968', name: 'Basso' },
+          { from: 6, to: 12, color: '#5a5fcf', name: 'Medio' },
+          { from: 13, to: 20, color: '#696cff', name: 'Alto' },
+          { from: 21, to: 99999, color: '#8592ff', name: 'Picco' }
+        ];
+      }
+
+      return [
+        { from: 0, to: 0, color: emptyColor, name: 'Nessuna ordinazione' },
+        { from: 1, to: 5, color: '#dbeafe', name: 'Basso' },
+        { from: 6, to: 12, color: '#93c5fd', name: 'Medio' },
+        { from: 13, to: 20, color: '#60a5fa', name: 'Alto' },
+        { from: 21, to: 99999, color: '#2563eb', name: 'Picco' }
+      ];
+    }
 
-    const heatmapConfig = {
-      chart: {
-        type: 'heatmap',
-        height: 360,
-        toolbar: { show: false }
-      },
-      series: heatmapSeries,
-      xaxis: {
-        categories: hourLabels
-      },
-      dataLabels: {
-        enabled: false
-      },
-      colors: ['#696cff'],
-      plotOptions: {
-        heatmap: {
-          shadeIntensity: 0.55,
-          radius: 4,
-          colorScale: {
-            ranges: [
-              { from: 0, to: 0, color: '#f8fafc', name: 'Nessuna ordinazione' },
-              { from: 1, to: 5, color: '#dbeafe', name: 'Basso' },
-              { from: 6, to: 12, color: '#93c5fd', name: 'Medio' },
-              { from: 13, to: 20, color: '#60a5fa', name: 'Alto' },
-              { from: 21, to: 99999, color: '#2563eb', name: 'Picco' }
-            ]
+    function buildHeatmapOptions() {
+      const dark = isDarkTheme();
+      const colors = getThemeColors();
+
+      return {
+        chart: {
+          type: 'heatmap',
+          height: 320,
+          toolbar: { show: false },
+          foreColor: colors.labelColor
+        },
+        theme: {
+          mode: dark ? 'dark' : 'light'
+        },
+        series: heatmapSeries,
+        xaxis: {
+          categories: hourLabels,
+          labels: {
+            style: { colors: colors.labelColor, fontSize: '11px' }
+          },
+          axisBorder: { show: false },
+          axisTicks: { show: false }
+        },
+        yaxis: {
+          labels: {
+            style: { colors: colors.labelColor, fontSize: '12px' }
           }
-        }
-      },
-      tooltip: {
-        y: {
-          formatter: function (val) {
-            return Number(val || 0).toLocaleString('it-IT') + ' ordinazioni';
+        },
+        dataLabels: {
+          enabled: false
+        },
+        colors: ['#696cff'],
+        plotOptions: {
+          heatmap: {
+            shadeIntensity: dark ? 0.35 : 0.55,
+            radius: 4,
+            colorScale: {
+              ranges: getHeatmapColorScale(dark, colors.emptyColor)
+            }
+          }
+        },
+        legend: {
+          position: 'bottom',
+          labels: {
+            colors: colors.labelColor
+          }
+        },
+        grid: {
+          borderColor: colors.borderColor,
+          strokeDashArray: 4
+        },
+        tooltip: {
+          theme: dark ? 'dark' : 'light',
+          y: {
+            formatter: function (val) {
+              return Number(val || 0).toLocaleString('it-IT') + ' ordinazioni';
+            }
           }
         }
+      };
+    }
+
+    function destroyHeatmap() {
+      if (heatmapChart) {
+        heatmapChart.destroy();
+        heatmapChart = null;
       }
-    };
+    }
 
-    new ApexCharts(document.querySelector('#heatmap-incassi-oggi'), heatmapConfig).render();
+    function renderHeatmap() {
+      const el = document.querySelector('#heatmap-incassi-oggi');
+      if (!el) {
+        return;
+      }
+
+      destroyHeatmap();
+      heatmapChart = new ApexCharts(el, buildHeatmapOptions());
+      heatmapChart.render();
+    }
+
+    function heatmapTabVisible() {
+      return !!document.querySelector('#servizio-tab-heatmap.show.active');
+    }
+
+    const heatmapTabBtn = document.getElementById('servizio-tab-heatmap-btn');
+    if (heatmapTabBtn) {
+      heatmapTabBtn.addEventListener('shown.bs.tab', renderHeatmap);
+    }
+
+    const dettagli = document.getElementById('servizioDettagli');
+    if (dettagli) {
+      dettagli.addEventListener('shown.bs.collapse', function () {
+        if (heatmapTabVisible()) {
+          renderHeatmap();
+        }
+      });
+    }
+
+    const themeObserver = new MutationObserver(function () {
+      if (heatmapChart && heatmapTabVisible()) {
+        renderHeatmap();
+      }
+    });
+    themeObserver.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['data-bs-theme']
+    });
   });
 </script>
 @endsection

resources/views/chiusura_servizio/index.blade.php

@@ -0,0 +1,148 @@
+<?php
+use App\Models\Role;
+use Illuminate\Support\Facades\Auth;
+?>
+@php
+$configData = Helper::appClasses();
+@endphp
+
+@extends('layouts/layoutMaster')
+
+@section('title', 'Chiusura Servizio')
+
+@section('vendor-style')
+@vite([
+'resources/assets/vendor/libs/datatables-bs5/datatables.bootstrap5.scss',
+'resources/assets/vendor/libs/datatables-responsive-bs5/responsive.bootstrap5.scss',
+'resources/assets/vendor/libs/datatables-buttons-bs5/buttons.bootstrap5.scss',
+'resources/assets/vendor/libs/flatpickr/flatpickr.scss',
+'resources/assets/vendor/libs/@form-validation/form-validation.scss'
+])
+@endsection
+
+<!-- Vendor Scripts -->
+@section('vendor-script')
+@vite([
+'resources/assets/vendor/libs/moment/moment.js',
+'resources/assets/vendor/libs/flatpickr/flatpickr.js',
+'resources/assets/vendor/libs/@form-validation/popular.js',
+'resources/assets/vendor/libs/@form-validation/bootstrap5.js',
+'resources/assets/vendor/libs/@form-validation/auto-focus.js',
+'resources/assets/vendor/libs/@form-validation/popular.js',
+'resources/assets/vendor/libs/@form-validation/bootstrap5.js',
+'resources/assets/vendor/libs/@form-validation/auto-focus.js',
+'resources/assets/vendor/libs/datatables-bs5/datatables-bootstrap5.js'
+])
+@endsection
+
+@section('pageTitle')
+<div class="d-flex flex-column">
+  <h4 class="mb-1 text-sm-small mt-md-4 mt-lg-4"> 
+    <i class="bx bx-time d-none d-md-inline-flex d-lg-inline-flex"></i> Chiusura Servizio</h4>
+</div>
+@endsection
+
+@section('content')
+<style>
+  div.upload button:first-child{
+    display: none !important;
+  }
+
+.bx-chef-hat{
+  --svg: url("data:image/svg+xml,%3csvg width='24' height='24' fill='currentColor' viewBox='0 0 24 24' transform='' xmlns='http://www.w3.org/2000/svg'%3e%3c!--Boxicons v3.0.8 https://boxicons.com %7c License https://docs.boxicons.com/free--%3e%3cpath d='M17.13 5.54C16.33 3.42 14.32 2 12 2S7.67 3.42 6.87 5.54A5.506 5.506 0 0 0 2 11c0 2.07 1.18 3.95 3 4.88V18c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-2.12c1.82-.93 3-2.81 3-4.88 0-2.82-2.13-5.15-4.87-5.46m.53 8.75c-.4.14-.67.52-.67.94v1.78H7v-1.78c0-.42-.27-.8-.67-.94-1.4-.5-2.33-1.82-2.33-3.28 0-1.93 1.57-3.5 3.42-3.5.04 0 .14.01.18.02.49 0 .9-.31 1-.78.36-1.61 1.76-2.73 3.41-2.73s3.05 1.12 3.41 2.73c.1.47.51.81 1 .78.06 0 .12 0 .09-.01 1.93 0 3.5 1.57 3.5 3.5 0 1.47-.94 2.79-2.33 3.28ZM5 20h14v2H5z'%3e%3c/path%3e%3c/svg%3e");
+}
+</style>
+
+@include('_partials.status')
+
+<div class="row justify-content-center">
+  <div class="col-xxl mb-4 mt-2">
+    <div class="card">
+      <div class="card-body">
+        {{ $dataTable_chiusura_servizio->table(['class' => 'table table-bordered']) }}
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="basicModal" tabindex="-1" aria-hidden="true">
+            <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title" id="exampleModalLabel1">Modal title</h5>
+                  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                  <div class="row">
+                    <div class="col mb-6">
+                      <label for="nameBasic" class="form-label">Name</label>
+                      <input type="text" id="nameBasic" class="form-control" placeholder="Enter Name">
+                    </div>
+                  </div>
+                  <div class="row g-6">
+                    <div class="col mb-0">
+                      <label for="emailBasic" class="form-label">Email</label>
+                      <input type="email" id="emailBasic" class="form-control" placeholder="xxxx@xxx.xx">
+                    </div>
+                    <div class="col mb-0">
+                      <label for="dobBasic" class="form-label">DOB</label>
+                      <input type="date" id="dobBasic" class="form-control">
+                    </div>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                  <button type="button" class="btn btn-label-secondary" data-bs-dismiss="modal">Close</button>
+                  <button type="button" class="btn btn-primary">Save changes</button>
+                </div>
+              </div>
+            </div>
+          </div>
+
+@endsection
+
+@section('page-script')
+
+{{$dataTable_chiusura_servizio->scripts(attributes: ['type' => 'module'])}}
+
+
+<script type="module">
+  $(document).ready(function(){
+    // Editor edit
+    $("#dataTable_chiusura_servizio").on('click', 'a.editor_edit', function (e) {
+      e.preventDefault();
+      window.LaravelDataTables["dataTable_chiusura_servizio-editor"].edit( $(this).closest('tr'), {
+        title: 'Modifica',
+        buttons: 'Aggiorna',
+      });
+    });
+
+    // Editor delete
+    $("#dataTable_chiusura_servizio").on('click', 'a.editor_delete', function (e) {
+      e.preventDefault();
+      window.LaravelDataTables["dataTable_chiusura_servizio-editor"].remove($(this).closest('tr'), {
+        title: 'Cancella record',
+        message: 'Sei sicuro di voler eliminare il record selezionato?',
+        buttons: 'Cancella record'
+      });
+    } );
+
+    $("#dataTable_chiusura_servizio").on('dblclick', 'tbody td', function (e) {
+      window.LaravelDataTables["dataTable_chiusura_servizio-editor"].edit( $(this).closest('tr'), {
+        title: 'Modifica',
+        buttons: 'Aggiorna',
+      });
+    });
+
+  });
+
+</script>
+
+<script>
+  function initComplete_chiusura_servizio(){
+    $('div.dt-buttons button').removeClass('btn-secondary');
+    $('div.dt-search').addClass('mt-0 mb-4');
+    $('div.dt-buttons').removeClass('btn-group');
+  }
+
+</script>
+@endsection

resources/views/chiusura_servizio/menu.blade.php

@@ -0,0 +1,29 @@
+<?php
+use Illuminate\Support\Facades\Auth;
+?>
+@if(Auth::user()->can('view-chiusura-servizio') || Auth::user()->can('edit-chiusura-servizio') || Auth::user()->can('delete-chiusura-servizio'))
+<div class="dropdown">
+    <button type="button" class="btn p-0 dropdown-toggle hide-arrow" data-bs-toggle="dropdown" aria-expanded="false">
+        <i class="bx bx-dots-vertical-rounded fs-large"></i>
+    </button>
+    <div class="dropdown-menu">
+        @if(Auth::user()->can('view-chiusura-servizio'))
+        <a href="{{ route('chiusura-servizio.show', ['chiusura_servizio_id' => $entity->id]) }}" class="dropdown-item">
+            <i class="bx bx-eye me-1"></i> Visualizza
+        </a>
+        @endif
+
+        @if(Auth::user()->can('edit-chiusura-servizio'))
+        <a href="#" class="dropdown-item editor_edit">
+            <i class="bx bx-edit-alt me-1"></i> Modifica
+        </a>
+        @endif
+
+        @if(Auth::user()->can('delete-chiusura-servizio'))
+        <a href="#" class="dropdown-item editor_delete">
+            <i class="bx bx-trash me-1"></i> Elimina
+        </a>
+        @endif
+    </div>
+</div>
+@endif

resources/views/chiusura_servizio/show.blade.php

@@ -0,0 +1,663 @@
+@php
+$configData = Helper::appClasses();
+$hasSnapshot = !empty($snapshot) && (
+  isset($snapshot['incasso'])
+  || !empty($snapshot['pagamenti_per_metodo'])
+  || !empty($snapshot['cucine'])
+);
+@endphp
+
+@extends('layouts/layoutMaster')
+
+@section('title', 'Chiusura servizio')
+
+@section('vendor-style')
+@vite([
+  'resources/assets/vendor/libs/apex-charts/apex-charts.scss'
+])
+@endsection
+
+@section('vendor-script')
+@vite([
+  'resources/assets/vendor/libs/apex-charts/apexcharts.js'
+])
+@endsection
+
+@section('pageTitle')
+<div class="d-flex flex-column">
+  <h4 class="mb-1 text-sm-small mt-md-4 mt-lg-4">
+    <i class="bx bx-time d-none d-md-inline-flex d-lg-inline-flex"></i>
+    Chiusura servizio
+    @if($chiusura->chiusura_at)
+      <span class="text-muted fs-6 fw-normal">· {{ $chiusura->chiusura_at->format('d/m/Y H:i') }}</span>
+    @endif
+  </h4>
+  <!-- <nav aria-label="breadcrumb" style="font-size: smaller;" class="d-none d-md-block d-lg-block mb-0">
+    <ol class="breadcrumb breadcrumb-custom-icon m-0">
+      <li class="breadcrumb-item">
+        <a href="{{ route('chiusura-servizio.index') }}">Chiusure servizio</a>
+        <i class="breadcrumb-icon icon-base bx bx-chevron-right align-middle"></i>
+      </li>
+      <li class="breadcrumb-item active text-primary">
+        {{ $chiusura->chiusura_at?->format('d/m/Y H:i') ?? ('#' . $chiusura->id) }}
+      </li>
+    </ol>
+  </nav> -->
+</div>
+@endsection
+
+@section('content')
+<style>
+  .servizio-kpi-value {
+    font-size: 1.75rem;
+    font-weight: 700;
+    line-height: 1.2;
+  }
+
+  .servizio-kpi-label {
+    font-size: .8rem;
+    text-transform: uppercase;
+    letter-spacing: .04em;
+    color: var(--bs-secondary-color);
+  }
+
+  .servizio-metodo-row:last-child {
+    border-bottom: 0 !important;
+  }
+
+  .snapshot-field-label {
+    font-size: .75rem;
+    text-transform: uppercase;
+    letter-spacing: .04em;
+    color: var(--bs-secondary-color);
+    margin-bottom: .25rem;
+  }
+
+  .snapshot-table-panel {
+    border: 1px solid var(--bs-border-color);
+    border-radius: .5rem;
+    overflow: hidden;
+    height: 100%;
+  }
+
+  .snapshot-table-panel__header {
+    display: flex;
+    align-items: center;
+    gap: .5rem;
+    padding: .75rem 1rem;
+    border-bottom: 1px solid var(--bs-border-color);
+    background: rgba(var(--bs-body-color-rgb), .03);
+  }
+
+  .snapshot-table-panel--qty {
+    border-top: 3px solid var(--bs-success);
+  }
+
+  .snapshot-table-panel--qty .snapshot-table-panel__header {
+    background: rgba(var(--bs-success-rgb), .08);
+  }
+
+  .snapshot-table-panel--incasso {
+    border-top: 3px solid var(--bs-primary);
+  }
+
+  .snapshot-table-panel--incasso .snapshot-table-panel__header {
+    background: rgba(var(--bs-primary-rgb), .08);
+  }
+
+  .snapshot-table-panel--orario {
+    border-top: 3px solid var(--bs-warning);
+  }
+
+  .snapshot-table-panel--orario .snapshot-table-panel__header {
+    background: rgba(var(--bs-warning-rgb), .08);
+  }
+
+  .snapshot-performance-table {
+    margin-bottom: 0;
+  }
+
+  .snapshot-performance-table thead th {
+    font-size: .72rem;
+    text-transform: uppercase;
+    letter-spacing: .04em;
+    color: var(--bs-secondary-color);
+    font-weight: 600;
+    border-bottom-width: 1px;
+    white-space: nowrap;
+  }
+
+  .snapshot-performance-table tbody tr:hover {
+    background: rgba(var(--bs-primary-rgb), .04);
+  }
+
+  .snapshot-performance-table tbody td {
+    vertical-align: middle;
+    padding-top: .55rem;
+    padding-bottom: .55rem;
+  }
+
+  .snapshot-rank {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 1.75rem;
+    height: 1.75rem;
+    border-radius: 50%;
+    font-size: .75rem;
+    font-weight: 700;
+  }
+
+  .snapshot-rank--1 {
+    background: rgba(var(--bs-warning-rgb), .18);
+    color: var(--bs-warning);
+  }
+
+  .snapshot-rank--2 {
+    background: rgba(var(--bs-secondary-rgb), .16);
+    color: var(--bs-secondary-color);
+  }
+
+  .snapshot-rank--3 {
+    background: rgba(var(--bs-info-rgb), .16);
+    color: var(--bs-info);
+  }
+
+  .snapshot-rank--default {
+    background: rgba(var(--bs-body-color-rgb), .06);
+    color: var(--bs-secondary-color);
+    font-weight: 600;
+  }
+
+  .snapshot-value-qty {
+    font-variant-numeric: tabular-nums;
+    font-weight: 600;
+  }
+
+  .snapshot-value-incasso {
+    font-variant-numeric: tabular-nums;
+    font-weight: 600;
+    color: var(--bs-primary);
+  }
+
+  .snapshot-cucina-summary {
+    padding: .65rem .85rem;
+    border-radius: .5rem;
+    border: 1px dashed var(--bs-border-color);
+    background: rgba(var(--bs-body-color-rgb), .02);
+  }
+
+  .snapshot-metodo-icon {
+    width: 2.25rem;
+    height: 2.25rem;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: .45rem;
+    background: rgba(var(--bs-primary-rgb), .1);
+    color: var(--bs-primary);
+    flex-shrink: 0;
+  }
+</style>
+
+@include('_partials.status')
+
+<!-- <div class="d-flex flex-wrap gap-2 mb-3">
+  <a href="{{ route('chiusura-servizio.index') }}" class="btn btn-sm btn-label-secondary">
+    <i class="bx bx-chevron-left me-1"></i> Torna all'elenco
+  </a>
+</div> -->
+
+{{-- Dati chiusura --}}
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="mb-0">Registro chiusura</h5>
+  </div>
+  <div class="card-body">
+    <div class="row g-3">
+      <div class="col-md-3">
+        <div class="snapshot-field-label">Data e ora</div>
+        <span class="fw-semibold">{{ $chiusura->chiusura_at?->format('d/m/Y H:i:s') ?? '—' }}</span>
+      </div>
+      <div class="col-md-3">
+        <div class="snapshot-field-label">Operatore</div>
+        <span class="fw-semibold">{{ $chiusura->user?->fullName ?? '—' }}</span>
+      </div>
+      <div class="col-md-3">
+        <div class="snapshot-field-label">Attività</div>
+        <span class="fw-semibold">{{ $chiusura->attivita?->nome ?? '—' }}</span>
+      </div>
+      <div class="col-md-3">
+        <div class="snapshot-field-label">Note</div>
+        <span>{{ $chiusura->note ?: '—' }}</span>
+      </div>
+    </div>
+  </div>
+</div>
+
+@if($hasSnapshot)
+  @if($periodoDa && $periodoA)
+    <div class="card mb-4 border-start border-3 border-info">
+      <div class="card-body py-3 d-flex flex-wrap align-items-center gap-3">
+        <div class="avatar avatar-sm">
+          <span class="avatar-initial rounded bg-label-info">
+            <i class="bx bx-time-five"></i>
+          </span>
+        </div>
+        <div>
+          <div class="fw-semibold">Periodo del servizio chiuso</div>
+          <div class="text-muted small">
+            Dal <strong>{{ $periodoDa->format('d/m/Y H:i') }}</strong>
+            al <strong>{{ $periodoA->format('d/m/Y H:i') }}</strong>
+            @if(!empty($snapshot['generato_at']))
+              <span class="d-block mt-1">Snapshot generato il {{ \Carbon\Carbon::parse($snapshot['generato_at'])->format('d/m/Y H:i:s') }}</span>
+            @endif
+          </div>
+        </div>
+      </div>
+    </div>
+  @endif
+
+  {{-- KPI snapshot --}}
+  <div class="row g-3">
+    <div class="col-md-4">
+      <div class="card h-100 border-start border-4 border-primary">
+        <div class="card-body">
+          <div class="servizio-kpi-label mb-1">Incasso</div>
+          <div class="servizio-kpi-value text-primary">
+            € {{ number_format($totaleIncasso, 2, ',', '.') }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-4">
+      <div class="card h-100">
+        <div class="card-body">
+          <div class="servizio-kpi-label mb-1">Transazioni</div>
+          <div class="servizio-kpi-value">
+            {{ number_format($totaleTransazioni, 0, ',', '.') }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-4">
+      <div class="card h-100">
+        <div class="card-body">
+          <div class="servizio-kpi-label mb-1">Piatti ordinati</div>
+          <div class="servizio-kpi-value">
+            {{ number_format($totPiattiOrdinati, 0, ',', '.') }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  {{-- Pagamenti per metodo --}}
+  <div class="card mt-4">
+    <div class="card-header">
+      <h5 class="mb-0">Pagamenti per metodo</h5>
+    </div>
+    <div class="card-body p-0">
+      @forelse($paymentSummary as $row)
+        <div class="d-flex justify-content-between align-items-center px-4 py-3 border-bottom servizio-metodo-row gap-3">
+          <div class="d-flex align-items-center gap-3">
+            <span class="snapshot-metodo-icon">
+              <i class="bx bx-wallet"></i>
+            </span>
+            <div>
+              <div class="fw-semibold">{{ $row['metodo'] ?? 'N/D' }}</div>
+              <small class="text-muted">
+                {{ number_format((int) ($row['count'] ?? 0), 0, ',', '.') }}
+                {{ (int) ($row['count'] ?? 0) === 1 ? 'transazione' : 'transazioni' }}
+              </small>
+            </div>
+          </div>
+          <div class="fs-5 fw-semibold text-primary">
+            € {{ number_format((float) ($row['totale'] ?? 0), 2, ',', '.') }}
+          </div>
+        </div>
+      @empty
+        <div class="p-4 text-muted">Nessun pagamento nello snapshot.</div>
+      @endforelse
+    </div>
+  </div>
+
+  {{-- Cucine e piatti --}}
+  <div class="card mt-4">
+    <div class="card-header">
+      <h5 class="mb-0">Cucine e piatti</h5>
+    </div>
+    <div class="card-body">
+      @if($cucineRows->isNotEmpty())
+        <ul class="nav nav-tabs mb-3 flex-nowrap overflow-auto" role="tablist">
+          @foreach($cucineRows as $index => $cucina)
+            <li class="nav-item" role="presentation">
+              <button
+                class="nav-link {{ $index === 0 ? 'active' : '' }}"
+                type="button"
+                data-bs-toggle="tab"
+                data-bs-target="#snapshot-cucina-{{ $index }}"
+                role="tab"
+                aria-selected="{{ $index === 0 ? 'true' : 'false' }}"
+              >
+                {{ $cucina['nome'] ?? 'Cucina' }}
+                <span class="text-muted small ms-1">
+                  ({{ number_format((int) ($cucina['tot_quantita'] ?? 0), 0, ',', '.') }})
+                </span>
+              </button>
+            </li>
+          @endforeach
+        </ul>
+
+        <div class="tab-content">
+          @foreach($cucineRows as $index => $cucina)
+            @php
+              $piatti = collect($cucina['piatti'] ?? []);
+              $piattiPerQuantita = $piatti
+                ->sortByDesc(fn ($p) => (int) ($p['quantita'] ?? 0))
+                ->values();
+              $piattiPerIncasso = $piatti
+                ->sortByDesc(fn ($p) => (float) ($p['totale'] ?? 0))
+                ->values();
+            @endphp
+            <div
+              class="tab-pane fade {{ $index === 0 ? 'show active' : '' }}"
+              id="snapshot-cucina-{{ $index }}"
+              role="tabpanel"
+            >
+              <div class="snapshot-cucina-summary d-flex flex-wrap justify-content-between align-items-center gap-2 mb-3">
+                <span class="fw-semibold">
+                  <i class="bx bx-restaurant me-1 text-success"></i>
+                  {{ $cucina['nome'] ?? 'Cucina' }}
+                </span>
+                <span class="text-muted small">
+                  {{ number_format((int) ($cucina['tot_quantita'] ?? 0), 0, ',', '.') }} ord.
+                  · € {{ number_format((float) ($cucina['tot_importo'] ?? 0), 2, ',', '.') }}
+                </span>
+              </div>
+
+              <div class="snapshot-table-panel snapshot-table-panel--orario mb-3">
+                <div class="snapshot-table-panel__header">
+                  <i class="bx bx-line-chart text-warning"></i>
+                  <span class="fw-semibold">Affluenza oraria</span>
+                  <span class="text-muted small">ordinazioni per ora nel servizio chiuso</span>
+                </div>
+                <div
+                  id="chart-affluenza-cucina-{{ $index }}"
+                  class="px-2 pb-2"
+                  style="min-height: 240px;"
+                  data-cucina-index="{{ $index }}"
+                ></div>
+              </div>
+
+              <div class="row g-3">
+                <div class="col-lg-6">
+                  <div class="snapshot-table-panel snapshot-table-panel--qty">
+                    <div class="snapshot-table-panel__header">
+                      <i class="bx bx-trending-up text-success"></i>
+                      <span class="fw-semibold">Più venduti</span>
+                      <span class="text-muted small">per quantità</span>
+                    </div>
+                    <div class="table-responsive">
+                      <table class="table table-sm table-hover snapshot-performance-table">
+                        <thead>
+                          <tr>
+                            <th style="width: 3rem;">#</th>
+                            <th>Piatto</th>
+                            <th class="text-end">Qtà</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          @forelse($piattiPerQuantita as $rank => $piatto)
+                            @php $pos = $rank + 1; @endphp
+                            <tr>
+                              <td>
+                                <span @class([
+                                  'snapshot-rank',
+                                  'snapshot-rank--1' => $pos === 1,
+                                  'snapshot-rank--2' => $pos === 2,
+                                  'snapshot-rank--3' => $pos === 3,
+                                  'snapshot-rank--default' => $pos > 3,
+                                ])>{{ $pos }}</span>
+                              </td>
+                              <td>{{ $piatto['nome'] ?? 'Piatto' }}</td>
+                              <td class="text-end snapshot-value-qty">{{ number_format((int) ($piatto['quantita'] ?? 0), 0, ',', '.') }}</td>
+                            </tr>
+                          @empty
+                            <tr>
+                              <td colspan="3" class="text-muted p-4 text-center">Nessun piatto nello snapshot.</td>
+                            </tr>
+                          @endforelse
+                        </tbody>
+                      </table>
+                    </div>
+                  </div>
+                </div>
+
+                <div class="col-lg-6">
+                  <div class="snapshot-table-panel snapshot-table-panel--incasso">
+                    <div class="snapshot-table-panel__header">
+                      <i class="bx bx-euro text-primary"></i>
+                      <span class="fw-semibold">Più redditizi</span>
+                      <span class="text-muted small">per incasso</span>
+                    </div>
+                    <div class="table-responsive">
+                      <table class="table table-sm table-hover snapshot-performance-table">
+                        <thead>
+                          <tr>
+                            <th style="width: 3rem;">#</th>
+                            <th>Piatto</th>
+                            <th class="text-end">Totale</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          @forelse($piattiPerIncasso as $rank => $piatto)
+                            @php $pos = $rank + 1; @endphp
+                            <tr>
+                              <td>
+                                <span @class([
+                                  'snapshot-rank',
+                                  'snapshot-rank--1' => $pos === 1,
+                                  'snapshot-rank--2' => $pos === 2,
+                                  'snapshot-rank--3' => $pos === 3,
+                                  'snapshot-rank--default' => $pos > 3,
+                                ])>{{ $pos }}</span>
+                              </td>
+                              <td>{{ $piatto['nome'] ?? 'Piatto' }}</td>
+                              <td class="text-end snapshot-value-incasso">€ {{ number_format((float) ($piatto['totale'] ?? 0), 2, ',', '.') }}</td>
+                            </tr>
+                          @empty
+                            <tr>
+                              <td colspan="3" class="text-muted p-4 text-center">Nessun piatto nello snapshot.</td>
+                            </tr>
+                          @endforelse
+                        </tbody>
+                      </table>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          @endforeach
+        </div>
+      @else
+        <div class="text-muted">Nessuna cucina nello snapshot.</div>
+      @endif
+    </div>
+  </div>
+@else
+  <div class="alert alert-warning">
+    Nessuno snapshot salvato per questa chiusura. I totali non erano ancora registrati al momento della chiusura.
+  </div>
+@endif
+@endsection
+
+@section('page-script')
+@if($cucineRows->isNotEmpty() && ($heatmapHourLabels ?? collect())->isNotEmpty())
+<script>
+  document.addEventListener('DOMContentLoaded', function () {
+    if (typeof ApexCharts === 'undefined') {
+      return;
+    }
+
+    const hourLabels = @json($heatmapHourLabels->values()->all());
+    const cucineOrario = @json($cucineRows->map(fn ($c) => $c['ordini_per_ora'] ?? [])->values()->all());
+    const lineCharts = {};
+
+    function isDarkTheme() {
+      const theme = document.documentElement.getAttribute('data-bs-theme');
+      if (theme === 'dark') return true;
+      if (theme === 'light') return false;
+      return window.matchMedia('(prefers-color-scheme: dark)').matches;
+    }
+
+    function getThemeColors() {
+      const css = getComputedStyle(document.documentElement);
+      const cfg = window.config?.colors || {};
+
+      return {
+        labelColor: cfg.textMuted || (css.getPropertyValue('--bs-secondary-color') || '#6c757d').trim(),
+        borderColor: cfg.borderColor || (css.getPropertyValue('--bs-border-color') || '#e9ecef').trim(),
+        lineColor: cfg.warning || (css.getPropertyValue('--bs-warning') || '#ffab1d').trim(),
+        fontFamily: window.config?.fontFamily || 'inherit'
+      };
+    }
+
+    function buildLineOptions(data) {
+      const dark = isDarkTheme();
+      const colors = getThemeColors();
+
+      return {
+        chart: {
+          type: 'area',
+          height: 260,
+          parentHeightOffset: 0,
+          toolbar: { show: false },
+          foreColor: colors.labelColor,
+          zoom: { enabled: false },
+          dropShadow: {
+            enabled: true,
+            top: 8,
+            left: 0,
+            blur: 3,
+            color: colors.lineColor,
+            opacity: 0.12
+          }
+        },
+        theme: { mode: dark ? 'dark' : 'light' },
+        series: [{
+          name: 'Ordinazioni',
+          data: data
+        }],
+        colors: [colors.lineColor],
+        fill: {
+          type: 'gradient',
+          gradient: {
+            shadeIntensity: 0.35,
+            opacityFrom: dark ? 0.35 : 0.45,
+            opacityTo: 0.05,
+            stops: [0, 90, 100]
+          }
+        },
+        stroke: {
+          curve: 'smooth',
+          width: 3
+        },
+        markers: {
+          size: 4,
+          strokeWidth: 2,
+          strokeColors: colors.lineColor,
+          hover: { size: 6 }
+        },
+        dataLabels: { enabled: false },
+        legend: { show: false },
+        xaxis: {
+          categories: hourLabels,
+          labels: {
+            style: {
+              colors: colors.labelColor,
+              fontSize: '12px',
+              fontFamily: colors.fontFamily
+            }
+          },
+          axisBorder: { show: false },
+          axisTicks: { show: false }
+        },
+        yaxis: {
+          min: 0,
+          forceNiceScale: true,
+          labels: {
+            style: {
+              colors: colors.labelColor,
+              fontSize: '12px',
+              fontFamily: colors.fontFamily
+            },
+            formatter: function (val) { return Math.round(val); }
+          }
+        },
+        grid: {
+          borderColor: colors.borderColor,
+          strokeDashArray: 6,
+          padding: { top: 0, right: 8, bottom: 0, left: 8 }
+        },
+        tooltip: {
+          theme: dark ? 'dark' : 'light',
+          x: { formatter: function (_, opts) { return 'Ore ' + (hourLabels[opts.dataPointIndex] || ''); } },
+          y: {
+            formatter: function (val) {
+              return Number(val || 0).toLocaleString('it-IT') + ' ordinazioni';
+            }
+          }
+        }
+      };
+    }
+
+    function renderLineChart(index) {
+      const el = document.getElementById('chart-affluenza-cucina-' + index);
+      if (!el || lineCharts[index]) {
+        return;
+      }
+
+      const data = cucineOrario[index] || [];
+      lineCharts[index] = new ApexCharts(el, buildLineOptions(data));
+      lineCharts[index].render();
+    }
+
+    function renderVisibleLineCharts() {
+      document.querySelectorAll('.tab-pane.active [data-cucina-index]').forEach(function (el) {
+        renderLineChart(parseInt(el.getAttribute('data-cucina-index'), 10));
+      });
+    }
+
+    function refreshLineChartsTheme() {
+      Object.keys(lineCharts).forEach(function (key) {
+        const idx = parseInt(key, 10);
+        if (lineCharts[idx]) {
+          lineCharts[idx].destroy();
+          delete lineCharts[idx];
+        }
+      });
+      renderVisibleLineCharts();
+    }
+
+    renderVisibleLineCharts();
+
+    document.querySelectorAll('[data-bs-toggle="tab"][data-bs-target^="#snapshot-cucina-"]').forEach(function (btn) {
+      btn.addEventListener('shown.bs.tab', function (e) {
+        const target = e.target.getAttribute('data-bs-target');
+        const match = target && target.match(/snapshot-cucina-(\d+)/);
+        if (match) {
+          renderLineChart(parseInt(match[1], 10));
+        }
+      });
+    });
+
+    const themeObserver = new MutationObserver(refreshLineChartsTheme);
+    themeObserver.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['data-bs-theme']
+    });
+  });
+</script>
+@endif
+@endsection

resources/views/layouts/sections/navbar/navbar-partial.blade.php

@@ -366,12 +366,13 @@ class="layout-menu-toggle navbar-nav align-items-xl-center me-4 me-xl-0{{ isset(
                                     $binding_token = \Illuminate\Support\Facades\Cookie::get('binding_token');
                                     $puntoVendita = \App\Models\Dispositivo::findByBindingCookieToken($binding_token);
                                     ?>
-                               
+                                    @if($puntoVendita)
                                     <a href="{{ route('punto-vendita.show', ['punto_vendita_id' => $puntoVendita->id]) }}" class="mx-5 btn text-bg-primary px-2 py-1">
                                       Torna a {{ $puntoVendita->nome }}
                                       <i class="bx bx-arrow-back rotate-180 float-end"></i>
                                     </a>
                                     @endif
+                                    @endif
                                     <!-- END - Accedi a punto vendita se in Session -->
 
                                     <!-- Attività -->

resources/views/mappa_dispositivi/_partials/device_card.blade.php

@@ -0,0 +1,74 @@
+@php
+  $searchText = implode(' ', array_filter([
+    $device['nome'] ?? '',
+    $device['attivita_nome'] ?? '',
+    $device['ubicazione'] ?? '',
+    $device['tipo'] ?? '',
+    (string) ($device['id'] ?? ''),
+  ]));
+  $attivitaId = $device['attivita_id'] ?? null;
+  $attivitaLabel = $device['attivita_nome'] ?? 'Senza attività';
+  $editUrl = ($device['is_punto_vendita'] ?? false) && ($puoModificarePv ?? false)
+    ? route('punto-vendita.edit', ['punto_vendita_id' => $device['id']])
+    : null;
+@endphp
+
+<div class="col-sm-6 col-lg-4 col-xl-3">
+  <div
+    class="card md-device-card h-100"
+    data-tipo="{{ $device['tipo'] ?? '_altro' }}"
+    data-attivita-id="{{ $attivitaId ?? '0' }}"
+    data-attivo="{{ !empty($device['is_attivo']) ? '1' : '0' }}"
+    data-search="{{ $searchText }}"
+  >
+    <div class="card-body d-flex flex-column">
+      <div class="d-flex align-items-start justify-content-between gap-2 mb-2">
+        <div class="d-flex align-items-center gap-2 min-w-0">
+          <span class="avatar avatar-sm">
+            <span class="avatar-initial rounded bg-label-primary">
+              <i class="{{ $tipoMeta['icon'] ?? 'bx bx-devices' }}"></i>
+            </span>
+          </span>
+          <div class="min-w-0">
+            <h6 class="mb-0 text-truncate" title="{{ $device['nome'] }}">{{ $device['nome'] }}</h6>
+            <small class="text-muted">#{{ $device['id'] }}</small>
+          </div>
+        </div>
+        @if(!empty($device['is_attivo']))
+          <span class="badge bg-label-success flex-shrink-0">Attivo</span>
+        @else
+          <span class="badge bg-label-danger flex-shrink-0">Non attivo</span>
+        @endif
+      </div>
+
+      <ul class="list-unstyled small mb-3 flex-grow-1">
+        <li class="mb-2 d-flex align-items-start gap-2">
+          <i class="bx bx-category-alt text-muted mt-1"></i>
+          <span class="text-truncate" title="{{ $attivitaLabel }}">{{ $attivitaLabel }}</span>
+        </li>
+        <li class="mb-2 d-flex align-items-start gap-2">
+          <i class="bx bx-map-pin text-muted mt-1"></i>
+          <span>{{ $device['ubicazione'] ?: '—' }}</span>
+        </li>
+        @if($device['is_punto_vendita'] ?? false)
+          <li class="d-flex align-items-start gap-2">
+            <i class="bx bx-link text-muted mt-1"></i>
+            <span>
+              @if(!empty($device['occupato']))
+                <span class="badge bg-label-info">Abbinato</span>
+              @else
+                <span class="badge bg-label-secondary">Libero</span>
+              @endif
+            </span>
+          </li>
+        @endif
+      </ul>
+
+      @if($editUrl)
+        <a href="{{ $editUrl }}" class="btn btn-sm btn-label-primary w-100">
+          <i class="bx bx-edit-alt me-1"></i> Gestisci
+        </a>
+      @endif
+    </div>
+  </div>
+</div>

resources/views/mappa_dispositivi/index.blade.php

@@ -1,686 +1,252 @@
 <?php
-use App\Models\Role;
+use App\Models\Dispositivo;
 use Illuminate\Support\Facades\Auth;
 ?>
 @php
 $configData = Helper::appClasses();
+$dispositiviByTipo = $dispositiviByTipo ?? [];
+$tipiDispositivo = $tipiDispositivo ?? Dispositivo::getTipoDispositivo();
+$attivitaList = $attivitaList ?? collect();
+$totaleDispositivi = collect($dispositiviByTipo)->flatten(1)->count();
+$totaleAttivi = collect($dispositiviByTipo)->flatten(1)->where('is_attivo', true)->count();
+$puoModificarePv = Auth::user()->can('edit-punto_vendita');
 @endphp
 
 @extends('layouts/layoutMaster')
 
 @section('title', 'Mappa Dispositivi')
 
-@section('vendor-style')
-@vite([
-'resources/assets/vendor/libs/datatables-bs5/datatables.bootstrap5.scss',
-'resources/assets/vendor/libs/datatables-responsive-bs5/responsive.bootstrap5.scss',
-'resources/assets/vendor/libs/datatables-buttons-bs5/buttons.bootstrap5.scss',
-'resources/assets/vendor/libs/flatpickr/flatpickr.scss',
-'resources/assets/vendor/libs/@form-validation/form-validation.scss'
-])
-@endsection
-
-<!-- Vendor Scripts -->
-@section('vendor-script')
-@vite([
-'resources/assets/vendor/libs/moment/moment.js',
-'resources/assets/vendor/libs/flatpickr/flatpickr.js',
-'resources/assets/vendor/libs/@form-validation/popular.js',
-'resources/assets/vendor/libs/@form-validation/bootstrap5.js',
-'resources/assets/vendor/libs/@form-validation/auto-focus.js',
-'resources/assets/vendor/libs/@form-validation/popular.js',
-'resources/assets/vendor/libs/@form-validation/bootstrap5.js',
-'resources/assets/vendor/libs/@form-validation/auto-focus.js',
-'resources/assets/vendor/libs/datatables-bs5/datatables-bootstrap5.js'
-])
-@endsection
-
 @section('pageTitle')
 <div class="d-flex flex-column">
-  <h4 class="mb-1"> 
-    <i class="bx bx-devices"></i> Mappa Dispositivi</h4>
+  <h4 class="mb-1">
+    <i class="bx bx-devices"></i> Mappa dispositivi
+  </h4>
+  <p class="text-muted small mb-0">Panoramica per tipologia · {{ $totaleDispositivi }} dispositivi · {{ $totaleAttivi }} attivi</p>
 </div>
 @endsection
 
 @section('content')
-<style>
-  div.upload button:first-child{
-    display: none !important;
-  }
-
-.bx-chef-hat{
-  --svg: url("data:image/svg+xml,%3csvg width='24' height='24' fill='currentColor' viewBox='0 0 24 24' transform='' xmlns='http://www.w3.org/2000/svg'%3e%3c!--Boxicons v3.0.8 https://boxicons.com %7c License https://docs.boxicons.com/free--%3e%3cpath d='M17.13 5.54C16.33 3.42 14.32 2 12 2S7.67 3.42 6.87 5.54A5.506 5.506 0 0 0 2 11c0 2.07 1.18 3.95 3 4.88V18c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-2.12c1.82-.93 3-2.81 3-4.88 0-2.82-2.13-5.15-4.87-5.46m.53 8.75c-.4.14-.67.52-.67.94v1.78H7v-1.78c0-.42-.27-.8-.67-.94-1.4-.5-2.33-1.82-2.33-3.28 0-1.93 1.57-3.5 3.42-3.5.04 0 .14.01.18.02.49 0 .9-.31 1-.78.36-1.61 1.76-2.73 3.41-2.73s3.05 1.12 3.41 2.73c.1.47.51.81 1 .78.06 0 .12 0 .09-.01 1.93 0 3.5 1.57 3.5 3.5 0 1.47-.94 2.79-2.33 3.28ZM5 20h14v2H5z'%3e%3c/path%3e%3c/svg%3e");
-}
-
-  .topo-card{
-    border: 1px solid rgba(67, 89, 113, .15);
-    border-radius: 14px;
-    background: linear-gradient(180deg, rgba(255,255,255,.85), rgba(255,255,255,.65));
-    backdrop-filter: blur(8px);
-  }
-
-  .topo-title{
-    font-weight: 700;
-    letter-spacing: .2px;
-  }
-
-  #topologyBoard{
-    min-height: 480px;
-    max-height: 72vh;
-    width: 100%;
-    border-radius: 14px;
-    background:
-      radial-gradient(1200px 420px at 10% 0%, rgba(105,108,255,.10), rgba(105,108,255,0)),
-      radial-gradient(900px 380px at 100% 15%, rgba(3,195,236,.12), rgba(3,195,236,0)),
-      linear-gradient(180deg, rgba(255,255,255,.9), rgba(255,255,255,.65));
-    border: 1px solid rgba(67, 89, 113, .15);
-    overflow: hidden;
-    padding: 14px;
-    overflow: auto;
-  }
-
-  .topo-board-grid{
-    display: grid;
-    gap: 12px;
-    grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
-    align-items: start;
-  }
-
-  .topo-group{
-    border-radius: 14px;
-    border: 1px solid rgba(67, 89, 113, .14);
-    background: rgba(255,255,255,.72);
-    box-shadow: 0 10px 30px rgba(17, 24, 39, .06);
-    overflow: hidden;
-  }
-
-  .topo-group-header{
-    padding: 10px 12px;
-    background: linear-gradient(135deg, rgba(105,108,255,.18), rgba(3,195,236,.10));
-    border-bottom: 1px solid rgba(67, 89, 113, .12);
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 10px;
-  }
-
-  .topo-group-title{
-    font-weight: 800;
-    font-size: .95rem;
-    letter-spacing: .2px;
-    color: #25314a;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .topo-group-count{
-    font-size: .75rem;
-    color: rgba(37, 49, 74, .75);
-    background: rgba(255,255,255,.65);
-    border: 1px solid rgba(67, 89, 113, .14);
-    padding: 3px 8px;
-    border-radius: 999px;
-    flex: 0 0 auto;
-  }
-
-  .topo-group-body{
-    padding: 10px 12px 12px;
-  }
+@include('_partials.status')
 
-  .topo-device{
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 10px;
-    padding: 8px 10px;
-    border-radius: 12px;
-    border: 1px solid rgba(67, 89, 113, .12);
-    background: rgba(255,255,255,.86);
-    cursor: pointer;
-    transition: transform .08s ease, box-shadow .08s ease, border-color .08s ease;
-    user-select: none;
+<style>
+  .md-device-card {
+    transition: box-shadow .15s ease, transform .15s ease;
+    height: 100%;
   }
-
-  .topo-device:hover{
+  .md-device-card:hover {
+    box-shadow: 0 8px 24px rgba(67, 89, 113, .12);
     transform: translateY(-1px);
-    box-shadow: 0 10px 22px rgba(17, 24, 39, .08);
-    border-color: rgba(105,108,255,.35);
-  }
-
-  .topo-device + .topo-device{
-    margin-top: 8px;
-  }
-
-  .topo-device-left{
-    min-width: 0;
-  }
-
-  .topo-device-name{
-    font-weight: 800;
-    font-size: .88rem;
-    color: #25314a;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    max-width: 100%;
-  }
-
-  .topo-device-meta{
-    font-size: .76rem;
-    color: rgba(37, 49, 74, .70);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  .topo-pill{
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    padding: 3px 8px;
-    border-radius: 999px;
-    font-size: .74rem;
-    font-weight: 700;
-    border: 1px solid rgba(67, 89, 113, .12);
-    background: rgba(255,255,255,.7);
-    flex: 0 0 auto;
-  }
-
-  .topo-dot{
-    width: 8px;
-    height: 8px;
-    border-radius: 999px;
   }
-
-  .topo-dot--on{ background: #03c3ec; }
-  .topo-dot--off{ background: #ff3e1d; }
-
-  .topo-legend-dot{
-    width: 10px;
-    height: 10px;
-    border-radius: 999px;
-    display: inline-block;
-    margin-right: 8px;
-    box-shadow: 0 0 0 3px rgba(0,0,0,.03);
-  }
-
-  .topo-kpi{
-    border: 1px solid rgba(67, 89, 113, .12);
-    border-radius: 12px;
-    padding: 10px 12px;
-    background: rgba(255,255,255,.7);
-  }
-
-  .topo-act-card{
-    border-radius: 16px;
-    border: 1px solid rgba(67, 89, 113, .14);
-    background: rgba(255,255,255,.78);
-    box-shadow: 0 12px 34px rgba(17, 24, 39, .07);
-    overflow: hidden;
-    grid-column: 1 / -1;
-  }
-
-  .topo-act-header{
-    padding: 14px 16px;
-    background: linear-gradient(120deg, rgba(105,108,255,.20), rgba(255,171,0,.12));
-    border-bottom: 1px solid rgba(67, 89, 113, .12);
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    justify-content: space-between;
-    gap: 10px;
-  }
-
-  .topo-act-title{
-    font-weight: 800;
-    font-size: 1.05rem;
-    color: #25314a;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-  }
-
-  .topo-act-body{
-    padding: 14px 16px 16px;
-    display: grid;
-    gap: 14px;
-  }
-
-  @media (min-width: 992px) {
-    .topo-act-body{
-      grid-template-columns: 1fr 1fr;
-      align-items: start;
-    }
-  }
-
-  .topo-section{
-    border: 1px dashed rgba(67, 89, 113, .18);
-    border-radius: 12px;
-    padding: 12px;
-    background: rgba(255,255,255,.5);
-  }
-
-  .topo-section-title{
-    font-size: .72rem;
-    font-weight: 800;
-    text-transform: uppercase;
-    letter-spacing: .06em;
-    color: rgba(37, 49, 74, .62);
-    margin-bottom: 10px;
-    display: flex;
-    align-items: center;
-    gap: 6px;
-  }
-
-  .topo-cucina-block{
-    border-radius: 12px;
-    border: 1px solid rgba(67, 89, 113, .12);
-    background: rgba(255,255,255,.88);
-    padding: 10px 10px 8px;
-    margin-bottom: 10px;
-  }
-
-  .topo-cucina-block:last-child{ margin-bottom: 0; }
-
-  .topo-cucina-name{
-    font-weight: 800;
-    font-size: .88rem;
-    color: #25314a;
-    margin-bottom: 8px;
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    flex-wrap: wrap;
-  }
-
-  .topo-arrow{
-    color: rgba(37, 49, 74, .45);
-    font-size: .85rem;
-    margin: 0 2px;
-  }
-
-  .topo-stampante-wrap{
-    padding-left: 8px;
-    border-left: 3px solid rgba(105,108,255,.35);
-    margin-top: 4px;
-  }
-
-  .topo-loc-pill{
-    font-size: .65rem;
-    font-weight: 700;
-    padding: 2px 7px;
-    border-radius: 999px;
-    background: rgba(3,195,236,.14);
-    color: #0b5f6f;
-    border: 1px solid rgba(3,195,236,.25);
+  .md-device-card.is-hidden-by-filter {
+    display: none !important;
   }
-
-  .topo-board-grid--activities{
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
+  .md-tab-empty {
+    border: 1px dashed rgba(67, 89, 113, .25);
+    border-radius: .75rem;
+    padding: 2.5rem 1rem;
+    text-align: center;
+    color: var(--bs-secondary-color);
   }
 </style>
 
-@include('_partials.status')
-
-@php
-  /** @var array<int, array<string, mixed>> $topologyByAttivita */
-  $topologyByAttivita = $topologyByAttivita ?? [];
-@endphp
+<div class="card mb-4">
+  <div class="card-body">
+    <div class="row g-3 align-items-end">
+      <div class="col-md-4">
+        <label class="form-label small mb-1" for="mdFilterSearch">Cerca</label>
+        <input type="text" class="form-control" id="mdFilterSearch" placeholder="Nome, attività, ubicazione...">
+      </div>
+      <div class="col-md-3">
+        <label class="form-label small mb-1" for="mdFilterAttivita">Attività</label>
+        <select class="form-select" id="mdFilterAttivita">
+          <option value="all">Tutte</option>
+          @foreach($attivitaList as $att)
+            <option value="{{ $att->id }}">{{ $att->nome }}</option>
+          @endforeach
+          <option value="0">Senza attività</option>
+        </select>
+      </div>
+      <div class="col-md-3">
+        <label class="form-label small mb-1" for="mdFilterStato">Stato</label>
+        <select class="form-select" id="mdFilterStato">
+          <option value="all">Tutti</option>
+          <option value="1">Solo attivi</option>
+          <option value="0">Solo non attivi</option>
+        </select>
+      </div>
+      <div class="col-md-2">
+        <button type="button" class="btn btn-outline-secondary w-100" id="mdFilterReset">
+          <i class="bx bx-refresh me-1"></i> Reset
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
 
-<div class="row g-4 mt-2">
-  <div class="col-12">
-    <div class="topo-card p-3 p-md-4">
-      <div class="d-flex flex-wrap justify-content-between align-items-center gap-2 mb-3">
-        <div>
-          <div class="topo-title fs-5">
-            <i class="bx bx-git-repo-forked me-1"></i> Topografica (per attività)
-          </div>
-          <div class="text-muted small">
-            Bozza: ogni <strong>attività</strong> mostra i dispositivi di punto vendita (cassa / kiosk / cameriere), le <strong>cucine</strong> con la stampante collegata, e gli altri dispositivi. Il <span class="topo-loc-pill d-inline-block">luogo</span> è l’<code>ubicazione</code> del dispositivo, se presente.
+<div class="nav-align-top">
+  <ul class="nav nav-tabs nav-fill flex-nowrap overflow-auto" role="tablist">
+    @foreach($tipiDispositivo as $tipoKey => $tipoMeta)
+      @php
+        $countTipo = count($dispositiviByTipo[$tipoKey] ?? []);
+      @endphp
+      <li class="nav-item" role="presentation">
+        <button
+          type="button"
+          class="nav-link {{ $loop->first ? 'active' : '' }}"
+          role="tab"
+          data-bs-toggle="tab"
+          data-bs-target="#md-tab-{{ $tipoKey }}"
+          aria-controls="md-tab-{{ $tipoKey }}"
+          aria-selected="{{ $loop->first ? 'true' : 'false' }}"
+        >
+          <i class="{{ $tipoMeta['icon'] ?? 'bx bx-devices' }} me-1"></i>
+          {{ $tipoMeta['label'] }}
+          <span class="badge bg-label-primary ms-1 md-tab-count" data-tipo="{{ $tipoKey }}">{{ $countTipo }}</span>
+        </button>
+      </li>
+    @endforeach
+    @if(!empty($dispositiviByTipo['_altro']))
+      <li class="nav-item" role="presentation">
+        <button
+          type="button"
+          class="nav-link"
+          role="tab"
+          data-bs-toggle="tab"
+          data-bs-target="#md-tab-altro"
+          aria-controls="md-tab-altro"
+          aria-selected="false"
+        >
+          <i class="bx bx-question-mark me-1"></i>
+          Altro
+          <span class="badge bg-label-secondary ms-1 md-tab-count" data-tipo="_altro">{{ count($dispositiviByTipo['_altro']) }}</span>
+        </button>
+      </li>
+    @endif
+  </ul>
+
+  <div class="tab-content border border-top-0 rounded-bottom p-3 p-md-4 bg-body">
+    @foreach($tipiDispositivo as $tipoKey => $tipoMeta)
+      @php $devices = $dispositiviByTipo[$tipoKey] ?? []; @endphp
+      <div
+        class="tab-pane fade {{ $loop->first ? 'show active' : '' }}"
+        id="md-tab-{{ $tipoKey }}"
+        role="tabpanel"
+      >
+        @if(count($devices))
+          <div class="row g-3 md-device-grid" data-tipo-pane="{{ $tipoKey }}">
+            @foreach($devices as $device)
+              @include('mappa_dispositivi._partials.device_card', [
+                'device' => $device,
+                'tipoMeta' => $tipoMeta,
+                'puoModificarePv' => $puoModificarePv,
+              ])
+            @endforeach
           </div>
-        </div>
-        <div class="d-flex flex-wrap align-items-center gap-2">
-          <div class="topo-kpi">
-            <div class="text-muted small">Attività in vista</div>
-            <div class="fw-bold" id="kpiActivities">-</div>
+          <div class="md-tab-empty d-none" data-empty-for="{{ $tipoKey }}">
+            <i class="bx bx-filter-alt fs-2 d-block mb-2"></i>
+            Nessun dispositivo corrisponde ai filtri.
           </div>
-          <div class="topo-kpi">
-            <div class="text-muted small">Dispositivi in vista</div>
-            <div class="fw-bold" id="kpiDevices">-</div>
+        @else
+          <div class="md-tab-empty">
+            <i class="{{ $tipoMeta['icon'] ?? 'bx bx-devices' }} fs-2 d-block mb-2"></i>
+            Nessun dispositivo di tipo {{ strtolower($tipoMeta['label']) }}.
           </div>
-          <button type="button" class="btn btn-sm btn-outline-primary" id="btnTopoFit">
-            <i class="bx bx-fullscreen me-1"></i> Fit
-          </button>
-          <button type="button" class="btn btn-sm btn-outline-secondary" id="btnTopoReset">
-            <i class="bx bx-refresh me-1"></i> Reset filtri
-          </button>
-        </div>
+        @endif
       </div>
-
-      <div class="row g-3">
-        <div class="col-12 col-xl-3">
-          <div class="card shadow-none border">
-            <div class="card-body">
-              <div class="fw-semibold mb-2">Filtri</div>
-
-              <label class="form-label mb-1 small">Attività</label>
-              <select class="form-select mb-3" id="filterAttivita"></select>
-
-              <label class="form-label mb-1 small">Stato</label>
-              <select class="form-select mb-3" id="filterAttivo">
-                <option value="all">Tutti</option>
-                <option value="1">Attivi</option>
-                <option value="0">Non attivi</option>
-              </select>
-
-              <label class="form-label mb-1 small">Cerca</label>
-              <input type="text" class="form-control mb-3" id="filterSearch" placeholder="Attività, cucina o dispositivo..." />
-
-              <div class="fw-semibold mb-2">Legenda</div>
-              <div class="d-flex flex-column gap-2 small">
-                <div><span class="topo-legend-dot" style="background:#03c3ec"></span> Attivo</div>
-                <div><span class="topo-legend-dot" style="background:#ff3e1d"></span> Non attivo</div>
-                <div><span class="topo-legend-dot" style="background:#696cff"></span> Sezione / collegamento</div>
-              </div>
-
-              <hr class="my-3" />
-              <div class="text-muted small">
-                Tip: click su un dispositivo per il riepilogo in basso.
-              </div>
-            </div>
-          </div>
+    @endforeach
+
+    @if(!empty($dispositiviByTipo['_altro']))
+      <div class="tab-pane fade" id="md-tab-altro" role="tabpanel">
+        <div class="row g-3 md-device-grid" data-tipo-pane="_altro">
+          @foreach($dispositiviByTipo['_altro'] as $device)
+            @include('mappa_dispositivi._partials.device_card', [
+              'device' => $device,
+              'tipoMeta' => ['label' => $device['tipo'] ?? 'Sconosciuto', 'icon' => 'bx bx-devices'],
+              'puoModificarePv' => $puoModificarePv,
+            ])
+          @endforeach
         </div>
-
-        <div class="col-12 col-xl-9">
-          <div id="topologyBoard">
-            <div class="topo-board-grid--activities" id="topologyBoardGrid"></div>
-          </div>
-          <div class="text-muted small mt-2" id="topologyHint"></div>
+        <div class="md-tab-empty d-none" data-empty-for="_altro">
+          <i class="bx bx-filter-alt fs-2 d-block mb-2"></i>
+          Nessun dispositivo corrisponde ai filtri.
         </div>
       </div>
-    </div>
-  </div>
-</div>
-
-<div class="row justify-content-center" style="display: none;">
-  <div class="col-xxl mb-4 mt-2">
-    <div class="card">
-      <div class="card-body">
-        {{ $dataTable_dispositivo->table(['class' => 'table table-bordered']) }}
-      </div>
-    </div>
+    @endif
   </div>
 </div>
-
-
-
-
 @endsection
 
 @section('page-script')
-
-{{$dataTable_dispositivo->scripts(attributes: ['type' => 'module'])}}
-
 <script type="module">
-  const TOPO_BY_ATTIVITA = @json($topologyByAttivita);
-
-  const elBoardGrid = document.getElementById('topologyBoardGrid');
-  const elHint = document.getElementById('topologyHint');
-  const elKpiActivities = document.getElementById('kpiActivities');
-  const elKpiDevices = document.getElementById('kpiDevices');
-
-  const elAttivita = document.getElementById('filterAttivita');
-  const elAttivo = document.getElementById('filterAttivo');
-  const elSearch = document.getElementById('filterSearch');
-
-  const btnFit = document.getElementById('btnTopoFit');
-  const btnReset = document.getElementById('btnTopoReset');
-
-  function esc(s){
-    return (s ?? '').toString()
-      .replaceAll('&', '&amp;')
-      .replaceAll('<', '&lt;')
-      .replaceAll('>', '&gt;')
-      .replaceAll('"', '&quot;')
-      .replaceAll("'", '&#039;');
-  }
+  const cards = Array.from(document.querySelectorAll('.md-device-card'));
+  const elSearch = document.getElementById('mdFilterSearch');
+  const elAttivita = document.getElementById('mdFilterAttivita');
+  const elStato = document.getElementById('mdFilterStato');
+  const btnReset = document.getElementById('mdFilterReset');
+  let searchTimer;
 
-  function locPill(ubicazione){
-    const u = (ubicazione ?? '').toString().trim();
-    if (!u.length) return '';
-    return `<span class="topo-loc-pill" title="Ubicazione">${esc(u)}</span>`;
+  function normalize(value) {
+    return (value ?? '').toString().trim().toLowerCase();
   }
 
-  function deviceMatchesFilter(d){
-    const attivo = (!!d.is_attivo) ? '1' : '0';
-    if (elAttivo.value !== 'all' && elAttivo.value !== attivo) return false;
-    return true;
-  }
-
-  function deviceRowHtml(d){
-    const isOn = !!d.is_attivo;
-    const name = d.nome ?? `Dispositivo #${d.id}`;
-    const tipo = (d.tipo ?? 'ND').toString();
-    const ip = (d.ip ?? '').toString().trim();
-    const ub = d.ubicazione ?? '';
-    return `
-      <div class="topo-device" data-device-id="${esc(d.id)}" data-device-name="${esc(name)}" data-device-tipo="${esc(tipo)}" data-device-ubicazione="${esc(ub)}" data-device-attivo="${isOn ? 1 : 0}">
-        <div class="topo-device-left">
-          <div class="topo-device-name">${esc(name)} ${locPill(ub)}</div>
-          <div class="topo-device-meta">${esc(tipo)} • ID ${esc(d.id)}${ip.length ? ` • IP ${esc(ip)}` : ''}</div>
-        </div>
-        <div class="topo-pill">
-          <span class="topo-dot ${isOn ? 'topo-dot--on' : 'topo-dot--off'}"></span>
-          ${isOn ? 'Attivo' : 'Non attivo'}
-        </div>
-      </div>
-    `;
-  }
+  function cardMatches(card) {
+    const q = normalize(elSearch.value);
+    const attivita = elAttivita.value;
+    const stato = elStato.value;
 
-  function filterDeviceList(list){
-    return (list ?? []).filter(deviceMatchesFilter);
-  }
-
-  function activityMatchesSearch(act, q){
-    if (!q.length) return true;
-    const n = (act.nome ?? '').toString().toLowerCase();
-    if (n.includes(q)) return true;
-    for (const d of act.punti_vendita ?? []) {
-      if ((d.nome ?? '').toString().toLowerCase().includes(q)) return true;
+    if (attivita !== 'all' && card.dataset.attivitaId !== attivita) {
+      return false;
     }
-    for (const d of act.altri ?? []) {
-      if ((d.nome ?? '').toString().toLowerCase().includes(q)) return true;
+    if (stato !== 'all' && card.dataset.attivo !== stato) {
+      return false;
     }
-    for (const c of act.cucine ?? []) {
-      if ((c.nome ?? '').toString().toLowerCase().includes(q)) return true;
-      const st = c.stampante;
-      if (st && (st.nome ?? '').toString().toLowerCase().includes(q)) return true;
+    if (q.length && !normalize(card.dataset.search).includes(q)) {
+      return false;
     }
-    return false;
+    return true;
   }
 
-  function fillAttivitaSelect(){
-    elAttivita.innerHTML = '';
-    const optAll = document.createElement('option');
-    optAll.value = 'all';
-    optAll.textContent = 'Tutte le attività';
-    elAttivita.appendChild(optAll);
-    TOPO_BY_ATTIVITA.forEach(a => {
-      const opt = document.createElement('option');
-      opt.value = String(a.id);
-      opt.textContent = a.nome ?? `Attività #${a.id}`;
-      elAttivita.appendChild(opt);
+  function updateTabCounts() {
+    document.querySelectorAll('.md-tab-count').forEach(function(badge) {
+      const tipo = badge.dataset.tipo;
+      const visible = cards.filter(function(card) {
+        return card.dataset.tipo === tipo && !card.classList.contains('is-hidden-by-filter');
+      }).length;
+      badge.textContent = String(visible);
     });
   }
 
-  function renderBoard(){
-    const q = (elSearch.value ?? '').toString().trim().toLowerCase();
-    const attId = elAttivita.value;
-
-    let acts = TOPO_BY_ATTIVITA.filter(a => activityMatchesSearch(a, q));
-    if (attId !== 'all') {
-      acts = acts.filter(a => String(a.id) === attId);
-    }
-
-    let totalDevices = 0;
-    const html = acts.map(act => {
-      const pv = filterDeviceList(act.punti_vendita);
-      const alt = filterDeviceList(act.altri);
-      let cucineHtml = '';
-      let stampantiVisibili = 0;
-
-      for (const c of act.cucine ?? []) {
-        if (q.length) {
-          const cname = (c.nome ?? '').toLowerCase();
-          const st = c.stampante;
-          const sn = st ? (st.nome ?? '').toLowerCase() : '';
-          const hitAct = (act.nome ?? '').toLowerCase().includes(q);
-          if (!hitAct && !cname.includes(q) && !sn.includes(q)) continue;
-        }
-
-        const st = c.stampante;
-        const stOk = st && deviceMatchesFilter(st);
-        if (stOk) stampantiVisibili += 1;
-
-        const stBlock = st
-          ? (stOk
-            ? `<div class="topo-stampante-wrap">${deviceRowHtml(st)}</div>`
-            : `<div class="topo-stampante-wrap text-muted small">Stampante presente ma filtrata dal campo stato.</div>`)
-          : `<div class="topo-stampante-wrap text-muted small fst-italic">Nessuna stampante collegata</div>`;
-
-        cucineHtml += `
-          <div class="topo-cucina-block">
-            <div class="topo-cucina-name">
-              <i class="bx bx-restaurant"></i> ${esc(c.nome ?? `Cucina #${c.id}`)}
-            </div>
-            <div class="d-flex align-items-center flex-wrap gap-1 small text-muted mb-1">
-              <span>Cucina</span><span class="topo-arrow">→</span><span>Stampante</span>
-            </div>
-            ${stBlock}
-          </div>
-        `;
-      }
-
-      const pvHtml = pv.length ? pv.map(deviceRowHtml).join('') : `<div class="text-muted small">Nessun dispositivo di punto vendita</div>`;
-      const altHtml = alt.length ? alt.map(deviceRowHtml).join('') : `<div class="text-muted small">Nessun altro dispositivo</div>`;
-      if (!cucineHtml.length) {
-        cucineHtml = `<div class="text-muted small">Nessuna cucina per questa attività (o nessun risultato per la ricerca)</div>`;
+  function updateEmptyStates() {
+    document.querySelectorAll('[data-tipo-pane]').forEach(function(grid) {
+      const tipo = grid.dataset.tipoPane;
+      const visible = grid.querySelectorAll('.md-device-card:not(.is-hidden-by-filter)').length;
+      const emptyEl = document.querySelector('[data-empty-for="' + tipo + '"]');
+      if (emptyEl) {
+        emptyEl.classList.toggle('d-none', visible > 0);
       }
-
-      const visibleDevCount = pv.length + alt.length + stampantiVisibili;
-      totalDevices += visibleDevCount;
-
-      return `
-        <article class="topo-act-card">
-          <header class="topo-act-header">
-            <div class="topo-act-title">
-              <i class="bx bx-category-alt"></i>
-              <span>${esc(act.nome ?? `Attività #${act.id}`)}</span>
-            </div>
-            <div class="topo-group-count">${visibleDevCount} in vista</div>
-          </header>
-          <div class="topo-act-body">
-            <section class="topo-section">
-              <div class="topo-section-title"><i class="bx bx-credit-card"></i> Punto vendita</div>
-              ${pvHtml}
-            </section>
-            <section class="topo-section">
-              <div class="topo-section-title"><i class="bx bx-dish"></i> Cucine e stampanti</div>
-              ${cucineHtml}
-            </section>
-            <section class="topo-section" style="grid-column: 1 / -1;">
-              <div class="topo-section-title"><i class="bx bx-devices"></i> Altri dispositivi (monitor, stampanti in elenco, …)</div>
-              ${altHtml}
-            </section>
-          </div>
-        </article>
-      `;
-    }).join('');
-
-    elBoardGrid.innerHTML = html || `<div class="text-muted p-3">Nessuna attività coincide con i filtri.</div>`;
-    elKpiActivities.textContent = String(acts.length);
-    elKpiDevices.textContent = String(totalDevices);
-    elHint.textContent = acts.length
-      ? `${acts.length} attività in vista · circa ${totalDevices} righe dispositivo (cucine contano la stampante se mostrata).`
-      : 'Nessun risultato.';
+      grid.classList.toggle('d-none', visible === 0 && grid.children.length > 0);
+    });
   }
 
-  function resetFilters(){
-    elAttivita.value = 'all';
-    elAttivo.value = 'all';
-    elSearch.value = '';
-    renderBoard();
+  function applyFilters() {
+    cards.forEach(function(card) {
+      card.classList.toggle('is-hidden-by-filter', !cardMatches(card));
+    });
+    updateTabCounts();
+    updateEmptyStates();
   }
 
-  fillAttivitaSelect();
-  [elAttivita, elAttivo].forEach(el => el.addEventListener('change', renderBoard));
-  elSearch.addEventListener('input', () => {
-    window.clearTimeout(window.__topoSearchT);
-    window.__topoSearchT = window.setTimeout(renderBoard, 120);
-  });
-
-  btnFit.addEventListener('click', () => {
-    document.getElementById('topologyBoard')?.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+  elAttivita.addEventListener('change', applyFilters);
+  elStato.addEventListener('change', applyFilters);
+  elSearch.addEventListener('input', function() {
+    clearTimeout(searchTimer);
+    searchTimer = setTimeout(applyFilters, 150);
   });
-  btnReset.addEventListener('click', resetFilters);
-
-  document.addEventListener('click', (e) => {
-    const el = e.target?.closest?.('.topo-device');
-    if (!el) return;
-    const id = el.getAttribute('data-device-id');
-    const name = el.getAttribute('data-device-name');
-    const tipo = el.getAttribute('data-device-tipo');
-    const ubicazione = el.getAttribute('data-device-ubicazione');
-    const stato = el.getAttribute('data-device-attivo') === '1' ? 'Attivo' : 'Non attivo';
-    const loc = (ubicazione ?? '').toString().trim();
-    elHint.textContent = `Selezionato: ${name} (ID ${id}) • ${tipo} • ${stato}${loc.length ? ` • Luogo: ${loc}` : ''}`;
-  });
-
-  renderBoard();
-</script>
-
-
-<script type="module">
-  $(document).ready(function(){
-    // Editor edit
-    $("#dataTable_dispositivo").on('click', 'a.editor_edit', function (e) {
-      e.preventDefault();
-      window.LaravelDataTables["dataTable_dispositivo-editor"].edit( $(this).closest('tr'), {
-        title: 'Modifica',
-        buttons: 'Aggiorna',
-      });
-    });
-
-    // Editor delete
-    $("#dataTable_dispositivo").on('click', 'a.editor_delete', function (e) {
-      e.preventDefault();
-      window.LaravelDataTables["dataTable_dispositivo-editor"].remove($(this).closest('tr'), {
-        title: 'Cancella record',
-        message: 'Sei sicuro di voler eliminare il record selezionato?',
-        buttons: 'Cancella record'
-      });
-    } );
-
-    $("#dataTable_dispositivo").on('dblclick', 'tbody td', function (e) {
-      window.LaravelDataTables["dataTable_dispositivo-editor"].edit( $(this).closest('tr'), {
-        title: 'Modifica',
-        buttons: 'Aggiorna',
-      });
-    });
-
+  btnReset.addEventListener('click', function() {
+    elSearch.value = '';
+    elAttivita.value = 'all';
+    elStato.value = 'all';
+    applyFilters();
   });
-
-</script>
-
-<script>
-  function initComplete_dispositivo(){
-    $('div.dt-buttons button').removeClass('btn-secondary');
-    $('div.dt-search').addClass('mt-0 mb-4');
-  }
-
-
 </script>
 @endsection

resources/views/pagamento/menu.blade.php

@@ -1,7 +1,7 @@
 <?php
 use Illuminate\Support\Facades\Auth;
 ?>
-
+@if(Auth::user()->can('edit-pagamento') || Auth::user()->can('delete-pagamento'))
 <div class="dropdown">
     <button type="button" class="btn p-0 dropdown-toggle hide-arrow" data-bs-toggle="dropdown" aria-expanded="false">
         <i class="bx bx-dots-vertical-rounded fs-large"></i>
@@ -21,3 +21,4 @@ use Illuminate\Support\Facades\Auth;
         @endif
     </div>
 </div>
+@endif

resources/views/prima_nota/_partials/statistiche.blade.php

@@ -1,5 +1,4 @@
 <div class="row">
-  <!-- esempio di card statistica -->
   <div class="col-12 mb-6">
     <div class="card">
       <div class="card-widget-separator-wrapper">
@@ -8,8 +7,8 @@
             <div class="col-sm-6 col-lg-3">
               <div class="d-flex justify-content-between align-items-center card-widget-1 border-end pb-4 pb-sm-0">
                 <div>
-                  <h4 class="mb-0">{{ $statistiche['totale_operazioni'] ?? '—' }}</h4>
-                  <p class="mb-0">Operazioni totali</p>
+                  <h4 class="mb-0" id="stat_totale_operazioni">{{ $statistiche['totale_operazioni'] ?? '—' }}</h4>
+                  <p class="mb-0">Operazioni</p>
                 </div>
                 <div class="avatar me-sm-6">
                   <span class="avatar-initial rounded bg-label-secondary text-heading">
@@ -22,8 +21,8 @@
             <div class="col-sm-6 col-lg-3">
               <div class="d-flex justify-content-between align-items-center card-widget-2 border-end pb-4 pb-sm-0">
                 <div>
-                  <h4 class="mb-0">{{ number_format($statistiche['importo_entrate'] ?? 0, 2, ',', '.') }} €</h4>
-                  <p class="mb-0">Entrate odierne</p>
+                  <h4 class="mb-0" id="stat_importo_entrate">{{ number_format($statistiche['importo_entrate'] ?? 0, 2, ',', '.') }} €</h4>
+                  <p class="mb-0">Entrate</p>
                 </div>
                 <div class="avatar me-lg-6">
                   <span class="avatar-initial rounded bg-label-secondary text-success">
@@ -36,8 +35,8 @@
             <div class="col-sm-6 col-lg-3">
               <div class="d-flex justify-content-between align-items-center card-widget-3 border-end pb-4 pb-sm-0">
                 <div>
-                  <h4 class="mb-0">{{ number_format($statistiche['importo_uscite'] ?? 0, 2, ',', '.') }} €</h4>
-                  <p class="mb-0">Uscite odierne</p>
+                  <h4 class="mb-0" id="stat_importo_uscite">{{ number_format($statistiche['importo_uscite'] ?? 0, 2, ',', '.') }} €</h4>
+                  <p class="mb-0">Uscite</p>
                 </div>
                 <div class="avatar me-lg-6">
                   <span class="avatar-initial rounded bg-label-secondary text-danger">
@@ -50,8 +49,8 @@
             <div class="col-sm-6 col-lg-3">
               <div class="d-flex justify-content-between align-items-center card-widget-4 pb-4 pb-sm-0">
                 <div>
-                  <h4 class="mb-0">{{ number_format($statistiche['saldo'] ?? 0, 2, ',', '.') }} €</h4>
-                  <p class="mb-0">Saldo odierno</p>
+                  <h4 class="mb-0" id="stat_saldo">{{ number_format($statistiche['saldo'] ?? 0, 2, ',', '.') }} €</h4>
+                  <p class="mb-0">Saldo</p>
                 </div>
                 <div class="avatar me-lg-6">
                   <span class="avatar-initial rounded bg-label-secondary text-info">
@@ -62,7 +61,7 @@
             </div>
           </div>
         </div>
-      </div>  
+      </div>
     </div>
   </div>
-</div>
+</div>

resources/views/prima_nota/index.blade.php

@@ -41,7 +41,7 @@ use Illuminate\Support\Facades\Auth;
             <ol class="breadcrumb breadcrumb-custom-icon">
       
               <li class="breadcrumb-item">
-                <a href="#">Configurazioni</a>
+                <a href="#">Contabilità</a>
                 <i class="breadcrumb-icon icon-base bx bx-chevron-right align-middle"></i>
               </li>
               <li class="breadcrumb-item active text-primary">
@@ -73,36 +73,46 @@ use Illuminate\Support\Facades\Auth;
       <div class="card-body">
 
       <div class=" mb-4">
-    <form class="dt_adv_search" method="GET">
+    <form id="filtri_prima_nota" class="dt_adv_search" method="GET">
       <div class="row">
         <div class="col-12">
-          <div class="row g-3">
+          <div class="row g-3 align-items-end">
             <div class="col-12 col-sm-3 col-lg-3">
-              <label class="form-label">Data inizio</label>
-              <input type="date" class="form-control dt-input flatpickr-range" data-column=1 placeholder="YYYY-MM-DD" data-column-index="0">
+              <label class="form-label" for="filtro_data_inizio">Data inizio</label>
+              <input type="date" id="filtro_data_inizio" name="data_inizio" class="form-control">
             </div>
             <div class="col-12 col-sm-3 col-lg-3">
-              <label class="form-label">Data fine</label>
-              <input type="date" class="form-control dt-input flatpickr-range" data-column=2 placeholder="YYYY-MM-DD" data-column-index="1">
+              <label class="form-label" for="filtro_data_fine">Data fine</label>
+              <input type="date" id="filtro_data_fine" name="data_fine" class="form-control">
             </div>
             <div class="col-12 col-sm-3 col-lg-3">
-              <label class="form-label">Categoria contabile</label>
-              <select name="categoria_contabile_id" id="categoria_contabile_id" class="form-control dt-input form-select" data-column=3 data-column-index="2">
-                <option value="">Seleziona categoria contabile</option>
-                @foreach(\App\Models\Categoriacontabile::where('is_attiva', true)->get() as $categoria)
+              <label class="form-label" for="categoria_contabile_id">Categoria contabile</label>
+              <select name="categoria_contabile_id" id="categoria_contabile_id" class="form-control form-select">
+                <option value="">Tutte le categorie</option>
+                @foreach($categorie as $categoria)
                   <option value="{{ $categoria->id }}">{{ $categoria->nome }}</option>
                 @endforeach
               </select>
             </div>
-            <div class="col-12 col-sm-3 col-lg-3">
-              <label class="form-label">Tipo movimento</label>
-              <select name="tipo_movimento" id="tipo_movimento" class="form-control dt-input form-select" data-column=4 data-column-index="3">
-                <option value="">Seleziona tipo movimento</option>
+            <div class="col-12 col-sm-2 col-lg-2">
+              <label class="form-label" for="tipo_movimento">Tipo movimento</label>
+              <select name="tipo_movimento" id="tipo_movimento" class="form-control form-select">
+                <option value="">Tutti i tipi</option>
                 @foreach(\App\Models\PrimaNota::getTipiMovimento() as $tipo)
                   <option value="{{ $tipo['value'] }}">{{ $tipo['label'] }}</option>
                 @endforeach
               </select>
             </div>
+            <div class="col-12 col-sm-auto">
+              <button
+                type="button"
+                id="btn_reset_filtri_prima_nota"
+                class="btn btn-icon btn-outline-secondary"
+                title="Azzera filtri"
+                aria-label="Azzera filtri">
+                <i class="bx bx-revision"></i>
+              </button>
+            </div>
             
           </div>
         </div>
@@ -156,6 +166,27 @@ use Illuminate\Support\Facades\Auth;
 
 
 <script type="module">
+  function formatEuroImporto(value) {
+    return new Intl.NumberFormat('it-IT', {
+      minimumFractionDigits: 2,
+      maximumFractionDigits: 2,
+    }).format(Number(value) || 0) + ' €';
+  }
+
+  function aggiornaStatistichePrimaNota() {
+    $.get('{{ route('prima-nota.statistiche') }}', {
+      data_inizio: $('#filtro_data_inizio').val(),
+      data_fine: $('#filtro_data_fine').val(),
+      categoria_contabile_id: $('#categoria_contabile_id').val(),
+      tipo_movimento: $('#tipo_movimento').val(),
+    }).done(function (data) {
+      $('#stat_totale_operazioni').text(data.totale_operazioni ?? 0);
+      $('#stat_importo_entrate').text(formatEuroImporto(data.importo_entrate));
+      $('#stat_importo_uscite').text(formatEuroImporto(data.importo_uscite));
+      $('#stat_saldo').text(formatEuroImporto(data.saldo));
+    });
+  }
+
   $(document).ready(function(){
     // Editor edit
     $("#dataTable_primanota").on('click', 'a.editor_edit', function (e) {
@@ -183,6 +214,17 @@ use Illuminate\Support\Facades\Auth;
       });
     });
 
+    $('#filtri_prima_nota').on('change', 'input, select', function () {
+      window.LaravelDataTables['dataTable_primanota'].draw();
+    });
+
+    $('#btn_reset_filtri_prima_nota').on('click', function () {
+      $('#filtri_prima_nota')[0].reset();
+      window.LaravelDataTables['dataTable_primanota'].draw();
+    });
+
+    $('#dataTable_primanota').on('draw.dt', aggiornaStatistichePrimaNota);
+
   });
 
 </script>

resources/views/punto_operatore/show.blade.php

@@ -104,7 +104,7 @@ $configData = Helper::appClasses();
         <p class="text-muted mb-3">
           Seleziona una riga ordine pronta e premi "Chiama".
         </p>
-        <div id="lista-da-chiamare" class="d-grid gap-2"></div>
+        <div id="lista-da-chiamare" class="d-grid gap-2 overflow-y-auto"></div>
       </div>
     </div>
   </div>
@@ -122,7 +122,7 @@ $configData = Helper::appClasses();
         <p class="text-muted mb-3">
           Quando il cliente ritira, premi "Ritirato".
         </p>
-        <div id="lista-chiamati" class="d-grid gap-2"></div>
+        <div id="lista-chiamati" class="d-grid gap-2 overflow-y-auto"></div>
       </div>
     </div>
   </div>
@@ -166,17 +166,27 @@ $configData = Helper::appClasses();
     righeDaChiamare.forEach((riga) => {
       container.append(`
         <div class="border rounded p-3">
-          <div class="d-flex justify-content-between align-items-start">
-            <div>
-              <div class="fw-semibold">Ordine #${riga.ordine_id}</div>
-              <div>${riga.quantita} x ${riga.piatto}</div>
-              <small class="text-muted">Riga #${riga.id} - stato: ${riga.stato}</small>
+          <div class="row align-items-center gx-2">
+            <!-- Colonna 1: ID ordine -->
+            <div class="col-auto fw-semibold text-nowrap" style="min-width: 90px;">
+             <span class="text-muted text-small d-none">Ordine</span> <span class="text-secondary fs-4">#${riga.ordine_id}</span>
+            </div>
+            <!-- Colonna 2: Quantità x Piatto (colonna più larga) -->
+            <div class="col flex-grow-1">
+              <span class="fs-large text-primary">${riga.quantita} x ${riga.piatto}</span>
+              <div>
+                <small class="text-muted">Riga #${riga.id} - stato: ${riga.stato}</small>
+              </div>
+            </div>
+            <!-- Colonna 3: Bottone Chiama -->
+            <div class="col-auto">
+              <button type="button" class="btn btn-sm btn-primary" onclick="chiamaRiga(${riga.id})">
+                Chiama
+              </button>
             </div>
-            <button type="button" class="btn btn-sm btn-primary" onclick="chiamaRiga(${riga.id})">
-              Chiama
-            </button>
           </div>
         </div>
+   
       `);
     });
   }
@@ -199,17 +209,27 @@ $configData = Helper::appClasses();
     righeChiamate.forEach((riga) => {
       container.append(`
         <div class="border rounded p-3">
-          <div class="d-flex justify-content-between align-items-start">
-            <div>
-              <div class="fw-semibold">Ordine #${riga.ordine_id}</div>
-              <div>${riga.quantita} x ${riga.piatto}</div>
-              <small class="text-muted">Riga #${riga.id} - stato: ${riga.stato}</small>
+          <div class="row align-items-center gx-2">
+            <!-- Colonna 1: ID ordine -->
+            <div class="col-auto fw-semibold text-nowrap" style="min-width: 90px;">
+              <span class="text-muted text-small d-none">Ordine</span> <span class="text-secondary fs-4">#${riga.ordine_id}</span>
+            </div>
+            <!-- Colonna 2: Quantità x Piatto (colonna più larga) -->
+            <div class="col flex-grow-1">
+              <span class="fs-large text-primary">${riga.quantita} x ${riga.piatto}</span>
+              <div>
+                <small class="text-muted">Riga #${riga.id} - stato: ${riga.stato}</small>
+              </div>
+            </div>
+            <!-- Colonna 3: Bottone Ritirato -->
+            <div class="col-auto">
+              <button type="button" class="btn btn-sm btn-success" onclick="ritiraRiga(${riga.id})">
+                Ritirato
+              </button>
             </div>
-            <button type="button" class="btn btn-sm btn-success" onclick="ritiraRiga(${riga.id})">
-              Ritirato
-            </button>
           </div>
         </div>
+   
       `);
     });
   }

resources/views/punto_vendita/cassa/index.blade.php

@@ -286,7 +286,7 @@ $cucine = $cucine ?? collect();
         text: response.message || 'Disassociazione completata',
         timeout: 3000
       }).success(response.message);
-        window.location.href = "{{ route('dashboard') }}";
+        window.location.href = "{{ route('punto-vendita.index') }}";
       },
       error: function(xhr, status, error) {
         new Notyf({

resources/views/punto_vendita/edit.blade.php

@@ -1,13 +1,85 @@
+<?php
+use App\Models\Role;
+use Illuminate\Support\Facades\Auth;
+?>
+@php
+$configData = Helper::appClasses();
+@endphp
+
+@extends('layouts/layoutMaster')
+
+@section('title', 'Punti di vendita')
+
+@section('vendor-style')
+@vite([
+'resources/assets/vendor/libs/datatables-bs5/datatables.bootstrap5.scss',
+'resources/assets/vendor/libs/datatables-responsive-bs5/responsive.bootstrap5.scss',
+'resources/assets/vendor/libs/datatables-buttons-bs5/buttons.bootstrap5.scss',
+'resources/assets/vendor/libs/flatpickr/flatpickr.scss',
+'resources/assets/vendor/libs/@form-validation/form-validation.scss'
+])
+@endsection
+
+<!-- Vendor Scripts -->
+@section('vendor-script')
+@vite([
+'resources/assets/vendor/libs/moment/moment.js',
+'resources/assets/vendor/libs/flatpickr/flatpickr.js',
+'resources/assets/vendor/libs/@form-validation/popular.js',
+'resources/assets/vendor/libs/@form-validation/bootstrap5.js',
+'resources/assets/vendor/libs/@form-validation/auto-focus.js',
+'resources/assets/vendor/libs/@form-validation/popular.js',
+'resources/assets/vendor/libs/@form-validation/bootstrap5.js',
+'resources/assets/vendor/libs/@form-validation/auto-focus.js',
+'resources/assets/vendor/libs/datatables-bs5/datatables-bootstrap5.js'
+])
+@endsection
+
+@section('pageTitle')
+<div class="d-flex flex-column ">
+  <h4 class="mb-1 text-sm-small mt-md-4 mt-lg-4"> 
+    <i class="bx bx-store d-none d-md-inline-flex d-lg-inline-flex"></i> 
+    {{ $puntoVendita->nome }}
+  </h4>
+  <nav aria-label="breadcrumb" style="font-size: smaller;" class="d-none d-md-block d-lg-block">
+            <ol class="breadcrumb breadcrumb-custom-icon">
+      
+              <li class="breadcrumb-item">
+                <a href="{{ route('punto-vendita.index') }}">Punti di vendita</a>
+                <i class="breadcrumb-icon icon-base bx bx-chevron-right align-middle"></i>
+              </li>
+              <li class="breadcrumb-item active text-primary">
+                <a href="{{ route('punto-vendita.edit', ['punto_vendita_id' => $puntoVendita->id]) }}">{{ $puntoVendita->nome }}</a>
+</div>
+@endsection
+
+@section('content')
+
 @php
   $tipiPuntoVendita = \App\Models\Dispositivo::getTipoPuntiVendita();
   $endpointList = \App\Models\Endpoint::query()->orderBy('label')->get();
   $cucineAssociateIds = $puntoVendita->hasCucine->pluck('id')->all();
+  $cucine = $puntoVendita->hasCucine;
+  $tipi = \App\Models\Dispositivo::getTipoDispositivo();
+  $tipoMeta = $tipi->get($puntoVendita->tipo);
+  $stampante = $puntoVendita->url_stampante ? $puntoVendita->stampante_dispositivo() : null;
+  if ($stampante) {
+    $stampante->loadMissing('endpoint');
+  }
+  $puoDissociareDispositivo = Auth::user()->hasRole('superadmin')
+    || Auth::user()->hasRole('amministratore')
+    || Auth::user()->hasRole('administrator');
 @endphp
 
 <div class="nav-align-top">
   <ul class="nav nav-tabs nav-fill" role="tablist">
     <li class="nav-item" role="presentation">
-      <button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#pv-tab-generali" aria-controls="pv-tab-generali" aria-selected="true">
+      <button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#pv-tab-riepilogo" aria-controls="pv-tab-riepilogo" aria-selected="true">
+        <i class="bx bx-list-ul me-1"></i>Riepilogo
+      </button>
+    </li>
+    <li class="nav-item" role="presentation">
+      <button type="button" class="nav-link" role="tab" data-bs-toggle="tab" data-bs-target="#pv-tab-generali" aria-controls="pv-tab-generali" aria-selected="false">
         <i class="bx bx-cog me-1"></i>Generali
       </button>
     </li>
@@ -29,18 +101,269 @@
   </ul>
 
   <div class="tab-content">
-    <div class="tab-pane fade show active" id="pv-tab-generali" role="tabpanel">
+    <div class="tab-pane fade show active" id="pv-tab-riepilogo" role="tabpanel">
+      <div class="row g-4 mt-1">
+        {{-- Sidebar profilo --}}
+        <div class="col-12 col-lg-4 col-xl-3">
+          <div class="card h-100">
+            <div class="card-body text-center pt-4 pb-3">
+              <div class="avatar avatar-xl mx-auto mb-3">
+                <span class="avatar-initial rounded-circle bg-label-primary">
+                  <i class="{{ $tipoMeta['icon'] ?? 'bx bx-store' }} bx-lg"></i>
+                </span>
+              </div>
+              <h5 class="mb-1">{{ $puntoVendita->nome ?? '—' }}</h5>
+              <p class="text-muted small mb-2">ID #{{ $puntoVendita->id }}</p>
+
+              @if($tipoMeta)
+                <span class="badge bg-label-info mb-3">
+                  {{ $tipoMeta['label'] }}
+                </span>
+              @endif
+
+              <ul class="list-unstyled text-start small mb-0">
+                <li class="d-flex justify-content-between py-2 border-bottom">
+                  <span class="text-muted">Stato</span>
+                  @if($puntoVendita->is_attivo)
+                    <span class="badge bg-label-success">Attivo</span>
+                  @else
+                    <span class="badge bg-label-danger">Non attivo</span>
+                  @endif
+                </li>
+                <li class="d-flex justify-content-between py-2 border-bottom">
+                  <span class="text-muted">Abbinamento</span>
+                  @if($puntoVendita->binding_token)
+                    <span class="badge bg-label-success">Abbinato</span>
+                  @else
+                    <span class="badge bg-label-danger">Libero</span>
+                  @endif
+                </li>
+                <li class="d-flex justify-content-between py-2 border-bottom">
+                  <span class="text-muted">Stampante</span>
+                  @if($stampante)
+                    <span class="badge bg-label-info text-truncate ms-2" style="max-width: 9rem;" title="{{ $stampante->nome }}">{{ $stampante->nome }}</span>
+                  @else
+                    <span class="badge bg-label-secondary">Assente</span>
+                  @endif
+                </li>
+                <li class="d-flex justify-content-between py-2">
+                  <span class="text-muted">Cucine</span>
+                  <span class="badge bg-label-primary">{{ $cucine->count() }}</span>
+                </li>
+              </ul>
+            </div>
+            <div class="card-body border-top pt-3 d-grid gap-2">
+              @can('view-punto_vendita')
+              <a href="{{ route('punto-vendita.show', ['punto_vendita_id' => $puntoVendita->id]) }}" class="btn btn-primary btn-sm">
+                <i class="bx bx-log-in me-1"></i> Entra nel punto vendita
+              </a>
+              @endcan
+              <a href="{{ route('punto-vendita.index') }}" class="btn btn-label-secondary btn-sm">
+                <i class="bx bx-arrow-back me-1"></i> Torna all'elenco
+              </a>
+            </div>
+          </div>
+        </div>
+
+        {{-- Contenuto principale --}}
+        <div class="col-12 col-lg-8 col-xl-9">
+          <div class="d-flex flex-wrap gap-2 mb-1">
+            <button type="button" class="btn btn-sm btn-outline-primary" data-pv-go-tab="#pv-tab-generali">
+              <i class="bx bx-cog me-1"></i> Modifica generali
+            </button>
+            <button type="button" class="btn btn-sm btn-outline-primary" data-pv-go-tab="#pv-tab-cucine">
+              <i class="bx bx-restaurant me-1"></i> Gestisci cucine
+            </button>
+            <button type="button" class="btn btn-sm btn-outline-primary" data-pv-go-tab="#pv-tab-stampante">
+              <i class="bx bx-printer me-1"></i> Configura stampante
+            </button>
+          </div>
+
+          <div class="row g-4">
+            {{-- Informazioni generali --}}
+            <div class="col-12">
+              <div class="card">
+                <div class="card-header">
+                  <h5 class="card-title mb-0">
+                    <i class="bx bx-info-circle text-primary me-1"></i>
+                    Informazioni generali
+                  </h5>
+                </div>
+                <div class="card-body">
+                  <div class="row g-4">
+                    <div class="col-md-6">
+                      <dl class="row mb-0">
+                        <dt class="col-sm-5 text-muted">Nome</dt>
+                        <dd class="col-sm-7 fw-medium">{{ $puntoVendita->nome ?? '—' }}</dd>
+                        <dt class="col-sm-5 text-muted">Tipo</dt>
+                        <dd class="col-sm-7">{{ $tipoMeta['label'] ?? $puntoVendita->tipo ?? '—' }}</dd>
+                        <dt class="col-sm-5 text-muted">Ubicazione</dt>
+                        <dd class="col-sm-7">{{ $puntoVendita->ubicazione ?: '—' }}</dd>
+                        <dt class="col-sm-5 text-muted">Attività</dt>
+                        <dd class="col-sm-7">{{ $puntoVendita->attivita?->nome ?? '—' }}</dd>
+                      </dl>
+                    </div>
+                    <div class="col-md-6">
+                      <dl class="row mb-0">
+                        <dt class="col-sm-5 text-muted">Licenza</dt>
+                        <dd class="col-sm-7">{{ $puntoVendita->licenza ?: '—' }}</dd>
+                        <dt class="col-sm-5 text-muted">PIN sblocco</dt>
+                        <dd class="col-sm-7">
+                          @if($puntoVendita->pin_sblocco)
+                            <code>••••</code>
+                            <span class="text-muted small">(configurato)</span>
+                          @else
+                            —
+                          @endif
+                        </dd>
+                        <dt class="col-sm-5 text-muted">Creato il</dt>
+                        <dd class="col-sm-7">{{ $puntoVendita->created_at?->format('d/m/Y H:i') ?? '—' }}</dd>
+                        <dt class="col-sm-5 text-muted">Aggiornato il</dt>
+                        <dd class="col-sm-7">{{ $puntoVendita->updated_at?->format('d/m/Y H:i') ?? '—' }}</dd>
+                      </dl>
+                    </div>
+                  </div>
+                  @if($puntoVendita->note)
+                    <div class="mt-3 pt-3 border-top">
+                      <p class="text-muted small mb-1">Note</p>
+                      <p class="mb-0">{{ $puntoVendita->note }}</p>
+                    </div>
+                  @endif
+                </div>
+              </div>
+            </div>
+
+            {{-- Abbinamento, stampante, orari --}}
+            <div class="col-md-4">
+              <div class="card h-100">
+                <div class="card-header">
+                  <h5 class="card-title mb-0">
+                    <i class="bx bx-link text-primary me-1"></i>
+                    Abbinamento
+                  </h5>
+                </div>
+                <div class="card-body d-flex flex-column">
+                  @if($puntoVendita->binding_token)
+                    <p class="mb-2">
+                      <span class="badge bg-label-success">Dispositivo collegato</span>
+                    </p>
+                    <p class="text-muted small mb-3">Un terminale è associato a questo punto vendita tramite binding token.</p>
+                    @if($puoDissociareDispositivo)
+                      <button type="button" class="btn btn-sm btn-outline-danger mt-auto align-self-start" id="btnDissociaDispositivo">
+                        <i class="bx bx-unlink me-1"></i> Dissocia
+                      </button>
+                    @endif
+                  @else
+                    <p class="mb-2">
+                      <span class="badge bg-label-secondary">Nessun dispositivo</span>
+                    </p>
+                    <p class="text-muted small mb-0">Il punto vendita non risulta abbinato a un dispositivo fisico.</p>
+                  @endif
+                </div>
+              </div>
+            </div>
+
+            <div class="col-md-4">
+              <div class="card h-100">
+                <div class="card-header">
+                  <h5 class="card-title mb-0">
+                    <i class="bx bx-printer text-info me-1"></i>
+                    Stampante
+                  </h5>
+                </div>
+                <div class="card-body">
+                  @if($stampante)
+                    <p class="mb-1 fw-medium">{{ $stampante->nome }}</p>
+                    @if($stampante->endpoint)
+                      <p class="mb-0 text-muted small">
+                        <i class="bx bx-chip me-1"></i>
+                        {{ $stampante->endpoint->label ?? 'Endpoint #' . $stampante->endpoint_id }}
+                      </p>
+                    @endif
+                    @if($stampante->ubicazione)
+                      <p class="mb-0 text-muted small mt-1">
+                        <i class="bx bx-map-pin me-1"></i>{{ $stampante->ubicazione }}
+                      </p>
+                    @endif
+                  @else
+                    <p class="text-muted small mb-2">Nessuna stampante configurata per gli scontrini.</p>
+                    <button type="button" class="btn btn-sm btn-label-info" data-pv-go-tab="#pv-tab-stampante">
+                      Configura ora
+                    </button>
+                  @endif
+                </div>
+              </div>
+            </div>
+
+            <div class="col-md-4">
+              <div class="card h-100">
+                <div class="card-header">
+                  <h5 class="card-title mb-0">
+                    <i class="bx bx-time-five text-warning me-1"></i>
+                    Orari turno
+                  </h5>
+                </div>
+                <div class="card-body">
+                  <dl class="row mb-0 small">
+                    <dt class="col-5 text-muted">Apertura</dt>
+                    <dd class="col-7 mb-2">{{ $puntoVendita->data_apertura_dispositivo?->format('d/m/Y H:i') ?? '—' }}</dd>
+                    <dt class="col-5 text-muted">Chiusura</dt>
+                    <dd class="col-7 mb-0">{{ $puntoVendita->data_chiusura_dispositivo?->format('d/m/Y H:i') ?? '—' }}</dd>
+                  </dl>
+                </div>
+              </div>
+            </div>
+
+            {{-- Cucine --}}
+            <div class="col-12">
+              <div class="card">
+                <div class="card-header d-flex flex-wrap align-items-center justify-content-between gap-2">
+                  <h5 class="card-title mb-0">
+                    <i class="bx bx-restaurant text-primary me-1"></i>
+                    Cucine associate
+                  </h5>
+                  <div class="d-flex align-items-center gap-2">
+                    <span class="badge bg-label-primary">{{ $cucine->count() }}</span>
+                    <button type="button" class="btn btn-sm btn-label-primary" data-pv-go-tab="#pv-tab-cucine">
+                      Modifica
+                    </button>
+                  </div>
+                </div>
+                <div class="card-body">
+                  @if($cucine->isNotEmpty())
+                    <div class="d-flex flex-wrap gap-2">
+                      @foreach($cucine as $cucina)
+                        <span class="badge bg-label-primary fs-6 fw-normal px-3 py-2">
+                          <i class="bx bx-restaurant me-1"></i>{{ $cucina->nome ?? '—' }}
+                        </span>
+                      @endforeach
+                    </div>
+                  @else
+                    <p class="text-muted small mb-2">Nessuna cucina associata.</p>
+                    <button type="button" class="btn btn-sm btn-label-primary" data-pv-go-tab="#pv-tab-cucine">
+                      <i class="bx bx-plus me-1"></i> Associa cucine
+                    </button>
+                  @endif
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="tab-pane fade" id="pv-tab-generali" role="tabpanel">
       <form id="puntoVenditaEditForm" class="mt-1">
         @csrf
-        <input type="hidden" name="id" value="{{ $puntoVendita->id }}">
+        <input type="hidden" name="punto_vendita_id" value="{{ $puntoVendita->id }}">
         <div class="row g-3">
           <div class="col-md-6">
             <label for="pv_nome" class="form-label">Nome</label>
-            <input type="text" class="form-control" id="pv_nome" name="nome" value="{{ $puntoVendita->nome }}">
+            <input type="text" class="form-control" id="pv_nome" name="nome" data-pv-save value="{{ $puntoVendita->nome }}">
           </div>
           <div class="col-md-6">
             <label for="pv_tipo" class="form-label">Tipo</label>
-            <select class="form-select" id="pv_tipo" name="tipo">
+            <select class="form-select" id="pv_tipo" name="tipo" data-pv-save>
               @foreach($tipiPuntoVendita as $label => $value)
                 <option value="{{ $value }}" {{ $puntoVendita->tipo === $value ? 'selected' : '' }}>
                   {{ $label }}
@@ -51,32 +374,32 @@
 
           <div class="col-md-6">
             <label for="pv_pin_sblocco" class="form-label">PIN sblocco</label>
-            <input type="text" class="form-control" id="pv_pin_sblocco" name="pin_sblocco" value="{{ $puntoVendita->pin_sblocco }}">
+            <input type="text" class="form-control" id="pv_pin_sblocco" name="pin_sblocco" data-pv-save value="{{ $puntoVendita->pin_sblocco }}">
           </div>
           <div class="col-md-6">
             <label for="pv_ubicazione" class="form-label">Ubicazione</label>
-            <input type="text" class="form-control" id="pv_ubicazione" name="ubicazione" value="{{ $puntoVendita->ubicazione }}">
+            <input type="text" class="form-control" id="pv_ubicazione" name="ubicazione" data-pv-save value="{{ $puntoVendita->ubicazione }}">
           </div>
 
           <div class="col-md-6">
             <label for="pv_data_apertura" class="form-label">Data apertura dispositivo</label>
-            <input type="datetime-local" class="form-control" id="pv_data_apertura" name="data_apertura_dispositivo" value="{{ $puntoVendita->data_apertura_dispositivo ? $puntoVendita->data_apertura_dispositivo->format('Y-m-d\TH:i') : '' }}">
+            <input type="datetime-local" class="form-control" id="pv_data_apertura" name="data_apertura_dispositivo" data-pv-save value="{{ $puntoVendita->data_apertura_dispositivo ? $puntoVendita->data_apertura_dispositivo->format('Y-m-d\TH:i') : '' }}">
           </div>
           <div class="col-md-6">
             <label for="pv_data_chiusura" class="form-label">Data chiusura dispositivo</label>
-            <input type="datetime-local" class="form-control" id="pv_data_chiusura" name="data_chiusura_dispositivo" value="{{ $puntoVendita->data_chiusura_dispositivo ? $puntoVendita->data_chiusura_dispositivo->format('Y-m-d\TH:i') : '' }}">
+            <input type="datetime-local" class="form-control" id="pv_data_chiusura" name="data_chiusura_dispositivo" data-pv-save value="{{ $puntoVendita->data_chiusura_dispositivo ? $puntoVendita->data_chiusura_dispositivo->format('Y-m-d\TH:i') : '' }}">
           </div>
 
           <div class="col-md-6 d-flex align-items-end">
             <div class="form-check form-switch">
-              <input class="form-check-input" type="checkbox" id="pv_is_attivo" name="is_attivo" value="1" {{ $puntoVendita->is_attivo ? 'checked' : '' }}>
+              <input class="form-check-input" type="checkbox" id="pv_is_attivo" name="is_attivo" data-pv-save value="1" {{ $puntoVendita->is_attivo ? 'checked' : '' }}>
               <label class="form-check-label" for="pv_is_attivo">Dispositivo attivo</label>
             </div>
           </div>
 
           <div class="col-12">
             <label for="pv_note" class="form-label">Note</label>
-            <textarea class="form-control" id="pv_note" name="note" rows="3">{{ $puntoVendita->note }}</textarea>
+            <textarea class="form-control" id="pv_note" name="note" data-pv-save rows="3">{{ $puntoVendita->note }}</textarea>
           </div>
         </div>
       </form>
@@ -115,7 +438,7 @@
       <div class="row g-3 mt-1">
         <div class="col-md-6">
           <label for="pv_url_stampante" class="form-label">URL/ID stampante</label>
-          <select class="form-select" id="pv_url_stampante" name="url_stampante">
+          <select class="form-select" id="pv_url_stampante" name="url_stampante" data-pv-save>
             <option value="">Seleziona stampante</option>
             @foreach($puntoVendita->attivita->stampanti as $stampante)
               <option value="{{ $stampante->id }}" {{ (int)$puntoVendita->url_stampante === (int)$stampante->id ? 'selected' : '' }}>
@@ -126,7 +449,7 @@
         </div>
         <div class="col-md-6">
           <label for="pv_endpoint_id" class="form-label">Endpoint</label>
-          <select class="form-select" id="pv_endpoint_id" name="endpoint_id">
+          <select class="form-select" id="pv_endpoint_id" name="endpoint_id" data-pv-save>
             <option value="">Seleziona endpoint</option>
             @foreach($endpointList as $endpoint)
               <option value="{{ $endpoint->id }}" {{ (int)$puntoVendita->endpoint_id === (int)$endpoint->id ? 'selected' : '' }}>
@@ -142,41 +465,158 @@
       <div class="row g-3 mt-1">
         <div class="col-md-6">
           <label for="pv_licenza" class="form-label">Licenza</label>
-          <input type="text" class="form-control" id="pv_licenza" name="licenza" value="{{ $puntoVendita->licenza }}">
+          <input type="text" class="form-control" id="pv_licenza" name="licenza" data-pv-save value="{{ $puntoVendita->licenza }}">
         </div>
       </div>
     </div>
   </div>
 </div>
+@endsection
+
+@section('page-script')
+<script type="module">
+  $(document).ready(function() {
+    var pvId = {{ $puntoVendita->id }};
+    var pvTimer = {};
+
+    function pvNotyf(type, message) {
+      new Notyf({ duration: 2500, position: { x: 'right', y: 'top' } })[type](message);
+    }
+
+    function pvValoreCampo($el) {
+      if ($el.is(':checkbox')) {
+        return $el.is(':checked') ? 1 : 0;
+      }
+      return $el.val();
+    }
+
+    function pvAjaxError(xhr, fallback) {
+      var msg = fallback;
+      if (xhr.status === 422 && xhr.responseJSON && xhr.responseJSON.errors) {
+        var key = Object.keys(xhr.responseJSON.errors)[0];
+        msg = xhr.responseJSON.errors[key][0];
+      } else if (xhr.responseJSON && xhr.responseJSON.message) {
+        msg = xhr.responseJSON.message;
+      }
+      pvNotyf('error', msg);
+    }
+
+    function salvaCampo(nome, valore) {
+      var data = {
+        punto_vendita_id: pvId,
+        _token: '{{ csrf_token() }}'
+      };
+      data[nome] = valore;
 
-<script>
-  $(document).off('click.pvSaveCucine', '#saveCucine').on('click.pvSaveCucine', '#saveCucine', function() {
-    var form = $('#puntoVenditaEditCucineForm');
-    var cucineIds = [];
-    form.find('input[name="cucina_id[]"]:checked').each(function() {
-      cucineIds.push($(this).val());
+      $.ajax({
+        url: '{{ route('punto-vendita.update') }}',
+        method: 'POST',
+        data: data,
+        headers: { 'Accept': 'application/json' }
+      })
+      .done(function(res) {
+        if (res.success) {
+          pvNotyf('success', res.message || 'Salvato');
+        } else {
+          pvNotyf('error', res.message || 'Errore nel salvataggio');
+        }
+      })
+      .fail(function(xhr) {
+        pvAjaxError(xhr, 'Errore nel salvataggio');
+      });
+    }
+
+    $(document).on('input.pvAutosave', '[data-pv-save]', function() {
+      var $el = $(this);
+      if ($el.is('select, :checkbox')) {
+        return;
+      }
+      var name = $el.attr('name');
+      if (!name) {
+        return;
+      }
+      clearTimeout(pvTimer[name]);
+      pvTimer[name] = setTimeout(function() {
+        salvaCampo(name, pvValoreCampo($el));
+      }, 500);
+    });
+
+    $(document).on('change.pvAutosave', '[data-pv-save]', function() {
+      var $el = $(this);
+      if (!$el.is('select, :checkbox')) {
+        return;
+      }
+      var name = $el.attr('name');
+      if (!name) {
+        return;
+      }
+      salvaCampo(name, pvValoreCampo($el));
+    });
+
+    function dissociaDispositivo() {
+      $.ajax({
+        url: '{{ route('punto-vendita.dissocia-dispositivo', ['punto_vendita_id' => $puntoVendita->id]) }}',
+        type: 'POST',
+        data: {
+          punto_vendita_id: pvId,
+          _token: '{{ csrf_token() }}'
+        },
+        headers: { 'Accept': 'application/json' }
+      })
+      .done(function(response) {
+        pvNotyf('success', response.message || 'Disassociazione completata');
+        window.location.reload();
+      })
+      .fail(function(xhr) {
+        pvAjaxError(xhr, 'Si è verificato un errore');
+      });
+    }
+
+    $(document).on('click.pvDissocia', '#btnDissociaDispositivo', function() {
+      if (confirm('Sei sicuro di voler dissociare il dispositivo?')) {
+        dissociaDispositivo();
+      }
+    });
+
+    $(document).on('click.pvGoTab', '#pv-tab-riepilogo [data-pv-go-tab]', function() {
+      var target = $(this).data('pv-go-tab');
+      if (!target) {
+        return;
+      }
+      var tabEl = document.querySelector('.nav-link[data-bs-target="' + target + '"]');
+      if (tabEl && window.bootstrap) {
+        bootstrap.Tab.getOrCreateInstance(tabEl).show();
+      }
     });
-    $.ajax({
-      url: form.attr('action'),
-      method: 'POST',
-      data: {
-        cucine_ids: cucineIds,
-        punto_vendita_id: form.find('input[name="punto_vendita_id"]').val(),
-        _token: form.find('input[name="_token"]').val(),
-      },
-      success: function(response) {
+
+    $(document).on('click.pvSaveCucine', '#saveCucine', function() {
+      var $form = $('#puntoVenditaEditCucineForm');
+      var cucineIds = [];
+      $form.find('input[name="cucina_id[]"]:checked').each(function() {
+        cucineIds.push($(this).val());
+      });
+
+      $.ajax({
+        url: $form.attr('action'),
+        method: 'POST',
+        data: {
+          cucine_ids: cucineIds,
+          punto_vendita_id: $form.find('input[name="punto_vendita_id"]').val(),
+          _token: $form.find('input[name="_token"]').val()
+        },
+        headers: { 'Accept': 'application/json' }
+      })
+      .done(function(response) {
         if (response.success) {
-          new Notyf({
-            duration: 2000,
-            position: { x: 'right', y: 'top' }
-          }).success(response.message);
+          pvNotyf('success', response.message);
         } else {
-          new Notyf({
-            duration: 2000,
-            position: { x: 'right', y: 'top' }
-          }).error(response.message);
+          pvNotyf('error', response.message);
         }
-      }
+      })
+      .fail(function(xhr) {
+        pvAjaxError(xhr, 'Si è verificato un errore');
+      });
     });
   });
 </script>
+@endsection

resources/views/punto_vendita/menu.blade.php

@@ -13,17 +13,18 @@ use Illuminate\Support\Facades\Auth;
         </a>
         @endif
 
-        @if(Auth::user()->can('view-punto_vendita'))
+        <!-- @if(Auth::user()->can('view-punto_vendita'))
         <a href="{{ route('punto-vendita.dettagli-punto-vendita', ['punto_vendita_id' => $entity->id]) }}" class="dropdown-item">
             <i class="bx bx-show me-1"></i> Dettagli
         </a>
-        @endif
+        @endif -->
 
         @if(Auth::user()->can('edit-punto_vendita'))
-        <a href="#" class="dropdown-item" onclick="openModalPuntoVendita('{{ $entity->id }}');">
+        <a href="{{ route('punto-vendita.edit', ['punto_vendita_id' => $entity->id]) }}" class="dropdown-item">
             <i class="bx bx-edit-alt me-1"></i> Modifica
         </a>
         @endif
+        <!--  onclick="openModalPuntoVendita('{{ $entity->id }}');" -->
 
         <!-- @if(Auth::user()->can('edit-punto_vendita'))
         <a href="#" class="dropdown-item editor_edit">
@@ -33,8 +34,8 @@ use Illuminate\Support\Facades\Auth;
 
 
         @if(Auth::user()->can('delete-punto_vendita'))
-        <a href="#" class="dropdown-item editor_delete">
-            <i class="bx bx-trash me-1"></i> Elimina
+        <a href="#" class="dropdown-item editor_delete text-danger">
+            <i class="bx bx-trash me-1 text-danger"></i> Elimina
         </a>
         @endif
     </div>

routes/web.php

@@ -41,6 +41,7 @@ use App\Http\Controllers\CategoriaContabileController;
 use App\Http\Controllers\RigaOrdineNotificaController;
 use App\Http\Controllers\OperatoreController;
 use App\Http\Controllers\TombolaController;
+use App\Http\Controllers\ChiusuraServizioController;
 
 Route::get('/', [HomePageController::class, 'welcome'])->name('welcome');
 
@@ -132,6 +133,7 @@ Route::middleware(['auth:sanctum', AttivitaMiddleware::class, config('jetstream.
   Route::get('punto-vendita/dettagli-punto-vendita', [PuntoVenditaController::class, 'dettagli_punto_vendita'])->name('punto-vendita.dettagli-punto-vendita');
   Route::get('punto-vendita/show', [PuntoVenditaController::class, 'show'])->name('punto-vendita.show');
   Route::get('punto-vendita/edit', [PuntoVenditaController::class, 'edit'])->name('punto-vendita.edit');
+  Route::post('punto-vendita/update', [PuntoVenditaController::class, 'update'])->name('punto-vendita.update');
   Route::post('punto-vendita/associa-cucina', [PuntoVenditaController::class, 'associa_cucina'])->name('punto-vendita.associa-cucina');
   Route::post('punto-vendita/dissocia-dispositivo' , [PuntoVenditaController::class , 'dissocia_dispositivo'])->name('punto-vendita.dissocia-dispositivo');
 
@@ -142,6 +144,12 @@ Route::middleware(['auth:sanctum', AttivitaMiddleware::class, config('jetstream.
   Route::get('punto-vendita/cerca-pre-ordine', [PuntoVenditaController::class, 'cerca_pre_ordine'])->name('punto-vendita.cassa.cerca-pre-ordine');
   Route::post('punto-vendita/importa-pre-ordine', [PuntoVenditaController::class, 'importa_pre_ordine'])->name('punto-vendita.cassa.importa-pre-ordine');
 
+
+  // Chiusura Servizio
+  Route::resource('chiusura-servizio', ChiusuraServizioController::class, ['only' => ['index', 'store']]);
+  Route::get('chiusura-servizio/show', [ChiusuraServizioController::class, 'show'])->name('chiusura-servizio.show');
+  Route::post('chiusura-servizio/chiudi-servizio', [ChiusuraServizioController::class, 'chiudi_servizio'])->name('chiusura-servizio.chiudi-servizio');
+
   // Punto Operatore
   Route::resource('punto-operatore', PuntoOperatoreController::class, ['only' => ['index', 'store']]);
   Route::get('punto-operatore/toggle-is-attivo', [PuntoOperatoreController::class, 'toggle_is_attivo'])->name('punto-operatore.toggle-is-attivo');
@@ -149,6 +157,7 @@ Route::middleware(['auth:sanctum', AttivitaMiddleware::class, config('jetstream.
 
   
   // Prima Nota
+  Route::get('prima-nota/statistiche', [PrimaNotaController::class, 'statistiche'])->name('prima-nota.statistiche');
   Route::resource('prima-nota', PrimaNotaController::class, ['only' => ['index', 'store']])->names('prima-nota');
   
   // Pagamento