From 652d8430f56f504dd8ec7f32696629c2101488b9 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Fri, 22 Apr 2022 12:50:46 +0000 Subject: [PATCH 1/2] following CRM changes, fix getting cutomer name for order index --- app/Http/Controllers/Bo/OrdersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index e243526..7581bc3 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -499,7 +499,7 @@ class OrdersController extends Controller return view('bo.customer.tippy-card', compact('cust')); } if ($mode == "json") { - return $cust; + return $cust->apiData; } return view('bo.customer.info-card', compact('cust')); } From 6a8676600f651a23697a5920ae9c252ecb1f80a4 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Tue, 26 Apr 2022 15:40:32 +0200 Subject: [PATCH 2/2] Date de livraison = date de livraison --- app/Jobs/CsvOrderWrite.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Jobs/CsvOrderWrite.php b/app/Jobs/CsvOrderWrite.php index 464fab9..b35a425 100644 --- a/app/Jobs/CsvOrderWrite.php +++ b/app/Jobs/CsvOrderWrite.php @@ -82,9 +82,6 @@ class CsvOrderWrite extends CsvJobs //convert to date object $datLivraison = Carbon::createFromFormat('d/m/Y H:i', $timeslot->day . " " . $timeslot->time); - //on enleve un jour pour avoir le produit la veille - $datLivraison = $datLivraison->subDay(); - $oneline = [ $product->foodProduct->no_art, //21/01/2022 : suppression du pcb ici $code_client,