diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index baa682eb..610dc73b 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -11,15 +11,17 @@ use App\Article; class ArticleController extends Controller { - private function queryTest() + private function articoliByDataStart($data_start) { ini_set("memory_limit", "512M"); try { - $articoli = Article::join(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY IdArticolo) b'), function ($join) { + $articoli = Article::join(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli WHERE Dataora >= ? GROUP BY IdArticolo) b'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'b.IdArticolo') ->on('T_WEB_Articoli.DataOra', '=', 'b.data'); - }) - ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as totaleVenduti FROM T_WEB_Ordini GROUP BY CodArticoloGM) O'), 'T_WEB_Articoli.IdArticolo', '=', 'O.CodArticoloGM') + }, [$data_start]) + ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as totaleVenduti FROM T_WEB_Ordini WHERE DataOra >= ? GROUP BY CodArticoloGM) O'), function ($join) use ($data_start) { + $join->on('T_WEB_Articoli.IdArticolo', '=', 'O.CodArticoloGM'); + }, [$data_start]) ->leftJoin(DB::raw('(SELECT g.IdTipologia, g.Descrizione as DescrizioneTipologia FROM T_WEB_Tipologie g JOIN (SELECT IdTipologia, MAX(DataOra) as data1 from T_WEB_Tipologie GROUP BY IdTipologia) h ON g.IdTipologia = h.IdTipologia AND g.DataOra = h.data1 ) i'), function ($join) { $join->on('T_WEB_Articoli.IdTipologia', '=', 'i.IdTipologia'); }) @@ -166,11 +168,11 @@ class ArticleController extends Controller } } - public function showtest(Request $request) + public function showArticoliByDataStart($data_start) { try { - $articoliVenduti = $this->queryTest(); + $articoliVenduti = $this->articoliByDataStart($data_start); return view('export_articles_test', ['articoli' => $articoliVenduti]); diff --git a/routes/web.php b/routes/web.php index e1e0c283..fbdeffdd 100644 --- a/routes/web.php +++ b/routes/web.php @@ -6466,6 +6466,6 @@ Route::get('/export-articles-sales', [ArticleController::class, 'exportArticlesS Route::get('/export-articles-sales-json', [ArticleController::class, 'exportArticlesSalesByJSON']); Route::get('/view-articles-sales', [ArticleController::class, 'showArticlesSales']); -Route::get('/view-articles-test', [ArticleController::class, 'showtest']); +Route::get('/view-articles-test/{data_start}', [ArticleController::class, 'showArticoliByDataStart']); Route::get('/view-ordini-test/{numrec}', [ArticleController::class, 'showOrdini']); Route::get('/article-test', [ArticleController::class, 'test']);