diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index dd0805a2..f2f23b21 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -45,9 +45,10 @@ class ArticleController extends Controller $ordini = DB::table('T_WEB_Ordini as O') ->join('T_WEB_Articoli as A', 'O.CodArticoloGM', '=', 'A.IdArticolo') ->select( + DB::raw('ROW_NUMBER() OVER (ORDER BY O.DataOra DESC) AS progressivo'), 'O.DataOra', 'O.Qta', - 'A.Titolo' + // 'A.Titolo' ) ->orderBy('O.DataOra', 'desc') ->get(); diff --git a/resources/views/ordini_test.blade.php b/resources/views/ordini_test.blade.php index cda44b99..bd82451a 100644 --- a/resources/views/ordini_test.blade.php +++ b/resources/views/ordini_test.blade.php @@ -14,6 +14,7 @@
| Num | Data Ora | Quantità | Titolo Articolo | @@ -22,9 +23,12 @@||
|---|---|---|---|---|---|
| {{ $ordine->progressivo }} | {{ \Carbon\Carbon::parse($ordine->DataOra)->format('d/m/Y H:i:s') }} | -{{ $ordine->Qta }} | -{{ $ordine->Titolo }} | +@if (isset($articolo->Qta)){{ $ordine->Qta }}@endif + | +@if (isset($articolo->Titolo)){{ $ordine->Titolo }}@endif + |