diff --git a/app/CustomFuncPao.php b/app/CustomFuncPao.php index 6eeea1dd..6e1649d1 100644 --- a/app/CustomFuncPao.php +++ b/app/CustomFuncPao.php @@ -278,11 +278,10 @@ function showOrdini() return $str; } -function showOrdini1() +function showDettOrdini() { $str = "Ordini"; - $orders = Order::orderBy('DataOra', 'desc')->take(2)->get(); try { diff --git a/resources/views/mylinkspao.blade.php b/resources/views/mylinkspao.blade.php index 6b1ad184..275b01f5 100644 --- a/resources/views/mylinkspao.blade.php +++ b/resources/views/mylinkspao.blade.php @@ -45,6 +45,7 @@ +
diff --git a/routes/web.php b/routes/web.php index 141146fa..e4a9b7a6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -2366,7 +2366,18 @@ Route::post('/updatecreate', function (Request $request) { foreach ($prodotti as $prodotto) { $orderdetail = new Orderdetail(); $orderdetail->IdInternet = $request->id; - $orderdetail->CodArticoloGM = $prodotto['sku']; + $sku = $prodotto['sku']; + $codifica = false; + if (strlen($sku) > 7 || strpos($sku, 'USATO') === 0) { + $codifica = true; + } + if ($codifica) { + + } else { + $orderdetail->CodArticoloGM = intval($prodotto['sku']); + } + + $orderdetail->Qta = $prodotto['quantity']; $orderdetail->PrezzoLordo = $prodotto['total']; $orderdetail->Enabled = 1; @@ -6172,7 +6183,8 @@ Route::get('/handle-article-action-pao/{id}/{action}', function ($id, $action) { return libriInPrevendita(); } elseif ($action == 'showOrdini') { return showOrdini(); - + } elseif ($action == 'showDettOrdini') { + return showDettOrdini(); } elseif ($action == 'setPreOrder') { setPreOrder($id, "1", true); } elseif ($action == 'checkPrevendita') {