April 2026 waren Wirtschaft Feedback

This commit is contained in:
Kevin Adametz 2026-04-10 17:14:38 +02:00
parent 02f2a4c23e
commit 9ce711d6b2
167 changed files with 25278 additions and 8518 deletions

View file

@ -2,11 +2,10 @@
namespace App\Services;
use App\Mail\PaymentReminderEmail;
use App\Models\Logger;
use App\Models\PaymentReminder;
use App\Models\ShoppingPayment;
use App\Mail\PaymentReminderEmail;
use App\Services\Util;
use Carbon\Carbon;
use Illuminate\Support\Facades\Mail;
@ -31,19 +30,23 @@ class PaymentReminderService
'action' => $action,
'channel' => 'payment_reminder',
'message' => $message,
'level' => $level
'level' => $level,
]);
}
/**
* Hole alle aktiven Intervalle für Zahlungserinnerungen
* Hole alle aktiven Intervalle für Zahlungserinnerungen, immer mit dem kleinsten intervall
*/
public function getActiveIntervals()
{
$intervals = [];
$payment_reminders = PaymentReminder::where('active', true)->get();
$payment_reminders = PaymentReminder::where('active', true)->orderBy('interval', 'asc')->get();
foreach($payment_reminders as $reminder) {
foreach ($payment_reminders as $reminder) {
if (isset($intervals[$reminder->clearingtype]) && $intervals[$reminder->clearingtype] < $reminder->interval) {
continue;
}
$intervals[$reminder->clearingtype] = $reminder->interval;
}
@ -64,7 +67,7 @@ class PaymentReminderService
->where('shopping_payments.created_at', '<', $date)
->where('shopping_payments.amount', '>', 0)
->whereNull('shopping_orders.deleted_at')
->whereIn('shopping_payments.id', function($query) use ($clearingtype, $date) {
->whereIn('shopping_payments.id', function ($query) use ($clearingtype, $date) {
$query->selectRaw('MAX(shopping_payments.id)')
->from('shopping_payments')
->join('shopping_orders', 'shopping_payments.shopping_order_id', '=', 'shopping_orders.id')
@ -79,7 +82,6 @@ class PaymentReminderService
->select('shopping_payments.*')
->get();
return $payments;
}
@ -91,15 +93,15 @@ class PaymentReminderService
$intervals = $this->getActiveIntervals();
$results = [];
foreach($intervals as $clearingtype => $interval){
foreach ($intervals as $clearingtype => $interval) {
$date = Carbon::now()->subDays($interval);
$payments = $this->getOpenPaymentsForClearingType($clearingtype, $interval);
$results[$clearingtype] = [
'interval' => $interval,
'date_limit' => $date,
'payments' => $payments,
'count' => $payments->count()
'count' => $payments->count(),
];
}
@ -114,18 +116,18 @@ class PaymentReminderService
$intervals = $this->getActiveIntervals();
$detailedData = [];
foreach($intervals as $clearingtype => $interval){
foreach ($intervals as $clearingtype => $interval) {
$date = Carbon::now()->subDays($interval);
$payments = $this->getOpenPaymentsForClearingType($clearingtype, $interval);
foreach($payments as $payment){
$name = !isset($payment->shopping_order->shopping_user) ? 'Kein Name' : $payment->shopping_order->shopping_user->billing_firstname.' '.$payment->shopping_order->shopping_user->billing_lastname;
$email = !isset($payment->shopping_order->shopping_user) ? 'Keine Email' : $payment->shopping_order->shopping_user->billing_email;
foreach ($payments as $payment) {
$name = ! isset($payment->shopping_order->shopping_user) ? 'Kein Name' : $payment->shopping_order->shopping_user->billing_firstname.' '.$payment->shopping_order->shopping_user->billing_lastname;
$email = ! isset($payment->shopping_order->shopping_user) ? 'Keine Email' : $payment->shopping_order->shopping_user->billing_email;
$shipped = '<span class="badge badge-pill badge-'.$payment->shopping_order->getShippedColor().'">'.$payment->shopping_order->getShippedType().'</span>';
// Countdown für nächste Erinnerung berechnen
$countdown = $this->getNextReminderCountdown($payment);
$detailedData[] = [
'clearingtype' => $clearingtype,
'clearingtype_name' => $this->getClearingtype($clearingtype),
@ -157,32 +159,31 @@ class PaymentReminderService
*/
public function sendReminder($payment)
{
//holen der nächsten zahlungserinnerung
// holen der nächsten zahlungserinnerung
$payment_reminder = $this->getReminder((int) $payment->reminder, $payment->clearingtype);
if(!$payment_reminder){
if (! $payment_reminder) {
return false;
}
//zahlungserinnerung Platzhalter ersetzen.
// zahlungserinnerung Platzhalter ersetzen.
$payment_reminder = $this->replacePlaceholder($payment, $payment_reminder);
//zahlungserinnerung senden
// zahlungserinnerung senden
$emailSent = $this->sendReminderEmail($payment, $payment_reminder);
if ($emailSent) {
$this->createLog(
'email_sent',
"Zahlungserinnerung E-Mail gesendet an: {$payment->shopping_order->shopping_user->billing_email}, Subject: {$payment_reminder->subject}",
'ShoppingOrder',
'ShoppingOrder',
$payment->shopping_order_id,
3
);
}
//action ausführen
if($payment_reminder->action === 'set_order_status_cancelled'){
// action ausführen
if ($payment_reminder->action === 'set_order_status_cancelled') {
$this->setNoNPayment($payment);
$payment->shopping_order->shipped = 10;
$payment->shopping_order->save();
@ -194,10 +195,10 @@ class PaymentReminderService
3
);
}
//reminder setzen +1
$payment->reminder = (int) $payment->reminder + 1;
$payment->reminder_date = Carbon::now();
// reminder setzen +1
$payment->reminder = (int) $payment->reminder + 1; // anzahl der Reminder
$payment->reminder_date = Carbon::now(); // wann wurde der letzte reminder gesendet?
$payment->save();
$this->createLog(
@ -225,7 +226,7 @@ class PaymentReminderService
public function getClearingtype($clearingtype)
{
return isset($this->clearingtypes[$clearingtype]) ? $this->clearingtypes[$clearingtype] : $clearingtype;
return isset($this->clearingtypes[$clearingtype]) ? $this->clearingtypes[$clearingtype] : $clearingtype;
}
public function getReminder($reminder, $clearingtype)
@ -235,13 +236,14 @@ class PaymentReminderService
->orderBy('interval', 'asc')
->get();
if($payment_reminders->isEmpty()) {
if ($payment_reminders->isEmpty()) {
return false;
}
// Wenn reminder größer ist als Anzahl der Erinnerungen
if($reminder >= $payment_reminders->count()) {
if ($reminder >= $payment_reminders->count()) {
return false;
}
// Hole die Erinnerung an Position $reminder (0,1,2,3...)
return $payment_reminders[$reminder];
}
@ -256,12 +258,12 @@ class PaymentReminderService
'{billing_last_name}' => $shopping_user->billing_lastname,
'{order_number}' => '<b>'.$shopping_order->getLastShoppingPayment('reference').'</b>',
'{order_date}' => '<b>'.$shopping_order->created_at->format('d.m.Y').'</b>',
'{order_total}' => '<b>'.$shopping_order->getFormattedTotalShipping().'</b>'
'{order_total}' => '<b>'.$shopping_order->getFormattedTotalShipping().'</b>',
];
$payment_reminder->subject = str_replace(
array_keys($replacements),
array_values($replacements),
array_values($replacements),
$payment_reminder->subject
);
@ -280,29 +282,30 @@ class PaymentReminderService
$email = $payment->shopping_order->shopping_user->billing_email;
$subject = $payment_reminder->subject;
$message = $payment_reminder->message;
if(Util::isTestSystem()){
if (Util::isTestSystem()) {
$email = config('app.checkout_test_mail');
}
if($payment->shopping_order->mode === 'test' || Util::isTestSystem()){
if ($payment->shopping_order->mode === 'test' || Util::isTestSystem()) {
$bcc[] = config('app.checkout_test_mail');
}else{
} else {
$bcc[] = config('app.checkout_mail');
}
Mail::to($email)->bcc($bcc)->send(new PaymentReminderEmail($subject, $message, $payment->shopping_order));
return true;
} catch (\Exception $e) {
\Log::error('Fehler beim E-Mail-Versand: ' . $e->getMessage());
\Log::error('Fehler beim E-Mail-Versand: '.$e->getMessage());
$this->createLog(
'email_exception',
"E-Mail Exception: " . $e->getMessage() . " für Payment ID: {$payment->id}",
'E-Mail Exception: '.$e->getMessage()." für Payment ID: {$payment->id}",
'ShoppingOrder',
$payment->shopping_order_id,
5
);
return false;
}
}
@ -332,39 +335,39 @@ class PaymentReminderService
return [
'type' => 'completed',
'message' => 'Alle Erinnerungen gesendet',
'days_left' => 0
'days_left' => 0,
];
}
// Hole die nächste Erinnerung
$next_reminder = $payment_reminders[$payment->reminder];
// Berechne die Differenz zwischen aktuellem und nächstem Reminder
$current_reminder = $payment_reminders[$payment->reminder - 1];
$interval_difference = $next_reminder->interval - $current_reminder->interval;
// Berechne das Datum der nächsten Erinnerung
$next_reminder_date = Carbon::parse($payment->reminder_date)->addDays($interval_difference);
// Berechne die verbleibenden Tage
$days_left = Carbon::now()->diffInDays($next_reminder_date, false);
// Wenn die nächste Erinnerung bereits fällig ist
if ($days_left <= 0) {
return [
'type' => 'overdue',
'message' => 'Nächste Erinnerung fällig',
'days_left' => 0,
'next_reminder_date' => $next_reminder_date
'next_reminder_date' => $next_reminder_date,
];
}
return [
'type' => 'countdown',
'message' => 'Nächste Erinnerung in ' . $days_left . ' Tagen',
'message' => 'Nächste Erinnerung in '.$days_left.' Tagen',
'days_left' => $days_left,
'next_reminder_date' => $next_reminder_date,
'next_reminder_interval' => $interval_difference
'next_reminder_interval' => $interval_difference,
];
}
@ -374,7 +377,7 @@ class PaymentReminderService
public function getPaymentReminderLogs($limit = 100, $paymentId = null, $action = null)
{
$query = Logger::where('channel', 'payment_reminder')
->orderBy('created_at', 'desc');
->orderBy('created_at', 'desc');
if ($paymentId) {
$query->where('model_id', $paymentId);
@ -393,9 +396,9 @@ class PaymentReminderService
public function getLogsForPayment($orderId)
{
return Logger::where('channel', 'payment_reminder')
->where('model_id', $orderId)
->orderBy('created_at', 'desc')
->get();
->where('model_id', $orderId)
->orderBy('created_at', 'desc')
->get();
}
/**
@ -404,9 +407,9 @@ class PaymentReminderService
public function getLogsForDateRange($startDate, $endDate)
{
return Logger::where('channel', 'payment_reminder')
->whereBetween('created_at', [$startDate, $endDate])
->orderBy('created_at', 'desc')
->get();
->whereBetween('created_at', [$startDate, $endDate])
->orderBy('created_at', 'desc')
->get();
}
/**
@ -415,39 +418,38 @@ class PaymentReminderService
public function getLogStatistics($days = 30)
{
$startDate = Carbon::now()->subDays($days);
$stats = Logger::where('channel', 'payment_reminder')
->where('created_at', '>=', $startDate)
->selectRaw('action, level, COUNT(*) as count')
->groupBy('action', 'level')
->get();
->where('created_at', '>=', $startDate)
->selectRaw('action, level, COUNT(*) as count')
->groupBy('action', 'level')
->get();
$summary = [
'total_logs' => Logger::where('channel', 'payment_reminder')
->where('created_at', '>=', $startDate)
->count(),
->where('created_at', '>=', $startDate)
->count(),
'emails_sent' => Logger::where('channel', 'payment_reminder')
->where('action', 'email_sent')
->where('created_at', '>=', $startDate)
->count(),
->where('action', 'email_sent')
->where('created_at', '>=', $startDate)
->count(),
'emails_failed' => Logger::where('channel', 'payment_reminder')
->where('action', 'email_exception')
->where('created_at', '>=', $startDate)
->count(),
->where('action', 'email_exception')
->where('created_at', '>=', $startDate)
->count(),
'reminders_completed' => Logger::where('channel', 'payment_reminder')
->where('action', 'reminder_completed')
->where('created_at', '>=', $startDate)
->count(),
->where('action', 'reminder_completed')
->where('created_at', '>=', $startDate)
->count(),
'actions_executed' => Logger::where('channel', 'payment_reminder')
->where('action', 'action_completed')
->where('created_at', '>=', $startDate)
->count(),
->where('action', 'action_completed')
->where('created_at', '>=', $startDate)
->count(),
];
return [
'summary' => $summary,
'detailed_stats' => $stats
'detailed_stats' => $stats,
];
}
}
}