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

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

@@ -30,8 +30,6 @@ class OrderController extends Controller
public function edit($id)
{
$data = Orders::edit($id);
// dump($data);
// exit;
return view('Admin.Shop.Orders.edit', $data);
}
@@ -39,13 +37,16 @@ class OrderController extends Controller
public function store(Request $request)
{
$order = Orders::store($request->all());
switch ($order->status) {
case 1:
OrderMails::sendPreparation($order->id);
break;
case 2:
OrderMails::sendShipping($order->id);
break;
if ($order->wasChanged('status')) {
switch ($order->status) {
case 1:
OrderMails::sendPreparation($order->id);
break;
case 2:
OrderMails::sendShipping($order->id);
break;
default:
}
}
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->nom = $order->customer->last_name;
$this->adresse = $order->address->address;
$this->cp = $order->address->zipcode;
$this->ville = $order->address->city;
$this->adresse = $order->delivery_address->address;
$this->cp = $order->delivery_address->zipcode;
$this->ville = $order->delivery_address->city;
$this->societe = $order->customer->company;
$this->email = $order->customer->email;
$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)
{
$order = Orders::get($orderId, ['customer', 'address']);
$order = Orders::get($orderId, ['customer', 'delivery_address']);
$mail = new Preparation($order);
return Mail::to($order->customer->email)->send($mail);
@@ -36,7 +36,7 @@ class OrderMails
public static function sendShipping($orderId)
{
$order = Orders::get($orderId, ['customer', 'address']);
$order = Orders::get($orderId, ['customer', 'delivery_address']);
$mail = new Acheminement($order);
return Mail::to($order->customer->email)->send($mail);