Mails angepasst. Infos zu Bestellung jetzt in Mail
This commit is contained in:
parent
abaf17eb0a
commit
1a656cf370
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Mail;
|
namespace App\Mail;
|
||||||
|
|
||||||
|
use App\Filament\Resources\Orders\OrderResource;
|
||||||
use App\Models\Order;
|
use App\Models\Order;
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
@ -41,6 +42,10 @@ class OrderArrived extends Mailable
|
|||||||
{
|
{
|
||||||
return new Content(
|
return new Content(
|
||||||
markdown: 'mail.order-arrived',
|
markdown: 'mail.order-arrived',
|
||||||
|
with: [
|
||||||
|
'url' => OrderResource::getUrl('edit', ['record' => $this->order]),
|
||||||
|
'order' => $this->order,
|
||||||
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Mail;
|
namespace App\Mail;
|
||||||
|
|
||||||
|
use App\Filament\Resources\Orders\OrderResource;
|
||||||
use App\Models\Order;
|
use App\Models\Order;
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
@ -41,6 +42,10 @@ class OrderRegistered extends Mailable
|
|||||||
{
|
{
|
||||||
return new Content(
|
return new Content(
|
||||||
markdown: 'mail.order-registered',
|
markdown: 'mail.order-registered',
|
||||||
|
with: [
|
||||||
|
'url' => OrderResource::getUrl('edit', ['record' => $this->order]),
|
||||||
|
'order' => $this->order,
|
||||||
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,15 +28,13 @@ class OrderObserver
|
|||||||
*/
|
*/
|
||||||
public function updated(Order $order): void
|
public function updated(Order $order): void
|
||||||
{
|
{
|
||||||
$hasChanged = array_diff($order->getOriginal(), $order->getAttributes());
|
$hasChanged = $order->getChanges();
|
||||||
if($hasChanged && isset($hasChanged['orderstatus_id'])) {
|
if($hasChanged && isset($hasChanged['orderstatus_id'])) {
|
||||||
$orderstatusOrdered = Orderstatus::where("name", "bestellt")->first();
|
if($order->orderstatus->name == "bestellt") {
|
||||||
if($order->orderstatus_id == $orderstatusOrdered->id) {
|
$order->orderdatetime = $order->updated_at;
|
||||||
$order->orderdatetime = Carbon::now()->toDateTimeString();
|
|
||||||
$order->saveQuietly();
|
$order->saveQuietly();
|
||||||
}
|
}
|
||||||
$orderstatusArrived = Orderstatus::where("name", "angekommen")->first();
|
if($order->orderstatus->name == "angekommen") {
|
||||||
if($order->orderstatus_id == $orderstatusArrived->id) {
|
|
||||||
$user = User::find($order->user_id);
|
$user = User::find($order->user_id);
|
||||||
Mail::to($user)->send(new OrderArrived($order));
|
Mail::to($user)->send(new OrderArrived($order));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,10 +2,15 @@
|
|||||||
# Bestellung angekommen
|
# Bestellung angekommen
|
||||||
|
|
||||||
Eine deiner Bestellungen ist angekommen.
|
Eine deiner Bestellungen ist angekommen.
|
||||||
|
|
||||||
|
* Name: {{ $order->name }}
|
||||||
|
* Anzahl: {{ $order->count }}
|
||||||
|
* <a href="{{ $order->url }}">{{ $order->url }}</a>
|
||||||
|
|
||||||
Bitte nicht vergessen, die Bestellung "abzuhaken", indem du auf "angenommen" drückst
|
Bitte nicht vergessen, die Bestellung "abzuhaken", indem du auf "angenommen" drückst
|
||||||
|
|
||||||
<x-mail::button :url="'https://z-lab-cockpit.digital-infinity.de/orders'">
|
<x-mail::button :url="$url">
|
||||||
Zum Cockpit
|
Zur Bestellung
|
||||||
</x-mail::button>
|
</x-mail::button>
|
||||||
|
|
||||||
Danke,<br>
|
Danke,<br>
|
||||||
|
|||||||
@ -3,10 +3,14 @@
|
|||||||
|
|
||||||
Hi,
|
Hi,
|
||||||
|
|
||||||
es gibt eine neue Bestellung.
|
es gibt eine neue Bestellung:
|
||||||
|
* Name: {{ $order->name }}
|
||||||
|
* Anzahl: {{ $order->count }}
|
||||||
|
* <a href="{{ $order->url }}">{{ $order->url }}</a>
|
||||||
|
* Bestellt von: {{ $order->user->name }}
|
||||||
|
|
||||||
<x-mail::button :url="'https://z-lab-cockpit.digital-infinity.de/orders'">
|
<x-mail::button :url="$url">
|
||||||
Zum Cockpit
|
Zur Bestellung
|
||||||
</x-mail::button>
|
</x-mail::button>
|
||||||
|
|
||||||
Danke,<br>
|
Danke,<br>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user