surya/apimacro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
paoloar77
2025-02-20 10:11:42 +01:00
parent 8f661a471c
commit d4d98c9a4e
5 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -86,3 +86,5 @@ WOOCOMMERCE_CONSUMER_SECRET=cs_c21f786163f49a3853e1c4e95d46e1d0f15761cd
WOOCOMMERCE_WP_HEADER_TOTAL=x-wp-total WOOCOMMERCE_WP_HEADER_TOTAL=x-wp-total
WOOCOMMERCE_WP_HEADER_TOTAL_PAGES=x-wp-totalpages WOOCOMMERCE_WP_HEADER_TOTAL_PAGES=x-wp-totalpages
WOOCOMMERCE_TIMEOUT=0 WOOCOMMERCE_TIMEOUT=0
API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK"

72
app/CustomFuncPao.php
View File

@@ -432,24 +432,34 @@ function loadArticleByIdArticle($id, $checkprevendita = false, $checkqtanegativa
{ {
try { try {
$articles = Article::join(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY IdArticolo) b'), function ($join) { if ($checkprevendita) {
$join->on('T_WEB_Articoli.IdArticolo', '=', 'b.IdArticolo') $articles = Article::join(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY IdArticolo) b'), function ($join) {
->on('T_WEB_Articoli.DataOra', '=', 'b.data'); $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 ->leftJoin(DB::raw('(SELECT e.IdStatoProdotto, e.Descrizione as DescrizioneStatoProdotto FROM T_WEB_StatiProdotto e
FROM T_WEB_StatiProdotto GROUP BY IdStatoProdotto) c JOIN (SELECT IdStatoProdotto, MAX(DataOra) as data1
ON e.IdStatoProdotto = c.IdStatoProdotto AND e.DataOra = c.data1) f'), function ($join) { FROM T_WEB_StatiProdotto GROUP BY IdStatoProdotto) c
$join->on('T_WEB_Articoli.IdStatoProdotto', '=', 'f.IdStatoProdotto'); 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 o.Codice, o.QtaDisponibile FROM T_WEB_Disponibile o })
JOIN (SELECT Codice, MAX(DataOra) as data1 ->leftJoin(DB::raw('(SELECT o.Codice, o.QtaDisponibile FROM T_WEB_Disponibile o
FROM T_WEB_Disponibile GROUP BY Codice) p JOIN (SELECT Codice, MAX(DataOra) as data1
ON o.Codice = p.Codice AND o.DataOra = p.data1) q'), function ($join) { FROM T_WEB_Disponibile GROUP BY Codice) p
$join->on('T_WEB_Articoli.IdArticolo', '=', 'q.Codice'); ON o.Codice = p.Codice AND o.DataOra = p.data1) q'), function ($join) {
}) $join->on('T_WEB_Articoli.IdArticolo', '=', 'q.Codice');
->where('T_WEB_Articoli.IdArticolo', $id) })
->get(); ->where('T_WEB_Articoli.IdArticolo', $id)
->get();
} else {
$articles = Article::join(DB::raw('(SELECT IdArticolo, MAX(DataOra) AS data FROM T_WEB_Articoli GROUP BY IdArticolo) b'), function ($join) {
$join->on('T_WEB_Articoli.IdArticolo', '=', 'b.IdArticolo')
->on('T_WEB_Articoli.DataOra', '=', 'b.data');
})
->where('T_WEB_Articoli.IdArticolo', $id)
->get();
}
if ($checkprevendita) { if ($checkprevendita) {
foreach ($articles as $article) { foreach ($articles as $article) {
@@ -2514,20 +2524,24 @@ function getClienti()
function getvalstr($mystr, $value, $separato = false) function getvalstr($mystr, $value, $separato = false)
{ {
$my = ''; try {
if ($mystr) { $my = '';
$my = " " . $mystr . ": " . $value; if ($mystr) {
} else { $my = " " . $mystr . ": " . $value;
if ($value) { } else {
$my = $value; if ($value) {
if (!$separato) { $my = $value;
$my = " " . $value; if (!$separato) {
$my = " " . $value;
}
} }
} }
}
if ($separato) { if ($separato) {
$my = '[' . $my . '] '; $my = '[' . $my . '] ';
}
} catch (Exception $e) {
echo "Errore: " . $e->getMessage();
} }
return $my; return $my;

1
app/Http/Controllers/ArticleController.php
View File

@@ -678,6 +678,7 @@ class ArticleController extends Controller
return $output; return $output;
} }
public function showTableByName($tableName, $numrec) public function showTableByName($tableName, $numrec)
{ {

4
resources/views/mylinkspao.blade.php
View File

@@ -60,12 +60,12 @@
<button type="button" data-action="cartolibri">Cartolibri</button> <button type="button" data-action="cartolibri">Cartolibri</button>
<button type="button" data-action="riviste">Riviste</button> <button type="button" data-action="riviste">Riviste</button>
<button type="button" data-action="showOrdini">Mostra Ordini</button> <button type="button" data-action="showOrdini">Mostra Ordini</button>
<button type="button" data-action="showOrdiniWeb">Mostra Ordini Web</button> <button type="button" data-action="showOrdiniWeb">Ordini GRUPPOMACRO.com</button>
<button type="button" data-action="showArticoliFatturatiWeb">Mostra Fatturati</button> <button type="button" data-action="showArticoliFatturatiWeb">Mostra Fatturati</button>
<button type="button" data-action="Vendite">Vendite</button> <button type="button" data-action="Vendite">Vendite</button>
<button type="button" data-action="showDettOrdini">Dettaglio Ordini</button> <button type="button" data-action="showDettOrdini">Dettaglio Ordini</button>
<button type="button" data-action="showDettOrdiniWeb">Dettaglio Ordini Web</button> <button type="button" data-action="showDettOrdiniWeb">Dettaglio Ordini MACRO</button>
</form> </form>
<div> <div>
<a href="http://vps-88271abb.vps.ovh.net/apimacro/public/view-articles-sales" target="_blank">Vedi Articoli Venduti e Fatturati</a> - <a href="http://vps-88271abb.vps.ovh.net/apimacro/public/export-articles-sales-json" target="_blank">(Esporta)</a><br> <a href="http://vps-88271abb.vps.ovh.net/apimacro/public/view-articles-sales" target="_blank">Vedi Articoli Venduti e Fatturati</a> - <a href="http://vps-88271abb.vps.ovh.net/apimacro/public/export-articles-sales-json" target="_blank">(Esporta)</a><br>

1
routes/web.php
View File

@@ -6477,3 +6477,4 @@ Route::get('/article-test', [ArticleController::class, 'test']);
Route::get('/view-info-articolo/{idarticolo}', [ArticleController::class, 'showInfoArticolo']); Route::get('/view-info-articolo/{idarticolo}', [ArticleController::class, 'showInfoArticolo']);
Route::get('/view-table/{tableName}/{numrec}', [ArticleController::class, 'showTableContent']); Route::get('/view-table/{tableName}/{numrec}', [ArticleController::class, 'showTableContent']);