jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fix on updating status of order, upgrade datatables

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-09-13 22:17:49 +02:00
parent ab8ab8eba1
commit 69478e3c74
6 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Admin/Shop/OrderController.php
View File

@@ -30,8 +30,6 @@ class OrderController extends Controller
public function edit($id) public function edit($id)
{ {
$data = Orders::edit($id); $data = Orders::edit($id);
// dump($data);
// exit;
return view('Admin.Shop.Orders.edit', $data); return view('Admin.Shop.Orders.edit', $data);
} }
@@ -39,6 +37,7 @@ class OrderController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$order = Orders::store($request->all()); $order = Orders::store($request->all());
if ($order->wasChanged('status')) {
switch ($order->status) { switch ($order->status) {
case 1: case 1:
OrderMails::sendPreparation($order->id); OrderMails::sendPreparation($order->id);
@@ -46,6 +45,8 @@ class OrderController extends Controller
case 2: case 2:
OrderMails::sendShipping($order->id); OrderMails::sendShipping($order->id);
break; break;
default:
}
} }
return redirect()->route('Admin.Shop.Orders.index'); return redirect()->route('Admin.Shop.Orders.index');

6
app/Mail/Acheminement.php
View File

@@ -45,9 +45,9 @@ class Acheminement extends TemplateMailable
{ {
$this->prenom = $order->customer->first_name; $this->prenom = $order->customer->first_name;
$this->nom = $order->customer->last_name; $this->nom = $order->customer->last_name;
$this->adresse = $order->address->address; $this->adresse = $order->delivery_address->address;
$this->cp = $order->address->zipcode; $this->cp = $order->delivery_address->zipcode;
$this->ville = $order->address->city; $this->ville = $order->delivery_address->city;
$this->societe = $order->customer->company; $this->societe = $order->customer->company;
$this->email = $order->customer->email; $this->email = $order->customer->email;
$this->numero_suivi = $order->delivery_ref; $this->numero_suivi = $order->delivery_ref;

4
app/Repositories/Shop/OrderMails.php
View File

@@ -28,7 +28,7 @@ class OrderMails
public static function sendPreparation($orderId) public static function sendPreparation($orderId)
{ {
$order = Orders::get($orderId, ['customer', 'address']); $order = Orders::get($orderId, ['customer', 'delivery_address']);
$mail = new Preparation($order); $mail = new Preparation($order);
return Mail::to($order->customer->email)->send($mail); return Mail::to($order->customer->email)->send($mail);
@@ -36,7 +36,7 @@ class OrderMails
public static function sendShipping($orderId) public static function sendShipping($orderId)
{ {
$order = Orders::get($orderId, ['customer', 'address']); $order = Orders::get($orderId, ['customer', 'delivery_address']);
$mail = new Acheminement($order); $mail = new Acheminement($order);
return Mail::to($order->customer->email)->send($mail); return Mail::to($order->customer->email)->send($mail);

2
composer.json
View File

@@ -103,7 +103,7 @@
"watson/rememberable": "^6.0", "watson/rememberable": "^6.0",
"wildside/userstamps": "^2.1", "wildside/userstamps": "^2.1",
"yadahan/laravel-authentication-log": "^1.2", "yadahan/laravel-authentication-log": "^1.2",
"yajra/laravel-datatables": "^1.5" "yajra/laravel-datatables": "^9.0"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.8", "barryvdh/laravel-debugbar": "^3.8",

12
resources/views/Admin/Shop/Orders/edit.blade.php
View File

@@ -13,7 +13,7 @@
<h4>{{ $order['delivery']['name'] }} </h4> <h4>{{ $order['delivery']['name'] }} </h4>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
@include('components.form.buttons.button-save') <x-save />
</div> </div>
</div> </div>
@@ -121,3 +121,13 @@
</x-card> </x-card>
{{ Form::close() }} {{ Form::close() }}
@endsection @endsection
@include('load.form.save')
@include('load.form.select2')
@push('js')
<script>
initSaveForm('#order-form');
initSelect2();
</script>
@endpush

4
resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
View File

@@ -5,7 +5,9 @@
<h1 class="p-2 green" style="font-size: 2em;">{{ $shelve['name'] }}</h1> <h1 class="p-2 green" style="font-size: 2em;">{{ $shelve['name'] }}</h1>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="mt-2 btn btn-green-dark" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Découvrir la sélection</a> <a href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}" class="mt-2 btn btn-green-dark" >
Découvrir la sélection
</a>
<a class="mt-2 green-dark btn" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Tout voir</a> <a class="mt-2 green-dark btn" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Tout voir</a>
</div> </div>
</div> </div>