suppression du pcb dans la colonne codeart

petit clean de code
This commit is contained in:
Olivier Legat 2022-01-21 08:24:11 +01:00
parent a02a8b4e2d
commit f01d698922
2 changed files with 37 additions and 36 deletions

View file

@ -50,18 +50,19 @@ class OrdersController extends Controller
$orders = $this->filterOrders($request);
//filter today
$today = CarbonImmutable::now()->startOfDay();
$orders = $orders->whereHas('timeslot', function($q) use($today) {
$today = CarbonImmutable::now()->startOfDay();
$orders = $orders->whereHas('timeslot', function ($q) use ($today) {
$q->where('day', '=', $today->format('d/m/Y'));
});
$orders = $orders->get(); //paginate(20);
return view('bo.orders.index', compact('orders','today'));
return view('bo.orders.index', compact('orders', 'today'));
}
protected function filterOrders(Request $request) {
protected function filterOrders(Request $request)
{
$orders = Order::query();
@ -192,7 +193,7 @@ class OrdersController extends Controller
{
//save
Cart::instance('panier');
$order = new Order();
$order = new Order();
//generate order ref
$order->reference = $this->generateOrderRef();
$order->date = Carbon::now();
@ -240,7 +241,8 @@ class OrdersController extends Controller
* generate order Reference
* for a new order
*/
public function generateOrderRef() {
public function generateOrderRef()
{
//Avant
//Str::uuid();
@ -251,7 +253,7 @@ class OrdersController extends Controller
$countorders = Order::whereDate('created_at', Carbon::today())->count();
//add one
$countorders++;
$ref = $now->isoFormat('YYYYMMDDHHmm') . str_pad($countorders,3,"0",STR_PAD_LEFT);
$ref = $now->isoFormat('YYYYMMDDHHmm') . str_pad($countorders, 3, "0", STR_PAD_LEFT);
return $ref;
}
@ -261,8 +263,7 @@ class OrdersController extends Controller
public function timeSlotPick($reference)
{
$activestep = 3;
if(config('theme.multi_relay'))
{
if (config('theme.multi_relay')) {
$magasin = Magasin::all();
} else {
$magasin = Magasin::first();
@ -283,15 +284,14 @@ class OrdersController extends Controller
public function getAvailableCreneauxByShop($id)
{
//setting à stocker et réutiliser
$plage_days = Setting::where('key', 'order_withdrawal_period')->firstOrFail()->value;
$plage_days = Setting::where('key', 'order_withdrawal_period')->firstOrFail()->value;
$magasin = Magasin::findOrFail($id);
$timeslotSettings = $magasin->timeslotSettings;
$magasin = Magasin::findOrFail($id);
$timeslotSettings = $magasin->timeslotSettings;
//$timeslotSettings = TimeslotSetting::all();
//fabriquons un tableau recap
$plage = array();
foreach ($timeslotSettings as $day) {
$plage[$day->day_index] = array(
'morning_start' => $day->morning_start,
'morning_end' => $day->morning_end,
@ -326,9 +326,9 @@ class OrdersController extends Controller
for ($i = 0; $i < $plage_days; $i++) {
/** @var Carbon */
$current = $today->add($i, 'day');
$weekDay = $current->weekday();
$interval = CarbonInterval::createFromFormat('h:i', $plage[$weekDay]['interval'] ?? '00:15');
$current = $today->add($i, 'day');
$weekDay = $current->weekday();
$interval = CarbonInterval::createFromFormat('h:i', $plage[$weekDay]['interval'] ?? '00:15');
//si c'est un jour exception skip
$skip = false;
@ -345,7 +345,7 @@ class OrdersController extends Controller
$currentTime = Carbon::createFromTimeString($plage[$weekDay]['morning_start']);
$endTime = Carbon::createFromTimeString($plage[$weekDay]['morning_end']);
do {
$creneau = $currentTime->format('H:i');
$creneau = $currentTime->format('H:i');
$nbtakens = $magasin->timeslots()
->where('day', $current->format('d/m/Y'))
->where('time', $creneau)->count();
@ -359,7 +359,7 @@ class OrdersController extends Controller
$isDispo = true;
}
if($current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i')) < $now->add($delaiPrepa)) {
if ($current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i')) < $now->add($delaiPrepa)) {
$isDispo = false;
}
//attention si la date est passée (today mais avant maintenant) : pas de créneau
@ -374,15 +374,15 @@ class OrdersController extends Controller
$currentTime = Carbon::createFromTimeString($plage[$weekDay]['afternoon_start']);
$endTime = Carbon::createFromTimeString($plage[$weekDay]['afternoon_end']);
do {
$creneau = $currentTime->format('H:i');
$nbtakens = Timeslot::where('day',$current->format('d/m/Y'))->where('time',$creneau)->count();
if($nbtakens >= $plage[$weekDay]['max_orders_per_interval']) {
$creneau = $currentTime->format('H:i');
$nbtakens = Timeslot::where('day', $current->format('d/m/Y'))->where('time', $creneau)->count();
if ($nbtakens >= $plage[$weekDay]['max_orders_per_interval']) {
$isDispo = false;
} else {
$isDispo = true;
}
if($current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i')) < $now->add($delaiPrepa)) {
if ($current->addHours($currentTime->format('H'))->addMinutes($currentTime->format('i')) < $now->add($delaiPrepa)) {
$isDispo = false;
}
@ -398,7 +398,8 @@ class OrdersController extends Controller
}
//call ajax pour le composant vue de timeslots
public function getAvailableCreneaux(Request $request) {
public function getAvailableCreneaux(Request $request)
{
return $this->getAvailableCreneauxByShop($request->id);
}
@ -415,12 +416,12 @@ class OrdersController extends Controller
'ok_cgv' => 'accepted',
]);
$time_slot = Carbon::createFromFormat('d/m/Y-H:i', $request->selectedcreneau);
$tsday = explode('-', $request->selectedcreneau)[0];
$tstime = explode('-', $request->selectedcreneau)[1];
$time_slot = Carbon::createFromFormat('d/m/Y-H:i', $request->selectedcreneau);
$tsday = explode('-', $request->selectedcreneau)[0];
$tstime = explode('-', $request->selectedcreneau)[1];
$magasin_id = $request->selectedmagasin;
$reference = $request->order_ref;
$order = Order::where('reference', '=', $reference)->firstOrFail();
$reference = $request->order_ref;
$order = Order::where('reference', '=', $reference)->firstOrFail();
if ($order->status_id == 1) {
// on ne traite l'enregistrement que pour les commandes en attente venant de l'étape de récap
@ -442,7 +443,7 @@ class OrdersController extends Controller
//envoi du mail de confirmation aux admins site
$toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first();
if(empty($toMailSetting->value)) {
if (empty($toMailSetting->value)) {
$toMail = config('mail.from.address');
} else {
$toMail = $toMailSetting->value;
@ -460,9 +461,10 @@ class OrdersController extends Controller
return redirect()->route('sales.confirm', ['reference' => $order->reference]);
}
public function generateOrder($reference) {
public function generateOrder($reference)
{
$order = Order::where('reference', '=', $reference)->with('lines')->firstOrFail();
$job = new CsvOrderWrite($order);
$job = new CsvOrderWrite($order);
$job->handle();
dd('end');
}
@ -492,11 +494,11 @@ class OrdersController extends Controller
public function getCustomerInfo($id, $mode = null)
{
$cust = Customers::findOrFail($id);
if(!is_null($mode)) {
if($mode=="tippy") {
if (!is_null($mode)) {
if ($mode == "tippy") {
return view('bo.customer.tippy-card', compact('cust'));
}
if($mode=="json") {
if ($mode == "json") {
return $cust;
}
return view('bo.customer.info-card', compact('cust'));

View file

@ -86,7 +86,7 @@ class CsvOrderWrite extends CsvJobs
$datLivraison = $datLivraison->subDay();
$oneline = [
$product->foodProduct->no_art . ".000", //manque le .000 pcb
$product->foodProduct->no_art, //21/01/2022 : suppression du pcb ici
$code_client,
$product->reference,
"commande ferme",
@ -109,6 +109,5 @@ class CsvOrderWrite extends CsvJobs
$disk->put($outputfilename, $data);
//send this file by mail
}
}