modifiche a scontrini e comande

app/Services/Stampa/CreaComandaCucina.php

@@ -2,50 +2,45 @@
 
 namespace App\Services\Stampa;
 
-use App\Models\Ordine;
 use App\Models\Cucina;
+use App\Models\Ordine;
+use Illuminate\Support\Facades\Log;
 use Mike42\Escpos\PrintConnectors\DummyPrintConnector;
 use Mike42\Escpos\Printer;
-use Illuminate\Support\Facades\Log;
 
 class CreaComandaCucina
 {
-    private const LINE_WIDTH = 42;
+    /** Larghezza nominale per stampante 78 mm (~48 caratteri font normale). */
+    private const LINE_WIDTH = 48;
+
     private const COL_QTA_WIDTH = 4;
-    private const COL_TOTAL_WIDTH = 10;
-    private const LARGE_ITEM_WIDTH = 20;
 
     /**
      * Genera il buffer ESC/POS e restituisce il payload per print_job (agent: base64).
      */
     public function perOrdine(Ordine $ordine, int $cucina_id): array
     {
-        $ordine->loadMissing(['righe_ordine.piatto', 'attivita', 'metodo_pagamento']);
+        $ordine->loadMissing(['righe_ordine.piatto', 'dispositivo']);
         $cucina = Cucina::find($cucina_id);
         if ($cucina === null) {
             Log::error('--- CreaComandaCucina --- Cucina non trovata id: '.$cucina_id);
             throw new \RuntimeException('--- CreaComandaCucina --- Cucina non trovata id: '.$cucina_id);
         }
-        $connector = new DummyPrintConnector;
-        $printer = new Printer($connector);
 
-        $nomeAttivita = $ordine->attivita?->nome ?? 'Ordine';
         $info = is_array($ordine->info) ? $ordine->info : [];
-        $cliente = $info['cliente'] ?? null;
-        $tavolo = $info['tavolo'] ?? null;
-        $this->printHeader($printer, $ordine, $nomeAttivita, $cliente, $tavolo, $cucina->nome ?? null);
+        $dataOra = $ordine->created_at?->format('d/m/Y H:i') ?? now()->format('d/m/Y H:i');
 
-        if (! empty($ordine->note)) {
-            $printer->setTextSize(1, 2);
-            $printer->text('-> '.$this->sanitizeLine((string) $ordine->note)."\n");
-            $printer->setTextSize(1, 1);
-        }
+        $connector = new DummyPrintConnector;
+        $printer = new Printer($connector);
+
+        $this->printHeader($printer, $ordine, $cucina->nome ?? null, $info);
 
+        $printer->text("\n");
         $printer->text($this->separator());
         $this->printItemsTable($printer, $ordine, $cucina_id);
 
-        $this->printQrCode($printer, route('consulta.comanda.show', ['ordine_id' => $ordine->id]));
-
+        $printer->text("\n");
+        $this->printFooter($printer, $ordine, $info, $dataOra);
 
         $printer->feed(2);
         $printer->cut();
@@ -59,25 +54,16 @@ class CreaComandaCucina
             'dati' => base64_encode($bytes),
             'ordine_id' => $ordine->id,
             'ordine_numero' => $ordine->id,
-            'ordine_data' => $ordine->created_at?->format('d/m/Y H:i') ?? now()->format('d/m/Y H:i'),
+            'ordine_data' => $dataOra,
         ];
     }
 
-    private function printHeader(Printer $printer, Ordine $ordine, string $nomeAttivita, ?string $cliente, ?string $tavolo, ?string $nomeCucina): void
+    private function printHeader(Printer $printer, Ordine $ordine, ?string $nomeCucina, array $info): void
     {
-        $nomeAttivitaHeader = mb_strtoupper($this->sanitizeLine($nomeAttivita));
-
         $printer->setJustification(Printer::JUSTIFY_CENTER);
         $printer->setEmphasis(true);
         $printer->setTextSize(2, 2);
-        $printer->text($nomeAttivitaHeader."\n");
-        $printer->setTextSize(1, 1);
-        $printer->setEmphasis(false);
-        $printer->text("\n");
-        $printer->setJustification(Printer::JUSTIFY_CENTER);
-        $printer->setEmphasis(true);
-        $printer->setTextSize(2, 2);
-        $printer->text("#".$ordine->id."\n");
+        $printer->text('#'.$ordine->id."\n");
         $printer->setTextSize(1, 1);
         $printer->setEmphasis(false);
 
@@ -87,21 +73,70 @@ class CreaComandaCucina
             $printer->setEmphasis(false);
         }
 
+        $printer->text("\n");
         $printer->setJustification(Printer::JUSTIFY_LEFT);
 
-        if ($tavolo) {
-            $printer->text("Tavolo:\n");
-            $printer->setTextSize(2, 2);
-            $printer->text(mb_strtoupper($this->sanitizeLine((string) $tavolo))."\n");
-            $printer->setTextSize(1, 1);
+        $this->printTavoloClienteRow(
+            $printer,
+            $info['tavolo'] ?? null,
+            $info['cliente'] ?? null
+        );
+
+        $this->printExtraInfoFields($printer, $info, $ordine);
+    }
+
+    /**
+     * Tavolo (col-4) e cliente (col-8) sulla stessa riga, testo grande.
+     */
+    private function printTavoloClienteRow(Printer $printer, ?string $tavolo, ?string $cliente): void
+    {
+        $effectiveWidth = (int) (self::LINE_WIDTH / 2);
+        $tavoloWidth = (int) floor($effectiveWidth * 4 / 12);
+        $clienteWidth = $effectiveWidth - $tavoloWidth;
+
+        $tavoloText = mb_strtoupper($this->sanitizeLine((string) ($tavolo ?? '')));
+        $clienteText = mb_strtoupper($this->sanitizeLine((string) ($cliente ?? '')));
+
+        if ($tavoloText === '' && $clienteText === '') {
+            return;
         }
-        if ($cliente) {
-            $printer->text("Cliente:\n");
-            $printer->setTextSize(2, 2);
-            $printer->text(mb_strtoupper($this->sanitizeLine((string) $cliente))."\n");
-            $printer->setTextSize(1, 1);
+
+        $tavoloText = mb_substr($tavoloText, 0, $tavoloWidth);
+        $clienteText = mb_substr($clienteText, 0, $clienteWidth);
+
+        $printer->setEmphasis(true);
+        $printer->setTextSize(2, 2);
+        $printer->text(str_pad($tavoloText, $tavoloWidth).str_pad($clienteText, $clienteWidth)."\n");
+        $printer->setTextSize(1, 1);
+        $printer->setEmphasis(false);
+    }
+
+    private function printExtraInfoFields(Printer $printer, array $info, Ordine $ordine): void
+    {
+        $skip = ['cliente', 'tavolo', 'coperti'];
+
+        foreach ($info as $key => $value) {
+            if (in_array($key, $skip, true) || $value === null || $value === '') {
+                continue;
+            }
+
+            $label = mb_strtoupper(str_replace('_', ' ', (string) $key));
+            $printer->text($label.': '.$this->sanitizeLine((string) $value)."\n");
         }
-        $printer->setJustification(Printer::JUSTIFY_LEFT);
+
+        if (! empty($ordine->note) && empty($info['note_ordine'])) {
+            $printer->text('NOTE: '.$this->sanitizeLine((string) $ordine->note)."\n");
+        }
+    }
+
+    private function printFooter(Printer $printer, Ordine $ordine, array $info, string $dataOra): void
+    {
+        $coperti = $info['coperti'] ?? null;
+        $copertiDisplay = ($coperti !== null && $coperti !== '') ? (string) $coperti : 'ND';
+
+        $printer->text('Totale coperti: '.$this->sanitizeLine($copertiDisplay)."\n");
+        $printer->text($this->sanitizeLine($dataOra)."\n");
+        $printer->text($this->sanitizeLine((string) ($ordine->dispositivo?->nome ?? 'ND'))."\n");
     }
 
     private function printItemsTable(Printer $printer, Ordine $ordine, int $cucinaId): void
@@ -115,12 +150,14 @@ class CreaComandaCucina
             throw new \RuntimeException('Nessuna riga ordine trovata per la cucina '.$cucinaId);
         }
 
+        $itemWidth = (int) (self::LINE_WIDTH / 2);
+
         $printer->setJustification(Printer::JUSTIFY_LEFT);
         foreach ($righeCucina as $riga) {
             $nome = $riga->piatto?->nome ?? 'Voce';
             $q = max(1, (int) ($riga->quantita ?? 1));
             $dishLabel = sprintf('%dx %s', $q, $this->sanitizeLine($nome));
-            $nameLines = $this->wrapText($dishLabel, self::LARGE_ITEM_WIDTH);
+            $nameLines = $this->wrapText($dishLabel, $itemWidth);
 
             $printer->setEmphasis(true);
             $printer->setTextSize(2, 2);
@@ -138,6 +175,7 @@ class CreaComandaCucina
                 }
                 $printer->setTextSize(1, 1);
             }
+
             $printer->text("\n");
         }
     }
@@ -174,14 +212,4 @@ class CreaComandaCucina
 
         return mb_substr($line, 0, 120);
     }
-
-
-    private function printQrCode(Printer $printer, string $value): void
-    {
-        try {
-            $printer->qrCode($this->sanitizeLine($value), Printer::QR_ECLEVEL_L, 6, Printer::QR_MODEL_2);
-        } catch (\Throwable $e) {
-            $printer->text('[QR: '.$this->sanitizeLine($value)."]\n");
-        }
-    }
 }

app/Services/Stampa/CreaScontrino.php

@@ -3,8 +3,10 @@
 namespace App\Services\Stampa;
 
 use App\Models\Ordine;
+use App\Models\Impostazioni;
 use Mike42\Escpos\PrintConnectors\DummyPrintConnector;
 use Mike42\Escpos\Printer;
+use Illuminate\Support\Facades\Log;
 
 class CreaScontrino
 {
@@ -155,7 +157,10 @@ class CreaScontrino
     {
         $printer->text($this->separator());
         $printer->setJustification(Printer::JUSTIFY_CENTER);
-        $this->printQrCode($printer, route('consulta.scontrino.show', ['ordine_id' => $ordine->id]));
+        if(Impostazioni::getImpostazione('stampa_qr_code_chiamata')){
+        $this->qrCode(route('consulta.scontrino.show', ['ordine_id' => $ordine->id]) , Printer::QR_ECLEVEL_L, 6, Printer::QR_MODEL_2);
+        // $this->printQrCode($printer, route('consulta.scontrino.show', ['ordine_id' => $ordine->id]));
+        }
         $printer->text("\n");
         $printer->text("Grazie e buon appetito!\n\n");
         $printer->setEmphasis(false);
@@ -221,14 +226,14 @@ class CreaScontrino
         return $parts;
     }
 
-    private function printQrCode(Printer $printer, string $value): void
-    {
-        try {
-            $printer->qrCode($this->sanitizeLine($value), Printer::QR_ECLEVEL_L, 6, Printer::QR_MODEL_2);
-        } catch (\Throwable $e) {
-            $printer->text('[QR: '.$this->sanitizeLine($value)."]\n");
-        }
-    }
+    // private function printQrCode(Printer $printer, string $value): void
+    // {
+    //     try {
+    //         $printer->qrCode($this->sanitizeLine($value), Printer::QR_ECLEVEL_L, 6, Printer::QR_MODEL_2);
+    //     } catch (\Throwable $e) {
+    //         $printer->text('[QR: '.$this->sanitizeLine($value)."]\n");
+    //     }
+    // }
 
     private function itemColumnWidth(): int
     {