diff --git a/.DS_Store b/.DS_Store index e1beca4a..43c4f273 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.env b/.env index ca56ef30..7f50a573 100644 --- a/.env +++ b/.env @@ -87,4 +87,4 @@ WOOCOMMERCE_WP_HEADER_TOTAL=x-wp-total WOOCOMMERCE_WP_HEADER_TOTAL_PAGES=x-wp-totalpages WOOCOMMERCE_TIMEOUT=0 -API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK" \ No newline at end of file +API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK" diff --git a/.gitignore b/.gitignore index db142b97..b6315e62 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,10 @@ Homestead.yaml npm-debug.log yarn-error.log *.zip +tests/.DS_Store +resources/.DS_Store +storage/.DS_Store +database/.DS_Store +app/.DS_Store +.DS_Store +.DS_Store diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index d9ed9bba..faad3446 100755 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -166,7 +166,7 @@ class ArticleController extends Controller ini_set("memory_limit", "512M"); $articoli = Article::where('IdArticolo', $idArticolo) - ->get(); // Usa + ->get(); // Usa if ($articoli->isEmpty()) { return ['error' => 'Nessun articolo']; @@ -201,30 +201,30 @@ class ArticleController extends Controller $join->on('T_WEB_Articoli.IdArticolo', '=', 'o.CodArticoloGM'); }) ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti3mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank3M - FROM T_WEB_Ordini + FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) GROUP BY CodArticoloGM) p'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'p.CodArticoloGM'); }) - ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti6mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank6M - FROM T_WEB_Ordini + ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti6mesi, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank6M + FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -6, GETDATE()) GROUP BY CodArticoloGM) q'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'q.CodArticoloGM'); }) ->leftJoin(DB::raw('(SELECT CodArticoloGM, SUM(Qta) as venduti1anno, RANK() OVER (ORDER BY SUM(Qta) DESC) as rank1Y - FROM T_WEB_Ordini + FROM T_WEB_Ordini WHERE DataOra >= DATEADD(MONTH, -12, GETDATE()) GROUP BY CodArticoloGM) r'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'r.CodArticoloGM'); }) - ->leftJoin(DB::raw('(SELECT CodArticoloGM, MAX(DataOra) as ultimoOrdine - FROM T_WEB_Ordini + ->leftJoin(DB::raw('(SELECT CodArticoloGM, MAX(DataOra) as ultimoOrdine + FROM T_WEB_Ordini GROUP BY CodArticoloGM) s'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 's.CodArticoloGM'); }) ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as fat3mesi, RANK() OVER (ORDER BY SUM(TRY_CAST(Qta AS INT)) DESC) as fatrank3M - FROM T_WEB_ArticoliFatturati + FROM T_WEB_ArticoliFatturati WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) AND ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) t'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 't.CodArticolo'); @@ -232,7 +232,7 @@ class ArticleController extends Controller ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as totFat FROM T_WEB_ArticoliFatturati WHERE ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) u'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'u.CodArticolo'); }) - ->leftJoin(DB::raw('( + /*->leftJoin(DB::raw('( SELECT v.IdCollana, v.Descrizione as DescrizioneCollana FROM T_WEB_Collane v INNER JOIN ( @@ -243,11 +243,11 @@ class ArticleController extends Controller ) y'), function ($join) { $join->on('T_WEB_Articoli.IdCollana', '=', 'y.IdCollana'); }) - ->leftJoin(DB::raw('(SELECT g2.IdArgomento, g2.Descrizione as DescrArgomento FROM T_WEB_Argomenti g2 - JOIN (SELECT IdArgomento, MAX(DataOra) as data12 from T_WEB_Argomenti GROUP BY IdArgomento) h2 + ->leftJoin(DB::raw('(SELECT g2.IdArgomento, g2.Descrizione as DescrArgomento FROM T_WEB_Argomenti g2 + JOIN (SELECT IdArgomento, MAX(DataOra) as data12 from T_WEB_Argomenti GROUP BY IdArgomento) h2 ON g2.IdArgomento = h.IdArgomento AND g2.DataOra = h.data12 ) i2'), function ($join) { $join->on('T_WEB_Articoli.ListaArgomenti', '=', 'i2.IdArgomento'); - }) + })*/ ->select( 'T_WEB_Articoli.*', @@ -295,67 +295,67 @@ class ArticleController extends Controller $join->on('T_WEB_Articoli.IdArticolo', '=', 'b.IdArticolo') ->on('T_WEB_Articoli.DataOra', '=', 'b.data'); }) - ->leftJoin(DB::raw('(SELECT e.IdStatoProdotto, e.Descrizione as DescrizioneStatoProdotto FROM T_WEB_StatiProdotto e - JOIN (SELECT IdStatoProdotto, MAX(DataOra) as data1 - FROM T_WEB_StatiProdotto GROUP BY IdStatoProdotto) c + ->leftJoin(DB::raw('(SELECT e.IdStatoProdotto, e.Descrizione as DescrizioneStatoProdotto FROM T_WEB_StatiProdotto e + JOIN (SELECT IdStatoProdotto, MAX(DataOra) as data1 + FROM T_WEB_StatiProdotto GROUP BY IdStatoProdotto) c ON e.IdStatoProdotto = c.IdStatoProdotto AND e.DataOra = c.data1) f'), function ($join) { $join->on('T_WEB_Articoli.IdStatoProdotto', '=', 'f.IdStatoProdotto'); }) - ->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 + ->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'); }) - ->leftJoin(DB::raw('(SELECT l.IdTipoFormato, l.Descrizione as DescrizioneFormato FROM T_WEB_TipiFormato l - JOIN (SELECT IdTipoFormato, MAX(DataOra) as data1 - FROM T_WEB_TipiFormato GROUP BY IdTipoFormato) m + ->leftJoin(DB::raw('(SELECT l.IdTipoFormato, l.Descrizione as DescrizioneFormato FROM T_WEB_TipiFormato l + JOIN (SELECT IdTipoFormato, MAX(DataOra) as data1 + FROM T_WEB_TipiFormato GROUP BY IdTipoFormato) m ON l.IdTipoFormato = m.IdTipoFormato AND l.DataOra = m.data1) n'), function ($join) { $join->on('T_WEB_Articoli.IdTipoFormato', '=', 'n.IdTipoFormato'); }) - ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) AS totFat FROM T_WEB_ArticoliFatturati + ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) AS totFat FROM T_WEB_ArticoliFatturati WHERE ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) o'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'o.CodArticolo'); }) - ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as venduti3mesi, + ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as venduti3mesi, RANK() OVER (ORDER BY SUM(TRY_CAST(Qta AS INT)) DESC) as rank3M FROM T_WEB_ArticoliFatturati WHERE DataOra >= DATEADD(MONTH, -3, GETDATE()) AND ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) p'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'p.CodArticolo'); }) - ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as venduti6mesi, - RANK() OVER (ORDER BY SUM(TRY_CAST(Qta AS INT)) DESC) as rank6M - FROM T_WEB_ArticoliFatturati + ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as venduti6mesi, + RANK() OVER (ORDER BY SUM(TRY_CAST(Qta AS INT)) DESC) as rank6M + FROM T_WEB_ArticoliFatturati WHERE DataOra >= DATEADD(MONTH, -6, GETDATE()) AND ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) q'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'q.CodArticolo'); }) - ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as venduti1anno, + ->leftJoin(DB::raw('(SELECT CodArticolo, SUM(TRY_CAST(Qta AS INT)) as venduti1anno, RANK() OVER (ORDER BY SUM(TRY_CAST(Qta AS INT)) DESC) as rank1Y - FROM T_WEB_ArticoliFatturati + FROM T_WEB_ArticoliFatturati WHERE DataOra >= DATEADD(MONTH, -12, GETDATE()) AND ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) r'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 'r.CodArticolo'); }) - ->leftJoin(DB::raw('(SELECT CodArticolo, MAX(DataOra) as ultimoOrdine + ->leftJoin(DB::raw('(SELECT CodArticolo, MAX(DataOra) as ultimoOrdine FROM T_WEB_ArticoliFatturati WHERE ISNUMERIC(Qta) = 1 GROUP BY CodArticolo) s'), function ($join) { $join->on('T_WEB_Articoli.IdArticolo', '=', 's.CodArticolo'); }) ->leftJoin(DB::raw('(SELECT v.IdCollana, v.Descrizione as DescrizioneCollana - FROM T_WEB_Collane v - INNER JOIN (SELECT IdCollana, MAX(ID) as MaxID - FROM T_WEB_Collane GROUP BY IdCollana) x + FROM T_WEB_Collane v + INNER JOIN (SELECT IdCollana, MAX(ID) as MaxID + FROM T_WEB_Collane GROUP BY IdCollana) x ON v.IdCollana = x.IdCollana AND v.ID = x.MaxID) y'), function ($join) { $join->on('T_WEB_Articoli.IdCollana', '=', 'y.IdCollana'); }) - ->leftJoin(DB::raw('(SELECT g2.IdArgomento, g2.Descrizione as DescrArgomento - FROM T_WEB_Argomenti g2 - JOIN (SELECT IdArgomento, MAX(DataOra) as data12 - FROM T_WEB_Argomenti - GROUP BY IdArgomento) h + ->leftJoin(DB::raw('(SELECT g2.IdArgomento, g2.Descrizione as DescrArgomento + FROM T_WEB_Argomenti g2 + JOIN (SELECT IdArgomento, MAX(DataOra) as data12 + FROM T_WEB_Argomenti + GROUP BY IdArgomento) h ON g2.IdArgomento = h.IdArgomento AND g2.DataOra = h.data12) i2'), function ($join) { $join->on('T_WEB_Articoli.ListaArgomenti', '=', 'i2.IdArgomento'); }) @@ -380,7 +380,7 @@ class ArticleController extends Controller //->orderBy('rank1Y', 'asc') ->orderBy('totFat', 'desc') ->get(); - + if ($articoliVenduti->isEmpty()) { return response()->json(['message' => 'Nessun articolo fatturato trovato.'], 404); } @@ -677,7 +677,7 @@ class ArticleController extends Controller return $output; } - + public function showTableByName($tableName, $numrec) { @@ -691,4 +691,4 @@ class ArticleController extends Controller 'tableContent' => $tableContent ]); } -} \ No newline at end of file +} diff --git a/config/filesystems.php b/config/filesystems.php index c882f300..0f965a22 100755 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -64,13 +64,13 @@ return [ 'url' => env('AWS_URL'), 'endpoint' => env('AWS_ENDPOINT'), ], - + 'ftp' => [ 'driver' => 'ftp', 'host' => 'ftp.pecos.it', 'username' => '15710515@aruba.it', 'password' => 'Km:cOuy#F8', - + // Optional FTP Settings... // 'port' => 21, 'root' => '/www.pecos.it/.backup',