Merge branch 'develop' of https://voight001.lesidc.com/boutique-cnc into develop
This commit is contained in:
commit
e26f3afb69
2 changed files with 6 additions and 8 deletions
|
|
@ -77,13 +77,14 @@ class CustomerController extends Controller
|
|||
$crmCustomer->country = Country::france();
|
||||
$crmCustomer->save();
|
||||
|
||||
// * Enrregistrement du Hashcode
|
||||
/** @var \App\Models\Customers $customer */
|
||||
$customer = new Customers($request->all());
|
||||
$customer->hashcode = $crmCustomer->hashcode;
|
||||
$customer->saveOrFail();
|
||||
|
||||
// * liaison éventuelle avec la table salaries
|
||||
if ($request->matricule && $request->code) {
|
||||
/** @var \App\Models\Customers $customer */
|
||||
$customer = new Customers($request->all());
|
||||
$customer->hashcode = $crmCustomer->hashcode;
|
||||
$customer->saveOrFail();
|
||||
|
||||
/** @var \App\Models\Salarie $salarie */
|
||||
$salarie = Salarie::where('matricule', '=', $request->matricule)
|
||||
->where('code', '=', $request->code)
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue