Compare commits
No commits in common. "c8d83dc542bc060e87f57368e79c617a17fb5503" and "a72ad30848b244e614930c55d32de2ddd28db840" have entirely different histories.
c8d83dc542
...
a72ad30848
@ -60,6 +60,7 @@ class OrdersTable
|
||||
->sortable()
|
||||
->toggleable(isToggledHiddenByDefault: false),
|
||||
])->striped()
|
||||
->selectable()
|
||||
->groups([
|
||||
Group::make('orderstatus.name')->label('Bestellstatus'),
|
||||
Group::make('user.name')->label('Bestellt von'),
|
||||
@ -79,6 +80,8 @@ class OrdersTable
|
||||
return $query;
|
||||
}),
|
||||
])
|
||||
->persistFiltersInSession()
|
||||
->persistColumnsInSession()
|
||||
->recordActions([
|
||||
Action::make('bestellt_single')
|
||||
->icon(Heroicon::ShoppingCart)->iconButton()->label("Bestellt")->action(function(Model $record) {
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Filament\Resources\Orders\OrderResource;
|
||||
use App\Models\Order;
|
||||
use App\Models\Orderstatus;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class OrderController extends Controller
|
||||
{
|
||||
public function ordered($uuid)
|
||||
{
|
||||
$order = Order::where('public_uuid', $uuid)->firstOrFail();
|
||||
$orderstatus = Orderstatus::where("name", "bestellt")->firstOrFail();
|
||||
$order->orderstatus_id = $orderstatus->id;
|
||||
$order->save();
|
||||
return redirect(OrderResource::getUrl('edit', ['record' => $order->id,]));
|
||||
}
|
||||
public function taken($uuid)
|
||||
{
|
||||
$order = Order::where('public_uuid', $uuid)->firstOrFail();
|
||||
$orderstatus = Orderstatus::where("name", "genommen")->firstOrFail();
|
||||
$order->orderstatus_id = $orderstatus->id;
|
||||
$order->save();
|
||||
return redirect(OrderResource::getUrl('edit', ['record' => $order->id,]));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -5,11 +5,11 @@ namespace App\Mail;
|
||||
use App\Filament\Resources\Orders\OrderResource;
|
||||
use App\Models\Order;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
|
||||
class OrderArrived extends Mailable
|
||||
{
|
||||
@ -43,8 +43,7 @@ class OrderArrived extends Mailable
|
||||
return new Content(
|
||||
markdown: 'mail.order-arrived',
|
||||
with: [
|
||||
'url_order' => OrderResource::getUrl('edit', ['record' => $this->order]),
|
||||
'url_taken' => URL::to('/updateOrderstatusTaken/'.$this->order->public_uuid),
|
||||
'url' => OrderResource::getUrl('edit', ['record' => $this->order]),
|
||||
'order' => $this->order,
|
||||
],
|
||||
);
|
||||
|
||||
@ -5,11 +5,11 @@ namespace App\Mail;
|
||||
use App\Filament\Resources\Orders\OrderResource;
|
||||
use App\Models\Order;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
|
||||
class OrderRegistered extends Mailable
|
||||
{
|
||||
@ -43,8 +43,7 @@ class OrderRegistered extends Mailable
|
||||
return new Content(
|
||||
markdown: 'mail.order-registered',
|
||||
with: [
|
||||
'url_order' => OrderResource::getUrl('edit', ['record' => $this->order]),
|
||||
'url_ordered' => URL::to('/updateOrderstatusOrdered/'.$this->order->public_uuid),
|
||||
'url' => OrderResource::getUrl('edit', ['record' => $this->order]),
|
||||
'order' => $this->order,
|
||||
],
|
||||
);
|
||||
|
||||
@ -7,7 +7,8 @@ use App\Mail\OrderRegistered;
|
||||
use App\Models\Order;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Str;
|
||||
use App\Models\Orderstatus;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class OrderObserver
|
||||
{
|
||||
@ -16,8 +17,6 @@ class OrderObserver
|
||||
*/
|
||||
public function created(Order $order): void
|
||||
{
|
||||
$order->public_uuid = (string) Str::uuid();
|
||||
$order->save();
|
||||
$users = User::where("ordermanager", 1)->get();
|
||||
foreach ($users as $user) {
|
||||
Mail::to($user)->send(new OrderRegistered($order));
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use Filament\Tables\Table;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
|
||||
class AppServiceProvider extends ServiceProvider
|
||||
@ -20,15 +19,6 @@ class AppServiceProvider extends ServiceProvider
|
||||
*/
|
||||
public function boot(): void
|
||||
{
|
||||
Table::configureUsing(function (Table $table): void {
|
||||
$table
|
||||
->reorderableColumns()
|
||||
->persistColumnSearchesInSession()
|
||||
->persistColumnsInSession()
|
||||
->persistFiltersInSession()
|
||||
->persistSearchInSession()
|
||||
->persistSortInSession()
|
||||
->selectable();
|
||||
});
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('orders', function (Blueprint $table) {
|
||||
$table->uuid('public_uuid')->nullable();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('orders', function (Blueprint $table) {
|
||||
$table->dropColumn('public_uuid');
|
||||
});
|
||||
}
|
||||
};
|
||||
@ -9,12 +9,8 @@ Eine deiner Bestellungen ist angekommen.
|
||||
|
||||
Bitte nicht vergessen, die Bestellung "abzuhaken", indem du auf "angenommen" drückst
|
||||
|
||||
<x-mail::button :url="$url_taken" color="success">
|
||||
Hab's genommen
|
||||
</x-mail::button>
|
||||
|
||||
<x-mail::button :url="$url_order" color="primary">
|
||||
Bestellung im Cockpit ansehen
|
||||
<x-mail::button :url="$url">
|
||||
Zur Bestellung
|
||||
</x-mail::button>
|
||||
|
||||
Danke,<br>
|
||||
|
||||
@ -9,12 +9,8 @@ es gibt eine neue Bestellung:
|
||||
* <a href="{{ $order->url }}">URL zum Artikel</a>
|
||||
* Bestellt von: {{ $order->user->name }}
|
||||
|
||||
<x-mail::button :url="$url_ordered" color="success">
|
||||
Habe bestellt
|
||||
</x-mail::button>
|
||||
|
||||
<x-mail::button :url="$url_order" color="primary">
|
||||
Bestellung im Cockpit ansehen
|
||||
<x-mail::button :url="$url">
|
||||
Zur Bestellung
|
||||
</x-mail::button>
|
||||
|
||||
Danke,<br>
|
||||
|
||||
@ -1,7 +1,4 @@
|
||||
<?php
|
||||
|
||||
use App\Http\Controllers\OrderController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::get('/updateOrderstatusOrdered/{uuid}', [OrderController::class, 'ordered']);
|
||||
Route::get('/updateOrderstatusTaken/{uuid}', [OrderController::class, 'taken']);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user