wip mail
This commit is contained in:
salam committed
1 parent
74c40cc49c
commit
97938724eb
13 files changed
+1214
-116
No files matched your search
@@ -3,10 +3,12 @@
|
||||
namespace App\Actions\SendMail;
|
||||
|
||||
use App\Jobs\SendNewsletterJob;
|
||||
use App\Mail\Newsletter;
|
||||
use App\Models\MailAdressen;
|
||||
use App\Models\MailGruppen;
|
||||
use App\Models\MailVorlage;
|
||||
use Filament\Notifications\Notification;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
|
||||
// use App\Mail\Newsletter;
|
||||
// use Illuminate\Support\Facades\Mail;
|
||||
@@ -41,7 +43,7 @@ class SendNewsletter
|
||||
"absender_mail" => ""
|
||||
*/
|
||||
|
||||
$adressen = MailAdressen::where('mail_gruppen_id', $record->mail_gruppen_id)->where('deaktiviert', 0)->get();
|
||||
$adressen = MailAdressen::where('mail_gruppen_id', $record->mail_gruppen_id)->where('is_active', 1)->get();
|
||||
|
||||
/***
|
||||
"mail_gruppen_id" => 1
|
||||
@@ -71,17 +73,23 @@ class SendNewsletter
|
||||
$data['absender_name'] = $gruppe->absender_name;
|
||||
$data['absender_email'] = $gruppe->absender_mail;
|
||||
|
||||
if ($adresse->anrede == 'Höflich') {
|
||||
if ($adresse->gender) {
|
||||
$anrede = 'Sehr geehrte Frau '.$adresse->last_name;
|
||||
} else {
|
||||
$anrede = 'Sehr geehrter Herr '.$adresse->last_name;
|
||||
}
|
||||
if ($adresse->gender) {
|
||||
$data['anrede'] = 'Sehr geehrte Architektin '.$adresse->last_name.', Lieber '.$adresse->first_name;
|
||||
} else {
|
||||
$anrede = 'Hallo '.$adresse->first_name;
|
||||
$data['anrede'] = 'Sehr geehrter Architekt '.$adresse->last_name.', Lieber '.$adresse->first_name;
|
||||
}
|
||||
|
||||
$data['inhalt'] = str_replace('###anrede###', $anrede, $template->inhalt);
|
||||
// if ($adresse->anrede == 'Höflich') {
|
||||
// if ($adresse->gender) {
|
||||
// $anrede = 'Sehr geehrte Architektin '.$adresse->last_name.', Lieber '.$adresse->first_name;
|
||||
// } else {
|
||||
// $anrede = 'Sehr geehrter Architekt '.$adresse->last_name.', Lieber '.$adresse->first_name;
|
||||
// }
|
||||
// } else {
|
||||
// $anrede = 'Hallo '.$adresse->first_name;
|
||||
// }
|
||||
|
||||
$data['inhalt'] = $template->inhalt;
|
||||
|
||||
SendNewsletterJob::dispatch($data);
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ class MailAdressenForm
|
||||
->required()
|
||||
->label('Mail Gruppe')
|
||||
->relationship(name: 'mail_gruppen', titleAttribute: 'name'),
|
||||
Toggle::make('deaktiviert'),
|
||||
Toggle::make('is_active'),
|
||||
]),
|
||||
Section::make('Persönliche Anrede')
|
||||
->columns(2)
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace App\Filament\Resources\MailAdressens\Tables;
|
||||
|
||||
use App\Models\MailAdressen;
|
||||
use App\Models\MailGruppen;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Actions\BulkAction;
|
||||
use Filament\Actions\BulkActionGroup;
|
||||
use Filament\Actions\DeleteAction;
|
||||
@@ -19,6 +20,7 @@ use Filament\Tables\Filters\Filter;
|
||||
use Filament\Tables\Table;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
||||
class MailAdressensTable
|
||||
{
|
||||
@@ -27,7 +29,8 @@ class MailAdressensTable
|
||||
return $table
|
||||
->defaultSort('vereidigung', direction: 'desc')
|
||||
->columns([
|
||||
ToggleColumn::make('deaktiviert')
|
||||
ToggleColumn::make('is_active')
|
||||
->label('Aktive')
|
||||
->alignCenter(),
|
||||
TextColumn::make('anrede')
|
||||
->badge()
|
||||
@@ -53,7 +56,7 @@ class MailAdressensTable
|
||||
->filters([
|
||||
Filter::make('mail_gruppen_id')
|
||||
->columnSpanFull()
|
||||
->columns(4)
|
||||
->columns(5)
|
||||
->schema([
|
||||
Select::make('mail_gruppen_id')
|
||||
->hiddenLabel()
|
||||
@@ -63,7 +66,17 @@ class MailAdressensTable
|
||||
->options(function (): array {
|
||||
return MailGruppen::pluck('name', 'id')->toArray();
|
||||
}),
|
||||
Toggle::make('deaktiviert')->label('Deaktivierte'),
|
||||
Toggle::make('is_active')->label('Aktive'),
|
||||
Select::make('gender')
|
||||
->selectablePlaceholder(false)
|
||||
->hiddenLabel()
|
||||
->preload()
|
||||
->default(0)
|
||||
->options([
|
||||
'0' => 'Alle',
|
||||
'women' => 'Frauen',
|
||||
'men' => 'Männer',
|
||||
]),
|
||||
DatePicker::make('vereidigung_von')->native(false)->hiddenLabel()->placeholder('Vereidigung von'),
|
||||
DatePicker::make('vereidigung_bis')->native(false)->hiddenLabel()->placeholder('Vereidigung bis'),
|
||||
])
|
||||
@@ -73,8 +86,18 @@ class MailAdressensTable
|
||||
$data['mail_gruppen_id'],
|
||||
fn (Builder $query, $mail_gruppen_id): Builder => $query->where('mail_gruppen_id', $mail_gruppen_id),
|
||||
)->when(
|
||||
$data['deaktiviert'],
|
||||
fn (Builder $query, $deaktiviert): Builder => $query->where('deaktiviert', $deaktiviert),
|
||||
$data['is_active'],
|
||||
fn (Builder $query, $is_active): Builder => $query->where('is_active', $is_active),
|
||||
)->when(
|
||||
$data['gender'],
|
||||
function (Builder $query, $gender) {
|
||||
switch ($gender) {
|
||||
case 'women':
|
||||
return $query->where('gender', 1);
|
||||
case 'men':
|
||||
return $query->where('gender', 0);
|
||||
}
|
||||
}
|
||||
)->when(
|
||||
$data['vereidigung_von'],
|
||||
fn (Builder $query, $date): Builder => $query->whereDate('vereidigung', '>=', $date),
|
||||
@@ -94,8 +117,36 @@ class MailAdressensTable
|
||||
DeleteAction::make()->iconButton(),
|
||||
])
|
||||
->toolbarActions([
|
||||
Action::make('nach2022')
|
||||
->color('gray')
|
||||
->label('Nach 2022')
|
||||
->tooltip('Aktiviert alle Teilnehmer NACH dem 1. Jan. 2022')
|
||||
->action(function (): void {
|
||||
MailAdressen::where('vereidigung', '>', Carbon::create(2022, 1, 1, 0, 0, 0))
|
||||
->update(
|
||||
['is_active' => 1]
|
||||
);
|
||||
MailAdressen::where('vereidigung', '<', Carbon::create(2022, 1, 1, 0, 0, 0))
|
||||
->update(
|
||||
['is_active' => 0]
|
||||
);
|
||||
}),
|
||||
Action::make('vor2022')
|
||||
->color('gray')
|
||||
->label('Vor 2022')
|
||||
->tooltip('Aktiviert alle Teilnehmer VOR dem 1. Jan. 2022')
|
||||
->action(function (): void {
|
||||
MailAdressen::where('vereidigung', '>', Carbon::create(2022, 1, 1, 0, 0, 0))
|
||||
->update(
|
||||
['is_active' => 0]
|
||||
);
|
||||
MailAdressen::where('vereidigung', '<', Carbon::create(2022, 1, 1, 0, 0, 0))
|
||||
->update(
|
||||
['is_active' => 1]
|
||||
);
|
||||
}),
|
||||
BulkActionGroup::make([
|
||||
BulkAction::make('deaktiviert_off')
|
||||
BulkAction::make('active')
|
||||
->label('Auswahl Aktivieren')
|
||||
->tooltip('Auswahl aktivieren')
|
||||
->icon('heroicon-o-play')
|
||||
@@ -104,11 +155,11 @@ class MailAdressensTable
|
||||
/** @var object $record */
|
||||
MailAdressen::where('id', '=', $record->id)
|
||||
->update(
|
||||
['deaktiviert' => 0]
|
||||
['is_active' => 0]
|
||||
);
|
||||
}
|
||||
}),
|
||||
BulkAction::make('deaktiviert_on')
|
||||
BulkAction::make('deaktive')
|
||||
->color('primary')
|
||||
->label('Auswahl Deaktivieren')
|
||||
->tooltip('Auswahl deaktivieren')
|
||||
@@ -118,7 +169,7 @@ class MailAdressensTable
|
||||
/** @var object $record */
|
||||
MailAdressen::where('id', '=', $record->id)
|
||||
->update(
|
||||
['deaktiviert' => 1]
|
||||
['is_active' => 1]
|
||||
);
|
||||
}
|
||||
}),
|
||||
|
||||
@@ -18,7 +18,7 @@ class MailAdressen extends Model
|
||||
'zip',
|
||||
'city',
|
||||
'vereidigung',
|
||||
'deaktiviert',
|
||||
'is_active',
|
||||
];
|
||||
|
||||
public function mail_gruppen()
|
||||
|
||||
Reference in new issue
Block a user