Merge branch 'develop' of https://voight001.lesidc.com/boutique-cnc into develop

This commit is contained in:
Olivier Legat 2022-04-27 09:54:42 +02:00
commit 69af67ff83
2 changed files with 1 additions and 4 deletions

View file

@ -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'));
}

View file

@ -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,