From 825d47797bcbcaca20b39b76cb77e407a7239a86 Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Thu, 24 Nov 2022 13:15:21 +0100 Subject: [PATCH 01/18] Add cancel order button for the customer --- app/Http/Controllers/CustomerController.php | 27 ++++++++++++ app/Mail/OrderCanceledConfirmMail.php | 47 +++++++++++++++++++++ routes/web.php | 1 + 3 files changed, 75 insertions(+) create mode 100644 app/Mail/OrderCanceledConfirmMail.php diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 53f1f40..c019f5f 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Http\Requests\CustomerRegisterRequest; use App\Http\Requests\LoginRequest; use App\Http\Requests\UpdateInfosRequest; +use App\Mail\OrderCanceledConfirmMail; use App\Mail\PasswordResetMail; use App\Mail\RegisterConfirmMail; use App\Models\Customers; @@ -12,6 +13,7 @@ use App\Models\Magasin; use App\Models\Order; use App\Models\PasswordReset; use App\Models\Salarie; +use App\Models\Setting; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -455,6 +457,31 @@ class CustomerController extends Controller return view('customer.order-detail', compact('order', 'magasin')); } + /** + * mise au statut annulé d'une commande + * + * @param string $reference + * @return \Illuminate\Http\RedirectResponse + */ + public function cancelOrder(string $reference) + { + $order = Order::where('reference', $reference)->first(); + $order->status_id = 7; + $order->save(); + + // Envoi du mail de confirmation aux admins site. + $toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first(); + if (empty($toMailSetting->value)) { + $toMail = config('mail.from.address'); + } else { + $toMail = $toMailSetting->value; + } + + Mail::to($toMail)->queue(new OrderCanceledConfirmMail($order)); + + return back()->with('success', "La commande " . $order->reference . " à été annulée."); + } + /** * delete customers * diff --git a/app/Mail/OrderCanceledConfirmMail.php b/app/Mail/OrderCanceledConfirmMail.php new file mode 100644 index 0000000..4e7d316 --- /dev/null +++ b/app/Mail/OrderCanceledConfirmMail.php @@ -0,0 +1,47 @@ +order = $order; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + $order = $this->order; + + return $this->subject( + "Commande " . config('theme.site_name') . " n°" . $order->reference . " a été annulée." + )->view('mails.order-canceled-confirm', compact('order')); + } +} diff --git a/routes/web.php b/routes/web.php index eefba9a..ab723e6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -222,6 +222,7 @@ Route::name('account.') )->name('change-password'); Route::get('/commandes', [CustomerController::class, 'myOrders'])->name('my-orders'); Route::get('/commandes/{reference}', [CustomerController::class, 'orderDetail'])->name('order-detail'); + Route::get('/commandes/{reference}/annuler', [CustomerController::class, 'cancelOrder'])->name('cancel-order'); } ); From 039587d1e3d449cf3f3a6b37995c54231102e9c4 Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Thu, 24 Nov 2022 16:31:54 +0100 Subject: [PATCH 02/18] Add shop email destination in form contact --- .../Controllers/Bo/MagasinsController.php | 2 ++ app/Http/Controllers/ContactController.php | 23 +++++++++++++------ app/Http/Requests/ContactFormRequest.php | 1 + app/Models/Magasin.php | 2 +- ...021_04_21_165607_create_magasins_table.php | 1 + database/seeders/MagasinsSeeder.php | 13 ++++++----- resources/views/bo/magasins/create.blade.php | 4 ++++ resources/views/bo/magasins/edit.blade.php | 4 ++++ resources/views/bo/magasins/index.blade.php | 2 ++ 9 files changed, 38 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Bo/MagasinsController.php b/app/Http/Controllers/Bo/MagasinsController.php index d16f32c..9c450d1 100644 --- a/app/Http/Controllers/Bo/MagasinsController.php +++ b/app/Http/Controllers/Bo/MagasinsController.php @@ -40,6 +40,7 @@ class MagasinsController extends Controller { $request->validate([ 'name' => 'required|string|max:255', + 'email' => 'required|email:rfc,dns,spoof|max:255', 'address' => 'required|string|max:255', 'postcode' => 'required', 'city' => 'required|string|max:255', @@ -73,6 +74,7 @@ class MagasinsController extends Controller { $request->validate([ 'name' => 'required|string|max:255', + 'email' => 'required|email:rfc,dns,spoof|max:255', 'address' => 'required|string|max:255', 'postcode' => 'required', 'city' => 'required|string|max:255', diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index 83f63c4..038c69b 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -25,11 +25,12 @@ class ContactController extends Controller // @phpcs:enable $status = $request->session()->get('status'); - // 1er magasin en base pour le moment - $magasin = Magasin::first(); + $magasin = Magasin::first(); + $magasins = Magasin::all(); + $content = Content::where('key', 'contact')->first(); - return view('contact', compact('status', 'magasin', 'content')); + return view('contact', compact('status', 'magasins', 'magasin', 'content')); } /** @@ -42,12 +43,20 @@ class ContactController extends Controller { $data = $request->all(); - $toMailSetting = Setting::where('key', 'send_contact_mail_to')->first(); - if (empty($toMailSetting->value)) { - $toMail = config('mail.from.address'); + /** @var Magasin|null */ + $shop = Magasin::where('name', $request->shop)->first(); + + if ($shop) { + $toMail = $shop->email; } else { - $toMail = $toMailSetting->value; + $toMailSetting = Setting::where('key', 'send_contact_mail_to')->first(); + if (empty($toMailSetting->value)) { + $toMail = config('mail.from.address'); + } else { + $toMail = $toMailSetting->value; + } } + // Envoi du mail d'alerte. Mail::to($toMail)->send(new SendContactMail($request)); diff --git a/app/Http/Requests/ContactFormRequest.php b/app/Http/Requests/ContactFormRequest.php index 9e99e13..0fb32b9 100644 --- a/app/Http/Requests/ContactFormRequest.php +++ b/app/Http/Requests/ContactFormRequest.php @@ -27,6 +27,7 @@ class ContactFormRequest extends FormRequest 'last_name' => 'required|min:2', 'first_name' => 'required|min:2', 'email' => 'required|email:rfc,dns,spoof', + 'shop' => 'sometimes', 'subject' => 'required|min:2', 'order_ref' => 'sometimes', 'message' => 'required|min:20|max:1900', diff --git a/app/Models/Magasin.php b/app/Models/Magasin.php index ce7c754..596e2bb 100644 --- a/app/Models/Magasin.php +++ b/app/Models/Magasin.php @@ -15,7 +15,7 @@ class Magasin extends Model * @var array */ protected $fillable = [ - 'name', 'address', 'postcode', 'city', 'phone', + 'name', 'email', 'address', 'postcode', 'city', 'phone', 'latitude', 'longitude', 'gmaps_placeid', 'gmaps_embed_href', 'gmaps_link_href', ]; diff --git a/database/migrations/2021_04_21_165607_create_magasins_table.php b/database/migrations/2021_04_21_165607_create_magasins_table.php index 1454099..2028ff6 100644 --- a/database/migrations/2021_04_21_165607_create_magasins_table.php +++ b/database/migrations/2021_04_21_165607_create_magasins_table.php @@ -17,6 +17,7 @@ class CreateMagasinsTable extends Migration Schema::create('magasins', function (Blueprint $table) { $table->id(); $table->string('name'); + $table->string('email'); $table->string('address'); $table->string('postcode'); $table->string('city'); diff --git a/database/seeders/MagasinsSeeder.php b/database/seeders/MagasinsSeeder.php index 54ffe4f..d6f4e4a 100644 --- a/database/seeders/MagasinsSeeder.php +++ b/database/seeders/MagasinsSeeder.php @@ -14,13 +14,14 @@ class MagasinsSeeder extends Seeder */ public function run() { - $shop = new Magasin(); - $shop->name = 'Point de retrait'; - $shop->address = 'l\'adresse'; - $shop->postcode = '72000'; - $shop->city = 'Le Mans'; + $shop = new Magasin(); + $shop->name = 'Point de retrait'; + $shop->email = 'adresse@domaine.fr'; + $shop->address = 'l\'adresse'; + $shop->postcode = '72000'; + $shop->city = 'Le Mans'; $shop->gmaps_embed_href = "https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d5338.425979915083!2d0.1977634707405403!3d48.00959481914027!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47e288cfcdc1a263%3A0x7acf6d8dc923c25a!2zQ2l0w6kgUGxhbnRhZ2Vuw6p0!5e0!3m2!1sfr!2sfr!4v1619612657653!5m2!1sfr!2sfr"; - $shop->gmaps_link_href = 'https://goo.gl/maps/sxuj7FevRSHsDb8MA'; + $shop->gmaps_link_href = 'https://goo.gl/maps/sxuj7FevRSHsDb8MA'; $shop->save(); } } diff --git a/resources/views/bo/magasins/create.blade.php b/resources/views/bo/magasins/create.blade.php index e1cf8fc..849b3c6 100644 --- a/resources/views/bo/magasins/create.blade.php +++ b/resources/views/bo/magasins/create.blade.php @@ -22,6 +22,10 @@ +
+ + +
diff --git a/resources/views/bo/magasins/edit.blade.php b/resources/views/bo/magasins/edit.blade.php index 2c2349d..feca979 100644 --- a/resources/views/bo/magasins/edit.blade.php +++ b/resources/views/bo/magasins/edit.blade.php @@ -31,6 +31,10 @@ Editer Créneaux de collecte
+
+ + +
diff --git a/resources/views/bo/magasins/index.blade.php b/resources/views/bo/magasins/index.blade.php index e753add..c247f70 100644 --- a/resources/views/bo/magasins/index.blade.php +++ b/resources/views/bo/magasins/index.blade.php @@ -15,6 +15,7 @@ Nom + Email Adresse Téléphone @@ -24,6 +25,7 @@ {{$magasin->name}} + {{$magasin->email}} {{$magasin->address}}, {{$magasin->postcode}} {{$magasin->city}} {{$magasin->phone}} From 6f14d1d9757238c10e659ff35a0d609af71e04c7 Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Thu, 24 Nov 2022 17:10:28 +0100 Subject: [PATCH 03/18] Sort orders list by desc date --- app/Http/Controllers/Bo/OrdersController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index 2d7ca6d..6b079c1 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -71,8 +71,7 @@ class OrdersController extends Controller */ protected function filterOrders(Request $request) { - $orders = Order::query(); - + $orders = Order::query()->orderByDesc('date'); if ($request->rst) { Session::remove('orders.sort_col'); From 9b5a68c12163b5576923c6b8034c023d39d38c85 Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Fri, 25 Nov 2022 09:51:40 +0100 Subject: [PATCH 04/18] Fix magasin migration bug --- ...021_04_21_165607_create_magasins_table.php | 1 - ...022_11_25_094244_add_field_to_magasins.php | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2022_11_25_094244_add_field_to_magasins.php diff --git a/database/migrations/2021_04_21_165607_create_magasins_table.php b/database/migrations/2021_04_21_165607_create_magasins_table.php index 2028ff6..1454099 100644 --- a/database/migrations/2021_04_21_165607_create_magasins_table.php +++ b/database/migrations/2021_04_21_165607_create_magasins_table.php @@ -17,7 +17,6 @@ class CreateMagasinsTable extends Migration Schema::create('magasins', function (Blueprint $table) { $table->id(); $table->string('name'); - $table->string('email'); $table->string('address'); $table->string('postcode'); $table->string('city'); diff --git a/database/migrations/2022_11_25_094244_add_field_to_magasins.php b/database/migrations/2022_11_25_094244_add_field_to_magasins.php new file mode 100644 index 0000000..59a02da --- /dev/null +++ b/database/migrations/2022_11_25_094244_add_field_to_magasins.php @@ -0,0 +1,32 @@ +string('email')->after('name'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('magasins', function (Blueprint $table) { + $table->dropColumn('email'); + }); + } +} From 11dad23fe2cb8c843f580f2778a1481ec5e8f54e Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Fri, 25 Nov 2022 14:42:18 +0100 Subject: [PATCH 05/18] Add confirm admin email according to shop --- app/Http/Controllers/Bo/MagasinsController.php | 6 ++++-- app/Http/Controllers/Bo/OrdersController.php | 17 ++++++++++++----- app/Http/Controllers/ContactController.php | 4 ++-- app/Http/Controllers/CustomerController.php | 2 +- app/Models/Magasin.php | 2 +- .../2022_11_25_094244_add_field_to_magasins.php | 6 ++++-- database/seeders/MagasinsSeeder.php | 2 +- resources/views/bo/magasins/create.blade.php | 16 +++++++++++++--- resources/views/bo/magasins/edit.blade.php | 16 +++++++++++++--- resources/views/bo/magasins/index.blade.php | 6 ++++-- 10 files changed, 55 insertions(+), 22 deletions(-) diff --git a/app/Http/Controllers/Bo/MagasinsController.php b/app/Http/Controllers/Bo/MagasinsController.php index 9c450d1..f08d312 100644 --- a/app/Http/Controllers/Bo/MagasinsController.php +++ b/app/Http/Controllers/Bo/MagasinsController.php @@ -40,7 +40,8 @@ class MagasinsController extends Controller { $request->validate([ 'name' => 'required|string|max:255', - 'email' => 'required|email:rfc,dns,spoof|max:255', + 'email_contact' => 'required|email:rfc,dns,spoof|max:255', + 'email_confirm' => 'nullable|email:rfc,dns,spoof|max:255', 'address' => 'required|string|max:255', 'postcode' => 'required', 'city' => 'required|string|max:255', @@ -74,7 +75,8 @@ class MagasinsController extends Controller { $request->validate([ 'name' => 'required|string|max:255', - 'email' => 'required|email:rfc,dns,spoof|max:255', + 'email_contact' => 'required|email:rfc,dns,spoof|max:255', + 'email_confirm' => 'nullable|email:rfc,dns,spoof|max:255', 'address' => 'required|string|max:255', 'postcode' => 'required', 'city' => 'required|string|max:255', diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index 6b079c1..e9460f4 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -494,7 +494,6 @@ 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]; $magasin_id = $request->selectedmagasin; @@ -519,12 +518,20 @@ class OrdersController extends Controller Mail::to($order->customer->email)->queue(new OrderConfirmMail($order)); // Envoi du mail de confirmation aux admins site. - $toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first(); - if (empty($toMailSetting->value)) { - $toMail = config('mail.from.address'); + /** @var Magasin|null */ + $shop = Magasin::where('id', $magasin_id)->first(); + + if ($shop && $shop->email_confirm) { + $toMail = $shop->email_confirm; } else { - $toMail = $toMailSetting->value; + $toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first(); + if (empty($toMailSetting->value)) { + $toMail = config('mail.from.address'); + } else { + $toMail = $toMailSetting->value; + } } + Mail::to($toMail)->queue(new OrderConfirmAdminMail($order)); // Export commande. diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index 038c69b..7409112 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -46,8 +46,8 @@ class ContactController extends Controller /** @var Magasin|null */ $shop = Magasin::where('name', $request->shop)->first(); - if ($shop) { - $toMail = $shop->email; + if ($shop && $shop->email_contact) { + $toMail = $shop->email_contact; } else { $toMailSetting = Setting::where('key', 'send_contact_mail_to')->first(); if (empty($toMailSetting->value)) { diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index c019f5f..c6f9185 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -469,7 +469,7 @@ class CustomerController extends Controller $order->status_id = 7; $order->save(); - // Envoi du mail de confirmation aux admins site. + // Envoi du mail d'annulation aux admins site. $toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first(); if (empty($toMailSetting->value)) { $toMail = config('mail.from.address'); diff --git a/app/Models/Magasin.php b/app/Models/Magasin.php index 596e2bb..a9236e5 100644 --- a/app/Models/Magasin.php +++ b/app/Models/Magasin.php @@ -15,7 +15,7 @@ class Magasin extends Model * @var array */ protected $fillable = [ - 'name', 'email', 'address', 'postcode', 'city', 'phone', + 'name', 'email_contact', 'email_confirm', 'address', 'postcode', 'city', 'phone', 'latitude', 'longitude', 'gmaps_placeid', 'gmaps_embed_href', 'gmaps_link_href', ]; diff --git a/database/migrations/2022_11_25_094244_add_field_to_magasins.php b/database/migrations/2022_11_25_094244_add_field_to_magasins.php index 59a02da..aeedb87 100644 --- a/database/migrations/2022_11_25_094244_add_field_to_magasins.php +++ b/database/migrations/2022_11_25_094244_add_field_to_magasins.php @@ -14,7 +14,8 @@ class AddFieldToMagasins extends Migration public function up() { Schema::table('magasins', function (Blueprint $table) { - $table->string('email')->after('name'); + $table->string('email_contact')->after('name'); + $table->string('email_confirm')->nullable()->after('email_contact'); }); } @@ -26,7 +27,8 @@ class AddFieldToMagasins extends Migration public function down() { Schema::table('magasins', function (Blueprint $table) { - $table->dropColumn('email'); + $table->dropColumn('email_contact'); + $table->dropColumn('email_confirm'); }); } } diff --git a/database/seeders/MagasinsSeeder.php b/database/seeders/MagasinsSeeder.php index d6f4e4a..0468cbb 100644 --- a/database/seeders/MagasinsSeeder.php +++ b/database/seeders/MagasinsSeeder.php @@ -16,7 +16,7 @@ class MagasinsSeeder extends Seeder { $shop = new Magasin(); $shop->name = 'Point de retrait'; - $shop->email = 'adresse@domaine.fr'; + $shop->email_contact = 'adresse@domaine.fr'; $shop->address = 'l\'adresse'; $shop->postcode = '72000'; $shop->city = 'Le Mans'; diff --git a/resources/views/bo/magasins/create.blade.php b/resources/views/bo/magasins/create.blade.php index 849b3c6..db19cfb 100644 --- a/resources/views/bo/magasins/create.blade.php +++ b/resources/views/bo/magasins/create.blade.php @@ -22,9 +22,19 @@
-
- - +
+
+
+ + +
+
+
+
+ + +
+
diff --git a/resources/views/bo/magasins/edit.blade.php b/resources/views/bo/magasins/edit.blade.php index feca979..0b768aa 100644 --- a/resources/views/bo/magasins/edit.blade.php +++ b/resources/views/bo/magasins/edit.blade.php @@ -31,9 +31,19 @@ Editer Créneaux de collecte
-
- - +
+
+
+ + +
+
+
+
+ + +
+
diff --git a/resources/views/bo/magasins/index.blade.php b/resources/views/bo/magasins/index.blade.php index c247f70..6698fe2 100644 --- a/resources/views/bo/magasins/index.blade.php +++ b/resources/views/bo/magasins/index.blade.php @@ -15,7 +15,8 @@ Nom - Email + Email de contact + Email de confirmation
de commande Adresse Téléphone @@ -25,7 +26,8 @@ {{$magasin->name}} - {{$magasin->email}} + {{$magasin->email_contact}} + {{$magasin->email_confirm}} {{$magasin->address}}, {{$magasin->postcode}} {{$magasin->city}} {{$magasin->phone}} From 1cca69c933b12894d71419ffe938b8f57c2ab632 Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Fri, 25 Nov 2022 15:22:16 +0100 Subject: [PATCH 06/18] BO - Add order filters --- app/Http/Controllers/Bo/OrdersController.php | 24 ++++++++- resources/views/bo/orders/index.blade.php | 51 ++++++++++++++++++-- 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index e9460f4..bfd59ba 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -16,6 +16,7 @@ use App\Mail\OrderConfirmMail; use App\Mail\OrderConfirmAdminMail; use App\Jobs\CsvOrderWrite; use App\Models\Customers; +use App\Models\OrdersStatus; use App\Models\Setting; use Carbon\Carbon; use Carbon\CarbonImmutable; @@ -37,9 +38,30 @@ class OrdersController extends Controller { $orders = $this->filterOrders($request); + $status_orders = OrdersStatus::all(); + $magasins = Magasin::all(); + + $filter_status_order = $request->query('filter_status_order'); + $filter_magasin = $request->query('filter_magasin'); + $filter_reference = $request->query('filter_reference'); + + if (!empty($filter_status_order)) { + $orders = $orders->where('status_id', $filter_status_order); + } + if (!empty($filter_magasin)) { + $orders = $orders->select('orders.*'); + $orders = $orders->join('timeslots', 'timeslots.order_id', '=', 'orders.id'); + $orders = $orders->where('timeslots.magasin_id', $filter_magasin); + } + if (!empty($filter_reference)) { + $orders = $orders->where('reference', 'like', '%' . $filter_reference . '%'); + } $orders = $orders->paginate(10); - return view('bo.orders.index', compact('orders')); + return view( + 'bo.orders.index', + compact('orders', 'status_orders', 'magasins', 'filter_status_order', 'filter_magasin', 'filter_reference') + ); } /** diff --git a/resources/views/bo/orders/index.blade.php b/resources/views/bo/orders/index.blade.php index 2d09e9b..e15751e 100644 --- a/resources/views/bo/orders/index.blade.php +++ b/resources/views/bo/orders/index.blade.php @@ -1,10 +1,55 @@ @extends('layouts.bo-layout') @section('content') -
-

Commandes @if (isset($today)) à retirer aujourd'hui @endif

+
+

Commandes @if (isset($today)) à retirer aujourd'hui @endif

+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ + Effacer le filtre +
+
+
+
+
+ @if (session('success')) - {{ session('success') }} + {{ session('success') }} @endif
From 30e53b81b3699bb8ede5396f03bbb403f7839fbd Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 11:04:22 +0100 Subject: [PATCH 07/18] Fix sort date bug (review feedback) --- app/Http/Controllers/Bo/OrdersController.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index bfd59ba..c4b8f2c 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -21,6 +21,7 @@ use App\Models\Setting; use Carbon\Carbon; use Carbon\CarbonImmutable; use Carbon\CarbonInterval; +use Doctrine\DBAL\Query\QueryBuilder; use Gloudemans\Shoppingcart\Facades\Cart; use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; @@ -52,6 +53,13 @@ class OrdersController extends Controller $orders = $orders->select('orders.*'); $orders = $orders->join('timeslots', 'timeslots.order_id', '=', 'orders.id'); $orders = $orders->where('timeslots.magasin_id', $filter_magasin); + + // $orders = $orders->whereHas( + // 'timeslots', + // function (QueryBuilder $q, $filter_magasin) { + // $q->where('timeslots.magasin_id', $filter_magasin); + // } + // ); } if (!empty($filter_reference)) { $orders = $orders->where('reference', 'like', '%' . $filter_reference . '%'); @@ -93,7 +101,8 @@ class OrdersController extends Controller */ protected function filterOrders(Request $request) { - $orders = Order::query()->orderByDesc('date'); + // $orders = Order::query()->orderByDesc('date'); + $orders = Order::query(); if ($request->rst) { Session::remove('orders.sort_col'); @@ -131,7 +140,9 @@ class OrdersController extends Controller case 'customer_id': $orders = $orders->orderBy('customer_id', Session::get('orders.sort_way')); break; - }//end switch + } //end switch + } else { + $orders->orderByDesc('date'); }//end if return $orders; From 6b3145eb8ff8f8039cb46de1d0a9f5538c9b68ae Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 11:55:25 +0100 Subject: [PATCH 08/18] Fix filters orders (review feedback) --- app/Http/Controllers/Bo/OrdersController.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index c4b8f2c..9db7583 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -21,8 +21,8 @@ use App\Models\Setting; use Carbon\Carbon; use Carbon\CarbonImmutable; use Carbon\CarbonInterval; -use Doctrine\DBAL\Query\QueryBuilder; use Gloudemans\Shoppingcart\Facades\Cart; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use Illuminate\Support\Facades\Session; @@ -50,19 +50,15 @@ class OrdersController extends Controller $orders = $orders->where('status_id', $filter_status_order); } if (!empty($filter_magasin)) { - $orders = $orders->select('orders.*'); - $orders = $orders->join('timeslots', 'timeslots.order_id', '=', 'orders.id'); - $orders = $orders->where('timeslots.magasin_id', $filter_magasin); - - // $orders = $orders->whereHas( - // 'timeslots', - // function (QueryBuilder $q, $filter_magasin) { - // $q->where('timeslots.magasin_id', $filter_magasin); - // } - // ); + $orders = $orders->whereHas( + 'timeslot', + function (Builder $q) use ($filter_magasin) { + $q->where('timeslots.magasin_id', $filter_magasin); + } + ); } if (!empty($filter_reference)) { - $orders = $orders->where('reference', 'like', '%' . $filter_reference . '%'); + $orders = $orders->where('reference', 'like', "%[$filter_reference]%"); } $orders = $orders->paginate(10); From 9e7fad8ebbeb0fe80ac11a67f5fea53a936408ed Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 12:03:19 +0100 Subject: [PATCH 09/18] Fix confirm admin mail bug (review feedback) --- app/Http/Controllers/Bo/OrdersController.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index 9db7583..0efd470 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -514,6 +514,7 @@ class OrdersController extends Controller * * @param Request $request * @return \Illuminate\Http\RedirectResponse + * @throws \RuntimeException If email missing. */ public function setTimeSlot(Request $request) { @@ -547,20 +548,25 @@ class OrdersController extends Controller Mail::to($order->customer->email)->queue(new OrderConfirmMail($order)); // Envoi du mail de confirmation aux admins site. - /** @var Magasin|null */ + /** @var \App\Model\Magasin|null */ $shop = Magasin::where('id', $magasin_id)->first(); - if ($shop && $shop->email_confirm) { + if ($shop and $shop->email_confirm) { + /** @var string */ $toMail = $shop->email_confirm; } else { - $toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first(); - if (empty($toMailSetting->value)) { + /** @var string|null */ + $toMail = \optional(Setting::where('key', 'send_order_confirm_mail_to')->first())->value; + if (!$toMail) { + /** @var string|null */ $toMail = config('mail.from.address'); - } else { - $toMail = $toMailSetting->value; } } + if (!$toMail) { + throw new \RuntimeException('Impossible de trouver un mail'); + } + Mail::to($toMail)->queue(new OrderConfirmAdminMail($order)); // Export commande. From e8d1669baedabf1f9038568a4ad659c9ddb6d8c0 Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 12:08:55 +0100 Subject: [PATCH 10/18] Fix contact mail bug (review feedback) --- app/Http/Controllers/ContactController.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index 7409112..5bdcb46 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -38,25 +38,29 @@ class ContactController extends Controller * * @param ContactFormRequest $request * @return \Illuminate\Http\Response + * @throws \RuntimeException If email missing. */ public function contactSubmit(ContactFormRequest $request) { - $data = $request->all(); - - /** @var Magasin|null */ + /** @var \App\Model\Magasin|null */ $shop = Magasin::where('name', $request->shop)->first(); - if ($shop && $shop->email_contact) { + if ($shop and $shop->email_contact) { + /** @var string */ $toMail = $shop->email_contact; } else { - $toMailSetting = Setting::where('key', 'send_contact_mail_to')->first(); - if (empty($toMailSetting->value)) { + /** @var string|null */ + $toMail = \optional(Setting::where('key', 'send_contact_mail_to')->first())->value; + if (!$toMail) { + /** @var string|null */ $toMail = config('mail.from.address'); - } else { - $toMail = $toMailSetting->value; } } + if (!$toMail) { + throw new \RuntimeException('Impossible de trouver un mail'); + } + // Envoi du mail d'alerte. Mail::to($toMail)->send(new SendContactMail($request)); From e9085b681a178e28796e669848f98f0abe31268d Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 12:30:40 +0100 Subject: [PATCH 11/18] Fix canceled order mail (review feedback) --- app/Http/Controllers/CustomerController.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index c6f9185..9f43113 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -462,6 +462,7 @@ class CustomerController extends Controller * * @param string $reference * @return \Illuminate\Http\RedirectResponse + * @throws \RuntimeException If email missing. */ public function cancelOrder(string $reference) { @@ -470,11 +471,15 @@ class CustomerController extends Controller $order->save(); // Envoi du mail d'annulation aux admins site. - $toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first(); - if (empty($toMailSetting->value)) { + /** @var string|null */ + $toMail = \optional(Setting::where('key', 'send_order_confirm_mail_to')->first())->value; + if (!$toMail) { + /** @var string|null */ $toMail = config('mail.from.address'); - } else { - $toMail = $toMailSetting->value; + } + + if (!$toMail) { + throw new \RuntimeException('Impossible de trouver un mail'); } Mail::to($toMail)->queue(new OrderCanceledConfirmMail($order)); From 1aceb54b0e2df14be774c810fb1eefa84b4ebceb Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 12:31:25 +0100 Subject: [PATCH 12/18] Fix contact request rule bug (review feedback) --- app/Http/Requests/ContactFormRequest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/ContactFormRequest.php b/app/Http/Requests/ContactFormRequest.php index 0fb32b9..b2aab85 100644 --- a/app/Http/Requests/ContactFormRequest.php +++ b/app/Http/Requests/ContactFormRequest.php @@ -27,7 +27,7 @@ class ContactFormRequest extends FormRequest 'last_name' => 'required|min:2', 'first_name' => 'required|min:2', 'email' => 'required|email:rfc,dns,spoof', - 'shop' => 'sometimes', + 'shop' => 'present|nullable|string|exists:magasins,name', 'subject' => 'required|min:2', 'order_ref' => 'sometimes', 'message' => 'required|min:20|max:1900', @@ -47,6 +47,7 @@ class ContactFormRequest extends FormRequest 'ok_cgv.accepted' => __('You must accept the terms and conditions and the privacy policy'), 'file.max' => __('La taille du fichier ne peut pas dépasser :max kilo-octets.'), 'file.mimes' => __('Le fichier doit être de type : :values.'), + 'shop.exists' => __('Le magasin :exists est introuvable.') ]; } } From 0c22695c77c112973a900b7c0bf48d2bcf5f958b Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 12:38:59 +0100 Subject: [PATCH 13/18] Fix type input email bug (review feedback) --- resources/views/bo/magasins/create.blade.php | 4 ++-- resources/views/bo/magasins/edit.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/bo/magasins/create.blade.php b/resources/views/bo/magasins/create.blade.php index db19cfb..1721d86 100644 --- a/resources/views/bo/magasins/create.blade.php +++ b/resources/views/bo/magasins/create.blade.php @@ -26,13 +26,13 @@
- +
- +
diff --git a/resources/views/bo/magasins/edit.blade.php b/resources/views/bo/magasins/edit.blade.php index 0b768aa..326d959 100644 --- a/resources/views/bo/magasins/edit.blade.php +++ b/resources/views/bo/magasins/edit.blade.php @@ -35,13 +35,13 @@
- +
- +
From 5872d670fec8387dcb4af63e863274396564ecfe Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 12:49:10 +0100 Subject: [PATCH 14/18] Add translatables column names (review feedback) --- resources/views/bo/magasins/index.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/bo/magasins/index.blade.php b/resources/views/bo/magasins/index.blade.php index 6698fe2..0f64303 100644 --- a/resources/views/bo/magasins/index.blade.php +++ b/resources/views/bo/magasins/index.blade.php @@ -14,11 +14,11 @@
- - - - - + + + + + From 6eef17a390e25acf48cd9c49f66776ab07cd31fa Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 12:59:14 +0100 Subject: [PATCH 15/18] Add translateable title (review feedback) --- resources/views/bo/orders/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/bo/orders/index.blade.php b/resources/views/bo/orders/index.blade.php index e15751e..e74b4ce 100644 --- a/resources/views/bo/orders/index.blade.php +++ b/resources/views/bo/orders/index.blade.php @@ -2,7 +2,7 @@ @section('content')
-

Commandes @if (isset($today)) à retirer aujourd'hui @endif

+

{{ __('Commandes') }} @if (isset($today))
{{ __('à retirer aujourd\'hui') }} @endif

From 1f235efebedb21d86c7943bfb6f0e79bf3a66c4c Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 13:07:25 +0100 Subject: [PATCH 16/18] Delete comment --- app/Http/Controllers/Bo/OrdersController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index 0efd470..66348fe 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -97,7 +97,6 @@ class OrdersController extends Controller */ protected function filterOrders(Request $request) { - // $orders = Order::query()->orderByDesc('date'); $orders = Order::query(); if ($request->rst) { From 7ba2c3b2fe53215a871f07163b18f5aabff9f7f4 Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Mon, 28 Nov 2022 13:07:49 +0100 Subject: [PATCH 17/18] Fix null order bug (review feedback) --- app/Http/Controllers/CustomerController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 9f43113..564ce9e 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -466,7 +466,11 @@ class CustomerController extends Controller */ public function cancelOrder(string $reference) { - $order = Order::where('reference', $reference)->first(); + /** @var \App\Models\Order|null */ + $order = Order::where('reference', $reference)->first(); + if (!$order) { + throw new \RuntimeException('Impossible de trouver un enregistrement Order'); + } $order->status_id = 7; $order->save(); From 4359c85b8c5366183de8bee4552d91a2ec02f3fc Mon Sep 17 00:00:00 2001 From: "S. Hattry" Date: Thu, 8 Dec 2022 09:35:28 +0100 Subject: [PATCH 18/18] Fix filter order bug --- 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 66348fe..179ccfd 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -58,7 +58,7 @@ class OrdersController extends Controller ); } if (!empty($filter_reference)) { - $orders = $orders->where('reference', 'like', "%[$filter_reference]%"); + $orders = $orders->where('reference', 'like', "%{$filter_reference}%"); } $orders = $orders->paginate(10);
NomEmail de contactEmail de confirmation
de commande
AdresseTéléphone{{ __('Nom') }}{{ __('Email de contact') }}{{ __('Email de confirmation') }}
{{ __('de commande') }}
{{ __('Adresse') }}{{ __('Téléphone') }}