diff --git a/app/Console/Commands/CheckPaymentsAccount.php b/app/Console/Commands/CheckPaymentsAccount.php new file mode 100644 index 00000000..64ed689a --- /dev/null +++ b/app/Console/Commands/CheckPaymentsAccount.php @@ -0,0 +1,213 @@ +info('COMMAND [payments:check-accounts] started.'); + $this->info('COMMAND [payments:check-accounts] started.'); + + // Die Logik wurde 1:1 aus der checkPaymentsAccounts-Methode übernommen + $renewalDate = Carbon::now()->modify('+'.(config('mivita.remind_first_days')+1).' days'); + Log::channel('cron')->info('Erneuerungsdatum für Zahlungen: ' . $renewalDate->format('Y-m-d H:i:s')); + + $users = User::where('payment_account', '!=', NULL) + ->where('active', '=', 1) + ->where('blocked', '!=', 1) + ->where('payment_account', '<', $renewalDate) + ->get(); + + Log::channel('cron')->info('Found ' . $users->count() . ' users for payment reminders.'); + $this->info('Found ' . $users->count() . ' users for payment reminders.'); + + foreach ($users as $user){ + Log::channel('cron')->info('Prüfe Zahlungserinnerungen für Benutzer: ' . $user->email); + $this->checkReminderPayments($user); + } + + Log::channel('cron')->info('COMMAND [payments:check-accounts] finished.'); + $this->info('COMMAND [payments:check-accounts] finished.'); + return 0; // Success + } + + /** + * Überprüft und sendet Zahlungserinnerungen basierend auf Benutzerkontostand + * + * RULES: + * > 21 remind_first_days = 31 reminder_first + * > 21 remind_first_days + sepa = 32 reminder_first_sepa + * > 14 remind_sec_days = 33 reminder_sec + * > 2 remind_last_days = 34 reminder_last + * > 0 deaktiv = 35 reminder_deaktiv + * > 0 deaktiv + sepa = 36 reminder_deaktiv_sepa + * == 7 abo_booking_days + sepa + cron = 37 reminder_collect_sepa + * + * @param User $user Benutzer + * @return void + */ + + private function checkReminderPayments(User $user) + { + //35 reminder_deaktiv, 36 reminder_deaktiv_sepa + if(!$user->isActiveAccount()){ + Log::channel('cron')->info('Inaktives Konto für Benutzer: ' . $user->email); + $this->checkIsReminderSend($user, 35); + return; + } + + //34 reminder_last + if($user->daysActiveAccount() <= config('mivita.remind_last_days')){ + Log::channel('cron')->info('Letzte Erinnerung für Benutzer: ' . $user->email . ' (Tage aktiv: ' . $user->daysActiveAccount() . ')'); + $this->checkIsReminderSend($user, 34); + return; + } + + //33 reminder_sec + if($user->daysActiveAccount() <= config('mivita.remind_sec_days')){ + Log::channel('cron')->info('Zweite Erinnerung für Benutzer: ' . $user->email . ' (Tage aktiv: ' . $user->daysActiveAccount() . ')'); + $this->checkIsReminderSend($user, 33); + return; + } + + //31 reminder_first + if($user->daysActiveAccount() > config('mivita.remind_sec_days')){ + Log::channel('cron')->info('Erste Erinnerung für Benutzer: ' . $user->email . ' (Tage aktiv: ' . $user->daysActiveAccount() . ')'); + $this->checkIsReminderSend($user, 31); + return; + } + } + + /** + * Überprüft, ob eine Erinnerung bereits gesendet wurde + * + * @param User $user Benutzer + * @param int $status Status-Code der Erinnerung + * @return bool + */ + private function checkIsReminderSend(User $user, $status) + { + $isSend = UserHistory::whereUserId($user->id) + ->whereAction('reminder_payments') + ->whereIdentifier($user->payment_account) + ->whereStatus($status) + ->latest() + ->first(); + + if($isSend){ + Log::channel('cron')->info('Erinnerung bereits gesendet für Benutzer: ' . $user->email . ' (Status: ' . $status . ')'); + return true; + } + + Log::channel('cron')->info('Sende neue Erinnerung für Benutzer: ' . $user->email . ' (Status: ' . $status . ')'); + $referenz = $this->sendReminderMail($user, $status); + + UserHistory::create([ + 'user_id' => $user->id, + 'action' => 'reminder_payments', + 'referenz' => $referenz, + 'identifier' => $user->payment_account, + 'status' => $status + ]); + + return false; + } + + /** + * Sendet eine Erinnerungs-E-Mail an den Benutzer + * + * @param User $user Benutzer + * @param int $status Status-Code der Erinnerung + * @return int + */ + private function sendReminderMail(User $user, $status) + { + $days = abs($user->daysActiveAccount()); + $pay_date = Carbon::parse($user->payment_account)->modify('- ' . config('mivita.abo_booking_days') . ' days')->format('d.m.Y'); + $datetime = $user->getPaymentAccountDateFormat(); + $price = ""; + + if($user->payment_order_id && isset($user->payment_order_product->price)){ + $price = 'von ' . $user->payment_order_product->getFormattedPrice() . ' EUR'; + } + + $message = __('reminder.copy_first_' . $status, ['days' => $days, 'datetime' => $datetime, 'price' => $price, 'pay_date' => $pay_date]); + $message_last = __('reminder.copy_last_' . $status, ['days' => $days, 'datetime' => $datetime, 'price' => $price, 'pay_date' => $pay_date]); + $button = __('reminder.button_' . $status); + + $message = preg_replace("/[\n\r]/", "", $message); + $message_last = preg_replace("/[\n\r]/", "", $message_last); + + $data = [ + 'subject' => __('reminder.subject') . " | ID: " . $status, + 'message' => $message, + 'message_last' => $message_last, + 'url' => route('user_membership'), + 'button' => $button, + ]; + + $sender = User::find(1); + $customer_mail = UserMessage::create(['user_id' => $user->id, 'send_user_id' => $sender->id, 'email' => $user->email, 'subject' => $data['subject'], 'message' => $data['message'] . " " . $data['message_last']]); + + try { + if(!Util::isTestSystem()){ + if($status >= 34){ + Log::channel('cron')->info('Sende kritische Erinnerung mit BCC an: ' . $user->email); + Mail::to($user->email) + ->locale($user->getLocale()) + ->bcc(config('app.default_mail')) + ->send(new MailCustomMessage($user, $data, $sender, false)); + } else { + Log::channel('cron')->info('Sende normale Erinnerung an: ' . $user->email); + Mail::to($user->email) + ->locale($user->getLocale()) + ->send(new MailCustomMessage($user, $data, $sender, false)); + } + } else { + Log::channel('cron')->info('Testsystem: E-Mail-Versand simuliert für: ' . $user->email); + } + } catch(\Exception $e) { + Log::channel('cron')->error('Mail-Fehler für Benutzer ' . $user->email . ': ' . $e->getMessage()); + $customer_mail->fail = true; + $customer_mail->error = $e->getMessage(); + $customer_mail->save(); + return 0; + } + + $customer_mail->send = true; + $customer_mail->sent_at = now(); + $customer_mail->save(); + + Log::channel('cron')->info('Erinnerungsmail erfolgreich gesendet an: ' . $user->email); + return 1; + } +} \ No newline at end of file diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index ce5cf2ca..2275555e 100755 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -3,6 +3,9 @@ namespace App\Console; use App\Console\Commands\BusinessStore; +use App\Console\Commands\CheckPaymentsAccount; +use App\Console\Commands\UserMakeAboOrder; +use App\Console\Commands\UserCleanup; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; @@ -15,6 +18,9 @@ class Kernel extends ConsoleKernel */ protected $commands = [ BusinessStore::class, + CheckPaymentsAccount::class, + UserMakeAboOrder::class, + UserCleanup::class, ]; /** @@ -25,8 +31,15 @@ class Kernel extends ConsoleKernel */ protected function schedule(Schedule $schedule) { - // $schedule->command('inspire') - // ->hourly(); + // Job 1: Überprüft täglich um 02:00 Uhr die Zahlungskonten. + $schedule->command('payments:check-accounts')->dailyAt('02:00'); + + // Jobs 2, 3, 4: Die Befehle aus deinem alten Shell-Skript. + // Werden nacheinander täglich zu unterschiedlichen Zeiten ausgeführt, + // um die Serverlast zu verteilen. + $schedule->command('business:store 0 0')->dailyAt('03:00'); + $schedule->command('user:cleanup')->dailyAt('03:30'); + $schedule->command('user:make_abo_order')->dailyAt('04:00'); } /** diff --git a/app/Http/Controllers/DhlShipmentController.php b/app/Http/Controllers/DhlShipmentController.php new file mode 100644 index 00000000..0bcb159b --- /dev/null +++ b/app/Http/Controllers/DhlShipmentController.php @@ -0,0 +1,662 @@ +middleware('auth'); + $this->middleware('admin')->except(['show', 'track']); + } + + /** + * Test the DHL API login credentials and return a JSON response. + * + * @return \Illuminate\Http\JsonResponse + */ + public function testLogin() + { + try { + // Get DHL configuration with admin settings + $settingController = new \App\Http\Controllers\SettingController(); + $dhlConfig = $settingController->getDhlConfig(); + + // Create DhlClient with merged configuration + $dhlClient = new \Acme\Dhl\Support\DhlClient( + $dhlConfig['base_url'], + $dhlConfig['api_key'], + $dhlConfig['username'], + $dhlConfig['password'] + ); + + // Test the connection + $connectionTest = $dhlClient->testConnection(); + + if ($connectionTest) { + $result = [ + 'success' => true, + 'message' => 'DHL API Verbindung erfolgreich getestet!', + 'details' => [ + 'base_url' => $dhlConfig['base_url'], + 'using_admin_config' => !empty($dhlConfig['api_key']) + ] + ]; + } else { + $result = [ + 'success' => false, + 'message' => 'DHL API Verbindung fehlgeschlagen. Prüfen Sie Ihre Zugangsdaten.' + ]; + } + + return response()->json($result); + } catch (Exception $e) { + Log::error('[DHL Controller] Test login failed', [ + 'error' => $e->getMessage() + ]); + + return response()->json([ + 'success' => false, + 'message' => 'DHL API Test fehlgeschlagen: ' . $e->getMessage() + ], 500); + } + } + + /** + * Display the DHL Cockpit (main overview) + * + * @param Request $request + * @return View + */ + public function index(Request $request): View + { + // Statistics for dashboard widgets + $stats = [ + 'total_shipments' => DhlShipment::count(), + 'pending_shipments' => DhlShipment::where('status', 'pending')->count(), + 'shipped_today' => DhlShipment::whereDate('created_at', today())->count(), + 'returns_count' => DhlShipment::where('type', 'return')->count(), + ]; + + return view('admin.dhl.cockpit', compact('stats')); + } + + /** + * Provides data for the DHL Cockpit DataTable. + * + * @param Request $request + * @return \Illuminate\Http\JsonResponse + */ + public function datatable(Request $request): JsonResponse + { + $query = DhlShipment::with(['shoppingOrder.shopping_user']) + ->select('dhl_package_shipments.*') // Explicitly select to avoid conflicts + ->orderBy('created_at', 'desc'); + + // Apply filters from the request + if ($request->filled('type')) { + $query->where('type', $request->get('type')); + } + if ($request->filled('status')) { + $query->where('status', $request->get('status')); + } + if ($request->filled('date_from')) { + $query->whereDate('created_at', '>=', $request->get('date_from')); + } + if ($request->filled('date_to')) { + $query->whereDate('created_at', '<=', $request->get('date_to')); + } + if ($request->filled('search')) { + $search = $request->get('search'); + $query->where(function ($q) use ($search) { + $q->where('dhl_shipment_no', 'LIKE', "%{$search}%") + ->orWhere('id', 'LIKE', "%{$search}%") + ->orWhereHas('shoppingOrder', function ($orderQuery) use ($search) { + $orderQuery->where('id', $search); + }); + }); + } + + return DataTables::eloquent($query) + ->addColumn('checkbox', function ($shipment) { + return ''; + }) + ->editColumn('id', function ($shipment) { + return '#' . $shipment->id . ''; + }) + ->addColumn('type', function ($shipment) { + if ($shipment->type == 'outbound') { + return ' Ausgehend'; + } else { + return ' Retoure'; + } + }) + ->addColumn('order', function ($shipment) { + if ($shipment->order_id) { + return '#' . $shipment->order_id . ''; + } + return 'N/A'; + }) + ->addColumn('customer', function ($shipment) { + if ($shipment->shoppingOrder && $shipment->shoppingOrder->shopping_user) { + return e($shipment->shoppingOrder->shopping_user->billing_firstname) . ' ' . e($shipment->shoppingOrder->shopping_user->billing_lastname) . + '
' . e($shipment->shoppingOrder->shopping_user->billing_email) . ''; + } + return 'Unbekannt'; + }) + ->editColumn('dhl_shipment_no', function ($shipment) { + return $shipment->dhl_shipment_no ? '' . e($shipment->dhl_shipment_no) . '' : '-'; + }) + ->addColumn('status', function ($shipment) { + $statusMap = [ + 'pending' => ['class' => 'warning', 'text' => 'Wartend'], + 'created' => ['class' => 'success', 'text' => 'Erstellt'], + 'shipped' => ['class' => 'primary', 'text' => 'Versendet'], + 'delivered' => ['class' => 'info', 'text' => 'Zugestellt'], + 'cancelled' => ['class' => 'secondary', 'text' => 'Storniert'], + 'failed' => ['class' => 'danger', 'text' => 'Fehler'], + ]; + $statusInfo = $statusMap[$shipment->status] ?? ['class' => 'light', 'text' => e($shipment->status)]; + return '' . $statusInfo['text'] . ''; + }) + ->addColumn('tracking_status', function ($shipment) { + if ($shipment->tracking_status) { + return '' . e($shipment->tracking_status) . '' . + ($shipment->last_tracked_at ? '
' . $shipment->last_tracked_at->format('d.m.Y H:i') . '' : ''); + } + return '-'; + }) + ->editColumn('weight_kg', function ($shipment) { + return number_format($shipment->weight_kg, 2) . ' kg'; + }) + ->editColumn('created_at', function ($shipment) { + return $shipment->created_at->format('d.m.Y H:i'); + }) + ->addColumn('actions', function ($shipment) { + $buttons = '
'; + $buttons .= ''; + if ($shipment->label_path) { + $buttons .= ''; + } + if ($shipment->canCancel()) { + $buttons .= ''; + } + if ($shipment->type == 'outbound' && !$shipment->returns()->count()) { + $buttons .= ''; + } + $buttons .= '
'; + return $buttons; + }) + ->rawColumns(['checkbox', 'id', 'type', 'order', 'customer', 'dhl_shipment_no', 'status', 'tracking_status', 'actions']) + ->make(true); + } + + /** + * Show the form for creating a new shipment + * + * @param ShoppingOrder $order + * @return View + */ + public function create(ShoppingOrder $order): View|\Illuminate\Http\RedirectResponse + { + // Check if order already has a shipment + $existingShipment = DhlShipment::where('shopping_order_id', $order->id) + ->where('type', 'outbound') + ->first(); + + if ($existingShipment) { + return redirect()->route('admin.dhl.show', $existingShipment) + ->with('warning', 'Für diese Bestellung existiert bereits eine Sendung.'); + } + + return view('admin.dhl.create', compact('order')); + } + + /** + * Store a new shipment (async via queue) + * + * @param Request $request + * @return JsonResponse + */ + public function store(Request $request): JsonResponse + { + try { + // Use DhlModalService for validation + $dhlModalService = new DhlModalService(); + $validationResult = $dhlModalService->validateShipmentData($request->all()); + + if (!$validationResult['valid']) { + return response()->json([ + 'success' => false, + 'message' => 'Validierungsfehler: ' . implode(', ', $validationResult['errors']) + ], 422); + } + + // Basic Laravel validation as fallback + $request->validate([ + 'order_id' => 'required|exists:shopping_orders,id', + 'weight' => 'required|numeric|min:0.1|max:31.5', + 'product_code' => 'sometimes|string', + 'priority' => 'sometimes|string|in:normal,high', + 'auto_track' => 'sometimes|boolean', + // Shipping address validation + 'shipping_firstname' => 'required|string|max:50', + 'shipping_lastname' => 'required|string|max:50', + 'shipping_company' => 'nullable|string|max:100', + 'shipping_address' => 'required|string|max:100', + 'shipping_houseNumber' => 'required|string|max:50', + 'shipping_zipcode' => 'required|string|max:10', + 'shipping_city' => 'required|string|max:50', + 'shipping_country_id' => 'required|exists:countries,id', + 'shipping_phone' => 'nullable|string|max:20', + ]); + + $order = ShoppingOrder::findOrFail($request->order_id); + + // Check if shipment already exists + /* $existingShipment = DhlShipment::where('shopping_order_id', $order->id) + ->where('type', 'outbound') + ->first(); + + if ($existingShipment) { + return response()->json([ + 'success' => false, + 'message' => 'Für diese Bestellung existiert bereits eine Sendung.' + ], 422); + } + */ + + // Use service to prepare address data + $shippingAddress = $dhlModalService->prepareAddressForApi($request->all()); + + // Prepare options for shipment creation + $options = [ + 'product_code' => $request->get('product_code', 'V01PAK'), + 'priority' => $request->get('priority', 'normal'), + 'auto_track' => $request->get('auto_track', true), + 'shipping_address' => $shippingAddress, + 'services' => $request->get('services', []), + 'dimensions' => $request->only(['length', 'width', 'height']) + ]; + + // Use DhlShipmentService (handles queue/sync automatically based on config) + $dhlShipmentService = new DhlShipmentService(); + $result = $dhlShipmentService->createShipment($order, (float) $request->weight, $options); + + Log::info('[DHL Controller] Shipment creation processed', [ + 'order_id' => $order->id, + 'weight' => $request->weight, + 'queued' => $result['queued'] ?? false, + 'success' => $result['success'] ?? false, + ]); + + return response()->json($result); + } catch (Exception $e) { + Log::error('[DHL Controller] Failed to dispatch shipment creation', [ + 'error' => $e->getMessage(), + 'order_id' => $request->order_id ?? 'unknown', + ]); + + return response()->json([ + 'success' => false, + 'message' => 'Fehler beim Erstellen der Sendung: ' . $e->getMessage() + ], 500); + } + } + + /** + * Display the specified shipment + * + * @param DhlShipment $shipment + * @return View + */ + public function show(DhlShipment $shipment): View + { + $shipment->load(['shoppingOrder.shopping_user', 'relatedShipment']); + + return view('admin.dhl.show', compact('shipment')); + } + + /** + * Cancel the specified shipment + * + * @param Request $request + * @param DhlShipment $shipment + * @return JsonResponse + */ + public function cancel(Request $request, DhlShipment $shipment): JsonResponse + { + try { + // Validate cancellation is possible + if (!$shipment->canCancel()) { + return response()->json([ + 'success' => false, + 'message' => 'Diese Sendung kann nicht mehr storniert werden.' + ], 422); + } + + // Dispatch cancellation job + $options = [ + 'priority' => $request->get('priority', 'normal') + ]; + + CancelShipmentJob::dispatch($shipment, $options); + + Log::info('[DHL Controller] Shipment cancellation job dispatched', [ + 'shipment_id' => $shipment->id, + 'shipment_number' => $shipment->shipment_number, + ]); + + return response()->json([ + 'success' => true, + 'message' => 'Sendung wird storniert...' + ]); + } catch (Exception $e) { + Log::error('[DHL Controller] Failed to dispatch shipment cancellation', [ + 'error' => $e->getMessage(), + 'shipment_id' => $shipment->id, + ]); + + return response()->json([ + 'success' => false, + 'message' => 'Fehler beim Stornieren der Sendung: ' . $e->getMessage() + ], 500); + } + } + + /** + * Create return label for the specified shipment + * + * @param Request $request + * @param DhlShipment $shipment + * @return JsonResponse + */ + public function createReturnLabel(Request $request, DhlShipment $shipment): JsonResponse + { + try { + // Validate return label creation is possible + if ($shipment->type !== 'outbound') { + return response()->json([ + 'success' => false, + 'message' => 'Retourenlabels können nur für ausgehende Sendungen erstellt werden.' + ], 422); + } + + // Check if return label already exists + $existingReturn = DhlShipment::where('related_shipment_id', $shipment->id) + ->where('type', 'return') + ->first(); + + if ($existingReturn) { + return response()->json([ + 'success' => false, + 'message' => 'Für diese Sendung existiert bereits ein Retourenlabel.' + ], 422); + } + + // Dispatch return label creation job + $options = [ + 'auto_track' => $request->get('auto_track', false), + 'priority' => $request->get('priority', 'normal') + ]; + + CreateReturnLabelJob::dispatch($shipment, $options); + + Log::info('[DHL Controller] Return label creation job dispatched', [ + 'original_shipment_id' => $shipment->id, + 'shipment_number' => $shipment->shipment_number, + ]); + + return response()->json([ + 'success' => true, + 'message' => 'Retourenlabel wird erstellt...' + ]); + } catch (Exception $e) { + Log::error('[DHL Controller] Failed to dispatch return label creation', [ + 'error' => $e->getMessage(), + 'shipment_id' => $shipment->id, + ]); + + return response()->json([ + 'success' => false, + 'message' => 'Fehler beim Erstellen des Retourenlabels: ' . $e->getMessage() + ], 500); + } + } + + /** + * Update tracking status for the specified shipment + * + * @param DhlShipment $shipment + * @return JsonResponse + */ + public function updateTracking(DhlShipment $shipment): JsonResponse + { + try { + if (!$shipment->tracking_number) { + return response()->json([ + 'success' => false, + 'message' => 'Keine Tracking-Nummer verfügbar.' + ], 422); + } + + // Dispatch tracking update job + TrackShipmentJob::dispatch($shipment, ['auto_retrack' => false]); + + Log::info('[DHL Controller] Tracking update job dispatched', [ + 'shipment_id' => $shipment->id, + 'tracking_number' => $shipment->tracking_number, + ]); + + return response()->json([ + 'success' => true, + 'message' => 'Tracking-Informationen werden aktualisiert...' + ]); + } catch (Exception $e) { + Log::error('[DHL Controller] Failed to dispatch tracking update', [ + 'error' => $e->getMessage(), + 'shipment_id' => $shipment->id, + ]); + + return response()->json([ + 'success' => false, + 'message' => 'Fehler beim Aktualisieren der Tracking-Informationen: ' . $e->getMessage() + ], 500); + } + } + + /** + * Download shipping label + * + * @param DhlShipment $shipment + * @return Response + */ + public function downloadLabel(DhlShipment $shipment): Response + { + try { + if (!$shipment->label_path || !Storage::exists($shipment->label_path)) { + abort(404, 'Versandlabel nicht gefunden.'); + } + + $labelContent = Storage::get($shipment->label_path); + $filename = sprintf( + 'dhl-label-%s-%s.pdf', + $shipment->type, + $shipment->shipment_number ?: $shipment->id + ); + + return response($labelContent, 200) + ->header('Content-Type', 'application/pdf') + ->header('Content-Disposition', "attachment; filename=\"{$filename}\""); + } catch (Exception $e) { + Log::error('[DHL Controller] Failed to download label', [ + 'error' => $e->getMessage(), + 'shipment_id' => $shipment->id, + 'label_path' => $shipment->label_path, + ]); + + abort(500, 'Fehler beim Download des Versandlabels.'); + } + } + + /** + * Batch operations (multiple shipments) + * + * @param Request $request + * @return JsonResponse + */ + public function batchAction(Request $request): JsonResponse + { + try { + $request->validate([ + 'action' => 'required|in:cancel,download_labels,update_tracking', + 'shipment_ids' => 'required|array|min:1', + 'shipment_ids.*' => 'exists:dhl_package_shipments,id', + ]); + + $shipmentIds = $request->shipment_ids; + $action = $request->action; + $processed = 0; + $errors = []; + + foreach ($shipmentIds as $shipmentId) { + try { + $shipment = DhlShipment::findOrFail($shipmentId); + + switch ($action) { + case 'cancel': + if ($shipment->canCancel()) { + CancelShipmentJob::dispatch($shipment); + $processed++; + } else { + $errors[] = "Sendung {$shipment->shipment_number} kann nicht storniert werden."; + } + break; + + case 'update_tracking': + if ($shipment->tracking_number) { + TrackShipmentJob::dispatch($shipment, ['auto_retrack' => false]); + $processed++; + } else { + $errors[] = "Sendung {$shipment->shipment_number} hat keine Tracking-Nummer."; + } + break; + + case 'download_labels': + // This would require ZIP creation - implement if needed + $errors[] = "Stapel-Download noch nicht implementiert."; + break; + } + } catch (Exception $e) { + $errors[] = "Fehler bei Sendung {$shipmentId}: " . $e->getMessage(); + } + } + + Log::info('[DHL Controller] Batch action executed', [ + 'action' => $action, + 'processed' => $processed, + 'errors_count' => count($errors), + ]); + + return response()->json([ + 'success' => $processed > 0, + 'message' => sprintf('%d Sendungen verarbeitet.', $processed), + 'processed' => $processed, + 'errors' => $errors, + ]); + } catch (Exception $e) { + Log::error('[DHL Controller] Batch action failed', [ + 'error' => $e->getMessage(), + 'action' => $request->action ?? 'unknown', + ]); + + return response()->json([ + 'success' => false, + 'message' => 'Fehler bei der Stapelverarbeitung: ' . $e->getMessage() + ], 500); + } + } + + /** + * Public tracking page (for customers) + * + * @param Request $request + * @return View|JsonResponse + */ + public function track(Request $request): View|JsonResponse + { + if ($request->expectsJson()) { + $request->validate([ + 'tracking_number' => 'required|string|min:10', + ]); + + try { + $shipment = DhlShipment::where('tracking_number', $request->tracking_number)->first(); + + if (!$shipment) { + return response()->json([ + 'success' => false, + 'message' => 'Sendung nicht gefunden.' + ], 404); + } + + // Dispatch tracking update + TrackShipmentJob::dispatch($shipment, ['auto_retrack' => false]); + + return response()->json([ + 'success' => true, + 'data' => [ + 'tracking_number' => $shipment->tracking_number, + 'status' => $shipment->status, + 'tracking_status' => $shipment->tracking_status, + 'last_tracked_at' => $shipment->last_tracked_at?->format('d.m.Y H:i'), + ] + ]); + } catch (Exception $e) { + Log::error('[DHL Controller] Public tracking failed', [ + 'error' => $e->getMessage(), + 'tracking_number' => $request->tracking_number ?? 'unknown', + ]); + + return response()->json([ + 'success' => false, + 'message' => 'Fehler beim Abrufen der Tracking-Informationen.' + ], 500); + } + } + + return view('public.tracking'); + } +} diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php index d0908d77..db061d38 100644 --- a/app/Http/Controllers/FileController.php +++ b/app/Http/Controllers/FileController.php @@ -130,24 +130,23 @@ class FileController extends Controller if(!Storage::disk($disk)->exists($path)){ return Response::make('Datei nicht gefunden.', 404); } + + if ($do === 'download') { + return Storage::disk($disk)->download($path, $filename); + } + $file = Storage::disk($disk)->get($path); $mime = Storage::disk($disk)->mimeType($path); if(isset($file)){ - if($do === 'download'){ - return Response::make($file, 200) - ->header("Content-Type", $mime) - ->header('Content-disposition', 'attachment; filename="'.$filename.'"'); - } if($do === 'stream'){ - return Response::make($file, 200) - ->header("Content-Type", $mime) - ->header('Content-disposition','inline; filename="'.$filename.'"'); + return Storage::disk($disk)->response($path, $filename); } if($do === 'file'){ return Response::make($file, 200) ->header("Content-Type", $mime) + ->header("Content-Length", strlen($file)) ->header('Content-disposition', 'filename="'.$filename.'"'); } if($do === 'image'){ diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php index 53639a80..d6386076 100644 --- a/app/Http/Controllers/ModalController.php +++ b/app/Http/Controllers/ModalController.php @@ -17,6 +17,7 @@ use App\Models\ShoppingOrder; use App\Models\UserSalesVolume; use App\Services\BusinessPlan\TreeCalcBot; use App\Services\BusinessPlan\TreeCalcBotOptimized; +use App\Services\DhlModalService; class ModalController extends Controller { @@ -170,6 +171,11 @@ class ModalController extends Controller $user_abo = UserAbo::find($data['id']); $ret = view("user.abo.modal_abo_show_products", compact( 'data', 'user_abo'))->render(); } + + if($data['action'] === 'create-dhl-shipment') { + $id = $data['id'] ?? null; + $ret = $this->handleDhlShipmentModal($id, $data); + } } return response()->json(['response' => $data, 'html'=>$ret, 'status'=>$status]); @@ -195,6 +201,55 @@ class ModalController extends Controller } + /** + * Handle DHL shipment modal preparation + * + * @param mixed $id Order ID or 'new' + * @param array $data Request data + * @return string Rendered view + */ + private function handleDhlShipmentModal($id, array $data): string + { + try { + $dhlModalService = new DhlModalService(); + $modalData = $dhlModalService->prepareModalData($id, $data); + + // Merge the prepared data with the original request data + $viewData = array_merge($data, $modalData, [ + 'id' => $id, + 'data' => $data + ]); + + return view("admin.dhl.modal_create_shipment", $viewData)->render(); + + } catch (\Exception $e) { + \Log::error('[ModalController] Error in DHL shipment modal', [ + 'order_id' => $id, + 'error' => $e->getMessage(), + 'trace' => $e->getTraceAsString() + ]); + + // Return error view or fallback + $errorData = [ + 'id' => $id, + 'data' => $data, + 'order' => null, + 'orderWeight' => 1.0, + 'shippingAddress' => null, + 'availableCountries' => \App\Models\Country::where('active', 1)->get(), + 'productCodes' => [ + 'V01PAK' => 'DHL Paket (National)', + 'V53WPAK' => 'DHL Paket International', + 'V54EPAK' => 'DHL Express' + ], + 'errors' => ['Fehler beim Laden der Daten: ' . $e->getMessage()], + 'warnings' => [] + ]; + + return view("admin.dhl.modal_create_shipment", $errorData)->render(); + } + } + } diff --git a/app/Http/Controllers/Portal/InController.php b/app/Http/Controllers/Portal/InController.php index df553eba..6093ef16 100755 --- a/app/Http/Controllers/Portal/InController.php +++ b/app/Http/Controllers/Portal/InController.php @@ -65,16 +65,16 @@ class InController extends Controller $data = Request::all(); - $response = ""; $status = false; - - if(isset($data['action']) && $data['action'] === 'user-order-show-product'){ - $product = Product::find($data['id']); //current user form order - $ret = view("admin.modal.show_product", compact('product', 'data'))->render(); - return response()->json(['response' => $data, 'html'=>$ret, 'status'=>$status]); - + if(isset($data['action'])){ + if($data['action'] === 'user-order-show-product'){ + $product = Product::find($data['id']); //current user form order + $ret = view("admin.modal.show_product", compact('product', 'data'))->render(); + return response()->json(['response' => $data, 'html'=>$ret, 'status'=>$status]); + } } + $data = Request::get('data'); $target = Request::get('target'); if($data === "data_protection"){ diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php index 52ed1d72..ea090072 100644 --- a/app/Http/Controllers/SettingController.php +++ b/app/Http/Controllers/SettingController.php @@ -27,19 +27,92 @@ class SettingController extends Controller public function store() { - $data = Request::all(); - if(isset($data['action'])){ - if(isset($data['settings'])){ - foreach ($data['settings'] as $key=>$value){ + if (isset($data['action'])) { + if (isset($data['settings'])) { + foreach ($data['settings'] as $key => $value) { $value['val'] = isset($value['val']) ? $value['val'] : false; Setting::setContentBySlug($key, $value['val'], $value['type']); } } + + // DHL-spezifische Behandlung + if ($data['action'] === 'save_dhl') { + $this->updateDhlConfigCache(); + \Session()->flash('alert-save-dhl', 'DHL Konfiguration erfolgreich gespeichert!'); + } else { + \Session()->flash('alert-save', '1'); + } } - \Session()->flash('alert-save', '1'); + return redirect(route('admin_settings')); - - } -} \ No newline at end of file + + /** + * Get DHL configuration merged from database settings and .env values + * Database settings override .env values + */ + public function getDhlConfig() + { + return [ + // API Settings + 'base_url' => Setting::getContentBySlug('dhl_base_url') ?: config('dhl.base_url'), + 'api_key' => Setting::getContentBySlug('dhl_api_key') ?: config('dhl.api_key'), + 'username' => Setting::getContentBySlug('dhl_username') ?: config('dhl.username'), + 'password' => Setting::getContentBySlug('dhl_password') ?: config('dhl.password'), + 'billing_number' => Setting::getContentBySlug('dhl_billing_number') ?: config('dhl.billing_number'), + + // Product Settings + 'default_product' => Setting::getContentBySlug('dhl_product') ?: config('dhl.default_product'), + 'label_format' => Setting::getContentBySlug('dhl_label_format') ?: config('dhl.label_format'), + 'print_format' => Setting::getContentBySlug('dhl_print_format') ?: config('dhl.print_format'), + 'retoure_print_format' => Setting::getContentBySlug('dhl_retoure_print_format') ?: config('dhl.retoure_print_format'), + 'use_queue' => Setting::getContentBySlug('dhl_use_queue') ?: config('dhl.use_queue'), + + // Sender Address + 'sender' => [ + 'company' => Setting::getContentBySlug('dhl_sender_company') ?: config('dhl.sender.company'), + 'name' => Setting::getContentBySlug('dhl_sender_name') ?: config('dhl.sender.name'), + 'street' => Setting::getContentBySlug('dhl_sender_street') ?: config('dhl.sender.street'), + 'houseNumber' => Setting::getContentBySlug('dhl_sender_house_number') ?: config('dhl.sender.houseNumber'), + 'postalCode' => Setting::getContentBySlug('dhl_sender_postal_code') ?: config('dhl.sender.postalCode'), + 'city' => Setting::getContentBySlug('dhl_sender_city') ?: config('dhl.sender.city'), + 'country' => Setting::getContentBySlug('dhl_sender_country') ?: config('dhl.sender.country'), + 'email' => Setting::getContentBySlug('dhl_sender_email') ?: config('dhl.sender.email'), + 'phone' => Setting::getContentBySlug('dhl_sender_phone') ?: config('dhl.sender.phone'), + ], + + // Account Numbers + 'account_numbers' => [ + 'V01PAK' => Setting::getContentBySlug('dhl_account_v01pak') ?: config('dhl.account_numbers.V01PAK'), + 'V62WP' => Setting::getContentBySlug('dhl_account_v62wp') ?: config('dhl.account_numbers.V62WP'), + 'V53PAK' => Setting::getContentBySlug('dhl_account_v53pak') ?: config('dhl.account_numbers.V53PAK'), + 'V07PAK' => Setting::getContentBySlug('dhl_account_v07pak') ?: config('dhl.account_numbers.V07PAK'), + 'default' => config('dhl.account_numbers.default'), + ], + + // Static config values (webhook, profile, legacy) + 'profile' => config('dhl.profile'), + 'webhook' => config('dhl.webhook'), + 'legacy' => config('dhl.legacy'), + ]; + } + + /** + * Update DHL configuration cache after saving settings + */ + private function updateDhlConfigCache() + { + // Clear config cache to force reload from database + \Artisan::call('config:clear'); + + // Optional: Test DHL connection with new settings + try { + $dhlManager = app('Acme\Dhl\DhlManager'); + // You could add a connection test here if needed + \Log::info('DHL configuration updated successfully'); + } catch (\Exception $e) { + \Log::error('DHL configuration update failed: ' . $e->getMessage()); + } + } +} diff --git a/app/Http/Controllers/UserShopController.php b/app/Http/Controllers/UserShopController.php index a38ead5e..60a3a369 100755 --- a/app/Http/Controllers/UserShopController.php +++ b/app/Http/Controllers/UserShopController.php @@ -322,6 +322,9 @@ class UserShopController extends Controller return redirect()->back()->withErrors($validator)->withInput(Request::all()); } \Session()->flash('shop-name-error', 'check'); + if(Request::get('user_shop_id')){ + return back()->withInput(Request::all()); + } return redirect(route('user_shop'))->withInput(Request::all()); } @@ -329,6 +332,8 @@ class UserShopController extends Controller $rules = array( 'user_shop_name' => ' required|alpha_dash|unique:user_shops,name|min:4|max:20|full_word_check', + 'user_shop_active' => 'accepted', + ); Validator::extend('full_word_check', function ($attribute, $value, $parameters, $validator) { if(in_array($value, config('profanity.full_word_check'))){ @@ -337,41 +342,43 @@ class UserShopController extends Controller return true; }); $validator = Validator::make(Request::all(), $rules); - - if ($validator->fails()) { - \Session()->flash('shop-name-error', 'error'); - }else{ - \Session()->flash('shop-name-error', 'check'); - - } - - $rules = array( - 'user_shop_active' => 'accepted', - ); - $validator = Validator::make(Request::all(), $rules); if ($validator->fails()) { + \Session()->flash('shop-name-error', 'error'); return redirect()->back()->withErrors($validator)->withInput(Request::all()); } + \Session()->flash('shop-name-error', 'check'); + //all is right - save $user = Auth::user(); $data = Request::all(); $slug = SlugService::createSlug(UserShop::class, 'slug', $data['user_shop_name']); - $user_shop = UserShop::create([ - 'user_id' => $user->id, - 'name' => $slug, - 'active' => true, - 'active_date' => now(), - ] - ); - - $ret = $this->userShopRegisterSubDomain($user_shop->slug); + if(isset($data['user_shop_id'])){ + $user_shop = UserShop::find($data['user_shop_id']); + if($user_shop->user_id != $user->id){ + abort(404); + } + $user_shop->name = $slug; + $user_shop->slug = $slug; + $user_shop->save(); + }else{ + $user_shop = UserShop::create([ + 'user_id' => $user->id, + 'name' => $slug, + 'active' => true, + 'active_date' => now(), + ] + ); + } + \Session()->flash('alert-save', true); + return redirect(route('user_shop')); + /*$ret = $this->userShopRegisterSubDomain($user_shop->slug); if($ret['success'] === true){ \Session()->flash('alert-save', true); }else{ $user_shop->forceDelete(); \Session()->flash('alert-error', $ret['error']); } - return redirect(route('user_shop')); + return redirect(route('user_shop'));*/ } } @@ -444,4 +451,19 @@ class UserShopController extends Controller )); } + public function editName(){ + $user = Auth::user(); + $user_shop = $user->shop; + if(!$user_shop){ + abort(404); + } + $user_shop_domain = $user_shop->getSubdomain(false); + $data = [ + 'user' => $user, + 'user_shop_id' => $user_shop->id, + 'user_shop_domain' => $user_shop_domain, + ]; + return view('user.shop_edit_name', $data); + } + } \ No newline at end of file diff --git a/app/Http/Middleware/DomainResolver.php b/app/Http/Middleware/DomainResolver.php index 668e007f..d94810a4 100644 --- a/app/Http/Middleware/DomainResolver.php +++ b/app/Http/Middleware/DomainResolver.php @@ -37,24 +37,26 @@ class DomainResolver // leiten wir sicher auf die Hauptdomain um. if ($context->isUnknown()) { // Detailliertes Logging für spätere Analyse - \Log::warning('Unknown domain accessed', [ - 'host' => $request->getHost(), - 'subdomain' => $context->subdomain, - 'user_agent' => $request->userAgent(), - 'ip' => $request->ip(), - 'referer' => $request->header('referer'), - 'path' => $request->getPathInfo() - ]); - + if(config('app.debug')){ + \Log::warning('Unknown domain accessed', [ + 'host' => $request->getHost(), + 'subdomain' => $context->subdomain, + 'user_agent' => $request->userAgent(), + 'ip' => $request->ip(), + 'referer' => $request->header('referer'), + 'path' => $request->getPathInfo() + ]); + } // Holt die URL der Hauptdomain vom DomainService und leitet um. $mainUrl = app(\App\Services\DomainService::class)->buildUrl('main'); return redirect()->away($mainUrl, 301); } - \Log::debug('DomainResolver: context', [ - 'context' => $context, - 'subdomain' => $context->subdomain - ]); - + if(config('app.debug')){ + \Log::debug('DomainResolver: context', [ + 'context' => $context, + 'subdomain' => $context->subdomain + ]); + } // Für User-Shop-Domains: Validierung und Route-Parameter-Bereinigung if ($context->isUserShop()) { // Validiere UserShop-Berechtigung (bereits im DomainServiceProvider geprüft, diff --git a/app/Jobs/CancelShipmentJob.php b/app/Jobs/CancelShipmentJob.php new file mode 100644 index 00000000..9b54e6c7 --- /dev/null +++ b/app/Jobs/CancelShipmentJob.php @@ -0,0 +1,144 @@ +dhlShipment = $dhlShipment; + $this->options = $options; + + // Set queue name based on priority + if (isset($options['priority']) && $options['priority'] === 'high') { + $this->onQueue('high-priority'); + } else { + $this->onQueue('dhl-cancellations'); + } + } + + /** + * Execute the job. + */ + public function handle(): void + { + try { + Log::info('[DHL Queue] Starting shipment cancellation job', [ + 'shipment_id' => $this->dhlShipment->id, + 'shipment_number' => $this->dhlShipment->shipment_number, + 'attempt' => $this->attempts(), + ]); + + $dhlService = new DhlApiService(); + + // Cancel the shipment + $success = $dhlService->cancelShipment($this->dhlShipment); + + if ($success) { + Log::info('[DHL Queue] Shipment cancelled successfully', [ + 'shipment_id' => $this->dhlShipment->id, + 'shipment_number' => $this->dhlShipment->shipment_number, + ]); + } else { + throw new Exception('Cancellation returned false'); + } + + } catch (Exception $e) { + Log::error('[DHL Queue] Shipment cancellation failed', [ + 'shipment_id' => $this->dhlShipment->id, + 'shipment_number' => $this->dhlShipment->shipment_number, + 'error' => $e->getMessage(), + 'attempt' => $this->attempts(), + 'max_tries' => $this->tries, + ]); + + // If this is the final attempt, mark as permanently failed + if ($this->attempts() >= $this->tries) { + Log::error('[DHL Queue] Shipment cancellation permanently failed', [ + 'shipment_id' => $this->dhlShipment->id, + 'error' => $e->getMessage(), + ]); + } + + throw $e; // Re-throw to trigger retry mechanism + } + } + + /** + * Handle a job failure. + * + * @param Exception $exception + */ + public function failed(Exception $exception): void + { + Log::error('[DHL Queue] CancelShipmentJob permanently failed', [ + 'shipment_id' => $this->dhlShipment->id, + 'shipment_number' => $this->dhlShipment->shipment_number, + 'error' => $exception->getMessage(), + 'trace' => $exception->getTraceAsString(), + ]); + + // You could implement additional failure handling here: + // - Send notification to admin + // - Create manual task for staff to handle cancellation + // - Update shipment status to indicate cancellation failed + } + + /** + * Determine the time at which the job should timeout. + * + * @return \DateTime + */ + public function retryUntil() + { + return now()->addHour(); // Shorter timeout for cancellations + } +} diff --git a/app/Jobs/CreateReturnLabelJob.php b/app/Jobs/CreateReturnLabelJob.php new file mode 100644 index 00000000..7f276370 --- /dev/null +++ b/app/Jobs/CreateReturnLabelJob.php @@ -0,0 +1,148 @@ +originalShipment = $originalShipment; + $this->options = $options; + + // Set queue name based on priority + if (isset($options['priority']) && $options['priority'] === 'high') { + $this->onQueue('high-priority'); + } else { + $this->onQueue('dhl-returns'); + } + } + + /** + * Execute the job. + */ + public function handle(): void + { + try { + Log::info('[DHL Queue] Starting return label creation job', [ + 'original_shipment_id' => $this->originalShipment->id, + 'original_shipment_number' => $this->originalShipment->shipment_number, + 'attempt' => $this->attempts(), + ]); + + $dhlService = new DhlApiService(); + + // Create the return label + $returnShipment = $dhlService->createReturnLabel( + $this->originalShipment, + $this->options + ); + + Log::info('[DHL Queue] Return label created successfully', [ + 'original_shipment_id' => $this->originalShipment->id, + 'return_shipment_id' => $returnShipment->id, + 'return_shipment_number' => $returnShipment->shipment_number, + ]); + + // Trigger follow-up actions if specified + if (isset($this->options['auto_track']) && $this->options['auto_track']) { + \App\Jobs\TrackShipmentJob::dispatch($returnShipment)->delay(now()->addMinutes(5)); + } + + } catch (Exception $e) { + Log::error('[DHL Queue] Return label creation failed', [ + 'original_shipment_id' => $this->originalShipment->id, + 'error' => $e->getMessage(), + 'attempt' => $this->attempts(), + 'max_tries' => $this->tries, + ]); + + // If this is the final attempt, mark as permanently failed + if ($this->attempts() >= $this->tries) { + Log::error('[DHL Queue] Return label creation permanently failed', [ + 'original_shipment_id' => $this->originalShipment->id, + 'error' => $e->getMessage(), + ]); + } + + throw $e; // Re-throw to trigger retry mechanism + } + } + + /** + * Handle a job failure. + * + * @param Exception $exception + */ + public function failed(Exception $exception): void + { + Log::error('[DHL Queue] CreateReturnLabelJob permanently failed', [ + 'original_shipment_id' => $this->originalShipment->id, + 'original_shipment_number' => $this->originalShipment->shipment_number, + 'error' => $exception->getMessage(), + 'trace' => $exception->getTraceAsString(), + ]); + + // You could implement additional failure handling here: + // - Send notification to admin + // - Create manual task for staff to handle return label creation + // - Update original shipment to mark return label creation failed + } + + /** + * Determine the time at which the job should timeout. + * + * @return \DateTime + */ + public function retryUntil() + { + return now()->addHours(2); + } +} diff --git a/app/Jobs/CreateShipmentJob.php b/app/Jobs/CreateShipmentJob.php new file mode 100644 index 00000000..7894fe27 --- /dev/null +++ b/app/Jobs/CreateShipmentJob.php @@ -0,0 +1,179 @@ +shoppingOrder = $shoppingOrder; + $this->weight = $weight; + $this->options = $options; + + // Load DHL config once when creating the job + if (empty($dhlConfig)) { + $settingController = new \App\Http\Controllers\SettingController(); + $this->dhlConfig = $settingController->getDhlConfig(); + } else { + $this->dhlConfig = $dhlConfig; + } + + // Set queue name based on priority + if (isset($options['priority']) && $options['priority'] === 'high') { + $this->onQueue('high-priority'); + } else { + $this->onQueue('dhl-shipments'); + } + } + + /** + * Execute the job. + */ + public function handle(): void + { + try { + Log::info('[DHL Queue] Starting shipment creation job', [ + 'order_id' => $this->shoppingOrder->id, + 'weight' => $this->weight, + 'attempt' => $this->attempts(), + ]); + + // Use DHL configuration loaded in constructor + $dhlClient = new \Acme\Dhl\Support\DhlClient( + $this->dhlConfig['base_url'], + $this->dhlConfig['api_key'], + $this->dhlConfig['username'], + $this->dhlConfig['password'] + ); + + $shippingService = new \Acme\Dhl\Services\ShippingService($dhlClient); + + // Prepare order data using helper + $orderData = DhlDataHelper::prepareOrderData($this->shoppingOrder, $this->weight, $this->options, $this->dhlConfig); + + // Create the shipment using new package + $result = $shippingService->createLabel($orderData); + + Log::info('[DHL Queue] Shipment created successfully', [ + 'order_id' => $this->shoppingOrder->id, + 'shipment_number' => $result['shipmentNumber'] ?? 'N/A', + 'label_path' => $result['labelPath'] ?? 'N/A', + ]); + + // Trigger follow-up actions if specified (if tracking number available) + if (isset($this->options['auto_track']) && $this->options['auto_track'] && !empty($result['trackingNumber'])) { + Log::info('[DHL Queue] Scheduling tracking update', [ + 'tracking_number' => $result['trackingNumber'] + ]); + // Note: TrackShipmentJob would need to be updated to work with tracking numbers + } + } catch (Exception $e) { + Log::error('[DHL Queue] Shipment creation failed', [ + 'order_id' => $this->shoppingOrder->id, + 'error' => $e->getMessage(), + 'attempt' => $this->attempts(), + 'max_tries' => $this->tries, + ]); + + // If this is the final attempt, mark as permanently failed + if ($this->attempts() >= $this->tries) { + Log::error('[DHL Queue] Shipment creation permanently failed', [ + 'order_id' => $this->shoppingOrder->id, + 'error' => $e->getMessage(), + ]); + } + + throw $e; // Re-throw to trigger retry mechanism + } + } + + /** + * Handle a job failure. + * + * @param Exception $exception + */ + public function failed(Exception $exception): void + { + Log::error('[DHL Queue] CreateShipmentJob permanently failed', [ + 'order_id' => $this->shoppingOrder->id, + 'error' => $exception->getMessage(), + 'trace' => $exception->getTraceAsString(), + ]); + + // You could implement additional failure handling here: + // - Send notification to admin + // - Update order status + // - Create manual task for staff + } + + + /** + * Determine the time at which the job should timeout. + * + * @return \DateTime + */ + public function retryUntil() + { + return now()->addHours(2); + } +} diff --git a/app/Jobs/TrackShipmentJob.php b/app/Jobs/TrackShipmentJob.php new file mode 100644 index 00000000..44c56b79 --- /dev/null +++ b/app/Jobs/TrackShipmentJob.php @@ -0,0 +1,194 @@ +dhlShipment = $dhlShipment; + $this->options = $options; + + // Set queue name - tracking is usually lower priority + $this->onQueue('dhl-tracking'); + } + + /** + * Execute the job. + */ + public function handle(): void + { + try { + Log::info('[DHL Queue] Starting shipment tracking job', [ + 'shipment_id' => $this->dhlShipment->id, + 'tracking_number' => $this->dhlShipment->tracking_number, + 'attempt' => $this->attempts(), + ]); + + $dhlService = new DhlApiService(); + + // Get tracking details + $trackingDetails = $dhlService->getTrackingDetails($this->dhlShipment); + + Log::info('[DHL Queue] Shipment tracking updated successfully', [ + 'shipment_id' => $this->dhlShipment->id, + 'tracking_status' => $trackingDetails['status'] ?? 'unknown', + 'events_count' => isset($trackingDetails['events']) ? count($trackingDetails['events']) : 0, + ]); + + // Schedule next tracking update if shipment is still in transit + if (isset($this->options['auto_retrack']) && $this->options['auto_retrack']) { + $status = $trackingDetails['status'] ?? ''; + if ($this->shouldContinueTracking($status)) { + // Schedule next tracking in 2-6 hours based on current status + $nextTrackingDelay = $this->getNextTrackingDelay($status); + TrackShipmentJob::dispatch($this->dhlShipment, $this->options) + ->delay(now()->addMinutes($nextTrackingDelay)); + + Log::info('[DHL Queue] Next tracking job scheduled', [ + 'shipment_id' => $this->dhlShipment->id, + 'delay_minutes' => $nextTrackingDelay, + ]); + } + } + + } catch (Exception $e) { + Log::warning('[DHL Queue] Shipment tracking failed', [ + 'shipment_id' => $this->dhlShipment->id, + 'tracking_number' => $this->dhlShipment->tracking_number, + 'error' => $e->getMessage(), + 'attempt' => $this->attempts(), + 'max_tries' => $this->tries, + ]); + + // For tracking, we don't necessarily need to fail hard + if ($this->attempts() >= $this->tries) { + Log::warning('[DHL Queue] Shipment tracking permanently failed', [ + 'shipment_id' => $this->dhlShipment->id, + 'error' => $e->getMessage(), + ]); + + // Don't re-throw for final attempt - just log and continue + return; + } + + throw $e; // Re-throw to trigger retry mechanism + } + } + + /** + * Handle a job failure. + * + * @param Exception $exception + */ + public function failed(Exception $exception): void + { + Log::warning('[DHL Queue] TrackShipmentJob permanently failed', [ + 'shipment_id' => $this->dhlShipment->id, + 'tracking_number' => $this->dhlShipment->tracking_number, + 'error' => $exception->getMessage(), + ]); + + // Tracking failures are less critical - just log them + } + + /** + * Determine if we should continue tracking this shipment + * + * @param string $status + * @return bool + */ + private function shouldContinueTracking(string $status): bool + { + $finalStates = [ + 'delivered', + 'delivered_to_recipient', + 'delivered_to_pickup_location', + 'returned_to_sender', + 'cancelled', + 'lost', + ]; + + return !in_array(strtolower($status), $finalStates); + } + + /** + * Get delay for next tracking update based on current status + * + * @param string $status + * @return int Minutes until next tracking + */ + private function getNextTrackingDelay(string $status): int + { + switch (strtolower($status)) { + case 'picked_up': + case 'in_transit': + return 120; // 2 hours for active shipments + case 'out_for_delivery': + return 60; // 1 hour when out for delivery + case 'exception': + case 'failed_attempt': + return 240; // 4 hours for problem shipments + default: + return 180; // 3 hours default + } + } + + /** + * Determine the time at which the job should timeout. + * + * @return \DateTime + */ + public function retryUntil() + { + return now()->addMinutes(30); // Short timeout for tracking + } +} diff --git a/app/Mail/MailAutoReleaseAccount.php b/app/Mail/MailAutoReleaseAccount.php index 2363137a..03ae254d 100644 --- a/app/Mail/MailAutoReleaseAccount.php +++ b/app/Mail/MailAutoReleaseAccount.php @@ -51,7 +51,7 @@ class MailAutoReleaseAccount extends Mailable $copy1line .= 'Sollte Daten nicht vollständig sein, bitte Kontakt zum Berater aufnehmen.'."\n"; return $this->view('emails.info')->with([ - 'url' => route('admin_lead_edit', $this->user->id).'?show=check_lead', + 'url' => config('app.url_crm') . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', 'title' => 'Berater Registrierung prüfen', 'button' => 'zur Berater Prüfung', 'copy1line' => $copy1line, diff --git a/app/Mail/MailInfo.php b/app/Mail/MailInfo.php index ed1d2389..3a24f0a6 100644 --- a/app/Mail/MailInfo.php +++ b/app/Mail/MailInfo.php @@ -61,14 +61,14 @@ class MailInfo extends Mailable $copy1line = "Infos zum Berater:"."\n"; $button = "zum Berater"; $title = "Ein Berater möchte seine Mitgliedschaft beenden."; - $url = route('admin_lead_edit', $this->user->id).'?show=check_lead'; + $url = config('app.url_crm') . '/admin/lead/edit/' . $this->user->id . '?show=check_lead'; } if($this->action === "check_is_like_customer") { $copy1line = "Hier geht es zum Kunden:"."\n"; $button = "zum Kunden"; $title = "Ein Kunden muss überprüft werden und einem Berater zugeordnet werden, da die Adresse nicht eindeutig ist."; - $url = route('admin_customer_detail', $this->user->id); + $url = config('app.url_crm') . '/admin/customer/detail/' . $this->user->id; $content .= $this->user ? 'Firma: '.$this->user->billing_company."\n" : ''; $content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation)." "; $content .= $this->user->billing_firstname." "; @@ -86,7 +86,7 @@ class MailInfo extends Mailable $copy1line = "Hier geht es zum Kunden:"."\n"; $button = "zum Kunden"; $title = "Ein Kunden muss erneut überprüft werden, da bei einer Änderung eine bestehende Kundenhoheit gefunden wurde."; - $url = route('admin_customer_detail', $this->user->id); + $url = config('app.url_crm') . '/admin/customer/detail/' . $this->user->id; $content .= "Folgende Daten für die Kundenhoheit wurden geändert:"."\n"; foreach ($this->data as $key=>$value){ $content .= $this->user->{$key}." => ".$value."\n"; diff --git a/app/Mail/MailReleaseAccount.php b/app/Mail/MailReleaseAccount.php index e064716d..83284400 100644 --- a/app/Mail/MailReleaseAccount.php +++ b/app/Mail/MailReleaseAccount.php @@ -52,7 +52,7 @@ class MailReleaseAccount extends Mailable $copy1line .= 'Der Berater erhält eine Mail, dass sein Account freigeschaltet wurde. Der Vertrag wird automatisch mit den Daten des Vertriebspartners erstellt.'."\n"; return $this->view('emails.info')->with([ - 'url' => route('admin_lead_edit', $this->user->id).'?show=check_lead', + 'url' => config('app.url_crm') . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', 'title' => 'Berater Registrierung prüfen', 'button' => 'zur Berater Prüfung', 'copy1line' => $copy1line, diff --git a/app/Mail/MailReleaseDocument.php b/app/Mail/MailReleaseDocument.php index 565ebaaa..764ff1c4 100644 --- a/app/Mail/MailReleaseDocument.php +++ b/app/Mail/MailReleaseDocument.php @@ -48,7 +48,7 @@ class MailReleaseDocument extends Mailable $copy1line .= 'Bei fehlerhafter Angabe nimm bitte kontakt mit dem Berater auf.'."\n"; return $this->view('emails.info')->with([ - 'url' => route('admin_lead_edit', $this->user->id).'?show=check_lead', + 'url' => config('app.url_crm') . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', 'title' => 'Berater Unterlagen prüfen', 'button' => 'zur Berater Prüfung', 'copy1line' => $copy1line, diff --git a/app/Models/DhlShipment.php b/app/Models/DhlShipment.php new file mode 100644 index 00000000..a5a7ce93 --- /dev/null +++ b/app/Models/DhlShipment.php @@ -0,0 +1,407 @@ +|DhlShipment active() + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment outbound() + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment query() + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment returns() + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment trackable() + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereApiErrors($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereApiRequestData($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereApiResponseData($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereCurrency($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereDeliveredAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereHeight($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereLabelFormat($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereLabelPath($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereLabelPrinted($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereLastTrackedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereLength($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereMetadata($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereNotes($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereProductCode($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientCity($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientCompany($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientCountry($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientEmail($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientName($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientPhone($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientPostalCode($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientState($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientStreet($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRecipientStreetNumber($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereRelatedShipmentId($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereServices($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereShipmentNumber($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereShippedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereShippingCost($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereShoppingOrderId($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereStatus($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereTrackingDetails($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereTrackingNumber($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereTrackingStatus($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereType($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereWeight($value) + * @method static \Illuminate\Database\Eloquent\Builder|DhlShipment whereWidth($value) + * @mixin \Eloquent + */ +class DhlShipment extends Model +{ + use HasFactory; + + /** + * The table associated with the model. + */ + protected $table = 'dhl_shipments'; + + /** + * The attributes that are mass assignable. + */ + protected $fillable = [ + 'shopping_order_id', + 'shipment_number', + 'tracking_number', + 'type', + 'related_shipment_id', + 'weight', + 'length', + 'width', + 'height', + 'product_code', + 'services', + 'label_path', + 'label_format', + 'label_printed', + 'status', + 'tracking_status', + 'tracking_details', + 'last_tracked_at', + 'recipient_name', + 'recipient_company', + 'recipient_street', + 'recipient_street_number', + 'recipient_postal_code', + 'recipient_city', + 'recipient_state', + 'recipient_country', + 'recipient_email', + 'recipient_phone', + 'api_request_data', + 'api_response_data', + 'api_errors', + 'shipping_cost', + 'currency', + 'notes', + 'metadata', + 'shipped_at', + 'delivered_at', + ]; + + /** + * The attributes that should be cast. + */ + protected $casts = [ + 'weight' => 'float', + 'length' => 'integer', + 'width' => 'integer', + 'height' => 'integer', + 'services' => 'array', + 'label_printed' => 'boolean', + 'tracking_details' => 'array', + 'last_tracked_at' => 'datetime', + 'api_request_data' => 'array', + 'api_response_data' => 'array', + 'shipping_cost' => 'decimal:2', + 'metadata' => 'array', + 'shipped_at' => 'datetime', + 'delivered_at' => 'datetime', + ]; + + /** + * Shipment types + */ + public const TYPE_OUTBOUND = 'outbound'; + public const TYPE_RETURN = 'return'; + + /** + * Shipment statuses + */ + public const STATUS_CREATED = 'created'; + public const STATUS_SUBMITTED = 'submitted'; + public const STATUS_IN_TRANSIT = 'in_transit'; + public const STATUS_DELIVERED = 'delivered'; + public const STATUS_RETURNED = 'returned'; + public const STATUS_CANCELLED = 'cancelled'; + public const STATUS_FAILED = 'failed'; + + /** + * Get the shopping order that owns the shipment + */ + public function shoppingOrder(): BelongsTo + { + return $this->belongsTo(ShoppingOrder::class, 'shopping_order_id'); + } + + /** + * Get the related shipment (for returns) + */ + public function relatedShipment(): BelongsTo + { + return $this->belongsTo(DhlShipment::class, 'related_shipment_id'); + } + + /** + * Get the return shipment (for outbound shipments) + */ + public function returnShipment(): HasOne + { + return $this->hasOne(DhlShipment::class, 'related_shipment_id'); + } + + /** + * Scope for outbound shipments + */ + public function scopeOutbound($query) + { + return $query->where('type', self::TYPE_OUTBOUND); + } + + /** + * Scope for return shipments + */ + public function scopeReturns($query) + { + return $query->where('type', self::TYPE_RETURN); + } + + /** + * Scope for active shipments (not cancelled or failed) + */ + public function scopeActive($query) + { + return $query->whereNotIn('status', [self::STATUS_CANCELLED, self::STATUS_FAILED]); + } + + /** + * Scope for trackable shipments (have tracking number) + */ + public function scopeTrackable($query) + { + return $query->whereNotNull('tracking_number'); + } + + /** + * Check if shipment is outbound + */ + public function isOutbound(): bool + { + return $this->type === self::TYPE_OUTBOUND; + } + + /** + * Check if shipment is return + */ + public function isReturn(): bool + { + return $this->type === self::TYPE_RETURN; + } + + /** + * Check if shipment can be cancelled + */ + public function canBeCancelled(): bool + { + return in_array($this->status, [ + self::STATUS_CREATED, + self::STATUS_SUBMITTED, + ]); + } + + /** + * Check if shipment is delivered + */ + public function isDelivered(): bool + { + return $this->status === self::STATUS_DELIVERED; + } + + /** + * Check if shipment has tracking information + */ + public function hasTracking(): bool + { + return !empty($this->tracking_number); + } + + /** + * Check if label is available + */ + public function hasLabel(): bool + { + return !empty($this->label_path) && file_exists(storage_path('app/' . $this->label_path)); + } + + /** + * Get full recipient address as formatted string + */ + public function getRecipientAddressAttribute(): string + { + $address = $this->recipient_name; + + if ($this->recipient_company) { + $address .= "\n" . $this->recipient_company; + } + + $address .= "\n" . $this->recipient_street . ' ' . $this->recipient_street_number; + $address .= "\n" . $this->recipient_postal_code . ' ' . $this->recipient_city; + + if ($this->recipient_state) { + $address .= "\n" . $this->recipient_state; + } + + $address .= "\n" . $this->recipient_country; + + return $address; + } + + /** + * Get package dimensions as formatted string + */ + public function getDimensionsAttribute(): ?string + { + if (!$this->length || !$this->width || !$this->height) { + return null; + } + + return $this->length . ' x ' . $this->width . ' x ' . $this->height . ' cm'; + } + + /** + * Get human-readable status + */ + public function getStatusLabelAttribute(): string + { + return match($this->status) { + self::STATUS_CREATED => 'Erstellt', + self::STATUS_SUBMITTED => 'Übertragen', + self::STATUS_IN_TRANSIT => 'Unterwegs', + self::STATUS_DELIVERED => 'Zugestellt', + self::STATUS_RETURNED => 'Zurückgeschickt', + self::STATUS_CANCELLED => 'Storniert', + self::STATUS_FAILED => 'Fehler', + default => 'Unbekannt', + }; + } + + /** + * Get human-readable type + */ + public function getTypeLabelAttribute(): string + { + return match($this->type) { + self::TYPE_OUTBOUND => 'Versand', + self::TYPE_RETURN => 'Retoure', + default => 'Unbekannt', + }; + } + + /** + * Get label file URL for download + */ + public function getLabelUrlAttribute(): ?string + { + if (!$this->hasLabel()) { + return null; + } + + return route('admin.dhl.shipments.label', $this->id); + } + + /** + * Boot the model + */ + protected static function boot() + { + parent::boot(); + + static::creating(function ($shipment) { + // Set default values + if (empty($shipment->currency)) { + $shipment->currency = config('dhl.defaults.currency', 'EUR'); + } + + if (empty($shipment->product_code)) { + $shipment->product_code = config('dhl.defaults.product', 'V01PAK'); + } + + if (empty($shipment->label_format)) { + $shipment->label_format = config('dhl.labels.format', 'PDF'); + } + }); + } +} \ No newline at end of file diff --git a/app/Models/ShoppingOrder.php b/app/Models/ShoppingOrder.php index 861b7770..e152fc6b 100644 --- a/app/Models/ShoppingOrder.php +++ b/app/Models/ShoppingOrder.php @@ -101,6 +101,12 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property int|null $abo_interval * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereAboInterval($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereIsAbo($value) + * @property-read \Illuminate\Database\Eloquent\Collection $dhlOutboundShipments + * @property-read int|null $dhl_outbound_shipments_count + * @property-read \Illuminate\Database\Eloquent\Collection $dhlReturnShipments + * @property-read int|null $dhl_return_shipments_count + * @property-read \Illuminate\Database\Eloquent\Collection $dhlShipments + * @property-read int|null $dhl_shipments_count * @mixin \Eloquent */ class ShoppingOrder extends Model @@ -623,4 +629,44 @@ class ShoppingOrder extends Model return $ret; } + /** + * Get DHL shipments for this order + */ + public function dhlShipments() + { + return $this->hasMany('App\Models\DhlShipment', 'shopping_order_id'); + } + + /** + * Get outbound DHL shipments only + */ + public function dhlOutboundShipments() + { + return $this->hasMany('App\Models\DhlShipment', 'shopping_order_id')->where('type', 'outbound'); + } + + /** + * Get return DHL shipments only + */ + public function dhlReturnShipments() + { + return $this->hasMany('App\Models\DhlShipment', 'shopping_order_id')->where('type', 'return'); + } + + /** + * Check if order has DHL shipments + */ + public function hasDhlShipments(): bool + { + return $this->dhlShipments()->exists(); + } + + /** + * Get latest DHL shipment + */ + public function getLatestDhlShipment() + { + return $this->dhlShipments()->latest()->first(); + } + } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php old mode 100755 new mode 100644 index 92ac31a7..42813597 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -16,7 +16,7 @@ class AppServiceProvider extends ServiceProvider public function boot() { Schema::defaultStringLength(191); - + if ($this->app->environment('production')) { URL::forceScheme('https'); } @@ -25,7 +25,7 @@ class AppServiceProvider extends ServiceProvider \View::composer('*', function ($view) { try { $context = app(\App\Domain\DomainContext::class); - + // Für die Main-Domain: user_shop immer auf null setzen if ($context->type === 'main') { $view->with('user_shop', null); @@ -49,9 +49,8 @@ class AppServiceProvider extends ServiceProvider public function register() { - if ($this->app->environment() !== 'production') { + if ($this->app->environment() !== 'production' && class_exists(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class)) { $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class); } - // ... } } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/DomainServiceProvider.php b/app/Providers/DomainServiceProvider.php index 4c12e35c..eea1069f 100644 --- a/app/Providers/DomainServiceProvider.php +++ b/app/Providers/DomainServiceProvider.php @@ -44,10 +44,12 @@ class DomainServiceProvider extends ServiceProvider // Analysiere den Host der aktuellen Anfrage $domainInfo = $domainService->parseDomain($request->getHost()); - \Log::debug('DomainServiceProvider: domainInfo', [ - 'domainInfo' => $domainInfo, - 'host' => $request->getHost() - ]); + if (config('app.debug')) { + \Log::debug('DomainServiceProvider: domainInfo', [ + 'domainInfo' => $domainInfo, + 'host' => $request->getHost() + ]); + } $userShop = null; // Wenn es sich um eine User-Shop-Domain handelt, versuche das Shop-Objekt zu finden. diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/YardServiceProvider.php b/app/Providers/YardServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Services/DhlApiService.php b/app/Services/DhlApiService.php new file mode 100644 index 00000000..8173c5b3 --- /dev/null +++ b/app/Services/DhlApiService.php @@ -0,0 +1,1312 @@ +config = config('dhl'); + $this->isSandbox = $this->config['api']['sandbox'] ?? true; + + $this->initializeClients(); + } + + /** + * Initialize DHL API clients + * + * @throws Exception + */ + private function initializeClients(): void + { + try { + // Get all credentials from the config. + $apiKey = $this->config['api']['api_key'] ?? null; + $apiSecret = $this->config['api']['api_secret'] ?? null; + $username = $this->config['api']['username'] ?? null; + $password = $this->config['api']['password'] ?? null; + + // The ChristophSchaeffer library for the "Geschäftskundenversand API" (SOAP) + // always requires both sets of credentials: + // 1. API Key/Secret for the Application's identity. + // 2. Username/Password for the Business Customer Portal user's identity. + + // We must validate that all four are present. + if (empty($apiKey) || empty($apiSecret)) { + throw new Exception('DHL API Key (DHL_API_KEY) and API Secret (DHL_API_SECRET) are missing. Please get them from the DHL Developer Portal.'); + } + if (empty($username) || empty($password)) { + throw new Exception('DHL API Username (DHL_API_USERNAME) and Password (DHL_API_PASSWORD) are missing. Please get them from your customer\'s DHL Business Customer Portal.'); + } + + $shippingCredentials = new ShippingClientCredentials( + $apiKey, + $apiSecret, + $username, + $password + ); + + $this->shippingClient = new ShippingClient( + $shippingCredentials, + $this->isSandbox, + MultiClient::LANGUAGE_LOCALE_GERMAN_DE + ); + + // Initialize Tracking Client (if enabled) + if ($this->config['tracking']['enabled']) { + // For tracking, the ZT-Token is often used as the "user" context + $trackingUser = $this->config['tracking']['username'] ?? 'zt12345'; // Sandbox default + $trackingPass = $this->config['tracking']['password'] ?? 'geheim'; // Sandbox default + + $trackingCredentials = new TrackingClientCredentials( + $apiKey, + $apiSecret, + $trackingUser, + $trackingPass + ); + + $this->trackingClient = new TrackingClient( + $trackingCredentials, + $this->isSandbox + ); + } + + } catch (Exception $e) { + $this->logError('Failed to initialize DHL clients', $e); + throw new Exception('DHL API initialization failed: ' . $e->getMessage()); + } + } + + /** + * Create a shipment for an order + * + * @param ShoppingOrder $order The shopping order + * @param float $weight Package weight in kg + * @param array $options Additional options + * @return DhlShipment The created shipment + * @throws Exception + */ + public function createShipment(ShoppingOrder $order, float $weight = 1.0, array $options = []): DhlShipment + { + try { + $this->logInfo('Creating DHL shipment', [ + 'order_id' => $order->id, + 'weight' => $weight, + 'options' => $options + ]); + + // Build shipment data from order, including address parsing + $shipmentData = $this->buildShipmentData($order, $weight, $options); + \Log::info('shipmentData', $shipmentData); + // Validate the built data before proceeding + $this->validateShipmentData($shipmentData, $order->id); + + // Create DHL shipment record first + $dhlShipment = $this->createDhlShipmentRecord($order, $shipmentData); + + // Create shipment order for DHL API + $shipmentOrder = $this->buildShipmentOrder($shipmentData, $dhlShipment); + + // Call DHL API + $request = new createShipmentOrder([$shipmentOrder]); // Constructor expects array of ShipmentOrder objects + + try { + $response = $this->shippingClient->createShipmentOrder($request); + + // Enhanced debug logging for troubleshooting + $this->logInfo('DHL API Response received', [ + 'response_class' => get_class($response), + 'has_errors' => !$response->hasNoErrors(), + 'creation_states_count' => count($response->CreationStates ?? []) + ]); + + // Log detailed response structure for debugging + if (!$response->hasNoErrors()) { + $this->logResponseStructure($response); + } + } catch (\ErrorException $e) { + if (str_contains($e->getMessage(), 'Attempt to read property "Version" on null')) { + throw new \Exception( + 'The DHL API returned an unexpected response. This often indicates an authentication problem with the Business Customer API. ' . + 'Please double-check your DHL_API_USERNAME and DHL_API_PASSWORD in the .env file. ' . + 'Original error: ' . $e->getMessage(), 0, $e + ); + } + throw $e; + } + + // Process response + $this->processShipmentResponse($dhlShipment, $response, $request); + + $this->logInfo('DHL shipment created successfully', [ + 'shipment_id' => $dhlShipment->id, + 'shipment_number' => $dhlShipment->shipment_number + ]); + + return $dhlShipment->fresh(); + + } catch (DhlException $e) { + $this->logError('DHL API error during shipment creation', $e, ['order_id' => $order->id]); + throw new Exception('DHL shipment creation failed: ' . $e->getMessage()); + } catch (Exception $e) { + $this->logError('General error during shipment creation', $e, ['order_id' => $order->id]); + throw $e; + } + } + + /** + * Test DHL API Login Credentials by creating a dummy shipment. + * + * @return array + */ + public function testLogin(): array + { + try { + $this->logInfo('Starting DHL API connection test.'); + + // Check basic configuration first + if (!$this->isConfigured()) { + return [ + 'success' => false, + 'message' => 'DHL API ist nicht vollständig konfiguriert. Prüfen Sie die .env Einstellungen.', + ]; + } + + // 1. Find a test order (preferably with complete shipping data) + $testOrder = ShoppingOrder::with(['shopping_user', 'shopping_order_items']) + ->whereHas('shopping_user') + ->where('id', 35511) // Use specific test order + ->first(); + + if (!$testOrder) { + return [ + 'success' => false, + 'message' => 'Test-Bestellung (ID: 35511) nicht gefunden. Bitte verwenden Sie eine existierende Bestellung für den Test.', + ]; + } + + $this->logInfo('Using test order for API test', [ + 'order_id' => $testOrder->id, + 'has_user' => !is_null($testOrder->shopping_user), + 'has_items' => $testOrder->shopping_order_items->count() > 0 + ]); + + // 2. Define test options with realistic data + $weight = 1.0; + $options = [ + 'product_code' => 'V01PAK', + 'is_test' => true // Mark as test to avoid any side effects + ]; + + // 3. Wrap in transaction to avoid database pollution + DB::beginTransaction(); + + try { + $dhlShipment = $this->createShipment($testOrder, $weight, $options); + + // If we get here, the API call was successful + $success = !empty($dhlShipment->shipment_number); + + if ($success) { + $this->logInfo('DHL API test successful', [ + 'shipment_number' => $dhlShipment->shipment_number, + 'status' => $dhlShipment->status + ]); + + $result = [ + 'success' => true, + 'message' => 'DHL API Test erfolgreich! Verbindung und Authentifizierung funktionieren.', + 'details' => [ + 'shipment_number' => $dhlShipment->shipment_number, + 'status' => $dhlShipment->status, + 'api_type' => $this->config['api']['api_type'] ?? 'unknown', + 'sandbox' => $this->isSandbox + ] + ]; + } else { + $result = [ + 'success' => false, + 'message' => 'DHL API Test unvollständig: Sendung erstellt aber keine Sendungsnummer erhalten.', + 'details' => [ + 'status' => $dhlShipment->status ?? 'unknown', + 'errors' => $dhlShipment->api_errors ?? 'No specific errors' + ] + ]; + } + + } catch (Exception $apiException) { + $this->logError('DHL API test failed during createShipment', $apiException, [ + 'order_id' => $testOrder->id + ]); + + $result = [ + 'success' => false, + 'message' => 'DHL API Test fehlgeschlagen: ' . $apiException->getMessage(), + 'details' => [ + 'error_type' => get_class($apiException), + 'api_type' => $this->config['api']['api_type'] ?? 'unknown', + 'sandbox' => $this->isSandbox + ] + ]; + } + + // Always rollback transaction for tests + DB::rollBack(); + + return $result; + + } catch (Exception $e) { + DB::rollBack(); // Ensure rollback on any failure + + $this->logError('DHL API test failed with general error', $e); + + return [ + 'success' => false, + 'message' => 'DHL API Test fehlgeschlagen: ' . $e->getMessage(), + 'details' => [ + 'error_type' => get_class($e), + 'configured' => $this->isConfigured(), + 'sandbox' => $this->isSandbox + ] + ]; + } + } + + /** + * Validates required shipment data fields to prevent API errors. + * + * @param array $shipmentData + * @param int $orderId + * @throws \Exception + */ + private function validateShipmentData(array $shipmentData, int $orderId): void + { + $requiredFields = [ + 'recipient_street' => 'streetName', + 'recipient_street_number' => 'streetNumber', + 'recipient_postal_code' => 'postal code', + 'recipient_city' => 'city', + 'recipient_country' => 'countryISOCode', + ]; + + $errors = []; + foreach ($requiredFields as $field => $errorName) { + if (empty(trim($shipmentData[$field]))) { + $errors[] = $errorName; + } + } + + if (empty(trim($shipmentData['recipient_name'])) && empty(trim($shipmentData['recipient_company']))) { + $errors[] = 'recipient name or company'; + } + + if (!empty($errors)) { + $errorMessage = 'Shipment data is missing required fields for Order ID ' . $orderId . ': ' . implode(', ', $errors); + throw new \Exception($errorMessage); + } + } + + /** + * Cancel a shipment + * + * @param DhlShipment $shipment + * @return bool Success status + * @throws Exception + */ + public function cancelShipment(DhlShipment $shipment): bool + { + try { + if (!$shipment->canBeCancelled()) { + throw new Exception('Shipment cannot be cancelled in current status: ' . $shipment->status); + } + + $this->logInfo('Cancelling DHL shipment', [ + 'shipment_id' => $shipment->id, + 'shipment_number' => $shipment->shipment_number + ]); + + $request = new deleteShipmentOrder([$shipment->shipment_number]); // Constructor expects array of shipment numbers + + $response = $this->shippingClient->deleteShipmentOrder($request); + + if ($this->isResponseSuccessful($response)) { + $shipment->update([ + 'status' => DhlShipment::STATUS_CANCELLED, + 'api_response_data' => $this->extractResponseData($response), + ]); + + $this->logInfo('DHL shipment cancelled successfully', [ + 'shipment_id' => $shipment->id + ]); + + return true; + } else { + $errorMessage = $this->extractErrorMessage($response); + $shipment->update([ + 'api_errors' => $errorMessage, + ]); + + throw new Exception('DHL cancellation failed: ' . $errorMessage); + } + + } catch (DhlException $e) { + $this->logError('DHL API error during cancellation', $e, ['shipment_id' => $shipment->id]); + throw new Exception('DHL shipment cancellation failed: ' . $e->getMessage()); + } catch (Exception $e) { + $this->logError('General error during cancellation', $e, ['shipment_id' => $shipment->id]); + throw $e; + } + } + + /** + * Create a return label + * + * @param DhlShipment $originalShipment The original outbound shipment + * @param array $options Additional options + * @return DhlShipment The return shipment + * @throws Exception + */ + public function createReturnLabel(DhlShipment $originalShipment, array $options = []): DhlShipment + { + try { + if (!$this->config['returns']['enabled']) { + throw new Exception('Return labels are disabled in configuration'); + } + + $this->logInfo('Creating DHL return label', [ + 'original_shipment_id' => $originalShipment->id, + 'options' => $options + ]); + + // Create return shipment using regular createShipment but with return data + $returnShipment = $this->createShipment( + $originalShipment->shoppingOrder, + $originalShipment->weight, + array_merge($options, ['is_return' => true, 'original_shipment' => $originalShipment]) + ); + + $this->logInfo('DHL return label created successfully', [ + 'return_shipment_id' => $returnShipment->id, + 'original_shipment_id' => $originalShipment->id + ]); + + return $returnShipment; + + } catch (Exception $e) { + $this->logError('Error creating return label', $e, [ + 'original_shipment_id' => $originalShipment->id + ]); + throw $e; + } + } + + /** + * Get tracking details for a shipment + * + * @param DhlShipment $shipment + * @return array Tracking details + * @throws Exception + */ + public function getTrackingDetails(DhlShipment $shipment): array + { + try { + if (!$this->config['tracking']['enabled']) { + throw new Exception('Tracking is disabled in configuration'); + } + + if (!$shipment->hasTracking()) { + throw new Exception('Shipment has no tracking number'); + } + + if (!$this->trackingClient) { + throw new Exception('Tracking client not initialized'); + } + + $this->logInfo('Getting tracking details', [ + 'shipment_id' => $shipment->id, + 'tracking_number' => $shipment->tracking_number + ]); + + $request = new getPieceDetail(); + $request->pieceCode = $shipment->tracking_number; + + $response = $this->trackingClient->getPieceDetail($request); + + if ($response && is_array($response) && count($response) > 0) { + $trackingData = method_exists($response[0], 'toArray') ? $response[0]->toArray() : (array)$response[0]; + + // Update shipment with latest tracking info + $shipment->update([ + 'tracking_details' => $trackingData, + 'last_tracked_at' => now(), + 'tracking_status' => $trackingData['status'] ?? null, + ]); + + $this->logInfo('Tracking details updated', [ + 'shipment_id' => $shipment->id, + 'status' => $trackingData['status'] ?? 'unknown' + ]); + + return $trackingData; + } else { + throw new Exception('No tracking data available'); + } + + } catch (DhlException $e) { + $this->logError('DHL API error during tracking', $e, ['shipment_id' => $shipment->id]); + throw new Exception('DHL tracking failed: ' . $e->getMessage()); + } catch (Exception $e) { + $this->logError('General error during tracking', $e, ['shipment_id' => $shipment->id]); + throw $e; + } + } + + /** + * Build shipment data from order + * + * @param ShoppingOrder $order + * @param float $weight + * @param array $options + * @return array + */ + private function buildShipmentData(ShoppingOrder $order, float $weight, array $options): array + { + $isReturn = $options['is_return'] ?? false; + $originalShipment = $options['original_shipment'] ?? null; + $shoppingUser = $order->shopping_user; + + // Data placeholders + $recipientName = ''; + $recipientCompany = null; + $streetName = ''; + $streetNumber = ''; + $recipientPostalCode = ''; + $recipientCity = ''; + $recipientCountryCode = ''; + $recipientEmail = $shoppingUser->email ?? null; // Fallback to user's main email + $recipientPhone = null; + + $customAddress = $options['shipping_address'] ?? null; + + if ($customAddress) { + // Use custom address from options (e.g., modal) + $recipientName = trim(($customAddress['firstname'] ?? '') . ' ' . ($customAddress['lastname'] ?? '')); + $recipientCompany = $customAddress['company'] ?? null; + $streetName = $customAddress['address'] ?? ''; + $streetNumber = $customAddress['address_2'] ?? ''; + $recipientPostalCode = $customAddress['zipcode'] ?? ''; + $recipientCity = $customAddress['city'] ?? ''; + $recipientPhone = $customAddress['phone'] ?? null; + + if (!empty($customAddress['country_id'])) { + $country = \App\Models\Country::find($customAddress['country_id']); + if ($country) { + $recipientCountryCode = $country->code; + } + } + } else { + // Fallback to shopping_user data + $useShipping = !($shoppingUser->same_as_billing ?? true); + $firstname = $useShipping ? ($shoppingUser->shipping_firstname ?? '') : ($shoppingUser->billing_firstname ?? ''); + $lastname = $useShipping ? ($shoppingUser->shipping_lastname ?? '') : ($shoppingUser->billing_lastname ?? ''); + $company = $useShipping ? ($shoppingUser->shipping_company ?? '') : ($shoppingUser->billing_company ?? ''); + $address = $useShipping ? ($shoppingUser->shipping_address ?? '') : ($shoppingUser->billing_address ?? ''); + $address_2 = $useShipping ? ($shoppingUser->shipping_address_2 ?? '') : ($shoppingUser->billing_address_2 ?? ''); + $zipcode = $useShipping ? ($shoppingUser->shipping_zipcode ?? '') : ($shoppingUser->billing_zipcode ?? ''); + $city = $useShipping ? ($shoppingUser->shipping_city ?? '') : ($shoppingUser->billing_city ?? ''); + $country = $useShipping ? ($shoppingUser->shipping_country ?? null) : ($shoppingUser->billing_country ?? null); + $phone = $useShipping ? ($shoppingUser->shipping_phone ?? '') : ($shoppingUser->billing_phone ?? ''); + $email = $shoppingUser->billing_email ?? ''; + + $recipientName = trim($firstname . ' ' . $lastname); + $recipientCompany = $company; + $streetName = $address; + //$streetNumber = $address_2; + $recipientPostalCode = $zipcode; + $recipientCity = $city; + $recipientCountryCode = $country->code ?? ''; + $recipientPhone = $phone; + $recipientEmail = $email; + } + + // Universal address parsing for combined street/number fields + if (empty($streetNumber) && !empty($streetName)) { + if (preg_match('/^([^\d]*[^\d\s])\s*(\d.*)$/', $streetName, $matches) && count($matches) === 3) { + $streetName = trim($matches[1]); + $streetNumber = trim($matches[2]); + } + } + + // --- START FIX: Automatically determine product code based on destination country --- + $isDomestic = strtoupper($recipientCountryCode) === 'DE'; + $productCode = $options['product_code'] ?? ($isDomestic + ? $this->config['defaults']['product'] + : $this->config['defaults']['product_international']); + // --- END FIX --- + + return [ + 'order_id' => $order->id, + 'type' => $isReturn ? DhlShipment::TYPE_RETURN : DhlShipment::TYPE_OUTBOUND, + 'related_shipment_id' => $originalShipment?->id, + 'weight' => $weight, + 'length' => $options['length'] ?? $this->config['defaults']['dimensions']['length'], + 'width' => $options['width'] ?? $this->config['defaults']['dimensions']['width'], + 'height' => $options['height'] ?? $this->config['defaults']['dimensions']['height'], + 'product_code' => $productCode, + 'services' => $options['services'] ?? [], + + // Recipient address + 'recipient_name' => $recipientName, + 'recipient_company' => $recipientCompany, + 'recipient_street' => $streetName, + 'recipient_street_number' => $streetNumber, + 'recipient_postal_code' => $recipientPostalCode, + 'recipient_city' => $recipientCity, + 'recipient_state' => null, // Not used + 'recipient_country' => $recipientCountryCode, + 'recipient_email' => $recipientEmail, + 'recipient_phone' => $recipientPhone, + ]; + } + + /** + * Create DHL shipment record in database + * + * @param ShoppingOrder $order + * @param array $shipmentData + * @return DhlShipment + */ + private function createDhlShipmentRecord(ShoppingOrder $order, array $shipmentData): DhlShipment + { + return DhlShipment::create([ + 'shopping_order_id' => $order->id, + 'type' => $shipmentData['type'], + 'related_shipment_id' => $shipmentData['related_shipment_id'], + 'weight' => $shipmentData['weight'], + 'length' => $shipmentData['length'], + 'width' => $shipmentData['width'], + 'height' => $shipmentData['height'], + 'product_code' => $shipmentData['product_code'], + 'services' => $shipmentData['services'], + 'status' => DhlShipment::STATUS_CREATED, + + // Recipient data + 'recipient_name' => $shipmentData['recipient_name'], + 'recipient_company' => $shipmentData['recipient_company'], + 'recipient_street' => $shipmentData['recipient_street'], + 'recipient_street_number' => $shipmentData['recipient_street_number'], + 'recipient_postal_code' => $shipmentData['recipient_postal_code'], + 'recipient_city' => $shipmentData['recipient_city'], + 'recipient_state' => $shipmentData['recipient_state'], + 'recipient_country' => $shipmentData['recipient_country'], + 'recipient_email' => $shipmentData['recipient_email'], + 'recipient_phone' => $shipmentData['recipient_phone'], + ]); + } + + /** + * Build ShipmentOrder object for DHL API + * + * @param array $shipmentData + * @param DhlShipment $dhlShipment + * @return ShipmentOrder + */ + private function buildShipmentOrder(array $shipmentData, DhlShipment $dhlShipment): ShipmentOrder + { + $shipmentOrder = new ShipmentOrder(); + $isReturn = $shipmentData['type'] === DhlShipment::TYPE_RETURN; + $productCode = $shipmentData['product_code']; + + // --- DYNAMIC ACCOUNT NUMBER SELECTION --- + $accountNumber = $this->getAccountNumberForProduct($productCode); + + // --- VALIDATE COUNTRY CODES --- + // Ensure sender country code is valid + $senderCountry = 'DE'; + if (!empty($this->config['sender']['country']) && strlen(trim($this->config['sender']['country'])) === 2) { + $senderCountry = strtoupper(trim($this->config['sender']['country'])); + } + + // Ensure recipient country code is valid + $recipientCountry = 'DE'; + if (!empty($shipmentData['recipient_country']) && strlen(trim($shipmentData['recipient_country'])) === 2) { + $recipientCountry = strtoupper(trim($shipmentData['recipient_country'])); + } + // --- END VALIDATION --- + + // Set basic shipment details + $shipmentOrder->sequenceNumber = $dhlShipment->id; + + // Set shipment details + $shipmentOrder->Shipment->ShipmentDetails->product = $productCode; + $shipmentOrder->Shipment->ShipmentDetails->accountNumber = $accountNumber; + $shipmentOrder->Shipment->ShipmentDetails->customerReference = ($isReturn ? 'Return-' : 'Order-') . $shipmentData['order_id']; + $shipmentOrder->Shipment->ShipmentDetails->shipmentDate = date('Y-m-d'); + + // --- ROBUST NAME & ADDRESS HANDLING --- + if ($isReturn) { + // RETURN LABEL: Customer ships TO warehouse + // Shipper = Customer (original recipient) + $this->setAddressBlock( + $shipmentOrder->Shipment->Shipper, + $shipmentData['recipient_name'], + $shipmentData['recipient_company'], + $shipmentData['recipient_street'], + $shipmentData['recipient_street_number'], + $shipmentData['recipient_postal_code'], + $shipmentData['recipient_city'], + $recipientCountry + ); + + // Receiver = Warehouse (original sender) + $this->setAddressBlock( + $shipmentOrder->Shipment->Receiver, + $this->config['sender']['name'] ?? '', + $this->config['sender']['company'] ?? '', + $this->config['sender']['street'] ?? '', + $this->config['sender']['street_number'] ?? '', + $this->config['sender']['postal_code'] ?? '', + $this->config['sender']['city'] ?? '', + $senderCountry, + true // isSender=true to throw exception on config error + ); + + } else { + // OUTBOUND LABEL: Warehouse ships TO customer (normal flow) + // Shipper = Warehouse + $this->setAddressBlock( + $shipmentOrder->Shipment->Shipper, + $this->config['sender']['name'] ?? '', + $this->config['sender']['company'] ?? '', + $this->config['sender']['street'] ?? '', + $this->config['sender']['street_number'] ?? '', + $this->config['sender']['postal_code'] ?? '', + $this->config['sender']['city'] ?? '', + $senderCountry, + true // isSender=true to throw exception on config error + ); + + // Receiver = Customer + $this->setAddressBlock( + $shipmentOrder->Shipment->Receiver, + $shipmentData['recipient_name'], + $shipmentData['recipient_company'], + $shipmentData['recipient_street'], + $shipmentData['recipient_street_number'], + $shipmentData['recipient_postal_code'], + $shipmentData['recipient_city'], + $recipientCountry + ); + } + + // Set package details + $shipmentOrder->Shipment->ShipmentDetails->ShipmentItem->weightInKG = $shipmentData['weight']; + $shipmentOrder->Shipment->ShipmentDetails->ShipmentItem->lengthInCM = $shipmentData['length']; + $shipmentOrder->Shipment->ShipmentDetails->ShipmentItem->widthInCM = $shipmentData['width']; + $shipmentOrder->Shipment->ShipmentDetails->ShipmentItem->heightInCM = $shipmentData['height']; + + // Configure minimal services to avoid SDK issues with dynamic properties + $this->configureShipmentServices($shipmentOrder, $shipmentData); + + return $shipmentOrder; + } + + /** + * Sets the address and name details for a shipper or receiver block. + * + * @param Shipper|Receiver $addressBlock The Shipper or Receiver object from the SDK + * @param string $name + * @param string|null $company + * @param string $street + * @param string $streetNumber + * @param string $postalCode + * @param string $city + * @param string $countryCode + * @param bool $isSender + * @throws \Exception + */ + private function setAddressBlock(Shipper|Receiver &$addressBlock, string $name, ?string $company, string $street, string $streetNumber, string $postalCode, string $city, string $countryCode, bool $isSender = false): void + { + $name = trim($name); + $company = trim($company ?? ''); + + $name1 = $name; + $name2 = $company; + + if (empty($name1)) { + // If personal name is empty, company MUST be name1 + $name1 = $name2; + $name2 = ''; + } + + if (empty($name1)) { + if ($isSender) { + throw new \Exception('DHL Sender Name (name1) is not configured. Please set DHL_SENDER_NAME or DHL_SENDER_COMPANY in your .env file.'); + } + return; + } + + // Handle the structural difference between Shipper (has ->Name object) and Receiver (has ->name1 directly) + if ($addressBlock instanceof Shipper) { + if (is_null($addressBlock->Name)) $addressBlock->Name = new ShipperName(); + $addressBlock->Name->name1 = $name1; + if (!empty($name2)) $addressBlock->Name->name2 = $name2; + + if (is_null($addressBlock->Address)) $addressBlock->Address = new ShipperAddress(); + if (is_null($addressBlock->Address->Origin)) $addressBlock->Address->Origin = new ShipperOrigin(); + } elseif ($addressBlock instanceof Receiver) { + $addressBlock->name1 = $name1; // Assign directly + + if (is_null($addressBlock->Address)) $addressBlock->Address = new ReceiverAddress(); + if (is_null($addressBlock->Address->Origin)) $addressBlock->Address->Origin = new ReceiverOrigin(); + } + + $addressBlock->Address->streetName = $street; + $addressBlock->Address->streetNumber = $streetNumber; + $addressBlock->Address->zip = $postalCode; + $addressBlock->Address->city = $city; + $addressBlock->Address->Origin->countryISOCode = $countryCode; + } + + /** + * Configure shipment services to avoid SDK dynamic property issues + * + * @param ShipmentOrder $shipmentOrder + * @param array $shipmentData + */ + private function configureShipmentServices(ShipmentOrder $shipmentOrder, array $shipmentData): void + { + // Initialize basic services that are commonly used and properly supported + $services = $shipmentData['services'] ?? []; + + // Only configure services that are explicitly requested and known to work + // This prevents the SDK from creating dynamic properties like ShipmentHandling + + if (isset($services['premium']) && $services['premium']) { + $shipmentOrder->Shipment->ShipmentDetails->Service->Premium->active = true; + } + + if (isset($services['endorsement']) && $services['endorsement']) { + $shipmentOrder->Shipment->ShipmentDetails->Service->Endorsement->active = true; + $shipmentOrder->Shipment->ShipmentDetails->Service->Endorsement->type = $services['endorsement']; + } + + if (isset($services['bulky_goods']) && $services['bulky_goods']) { + $shipmentOrder->Shipment->ShipmentDetails->Service->BulkyGoods->active = true; + } + + if (isset($services['return_receipt']) && $services['return_receipt']) { + $shipmentOrder->Shipment->ShipmentDetails->Service->ReturnReceipt->active = true; + } + + // Avoid problematic services that cause dynamic property warnings + // Do NOT set ShipmentHandling or other services that the SDK dynamically creates + + $this->logInfo('Configured DHL services', [ + 'requested_services' => array_keys($services), + 'product_code' => $shipmentData['product_code'] + ]); + } + + /** + * Get the correct DHL account number for a given product code. + * + * @param string $productCode + * @return string + * @throws \Exception + */ + private function getAccountNumberForProduct(string $productCode): string + { + $productAccounts = $this->config['api']['product_accounts'] ?? []; + + if (isset($productAccounts[$productCode]) && !empty($productAccounts[$productCode])) { + return $productAccounts[$productCode]; + } + + $defaultAccount = $this->config['api']['account_number_default'] ?? null; + if (!empty($defaultAccount)) { + return $defaultAccount; + } + + throw new \Exception("DHL Abrechnungsnummer for product '{$productCode}' is not configured, and no default account number is set."); + } + + /** + * Process shipment response from DHL API + * + * @param DhlShipment $dhlShipment + * @param CreateShipmentOrderResponse $response + * @param createShipmentOrder $request + * @throws Exception + */ + private function processShipmentResponse(DhlShipment $dhlShipment, $response, $request): void + { + // Store request and response data + $dhlShipment->update([ + 'api_request_data' => $this->extractRequestData($request), + 'api_response_data' => $this->extractResponseData($response), + ]); + + $isSuccessful = $this->isResponseSuccessful($response); + + $this->logInfo('Processing DHL shipment response', [ + 'shipment_id' => $dhlShipment->id, + 'is_successful' => $isSuccessful, + 'has_creation_states' => !empty($response->CreationStates), + 'creation_states_count' => count($response->CreationStates ?? []) + ]); + + if ($isSuccessful) { + // Extract shipment and tracking information + $shipmentData = $this->extractShipmentData($response); + + $this->logInfo('Extracted shipment data', [ + 'shipment_id' => $dhlShipment->id, + 'shipment_number' => $shipmentData['shipment_number'] ?? 'not_found', + 'has_label_data' => !empty($shipmentData['label_data']) + ]); + + // Validate that we got essential data + if (empty($shipmentData['shipment_number'])) { + $this->logError('No shipment number in successful response', new Exception('Missing shipment number'), [ + 'shipment_id' => $dhlShipment->id, + 'response_data' => $this->extractResponseData($response) + ]); + + $dhlShipment->update([ + 'status' => DhlShipment::STATUS_FAILED, + 'api_errors' => 'DHL API reported success but no shipment number was provided', + ]); + + throw new Exception('DHL API reported success but no shipment number was provided'); + } + + // Save label if provided + $labelPath = null; + if (isset($shipmentData['label_data']) && $shipmentData['label_data']) { + try { + $labelPath = $this->saveLabelFile($dhlShipment, $shipmentData['label_data']); + } catch (Exception $e) { + $this->logError('Failed to save label file', $e, ['shipment_id' => $dhlShipment->id]); + // Don't fail the whole process for label save issues + } + } + + // Update shipment with success data + $dhlShipment->update([ + 'shipment_number' => $shipmentData['shipment_number'], + 'tracking_number' => $shipmentData['tracking_number'] ?? $shipmentData['shipment_number'], + 'label_path' => $labelPath, + 'status' => DhlShipment::STATUS_SUBMITTED, + 'shipped_at' => now(), + ]); + + } else { + // Handle API error + $errorMessage = $this->extractErrorMessage($response); + + $this->logInfo('DHL API returned errors', [ + 'shipment_id' => $dhlShipment->id, + 'error_message' => $errorMessage + ]); + + $dhlShipment->update([ + 'status' => DhlShipment::STATUS_FAILED, + 'api_errors' => $errorMessage, + ]); + + throw new Exception('DHL API error: ' . $errorMessage); + } + } + + /** + * Extract shipment data from response + * + * @param CreateShipmentOrderResponse $response + * @return array + */ + private function extractShipmentData($response): array + { + $data = []; + + // Use the SDK's proper structure with CreationStates + if ($response instanceof CreateShipmentOrderResponse && !empty($response->CreationStates)) { + foreach ($response->CreationStates as $creationState) { + if (isset($creationState->shipmentNumber)) { + $data['shipment_number'] = $creationState->shipmentNumber; + } + if (isset($creationState->LabelData->labelData)) { + $data['label_data'] = $creationState->LabelData->labelData; + } + // Only process the first creation state for now (single shipment) + break; + } + } + + return $data; + } + + /** + * Check if response indicates success + * + * @param CreateShipmentOrderResponse|DeleteShipmentOrderResponse $response + * @return bool + */ + private function isResponseSuccessful($response): bool + { + // Use the SDK's built-in success check methods + if ($response instanceof CreateShipmentOrderResponse) { + return $response->hasNoErrors(); + } elseif ($response instanceof DeleteShipmentOrderResponse) { + return $response->hasNoErrors(); + } + + return false; + } + + /** + * Extract error message from response + * + * @param CreateShipmentOrderResponse|DeleteShipmentOrderResponse $response + * @return string + */ + private function extractErrorMessage($response): string + { + $messages = []; + + // Check for top-level status messages + if (is_object($response) && property_exists($response, 'Status') && !empty($response->Status)) { + $statusArray = is_array($response->Status) ? $response->Status : [$response->Status]; + + foreach ($statusArray as $status) { + if (is_object($status)) { + // Try different status property names + $statusProps = ['statusText', 'statusMessage', 'statusCode']; + foreach ($statusProps as $prop) { + if (property_exists($status, $prop) && !empty($status->{$prop})) { + $value = $status->{$prop}; + $messages[] = is_array($value) ? implode(', ', $value) : (string)$value; + break; + } + } + } + } + } + + // Check for messages within CreationStates + if ($response instanceof CreateShipmentOrderResponse && !empty($response->CreationStates)) { + foreach ($response->CreationStates as $creationState) { + // Check LabelData Status + if (isset($creationState->LabelData->Status)) { + $statusArray = is_array($creationState->LabelData->Status) + ? $creationState->LabelData->Status + : [$creationState->LabelData->Status]; + + foreach ($statusArray as $status) { + if (is_object($status)) { + $statusProps = ['statusText', 'statusMessage', 'statusCode']; + foreach ($statusProps as $prop) { + if (property_exists($status, $prop) && !empty($status->{$prop})) { + $value = $status->{$prop}; + $messages[] = is_array($value) ? implode('; ', $value) : (string)$value; + break; + } + } + } + } + } + + // Check direct status on CreationState + if (isset($creationState->sequenceNumber) && isset($creationState->LabelData)) { + // This might be a successful creation state, not an error + continue; + } + } + } + + // If we still have no messages, check if this might actually be a success + if (empty($messages) && $response instanceof CreateShipmentOrderResponse) { + if ($response->hasNoErrors()) { + return 'No errors found - response appears successful'; + } else { + // Try to extract any available information from the response + $responseData = $this->extractResponseData($response); + $this->logInfo('Could not extract error message, full response data:', $responseData ?? []); + return 'DHL API returned errors but no specific error message could be extracted. Check logs for full response.'; + } + } + + return !empty($messages) ? implode('; ', array_unique($messages)) : 'Unknown DHL API error'; + } + + /** + * Extract request data for logging + * + * @param createShipmentOrder|deleteShipmentOrder $request + * @return array|null + */ + private function extractRequestData($request): ?array + { + // Safely convert complex SDK objects to arrays for logging + return json_decode(json_encode($request), true); + } + + /** + * Extract response data for logging + * + * @param CreateShipmentOrderResponse|DeleteShipmentOrderResponse $response + * @return array|null + */ + private function extractResponseData($response): ?array + { + // Safely convert complex SDK objects to arrays for logging + return json_decode(json_encode($response), true); + } + + /** + * Save label file to storage + * + * @param DhlShipment $dhlShipment + * @param string $labelData Base64 encoded label data + * @return string The saved file path + */ + private function saveLabelFile(DhlShipment $dhlShipment, string $labelData): string + { + $filename = 'dhl_label_' . $dhlShipment->id . '_' . time() . '.pdf'; + $path = 'dhl/labels/' . $filename; + + Storage::put($path, base64_decode($labelData)); + + return $path; + } + + /** + * Log info message + * + * @param string $message + * @param array $context + */ + private function logInfo(string $message, array $context = []): void + { + if ($this->config['logging']['enabled']) { + Log::info('[DHL API] ' . $message, $context); + } + } + + /** + * Log error message + * + * @param string $message + * @param Exception $exception + * @param array $context + */ + private function logError(string $message, Exception $exception, array $context = []): void + { + if ($this->config['logging']['enabled']) { + Log::error('[DHL API] ' . $message, array_merge($context, [ + 'exception' => $exception->getMessage(), + 'trace' => $exception->getTraceAsString(), + ])); + } + } + + /** + * Log detailed response structure for debugging + * + * @param CreateShipmentOrderResponse $response + */ + private function logResponseStructure($response): void + { + if (!$this->config['logging']['enabled']) { + return; + } + + $structure = [ + 'class' => get_class($response), + 'hasNoErrors' => $response->hasNoErrors(), + 'properties' => [] + ]; + + // Get all public properties + $reflection = new \ReflectionClass($response); + foreach ($reflection->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) { + $name = $property->getName(); + try { + $value = $property->getValue($response); + + if (is_object($value)) { + $structure['properties'][$name] = [ + 'type' => 'object', + 'class' => get_class($value), + 'properties' => $this->extractObjectProperties($value, 2) // Limit depth + ]; + } elseif (is_array($value)) { + $structure['properties'][$name] = [ + 'type' => 'array', + 'count' => count($value), + 'sample' => count($value) > 0 ? $this->extractObjectProperties($value[0], 1) : null + ]; + } else { + $structure['properties'][$name] = [ + 'type' => gettype($value), + 'value' => $value + ]; + } + } catch (\Exception $e) { + $structure['properties'][$name] = [ + 'type' => 'error', + 'error' => $e->getMessage() + ]; + } + } + + Log::info('[DHL API] Response structure analysis:', $structure); + } + + /** + * Extract object properties for debugging (with depth limit) + * + * @param mixed $object + * @param int $maxDepth + * @return array|mixed + */ + private function extractObjectProperties($object, int $maxDepth = 1) + { + if ($maxDepth <= 0 || !is_object($object)) { + return is_object($object) ? get_class($object) : $object; + } + + $properties = []; + $reflection = new \ReflectionClass($object); + + foreach ($reflection->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) { + $name = $property->getName(); + try { + $value = $property->getValue($object); + + if (is_object($value)) { + $properties[$name] = $this->extractObjectProperties($value, $maxDepth - 1); + } elseif (is_array($value)) { + $properties[$name] = [ + 'type' => 'array', + 'count' => count($value) + ]; + } else { + $properties[$name] = $value; + } + } catch (\Exception $e) { + $properties[$name] = 'Error: ' . $e->getMessage(); + } + } + + return $properties; + } + + /** + * Check if service is properly configured + * + * @return bool + */ + public function isConfigured(): bool + { + $apiType = $this->config['api']['api_type']; + + if ($apiType === 'developer') { + return !empty($this->config['api']['api_key']) && + !empty($this->config['api']['api_secret']); + } else { + return !empty($this->config['api']['username']) && + !empty($this->config['api']['password']) && + !empty($this->config['api']['account_number']); + } + } + + /** + * Test API connection + * + * @return array Test results + */ + public function testConnection(): array + { + try { + // Simple test - check if clients are initialized + if ($this->shippingClient) { + return [ + 'success' => true, + 'message' => 'DHL API clients initialized successfully', + 'sandbox' => $this->isSandbox, + 'configured' => $this->isConfigured(), + 'api_type' => $this->config['api']['api_type'], + ]; + } else { + throw new Exception('Shipping client not initialized'); + } + + } catch (Exception $e) { + return [ + 'success' => false, + 'message' => 'DHL API connection failed: ' . $e->getMessage(), + 'sandbox' => $this->isSandbox, + 'configured' => $this->isConfigured(), + ]; + } + } +} \ No newline at end of file diff --git a/app/Services/DhlDataHelper.php b/app/Services/DhlDataHelper.php new file mode 100644 index 00000000..b3b0880b --- /dev/null +++ b/app/Services/DhlDataHelper.php @@ -0,0 +1,89 @@ +getDhlConfig(); + } + return [ + 'order_id' => $order->id, + 'weight_kg' => $weight, + 'product_code' => $options['product_code'] ?? 'V01PAK', + 'label_format' => $options['label_format'] ?? $dhlConfig['label_format'] ?? 'PDF', + 'print_format' => $options['print_format'] ?? $dhlConfig['print_format'] ?? null, + 'retoure_print_format' => $options['retoure_print_format'] ?? $dhlConfig['retoure_print_format'] ?? null, + + // Shipper data (sender) - from admin settings + 'shipper' => [ + 'name' => $dhlConfig['sender']['company'] ?? 'mivita care gmbh', + 'name2' => $dhlConfig['sender']['name'] ?? '', + 'street' => $dhlConfig['sender']['street'] ?? 'Leinfeld', + 'houseNumber' => $dhlConfig['sender']['house_number'] ?? '2', + 'postalCode' => $dhlConfig['sender']['postalCode'] ?? '87755', + 'city' => $dhlConfig['sender']['city'] ?? 'Kirchhaslach', + 'country' => $dhlConfig['sender']['country'] ?? 'DE', + 'email' => $dhlConfig['sender']['email'] ?? 'versand@mivita.care', + 'phone' => $dhlConfig['sender']['phone'] ?? '+49 123 456789', + ], + + // Consignee data (recipient) - from order + 'consignee' => [ + 'name' => $shippingAddress['firstname'] ?? '' . ' ' . $shippingAddress['lastname'] ?? '', + 'name2' => $shippingAddress['company'] ?? '', + 'street' => $shippingAddress['address'] ?? '', + 'houseNumber' => $shippingAddress['houseNumber'] ?? '', + 'postalCode' => $shippingAddress['zipcode'] ?? '', + 'city' => $shippingAddress['city'] ?? '', + 'country' => $shippingAddress['country']?->code ?? 'DE', + 'email' => $shippingAddress['email'] ?? '', + 'phone' => $shippingAddress['phone'] ?? '', + ], + // Package dimensions from options or defaults + 'dimensions' => [ + 'length' => $options['length'] ?? 30, + 'width' => $options['width'] ?? 25, + 'height' => $options['height'] ?? 10, + ], + + // Additional services + 'services' => $options['services'] ?? [], + + // Custom reference for tracking + 'reference' => 'Order-' . $order->id, + ]; + } +} diff --git a/app/Services/DhlModalService.php b/app/Services/DhlModalService.php new file mode 100644 index 00000000..31f0ba4f --- /dev/null +++ b/app/Services/DhlModalService.php @@ -0,0 +1,439 @@ +config = config('dhl'); + } + + /** + * Prepare modal data for DHL shipment creation + * + * @param mixed $id Order ID or 'new' + * @param array $data Additional data from the request + * @return array Prepared data for the view + * @throws Exception + */ + public function prepareModalData($id, array $data): array + { + $result = [ + 'order' => null, + 'orderWeight' => 1.0, + 'shippingAddress' => null, + 'availableCountries' => $this->getAvailableCountries(), + 'productCodes' => $this->getAvailableProductCodes(), + 'errors' => [], + 'warnings' => [] + ]; + + // If no order ID or 'new', return empty data for order selection + if (!$id || $id === 'new') { + return $result; + } + + try { + // Load and validate order + $order = $this->loadOrder($id); + if (!$order) { + $result['errors'][] = "Bestellung #{$id} wurde nicht gefunden."; + return $result; + } + + $result['order'] = $order; + + // Calculate order weight + $result['orderWeight'] = $this->calculateOrderWeight($order); + + // Process and validate shipping address + $result['shippingAddress'] = $this->processShippingAddress($order); + + // Validate address completeness + $addressValidation = $this->validateAddress($result['shippingAddress']); + if (!$addressValidation['valid']) { + $result['errors'] = array_merge($result['errors'], $addressValidation['errors']); + } + if (!empty($addressValidation['warnings'])) { + $result['warnings'] = array_merge($result['warnings'], $addressValidation['warnings']); + } + + Log::info('[DHL Modal] Prepared modal data successfully', [ + 'order_id' => $order->id, + 'weight' => $result['orderWeight'], + 'address_valid' => empty($result['errors']) + ]); + } catch (Exception $e) { + Log::error('[DHL Modal] Error preparing modal data', [ + 'order_id' => $id, + 'error' => $e->getMessage() + ]); + + $result['errors'][] = 'Fehler beim Laden der Bestelldaten: ' . $e->getMessage(); + } + + return $result; + } + + /** + * Load order with required relationships + * + * @param mixed $id + * @return ShoppingOrder|null + */ + private function loadOrder($id): ?ShoppingOrder + { + return ShoppingOrder::with([ + 'shopping_order_items', + 'shopping_user', + ])->find($id); + } + + /** + * Calculate order weight in kg + * + * @param ShoppingOrder $order + * @return float + */ + private function calculateOrderWeight(ShoppingOrder $order): float + { + return $order->weight / 100; + /* + // Default fallback weight + $defaultWeight = 1.0; + + if (!$order->shopping_order_items || $order->shopping_order_items->isEmpty()) { + return $defaultWeight; + } + + // If order has a weight field (in grams), convert to kg + if ($order->weight && $order->weight > 0) { + return round($order->weight / 100, 1); // Convert grams to kg + } + + // Calculate from items if available + $totalWeight = 0; + foreach ($order->shopping_order_items as $item) { + if ($item->weight && $item->weight > 0) { + $totalWeight += ($item->weight * $item->quantity); + } + } + + if ($totalWeight > 0) { + return round($totalWeight / 100, 1); // Convert grams to kg + } + + // Estimate based on item count if no weight data + $itemCount = $order->shopping_order_items->sum('quantity'); + $estimatedWeight = max($itemCount * 0.5, $defaultWeight); // Estimate 0.5kg per item + + return round($estimatedWeight, 1); + */ + } + + /** + * Process and parse shipping address from order + * + * @param ShoppingOrder $order + * @return array + */ + private function processShippingAddress(ShoppingOrder $order): array + { + $shoppingUser = $order->shopping_user; + + if (!$shoppingUser) { + return $this->getEmptyAddress(); + } + + // Determine if shipping address is different from billing + $useShipping = !($shoppingUser->same_as_billing ?? true); + + // Extract address data + $addressData = [ + 'firstname' => $useShipping ? ($shoppingUser->shipping_firstname ?? '') : ($shoppingUser->billing_firstname ?? ''), + 'lastname' => $useShipping ? ($shoppingUser->shipping_lastname ?? '') : ($shoppingUser->billing_lastname ?? ''), + 'company' => $useShipping ? ($shoppingUser->shipping_company ?? '') : ($shoppingUser->billing_company ?? ''), + 'address' => $useShipping ? ($shoppingUser->shipping_address ?? '') : ($shoppingUser->billing_address ?? ''), + 'address_2' => $useShipping ? ($shoppingUser->shipping_address_2 ?? '') : ($shoppingUser->billing_address_2 ?? ''), + 'zipcode' => $useShipping ? ($shoppingUser->shipping_zipcode ?? '') : ($shoppingUser->billing_zipcode ?? ''), + 'city' => $useShipping ? ($shoppingUser->shipping_city ?? '') : ($shoppingUser->billing_city ?? ''), + 'country' => $useShipping ? ($shoppingUser->shipping_country ?? null) : ($shoppingUser->billing_country ?? null), + 'phone' => $useShipping ? ($shoppingUser->shipping_phone ?? '') : ($shoppingUser->billing_phone ?? ''), + 'email' => $shoppingUser->billing_email ?? '', + 'houseNumber' => '', + ]; + + // Parse and separate street name and number + $this->parseStreetAddress($addressData); + + return $addressData; + } + + /** + * Parse street address and separate street name from house number + * + * @param array &$addressData + */ + private function parseStreetAddress(array &$addressData): void + { + $address = trim($addressData['address']); + // If address_2 is empty and address contains both street and number + if (!empty($address)) { + // Try to separate street name and house number + $patterns = [ + // Pattern 1: "Musterstraße 123" or "Musterstraße 123a" + '/^(.+?)\s+(\d+[a-zA-Z]?)$/u', + // Pattern 2: "Musterstraße 123-125" or "Musterstraße 123/125" + '/^(.+?)\s+(\d+[-\/]\d+[a-zA-Z]?)$/u', + // Pattern 3: "123 Musterstraße" (number first) + '/^(\d+[a-zA-Z]?)\s+(.+)$/u' + ]; + + foreach ($patterns as $index => $pattern) { + if (preg_match($pattern, $address, $matches)) { + if ($index === 2) { + // Number first pattern + $addressData['address'] = trim($matches[2]); + $addressData['houseNumber'] = trim($matches[1]); + } else { + // Street first patterns + $addressData['address'] = trim($matches[1]); + $addressData['houseNumber'] = trim($matches[2]); + } + break; + } + } + } + + // Clean up the address data + $addressData['address'] = trim($addressData['address']); + $addressData['houseNumber'] = trim($addressData['houseNumber']); + } + + /** + * Validate address completeness and format + * + * @param array $address + * @return array Validation result with 'valid', 'errors', and 'warnings' keys + */ + private function validateAddress(array $address): array + { + $errors = []; + $warnings = []; + + // Required fields + $requiredFields = [ + 'firstname' => 'Vorname', + 'lastname' => 'Nachname', + 'address' => 'Straße', + 'zipcode' => 'Postleitzahl', + 'city' => 'Stadt' + ]; + + foreach ($requiredFields as $field => $label) { + if (empty(trim($address[$field]))) { + $errors[] = "{$label} ist erforderlich."; + } + } + + // Name validation + if (empty(trim($address['firstname'])) && empty(trim($address['lastname'])) && empty(trim($address['company']))) { + $errors[] = 'Entweder Name oder Firmenname muss angegeben werden.'; + } + + // Street number validation + if (!empty($address['address']) && empty($address['houseNumber'])) { + $warnings[] = 'Hausnummer konnte nicht automatisch erkannt werden. Bitte prüfen Sie die Adressangaben.'; + } + + // Postal code format validation for Germany + if (!empty($address['zipcode']) && $address['country'] && $address['country']->code === 'DE') { + if (!preg_match('/^\d{5}$/', $address['zipcode'])) { + $warnings[] = 'Deutsche Postleitzahl sollte 5 Ziffern haben.'; + } + } + + // Country validation + if (!$address['country']) { + $errors[] = 'Land konnte nicht ermittelt werden.'; + } + + return [ + 'valid' => empty($errors), + 'errors' => $errors, + 'warnings' => $warnings + ]; + } + + /** + * Get empty address template + * + * @return array + */ + private function getEmptyAddress(): array + { + return [ + 'firstname' => '', + 'lastname' => '', + 'company' => '', + 'address' => '', + 'address_2' => '', + 'zipcode' => '', + 'city' => '', + 'country' => null, + 'phone' => '', + 'email' => '', + ]; + } + + /** + * Get available countries for shipping + * + * @return \Illuminate\Database\Eloquent\Collection + */ + private function getAvailableCountries() + { + return Country::where('active', 1)->get(); + } + + /** + * Get available DHL product codes from settings + * + * @return array + */ + private function getAvailableProductCodes(): array + { + // Get DHL configuration with merged settings + $settingController = new \App\Http\Controllers\SettingController(); + $dhlConfig = $settingController->getDhlConfig(); + + $productCodes = []; + + // Add products based on configured account numbers + $accountNumbers = $dhlConfig['account_numbers'] ?? []; + + if (!empty($accountNumbers['V01PAK'])) { + $productCodes['V01PAK'] = 'DHL Paket National'; + } + + if (!empty($accountNumbers['V53PAK'])) { + $productCodes['V53PAK'] = 'DHL Paket International'; + } + + if (!empty($accountNumbers['V62WP'])) { + $productCodes['V62WP'] = 'DHL Warenpost National'; + } + + if (!empty($accountNumbers['V07PAK'])) { + $productCodes['V07PAK'] = 'DHL Retoure Online'; + } + + // Fallback to default if no account numbers configured + if (empty($productCodes)) { + $productCodes = [ + 'V01PAK' => 'DHL Paket National', + 'V53PAK' => 'DHL Paket International', + 'V62WP' => 'DHL Warenpost National' + ]; + } + + return $productCodes; + } + + /** + * Validate shipment parameters before API call + * + * @param array $shipmentData + * @return array Validation result + */ + public function validateShipmentData(array $shipmentData): array + { + $errors = []; + $warnings = []; + + // Weight validation + $weight = floatval($shipmentData['weight'] ?? 0); + if ($weight < 0.1) { + $errors[] = 'Gewicht muss mindestens 0.1 kg betragen.'; + } elseif ($weight > 31.5) { + $errors[] = 'Gewicht darf maximal 31.5 kg betragen.'; + } + + // Product code validation + $productCode = $shipmentData['product_code'] ?? ''; + $availableProducts = array_keys($this->getAvailableProductCodes()); + if (!in_array($productCode, $availableProducts)) { + $errors[] = 'Ungültiger Produktcode ausgewählt.'; + } + + // Address validation + $requiredAddressFields = [ + 'shipping_firstname' => 'Vorname', + 'shipping_lastname' => 'Nachname', + 'shipping_address' => 'Straße', + 'shipping_houseNumber' => 'Hausnummer', + 'shipping_zipcode' => 'Postleitzahl', + 'shipping_city' => 'Stadt', + 'shipping_country_id' => 'Land' + ]; + + foreach ($requiredAddressFields as $field => $label) { + if (empty(trim($shipmentData[$field] ?? ''))) { + $errors[] = "{$label} ist erforderlich."; + } + } + + return [ + 'valid' => empty($errors), + 'errors' => $errors, + 'warnings' => $warnings + ]; + } + + /** + * Prepare address data for DHL API + * + * @param array $formData + * @return array + */ + public function prepareAddressForApi(array $formData): array + { + $country = null; + if (!empty($formData['shipping_country_id'])) { + $country = Country::find($formData['shipping_country_id']); + } + + return [ + 'firstname' => trim($formData['shipping_firstname'] ?? ''), + 'lastname' => trim($formData['shipping_lastname'] ?? ''), + 'company' => trim($formData['shipping_company'] ?? ''), + 'address' => trim($formData['shipping_address'] ?? ''), + 'address_2' => trim($formData['shipping_address_2'] ?? ''), + 'houseNumber' => trim($formData['shipping_houseNumber'] ?? ''), + 'zipcode' => trim($formData['shipping_zipcode'] ?? ''), + 'city' => trim($formData['shipping_city'] ?? ''), + 'country_id' => $country?->id, + 'phone' => trim($formData['shipping_phone'] ?? '') + ]; + } +} diff --git a/app/Services/DhlShipmentService.php b/app/Services/DhlShipmentService.php new file mode 100644 index 00000000..28cd0171 --- /dev/null +++ b/app/Services/DhlShipmentService.php @@ -0,0 +1,147 @@ +getDhlConfig(); + \Log::info('dhlConfig', $dhlConfig); + // Check if queue should be used + $useQueue = $dhlConfig['use_queue'] ?? false; + + if ($useQueue) { + return $this->createShipmentAsync($order, $weight, $options, $dhlConfig); + } else { + return $this->createShipmentSync($order, $weight, $options, $dhlConfig); + } + } + + /** + * Create shipment asynchronously using queue + * + * @param ShoppingOrder $order + * @param float $weight + * @param array $options + * @param array $dhlConfig + * @return array + */ + private function createShipmentAsync(ShoppingOrder $order, float $weight, array $options, array $dhlConfig): array + { + try { + // Dispatch job with pre-loaded config + CreateShipmentJob::dispatch($order, $weight, $options, $dhlConfig); + + Log::info('[DHL Service] Shipment creation dispatched to queue', [ + 'order_id' => $order->id, + 'weight' => $weight + ]); + + return [ + 'success' => true, + 'message' => 'Sendung wird erstellt. Sie erhalten eine Benachrichtigung, sobald das Versandlabel verfügbar ist.', + 'queued' => true, + 'order_id' => $order->id + ]; + } catch (Exception $e) { + Log::error('[DHL Service] Failed to dispatch shipment creation', [ + 'error' => $e->getMessage(), + 'order_id' => $order->id, + ]); + + return [ + 'success' => false, + 'message' => 'Fehler beim Einreihen der Sendungserstellung: ' . $e->getMessage(), + 'queued' => false + ]; + } + } + + /** + * Create shipment synchronously + * + * @param ShoppingOrder $order + * @param float $weight + * @param array $options + * @param array $dhlConfig + * @return array + */ + private function createShipmentSync(ShoppingOrder $order, float $weight, array $options, array $dhlConfig): array + { + try { + Log::info('[DHL Service] Creating shipment synchronously', [ + 'order_id' => $order->id, + 'weight' => $weight + ]); + + // Create DHL client directly + $dhlClient = new \Acme\Dhl\Support\DhlClient( + $dhlConfig['base_url'], + $dhlConfig['api_key'], + $dhlConfig['username'], + $dhlConfig['password'] + ); + + $shippingService = new \Acme\Dhl\Services\ShippingService($dhlClient); + + // Prepare order data using helper + $orderData = DhlDataHelper::prepareOrderData($order, $weight, $options, $dhlConfig); + Log::info('orderData', $orderData); + // Create the shipment directly + $result = $shippingService->createLabel($orderData); + + Log::info('[DHL Service] Shipment created successfully (sync)', [ + 'order_id' => $order->id, + 'shipment_number' => $result['shipmentNumber'] ?? 'N/A', + 'label_path' => $result['labelPath'] ?? 'N/A', + ]); + + return [ + 'success' => true, + 'message' => 'Versandlabel erfolgreich erstellt!', + 'queued' => false, + 'order_id' => $order->id, + 'shipment_number' => $result['shipmentNumber'] ?? null, + 'tracking_number' => $result['trackingNumber'] ?? null, + 'label_path' => $result['labelPath'] ?? null, + 'label_url' => $result['labelUrl'] ?? null, + ]; + } catch (Exception $e) { + Log::error('[DHL Service] Shipment creation failed (sync)', [ + 'order_id' => $order->id, + 'error' => $e->getMessage() + ]); + + return [ + 'success' => false, + 'message' => 'Fehler beim Erstellen des Versandlabels: ' . $e->getMessage(), + 'queued' => false, + 'order_id' => $order->id + ]; + } + } +} diff --git a/app/Services/DomainService.php b/app/Services/DomainService.php index 1918c138..c216810d 100644 --- a/app/Services/DomainService.php +++ b/app/Services/DomainService.php @@ -126,7 +126,9 @@ class DomainService $subdomain = null; if (count($parts) > 2) { $subdomain = $parts[0]; - \Log::debug('DomainService: Using extracted subdomain', ['subdomain' => $subdomain, 'host' => $host]); + if (config('app.debug')) { + \Log::debug('DomainService: Using extracted subdomain', ['subdomain' => $subdomain, 'host' => $host]); + } } // Determine domain type based on subdomain and host diff --git a/app/Services/Payment.php b/app/Services/Payment.php index 4d593ecf..e41b6c84 100644 --- a/app/Services/Payment.php +++ b/app/Services/Payment.php @@ -270,6 +270,9 @@ class Payment public static function paymentStatusSendMail(ShoppingOrder $shopping_order, $shopping_payment, $data){ $bcc = []; $billing_email = $shopping_order->shopping_user->billing_email; + + // Überprüfung der Billing-E-Mail-Adresse + if(!$billing_email){ if($data['mode'] === 'test'){ $billing_email = config('app.checkout_test_mail'); @@ -277,6 +280,11 @@ class Payment $billing_email = config('app.checkout_mail'); } } + if(!filter_var($billing_email, FILTER_VALIDATE_EMAIL)){ + \Log::channel('payment')->error("Invalid billing email at shopping_order ".$shopping_order->id, ['billing_email' => $billing_email]); + $billing_email = config('app.checkout_mail'); + } + if($data['mode'] === 'test'){ $bcc[] = config('app.checkout_test_mail'); }else{ diff --git a/app/Services/Util.php b/app/Services/Util.php index c4aa7e42..cecc6681 100644 --- a/app/Services/Util.php +++ b/app/Services/Util.php @@ -1,4 +1,5 @@ $length){ + if (strlen($str) > $length) { $str = substr($str, 0, $length); //$str = substr($str, 0, strrpos($str, " ")); - $str = $str." ..."; + $str = $str . " ..."; } return $str; } - - public static function reFormatNumber($value){ + + public static function reFormatNumber($value) + { return (float) str_replace(',', '.', self::_format_number($value)); } - public static function formatNumber($value, $dec=2){ + public static function formatNumber($value, $dec = 2) + { $value = floatval(str_replace(',', '', $value)); return number_format($value, $dec, self::_decimal_separator(), self::_thousands_separator()); - } - public static function cleanIntegerFromString($value) { + public static function cleanIntegerFromString($value) + { // Entferne alle nicht-numerischen Zeichen außer Minus $cleanStr = preg_replace("/[^0-9-]/", "", $value); - + // Konvertiere zu Integer und entferne führende Nullen $number = (int)$cleanStr; - + return $number; } - public static function cleanNumberFormat($num = 0, $dec = 2, $fullzero = false){ - - if($fullzero && $num == 0){ + public static function cleanNumberFormat($num = 0, $dec = 2, $fullzero = false) + { + + if ($fullzero && $num == 0) { return number_format($num, $dec, self::_decimal_separator(), self::_thousands_separator()); } - return rtrim(rtrim(number_format($num, $dec, self::_decimal_separator(), self::_thousands_separator()),'0'), self::_decimal_separator()); + return rtrim(rtrim(number_format($num, $dec, self::_decimal_separator(), self::_thousands_separator()), '0'), self::_decimal_separator()); } - public static function utf8ize( $mixed ) { + public static function utf8ize($mixed) + { if (is_array($mixed)) { foreach ($mixed as $key => $value) { $mixed[$key] = self::utf8ize($value); @@ -115,14 +124,17 @@ class Util } - public static function getPostRoute(){ + public static function getPostRoute() + { return self::$postRoute; } - public static function setPostRoute($postRoute){ + public static function setPostRoute($postRoute) + { self::$postRoute = $postRoute; } - public static function getUserShop(){ + public static function getUserShop() + { $shop = session('user_shop'); if (empty($shop) || !is_object($shop)) { return null; @@ -130,17 +142,19 @@ class Util return $shop; } - public static function getDefaultUserShop(){ + public static function getDefaultUserShop() + { $user = \App\User::find(6); - if($user && $user->shop){ + if ($user && $user->shop) { return $user->shop; } return false; } - public static function getAuthUser(){ - if(\Session::has('auth_user')){ - if($auth_user = \Session::get('auth_user')){ + public static function getAuthUser() + { + if (\Session::has('auth_user')) { + if ($auth_user = \Session::get('auth_user')) { return $auth_user; } } @@ -148,91 +162,102 @@ class Util } - public static function getUserShopIdentifier(){ - if(\Session::has('user_shop_identifier')){ - if($user_shop_identifier = \Session::get('user_shop_identifier')){ + public static function getUserShopIdentifier() + { + if (\Session::has('user_shop_identifier')) { + if ($user_shop_identifier = \Session::get('user_shop_identifier')) { return $user_shop_identifier; } } return false; } - public static function getInstanceStatus(){ + public static function getInstanceStatus() + { $identifier = self::getUserShopIdentifier(); - if($identifier && \Session::has('user_shop_payment') && \Session::get('user_shop_payment') === 6){ + if ($identifier && \Session::has('user_shop_payment') && \Session::get('user_shop_payment') === 6) { return OrderPaymentService::getInstanceStatus($identifier); } return false; } - public static function setInstanceStatus($status, $lower = true){ + public static function setInstanceStatus($status, $lower = true) + { $identifier = self::getUserShopIdentifier(); - if($identifier && \Session::has('user_shop_payment') && \Session::get('user_shop_payment') === 6){ + if ($identifier && \Session::has('user_shop_payment') && \Session::get('user_shop_payment') === 6) { OrderPaymentService::updateInstanceStatus($identifier, $status, $lower); } } - public static function setInstanceStatusByPayment($shopping_payment, $status, $lower = true){ - if($shopping_payment->identifier){ + public static function setInstanceStatusByPayment($shopping_payment, $status, $lower = true) + { + if ($shopping_payment->identifier) { OrderPaymentService::updateInstanceStatus($shopping_payment->identifier, $status, $lower); } } - public static function getShoppingInstance(){ - if(\Session::has('shopping_instance')){ + public static function getShoppingInstance() + { + if (\Session::has('shopping_instance')) { return \Session::get('shopping_instance'); } return false; } - public static function getUserHistory(){ + public static function getUserHistory() + { $auth_user = self::getAuthUser(); $user_shop_identifier = self::getUserShopIdentifier(); - if($user_shop_identifier && $auth_user){ + if ($user_shop_identifier && $auth_user) { return UserHistory::whereUserId($auth_user->id)->whereIdentifier($user_shop_identifier)->get()->last(); } return false; } - public static function setUserHistoryValue($values = []){ - if($user_history = self::getUserHistory()){ - foreach ($values as $key=>$val){ + public static function setUserHistoryValue($values = []) + { + if ($user_history = self::getUserHistory()) { + foreach ($values as $key => $val) { $user_history->{$key} = $val; } $user_history->save(); - } + } } - public static function getUserHistoryValue($key){ - if($user_history = self::getUserHistory()) { + public static function getUserHistoryValue($key) + { + if ($user_history = self::getUserHistory()) { return $user_history->{$key}; } return null; } - public static function getUserShoppingMode(){ - if($auth_user = self::getAuthUser()){ - if($auth_user->isTestMode()){ + public static function getUserShoppingMode() + { + if ($auth_user = self::getAuthUser()) { + if ($auth_user->isTestMode()) { return 'test'; } } return config('app.mode'); } - public static function addRoute($p = []){ + public static function addRoute($p = []) + { $b = []; - if(\Session::has('user_shop')){ - if($user_shop = \Session::get('user_shop')){ + if (\Session::has('user_shop')) { + if ($user_shop = \Session::get('user_shop')) { $b = ['subdomain' => $user_shop->slug]; } } return array_merge($p, $b); } - public static function checkUserLandIsNot($user){ + public static function checkUserLandIsNot($user) + { - if(isset($user->account->country_id)){ + if (isset($user->account->country_id)) { //ch schweiz is out - if($user->account->country_id === 6){ + if ($user->account->country_id === 6) { return false; } return true; @@ -241,9 +266,10 @@ class Util } - public static function getMyMivitaShopUrl($add_url = ""){ - if(\Session::has('user_shop_domain')){ - $url = \Session::get('user_shop_domain').$add_url; + public static function getMyMivitaShopUrl($add_url = "") + { + if (\Session::has('user_shop_domain')) { + $url = \Session::get('user_shop_domain') . $add_url; if (!str_starts_with($url, 'http')) { $url = 'https://' . ltrim($url, '/'); } @@ -251,83 +277,90 @@ class Util } //alois sein shop $user = \App\User::find(6); - if($user && $user->shop){ - return config('app.protocol').$user->shop->slug.".".config('app.domain').config('app.tld_care').$add_url; + if ($user && $user->shop) { + return config('app.protocol') . $user->shop->slug . "." . config('app.domain') . config('app.tld_care') . $add_url; } } - public static function getMyMivitaPortalUrl($protocol = true){ + public static function getMyMivitaPortalUrl($protocol = true) + { $pro = $protocol ? config('app.protocol') : ""; - return $pro.config('app.pre_url_portal').config('app.domain').config('app.tld_care'); + return $pro . config('app.pre_url_portal') . config('app.domain') . config('app.tld_care'); } - public static function getMyMivitaUrl($protocol = true){ + public static function getMyMivitaUrl($protocol = true) + { $pro = $protocol ? config('app.protocol') : ""; - return $pro.config('app.pre_url_crm').config('app.domain').config('app.tld_care'); + return $pro . config('app.pre_url_crm') . config('app.domain') . config('app.tld_care'); } - public static function getUserPaymentFor($instance = 'shopping'){ - if(Yard::instance($instance)->getYardExtra('user_shop_payment')){ + public static function getUserPaymentFor($instance = 'shopping') + { + if (Yard::instance($instance)->getYardExtra('user_shop_payment')) { return Yard::instance($instance)->getYardExtra('user_shop_payment'); } - if(\Session::has('user_shop_payment')){ + if (\Session::has('user_shop_payment')) { return \Session::get('user_shop_payment'); } return null; } - public static function getUserShopBackUrl($reference = ""){ + public static function getUserShopBackUrl($reference = "") + { - if(\Session::has('user_shop')){ - if(\Session::has('user_shop_domain')){ + if (\Session::has('user_shop')) { + if (\Session::has('user_shop_domain')) { return \Session::get('user_shop_domain'); } - if($user_shop = \Session::get('user_shop')){ - return config('app.protocol').$user_shop->slug.".".config('app.domain').config('app.tld_care')."/back/to/shop/".$reference; + if ($user_shop = \Session::get('user_shop')) { + return config('app.protocol') . $user_shop->slug . "." . config('app.domain') . config('app.tld_care') . "/back/to/shop/" . $reference; } } - return config('app.protocol').config('app.domain').config('app.tld_care'); + return config('app.protocol') . config('app.domain') . config('app.tld_care'); } - public static function getUserCardBackUrl($uri, $instance = 'shopping'){ + public static function getUserCardBackUrl($uri, $instance = 'shopping') + { - if(\Session::has('user_shop')){ - if(\Session::has('user_shop_domain')){ - if(\Session::has('back_link')){ + if (\Session::has('user_shop')) { + if (\Session::has('user_shop_domain')) { + if (\Session::has('back_link')) { return \Session::get('back_link'); } - if(self::getUserPaymentFor($instance) === 3){ - return \Session::get('user_shop_domain')."/user/membership"; + if (self::getUserPaymentFor($instance) === 3) { + return \Session::get('user_shop_domain') . "/user/membership"; } - if(self::getUserPaymentFor($instance) === 2){ - return \Session::get('user_shop_domain')."/user/orders"; + if (self::getUserPaymentFor($instance) === 2) { + return \Session::get('user_shop_domain') . "/user/orders"; } return \Session::get('user_shop_domain'); } - if($user_shop = \Session::get('user_shop')){ - return config('app.protocol').$user_shop->slug.".".config('app.domain').config('app.tld_care').$uri; + if ($user_shop = \Session::get('user_shop')) { + return config('app.protocol') . $user_shop->slug . "." . config('app.domain') . config('app.tld_care') . $uri; } } - return config('app.protocol').config('app.domain').config('app.tld_care'); + return config('app.protocol') . config('app.domain') . config('app.tld_care'); } - public static function isMivitaShop(){ - if(Request::getHost() === 'checkout.'.config('app.domain').config('app.tld_care')){ - if($user_shop = \Session::get('user_shop')){ - if($user_shop->slug === 'aloevera' || $user_shop->slug === 'naturcosmetic'){ + public static function isMivitaShop() + { + if (Request::getHost() === 'checkout.' . config('app.domain') . config('app.tld_care')) { + if ($user_shop = \Session::get('user_shop')) { + if ($user_shop->slug === 'aloevera' || $user_shop->slug === 'naturcosmetic') { return true; } - } + } } - if(Request::getHost() === 'naturcosmetic.'.config('app.domain').config('app.tld_care')){ + if (Request::getHost() === 'naturcosmetic.' . config('app.domain') . config('app.tld_care')) { return true; - } - return \Config::get('app.url') === config('app.domain').config('app.tld_shop'); + } + return \Config::get('app.url') === config('app.domain') . config('app.tld_shop'); } - public static function isTestSystem($dev = false){ - if(\Config::get('app.tld_care') === '.test' || \Config::get('app.tld_shop') === '.lshop'){ - if($dev && config('app.debug') !== true){ + public static function isTestSystem($dev = false) + { + if (\Config::get('app.tld_care') === '.test' || \Config::get('app.tld_shop') === '.lshop') { + if ($dev && config('app.debug') !== true) { return false; } return true; @@ -347,25 +380,61 @@ class Util return $size; } } - + public static function sanitize($string, $force_lowercase = true, $anal = false, $substr = false) { - $strip = array("~", "`", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "=", "+", "[", "{", "]", - "}", "\\", "|", ";", ":", "\"", "'", "‘", "’", "“", "”", "–", "—", - "—", "–", ",", "<", ".", ">", "/", "?"); + $strip = array( + "~", + "`", + "!", + "@", + "#", + "$", + "%", + "^", + "&", + "*", + "(", + ")", + "_", + "=", + "+", + "[", + "{", + "]", + "}", + "\\", + "|", + ";", + ":", + "\"", + "'", + "‘", + "’", + "“", + "”", + "–", + "—", + "—", + "–", + ",", + "<", + ".", + ">", + "/", + "?" + ); $clean = trim(str_replace($strip, "", strip_tags($string))); $clean = preg_replace('/\s+/', "_", $clean); - $clean = ($anal) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ; - - if($substr){ - $clean = (strlen($clean) > 20) ? substr($clean,-20) : $clean; + $clean = ($anal) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean; + if ($substr) { + $clean = (strlen($clean) > 20) ? substr($clean, -20) : $clean; } return ($force_lowercase) ? (function_exists('mb_strtolower')) ? - mb_strtolower($clean, 'UTF-8') : - strtolower($clean) : + mb_strtolower($clean, 'UTF-8') : + strtolower($clean) : $clean; } - -} \ No newline at end of file +} diff --git a/app/User.php b/app/User.php index b4e6ab9e..b27f7234 100755 --- a/app/User.php +++ b/app/User.php @@ -120,6 +120,8 @@ use Laravel\Passport\HasApiTokens; * @method static \Illuminate\Database\Eloquent\Builder|User wherePreSponsor($value) * @property \Illuminate\Support\Carbon|null $pre_deleted_at * @method static \Illuminate\Database\Eloquent\Builder|User wherePreDeletedAt($value) + * @property-read \Illuminate\Database\Eloquent\Collection $userBusiness + * @property-read int|null $user_business_count * @mixin \Eloquent */ class User extends Authenticatable diff --git a/app/helpers.php b/app/helpers.php index 4a779534..0eed855c 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -129,62 +129,4 @@ if (! function_exists('legal_url')) { return url($path); } } -} - -if (! function_exists('main_asset')) { - /** - * Generate an asset URL using the main domain to avoid CORS issues. - * This ensures all assets are loaded from the main domain regardless of subdomain. - */ - function main_asset($path) - { - // Entferne führende Slashes - $path = ltrim($path, '/'); - - // Baue die Hauptdomain-URL - $protocol = config('app.protocol', 'https://'); - $domain = config('app.domain', 'mivita'); - $tld = config('app.tld_care', '.care'); - - return $protocol . $domain . $tld . '/' . $path; - } -} - -if (! function_exists('cors_asset')) { - /** - * Alias for main_asset for backward compatibility and clarity. - */ - function cors_asset($path) - { - return main_asset($path); - } -} - - -if (!function_exists('route')) { - /** - * Route auf Hauptdomain generieren - */ - function route($name, $parameters = [], $absolute = true) - { - $url = route($name, $parameters, $absolute); - - // Ersetze Subdomain mit Hauptdomain - if (request()->hasHeader('X-Subdomain')) { - $currentHost = request()->getHost(); - $url = str_replace($currentHost, config('app.domain').config('app.tld_care'), $url); - } - - return $url; - } -} - -if (!function_exists('asset_route')) { - /** - * Asset/Storage Route immer auf Hauptdomain - */ - function asset_route($name, $parameters = []) - { - return 'https://' . config('app.domain') . config('app.tld_care') . route($name, $parameters, false); - } } \ No newline at end of file diff --git a/bootstrap/cache/packages.php b/bootstrap/cache/packages.php index d51eaf0c..bd818981 100755 --- a/bootstrap/cache/packages.php +++ b/bootstrap/cache/packages.php @@ -1,15 +1,4 @@ - array ( - 'aliases' => - array ( - 'Form' => 'Alban\\LaravelCollectiveSpatieHtmlParser\\FormFacade', - ), - 'providers' => - array ( - 0 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', - ), - ), 'barryvdh/laravel-debugbar' => array ( 'aliases' => diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php index 3d18020b..c49c1e7d 100755 --- a/bootstrap/cache/services.php +++ b/bootstrap/cache/services.php @@ -23,39 +23,39 @@ 19 => 'Illuminate\\Translation\\TranslationServiceProvider', 20 => 'Illuminate\\Validation\\ValidationServiceProvider', 21 => 'Illuminate\\View\\ViewServiceProvider', - 22 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', - 23 => 'Barryvdh\\Debugbar\\ServiceProvider', - 24 => 'Barryvdh\\DomPDF\\ServiceProvider', - 25 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', - 26 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', - 27 => 'Jenssegers\\Date\\DateServiceProvider', - 28 => 'JoeDixon\\Translation\\TranslationServiceProvider', - 29 => 'JoeDixon\\Translation\\TranslationBindingsServiceProvider', - 30 => 'Laracasts\\Flash\\FlashServiceProvider', - 31 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', - 32 => 'Laravel\\Passport\\PassportServiceProvider', - 33 => 'Laravel\\Sail\\SailServiceProvider', - 34 => 'Laravel\\Tinker\\TinkerServiceProvider', - 35 => 'Laravel\\Ui\\UiServiceProvider', - 36 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 37 => 'Carbon\\Laravel\\ServiceProvider', - 38 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 39 => 'Termwind\\Laravel\\TermwindServiceProvider', - 40 => 'Pest\\Laravel\\PestServiceProvider', - 41 => 'Spatie\\Html\\HtmlServiceProvider', - 42 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', - 43 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 44 => 'Laravel\\Tinker\\TinkerServiceProvider', + 22 => 'Barryvdh\\Debugbar\\ServiceProvider', + 23 => 'Barryvdh\\DomPDF\\ServiceProvider', + 24 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', + 25 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', + 26 => 'Jenssegers\\Date\\DateServiceProvider', + 27 => 'JoeDixon\\Translation\\TranslationServiceProvider', + 28 => 'JoeDixon\\Translation\\TranslationBindingsServiceProvider', + 29 => 'Laracasts\\Flash\\FlashServiceProvider', + 30 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', + 31 => 'Laravel\\Passport\\PassportServiceProvider', + 32 => 'Laravel\\Sail\\SailServiceProvider', + 33 => 'Laravel\\Tinker\\TinkerServiceProvider', + 34 => 'Laravel\\Ui\\UiServiceProvider', + 35 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 36 => 'Carbon\\Laravel\\ServiceProvider', + 37 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', + 38 => 'Termwind\\Laravel\\TermwindServiceProvider', + 39 => 'Pest\\Laravel\\PestServiceProvider', + 40 => 'Spatie\\Html\\HtmlServiceProvider', + 41 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', + 42 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 43 => 'Laravel\\Tinker\\TinkerServiceProvider', + 44 => 'Acme\\Dhl\\DhlServiceProvider', 45 => 'App\\Providers\\AppServiceProvider', 46 => 'App\\Providers\\AuthServiceProvider', 47 => 'App\\Providers\\EventServiceProvider', 48 => 'App\\Providers\\DomainServiceProvider', 49 => 'App\\Providers\\RouteServiceProvider', - 50 => 'Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider', - 51 => 'Jenssegers\\Date\\DateServiceProvider', - 52 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 53 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 54 => 'App\\Providers\\YardServiceProvider', + 50 => 'Jenssegers\\Date\\DateServiceProvider', + 51 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 52 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 53 => 'App\\Providers\\YardServiceProvider', + 54 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', ), 'eager' => array ( @@ -69,24 +69,24 @@ 7 => 'Illuminate\\Pagination\\PaginationServiceProvider', 8 => 'Illuminate\\Session\\SessionServiceProvider', 9 => 'Illuminate\\View\\ViewServiceProvider', - 10 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', - 11 => 'Barryvdh\\Debugbar\\ServiceProvider', - 12 => 'Barryvdh\\DomPDF\\ServiceProvider', - 13 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', - 14 => 'Jenssegers\\Date\\DateServiceProvider', - 15 => 'JoeDixon\\Translation\\TranslationServiceProvider', - 16 => 'Laracasts\\Flash\\FlashServiceProvider', - 17 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', - 18 => 'Laravel\\Passport\\PassportServiceProvider', - 19 => 'Laravel\\Ui\\UiServiceProvider', - 20 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 21 => 'Carbon\\Laravel\\ServiceProvider', - 22 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 23 => 'Termwind\\Laravel\\TermwindServiceProvider', - 24 => 'Pest\\Laravel\\PestServiceProvider', - 25 => 'Spatie\\Html\\HtmlServiceProvider', - 26 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', - 27 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 10 => 'Barryvdh\\Debugbar\\ServiceProvider', + 11 => 'Barryvdh\\DomPDF\\ServiceProvider', + 12 => 'Cviebrock\\EloquentSluggable\\ServiceProvider', + 13 => 'Jenssegers\\Date\\DateServiceProvider', + 14 => 'JoeDixon\\Translation\\TranslationServiceProvider', + 15 => 'Laracasts\\Flash\\FlashServiceProvider', + 16 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', + 17 => 'Laravel\\Passport\\PassportServiceProvider', + 18 => 'Laravel\\Ui\\UiServiceProvider', + 19 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 20 => 'Carbon\\Laravel\\ServiceProvider', + 21 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', + 22 => 'Termwind\\Laravel\\TermwindServiceProvider', + 23 => 'Pest\\Laravel\\PestServiceProvider', + 24 => 'Spatie\\Html\\HtmlServiceProvider', + 25 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', + 26 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 27 => 'Acme\\Dhl\\DhlServiceProvider', 28 => 'App\\Providers\\AppServiceProvider', 29 => 'App\\Providers\\AuthServiceProvider', 30 => 'App\\Providers\\EventServiceProvider', @@ -96,6 +96,7 @@ 34 => 'Maatwebsite\\Excel\\ExcelServiceProvider', 35 => 'Yajra\\DataTables\\DataTablesServiceProvider', 36 => 'App\\Providers\\YardServiceProvider', + 37 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', ), 'deferred' => array ( diff --git a/composer.json b/composer.json index 87073fe0..1ccd3c29 100755 --- a/composer.json +++ b/composer.json @@ -4,15 +4,15 @@ "keywords": ["framework", "laravel"], "license": "MIT", "type": "project", - "require": { + + "require": { "php": "^8.2", - "alban/laravel-collective-spatie-html-parser": "^1.1.9", "barryvdh/laravel-dompdf": "^2.2", "cocur/slugify": "^4.5", "cviebrock/eloquent-sluggable": "^11.0", "doctrine/dbal": "^3.6.0|^4.0", "guzzlehttp/guzzle": "^7.4", - "intervention/image": "^3.0", + "intervention/image": "^3", "jenssegers/date": "^4.0", "joedixon/laravel-translation": "2.x-dev", "laracasts/flash": "^3.2", @@ -24,6 +24,7 @@ "maatwebsite/excel": "^3.1", "setasign/fpdf": "^1.8.6", "setasign/fpdi": "^2.6", + "spatie/laravel-html": "^3.7", "wearepixel/laravel-google-shopping-feed": "^4.0", "yajra/laravel-datatables-oracle": "^11.0" }, @@ -54,7 +55,7 @@ "laravel": { "dont-discover": [] } - }, + }, "autoload": { "files": [ "app/helpers.php" @@ -62,6 +63,8 @@ "psr-4": { "App\\": "app/", "Gloudemans\\Shoppingcart\\": "packages/digital-bird/shoppingcart/src", + "Alban\\LaravelCollectiveSpatieHtmlParser\\": "packages/laravel-collective-spatie-html-parser/src", + "Acme\\Dhl\\": "packages/acme-laravel-dhl/src", "Database\\Factories\\": "database/factories/", "Database\\Seeders\\": "database/seeders/" } @@ -78,10 +81,7 @@ "@php artisan vendor:publish --force --tag=livewire:assets --ansi" ], "post-update-cmd": [ - "@php artisan vendor:publish --tag=laravel-assets --ansi --force", - "php artisan ide-helper:generate", - "php artisan ide-helper:meta", - "php artisan ide-helper:models" + "@php artisan vendor:publish --tag=laravel-assets --ansi --force" ], "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" @@ -95,6 +95,10 @@ ] }, "repositories": [ + { + "type": "path", + "url": "./packages/acme-laravel-dhl" + }, { "type": "vcs", "url": "https://github.com/bjhijmans/laravel-translation.git" @@ -102,4 +106,5 @@ ], "minimum-stability": "dev", "prefer-stable": true + } diff --git a/composer.lock b/composer.lock index bf8932ec..3f12675d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,60 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f85e5045b24cd27d3bf9f066d3f48713", + "content-hash": "7fc21677cad34a62767eaccbc243e7d6", "packages": [ - { - "name": "alban/laravel-collective-spatie-html-parser", - "version": "v1.1.10", - "source": { - "type": "git", - "url": "https://github.com/christianalban/laravel-collective-spatie-html-parser.git", - "reference": "496fbd38dea78179e9fcd930ee6c42b1c9b1b889" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/christianalban/laravel-collective-spatie-html-parser/zipball/496fbd38dea78179e9fcd930ee6c42b1c9b1b889", - "reference": "496fbd38dea78179e9fcd930ee6c42b1c9b1b889", - "shasum": "" - }, - "require": { - "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0", - "php": "^8.3 | ^8.2 | ^8.0 | ^7.4", - "spatie/laravel-html": "^3.12" - }, - "type": "library", - "extra": { - "laravel": { - "aliases": { - "Form": "Alban\\LaravelCollectiveSpatieHtmlParser\\FormFacade" - }, - "providers": [ - "Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Alban\\LaravelCollectiveSpatieHtmlParser\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christian Albán", - "email": "christianalbanctdb1d@gmail.com" - } - ], - "description": "Adapter class that allows use spatie/laravel-html for old projects that were using the abanondated laravelcollective/html package, and allow to update to new versions of laravel", - "support": { - "issues": "https://github.com/christianalban/laravel-collective-spatie-html-parser/issues", - "source": "https://github.com/christianalban/laravel-collective-spatie-html-parser/tree/v1.1.10" - }, - "time": "2025-05-04T17:49:43+00:00" - }, { "name": "barryvdh/laravel-dompdf", "version": "v2.2.0", @@ -419,16 +367,16 @@ }, { "name": "composer/semver", - "version": "3.4.3", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", - "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95", + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95", "shasum": "" }, "require": { @@ -480,7 +428,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.3" + "source": "https://github.com/composer/semver/tree/3.4.4" }, "funding": [ { @@ -490,13 +438,9 @@ { "url": "https://github.com/composer", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], - "time": "2024-09-19T14:15:21+00:00" + "time": "2025-08-20T19:15:30+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -716,34 +660,34 @@ }, { "name": "doctrine/dbal", - "version": "4.2.3", + "version": "4.3.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "33d2d7fe1269b2301640c44cf2896ea607b30e3e" + "reference": "7669f131d43b880de168b2d2df9687d152d6c762" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/33d2d7fe1269b2301640c44cf2896ea607b30e3e", - "reference": "33d2d7fe1269b2301640c44cf2896ea607b30e3e", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/7669f131d43b880de168b2d2df9687d152d6c762", + "reference": "7669f131d43b880de168b2d2df9687d152d6c762", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3|^1", - "php": "^8.1", + "doctrine/deprecations": "^1.1.5", + "php": "^8.2", "psr/cache": "^1|^2|^3", "psr/log": "^1|^2|^3" }, "require-dev": { - "doctrine/coding-standard": "12.0.0", + "doctrine/coding-standard": "13.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.2", - "phpstan/phpstan": "2.1.1", - "phpstan/phpstan-phpunit": "2.0.3", + "phpstan/phpstan": "2.1.17", + "phpstan/phpstan-phpunit": "2.0.6", "phpstan/phpstan-strict-rules": "^2", - "phpunit/phpunit": "10.5.39", - "slevomat/coding-standard": "8.13.1", - "squizlabs/php_codesniffer": "3.10.2", + "phpunit/phpunit": "11.5.23", + "slevomat/coding-standard": "8.16.2", + "squizlabs/php_codesniffer": "3.13.1", "symfony/cache": "^6.3.8|^7.0", "symfony/console": "^5.4|^6.3|^7.0" }, @@ -802,7 +746,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/4.2.3" + "source": "https://github.com/doctrine/dbal/tree/4.3.2" }, "funding": [ { @@ -818,7 +762,7 @@ "type": "tidelift" } ], - "time": "2025-03-07T18:29:05+00:00" + "time": "2025-08-05T13:30:38+00:00" }, { "name": "doctrine/deprecations", @@ -870,33 +814,32 @@ }, { "name": "doctrine/inflector", - "version": "2.0.10", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" + "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", - "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b", + "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^11.0", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.3", - "phpunit/phpunit": "^8.5 || ^9.5", - "vimeo/psalm": "^4.25 || ^5.4" + "doctrine/coding-standard": "^12.0 || ^13.0", + "phpstan/phpstan": "^1.12 || ^2.0", + "phpstan/phpstan-phpunit": "^1.4 || ^2.0", + "phpstan/phpstan-strict-rules": "^1.6 || ^2.0", + "phpunit/phpunit": "^8.5 || ^12.2" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" + "Doctrine\\Inflector\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -941,7 +884,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.10" + "source": "https://github.com/doctrine/inflector/tree/2.1.0" }, "funding": [ { @@ -957,7 +900,7 @@ "type": "tidelift" } ], - "time": "2024-02-18T20:23:39+00:00" + "time": "2025-08-10T19:31:58+00:00" }, { "name": "doctrine/lexer", @@ -1968,16 +1911,16 @@ }, { "name": "intervention/image", - "version": "3.11.3", + "version": "3.11.4", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "d0f097b8a3fa8fb758efc9440b513aa3833cda17" + "reference": "8c49eb21a6d2572532d1bc425964264f3e496846" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/d0f097b8a3fa8fb758efc9440b513aa3833cda17", - "reference": "d0f097b8a3fa8fb758efc9440b513aa3833cda17", + "url": "https://api.github.com/repos/Intervention/image/zipball/8c49eb21a6d2572532d1bc425964264f3e496846", + "reference": "8c49eb21a6d2572532d1bc425964264f3e496846", "shasum": "" }, "require": { @@ -2024,7 +1967,7 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/3.11.3" + "source": "https://github.com/Intervention/image/tree/3.11.4" }, "funding": [ { @@ -2040,7 +1983,7 @@ "type": "ko_fi" } ], - "time": "2025-05-22T17:26:23+00:00" + "time": "2025-07-30T13:13:19+00:00" }, { "name": "jenssegers/date", @@ -2125,23 +2068,23 @@ "source": { "type": "git", "url": "https://github.com/bjhijmans/laravel-translation.git", - "reference": "a490272ba2db86887a71c07c4aa838b9858866d5" + "reference": "d63900e2de938e1274b74fde5f80c60e9a1484e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bjhijmans/laravel-translation/zipball/a490272ba2db86887a71c07c4aa838b9858866d5", - "reference": "a490272ba2db86887a71c07c4aa838b9858866d5", + "url": "https://api.github.com/repos/bjhijmans/laravel-translation/zipball/d63900e2de938e1274b74fde5f80c60e9a1484e5", + "reference": "d63900e2de938e1274b74fde5f80c60e9a1484e5", "shasum": "" }, "require": { - "illuminate/support": "^8.0||^9.0||^10.0||^11.0", + "illuminate/support": "^8.0||^9.0||^10.0||^11.0||^12.0", "laravel/legacy-factories": "^1.3", "php": "^8.0" }, "require-dev": { "mockery/mockery": "^1.0.0", - "orchestra/testbench": "^6.0|^8.0|^9.0", - "phpunit/phpunit": "^9.0|^10.0" + "orchestra/testbench": "^6.0|^8.0|^9.0|^10.0", + "phpunit/phpunit": "^9.0|^10.0|^11.0" }, "default-branch": true, "type": "library", @@ -2184,7 +2127,7 @@ "support": { "source": "https://github.com/bjhijmans/laravel-translation/tree/2.x" }, - "time": "2024-04-03T15:19:33+00:00" + "time": "2025-07-01T07:27:42+00:00" }, { "name": "laracasts/flash", @@ -2245,16 +2188,16 @@ }, { "name": "laravel/framework", - "version": "v11.45.1", + "version": "v11.45.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "b09ba32795b8e71df10856a2694706663984a239" + "reference": "d134bf11e2208c0c5bd488cf19e612ca176b820a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/b09ba32795b8e71df10856a2694706663984a239", - "reference": "b09ba32795b8e71df10856a2694706663984a239", + "url": "https://api.github.com/repos/laravel/framework/zipball/d134bf11e2208c0c5bd488cf19e612ca176b820a", + "reference": "d134bf11e2208c0c5bd488cf19e612ca176b820a", "shasum": "" }, "require": { @@ -2362,7 +2305,7 @@ "league/flysystem-read-only": "^3.25.1", "league/flysystem-sftp-v3": "^3.25.1", "mockery/mockery": "^1.6.10", - "orchestra/testbench-core": "^9.13.2", + "orchestra/testbench-core": "^9.16.0", "pda/pheanstalk": "^5.0.6", "php-http/discovery": "^1.15", "phpstan/phpstan": "^2.0", @@ -2456,7 +2399,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-06-03T14:01:40+00:00" + "time": "2025-08-13T20:28:00+00:00" }, { "name": "laravel/legacy-factories", @@ -2977,16 +2920,16 @@ }, { "name": "league/commonmark", - "version": "2.7.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405" + "reference": "10732241927d3971d28e7ea7b5712721fa2296ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6fbb36d44824ed4091adbcf4c7d4a3923cdb3405", - "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/10732241927d3971d28e7ea7b5712721fa2296ca", + "reference": "10732241927d3971d28e7ea7b5712721fa2296ca", "shasum": "" }, "require": { @@ -3015,7 +2958,7 @@ "symfony/process": "^5.4 | ^6.0 | ^7.0", "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0", "unleashedtech/php-coding-standard": "^3.1.1", - "vimeo/psalm": "^4.24.0 || ^5.0.0" + "vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0" }, "suggest": { "symfony/yaml": "v2.3+ required if using the Front Matter extension" @@ -3080,7 +3023,7 @@ "type": "tidelift" } ], - "time": "2025-05-05T12:20:28+00:00" + "time": "2025-07-20T12:47:49+00:00" }, { "name": "league/config", @@ -3220,16 +3163,16 @@ }, { "name": "league/flysystem", - "version": "3.29.1", + "version": "3.30.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319" + "reference": "2203e3151755d874bb2943649dae1eb8533ac93e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319", - "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2203e3151755d874bb2943649dae1eb8533ac93e", + "reference": "2203e3151755d874bb2943649dae1eb8533ac93e", "shasum": "" }, "require": { @@ -3253,13 +3196,13 @@ "composer/semver": "^3.0", "ext-fileinfo": "*", "ext-ftp": "*", - "ext-mongodb": "^1.3", + "ext-mongodb": "^1.3|^2", "ext-zip": "*", "friendsofphp/php-cs-fixer": "^3.5", "google/cloud-storage": "^1.23", "guzzlehttp/psr7": "^2.6", "microsoft/azure-storage-blob": "^1.1", - "mongodb/mongodb": "^1.2", + "mongodb/mongodb": "^1.2|^2", "phpseclib/phpseclib": "^3.0.36", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5.11|^10.0", @@ -3297,22 +3240,22 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.29.1" + "source": "https://github.com/thephpleague/flysystem/tree/3.30.0" }, - "time": "2024-10-08T08:58:34+00:00" + "time": "2025-06-25T13:29:59+00:00" }, { "name": "league/flysystem-local", - "version": "3.29.0", + "version": "3.30.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27" + "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27", - "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/6691915f77c7fb69adfb87dcd550052dc184ee10", + "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10", "shasum": "" }, "require": { @@ -3346,9 +3289,9 @@ "local" ], "support": { - "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.30.0" }, - "time": "2024-08-09T21:24:39+00:00" + "time": "2025-05-21T10:34:19+00:00" }, { "name": "league/mime-type-detection", @@ -3670,16 +3613,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.64", + "version": "3.1.66", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "e25d44a2d91da9179cd2d7fec952313548597a79" + "reference": "3b29c2426a46674f444890c45f742452a396aae8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/e25d44a2d91da9179cd2d7fec952313548597a79", - "reference": "e25d44a2d91da9179cd2d7fec952313548597a79", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/3b29c2426a46674f444890c45f742452a396aae8", + "reference": "3b29c2426a46674f444890c45f742452a396aae8", "shasum": "" }, "require": { @@ -3687,7 +3630,7 @@ "ext-json": "*", "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0||^11.0||^12.0", "php": "^7.0||^8.0", - "phpoffice/phpspreadsheet": "^1.29.9", + "phpoffice/phpspreadsheet": "^1.29.12", "psr/simple-cache": "^1.0||^2.0||^3.0" }, "require-dev": { @@ -3735,7 +3678,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.64" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.66" }, "funding": [ { @@ -3747,7 +3690,7 @@ "type": "github" } ], - "time": "2025-02-24T11:12:50+00:00" + "time": "2025-08-07T08:31:22+00:00" }, { "name": "maennchen/zipstream-php", @@ -3936,16 +3879,16 @@ }, { "name": "masterminds/html5", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6" + "reference": "fcf91eb64359852f00d921887b219479b4f21251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251", + "reference": "fcf91eb64359852f00d921887b219479b4f21251", "shasum": "" }, "require": { @@ -3997,9 +3940,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.9.0" + "source": "https://github.com/Masterminds/html5-php/tree/2.10.0" }, - "time": "2024-03-31T07:05:07+00:00" + "time": "2025-07-25T09:04:22+00:00" }, { "name": "monolog/monolog", @@ -4275,29 +4218,29 @@ }, { "name": "nette/utils", - "version": "v4.0.7", + "version": "v4.0.8", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2" + "reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/e67c4061eb40b9c113b218214e42cb5a0dda28f2", - "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2", + "url": "https://api.github.com/repos/nette/utils/zipball/c930ca4e3cf4f17dcfb03037703679d2396d2ede", + "reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede", "shasum": "" }, "require": { - "php": "8.0 - 8.4" + "php": "8.0 - 8.5" }, "conflict": { "nette/finder": "<3", "nette/schema": "<1.2.2" }, "require-dev": { - "jetbrains/phpstorm-attributes": "dev-master", + "jetbrains/phpstorm-attributes": "^1.2", "nette/tester": "^2.5", - "phpstan/phpstan": "^1.0", + "phpstan/phpstan-nette": "^2.0@stable", "tracy/tracy": "^2.9" }, "suggest": { @@ -4315,6 +4258,9 @@ } }, "autoload": { + "psr-4": { + "Nette\\": "src" + }, "classmap": [ "src/" ] @@ -4355,22 +4301,22 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.7" + "source": "https://github.com/nette/utils/tree/v4.0.8" }, - "time": "2025-06-03T04:55:08+00:00" + "time": "2025-08-06T21:43:34+00:00" }, { "name": "nikic/php-parser", - "version": "v5.5.0", + "version": "v5.6.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "ae59794362fe85e051a58ad36b289443f57be7a9" + "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9", - "reference": "ae59794362fe85e051a58ad36b289443f57be7a9", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", + "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", "shasum": "" }, "require": { @@ -4389,7 +4335,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.x-dev" } }, "autoload": { @@ -4413,9 +4359,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1" }, - "time": "2025-05-31T08:24:38+00:00" + "time": "2025-08-13T20:13:15+00:00" }, { "name": "nunomaduro/termwind", @@ -4791,16 +4737,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.29.10", + "version": "1.30.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "c80041b1628c4f18030407134fe88303661d4e4e" + "reference": "2f39286e0136673778b7a142b3f0d141e43d1714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/c80041b1628c4f18030407134fe88303661d4e4e", - "reference": "c80041b1628c4f18030407134fe88303661d4e4e", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/2f39286e0136673778b7a142b3f0d141e43d1714", + "reference": "2f39286e0136673778b7a142b3f0d141e43d1714", "shasum": "" }, "require": { @@ -4891,22 +4837,22 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.10" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.30.0" }, - "time": "2025-02-08T02:56:14+00:00" + "time": "2025-08-10T06:28:02+00:00" }, { "name": "phpoption/phpoption", - "version": "1.9.3", + "version": "1.9.4", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54" + "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54", - "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d", + "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d", "shasum": "" }, "require": { @@ -4914,7 +4860,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" + "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34" }, "type": "library", "extra": { @@ -4956,7 +4902,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.3" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.4" }, "funding": [ { @@ -4968,20 +4914,20 @@ "type": "tidelift" } ], - "time": "2024-07-20T21:41:07+00:00" + "time": "2025-08-21T11:53:16+00:00" }, { "name": "phpseclib/phpseclib", - "version": "3.0.43", + "version": "3.0.46", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "709ec107af3cb2f385b9617be72af8cf62441d02" + "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/709ec107af3cb2f385b9617be72af8cf62441d02", - "reference": "709ec107af3cb2f385b9617be72af8cf62441d02", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6", + "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6", "shasum": "" }, "require": { @@ -5062,7 +5008,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.43" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.46" }, "funding": [ { @@ -5078,7 +5024,7 @@ "type": "tidelift" } ], - "time": "2024-12-14T21:12:59+00:00" + "time": "2025-06-26T16:29:55+00:00" }, { "name": "psr/cache", @@ -5543,16 +5489,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.8", + "version": "v0.12.10", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625" + "reference": "6e80abe6f2257121f1eb9a4c55bf29d921025b22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625", - "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/6e80abe6f2257121f1eb9a4c55bf29d921025b22", + "reference": "6e80abe6f2257121f1eb9a4c55bf29d921025b22", "shasum": "" }, "require": { @@ -5602,12 +5548,11 @@ "authors": [ { "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" + "email": "justin@justinhileman.info" } ], "description": "An interactive shell for modern PHP.", - "homepage": "http://psysh.org", + "homepage": "https://psysh.org", "keywords": [ "REPL", "console", @@ -5616,9 +5561,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.8" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.10" }, - "time": "2025-03-16T03:05:19+00:00" + "time": "2025-08-04T12:39:37+00:00" }, { "name": "ralouphie/getallheaders", @@ -5742,21 +5687,20 @@ }, { "name": "ramsey/uuid", - "version": "4.8.1", + "version": "4.9.0", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28" + "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28", - "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0", + "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0", "shasum": "" }, "require": { "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13", - "ext-json": "*", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" }, @@ -5815,22 +5759,22 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.8.1" + "source": "https://github.com/ramsey/uuid/tree/4.9.0" }, - "time": "2025-06-01T06:28:46+00:00" + "time": "2025-06-25T14:20:11+00:00" }, { "name": "sabberworm/php-css-parser", - "version": "v8.8.0", + "version": "v8.9.0", "source": { "type": "git", "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git", - "reference": "3de493bdddfd1f051249af725c7e0d2c38fed740" + "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/3de493bdddfd1f051249af725c7e0d2c38fed740", - "reference": "3de493bdddfd1f051249af725c7e0d2c38fed740", + "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9", + "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9", "shasum": "" }, "require": { @@ -5838,7 +5782,8 @@ "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" }, "require-dev": { - "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41" + "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41", + "rawr/cross-data-providers": "^2.0.0" }, "suggest": { "ext-mbstring": "for parsing UTF-8 CSS" @@ -5880,9 +5825,9 @@ ], "support": { "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues", - "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.8.0" + "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0" }, - "time": "2025-03-23T17:59:05+00:00" + "time": "2025-07-11T13:20:48+00:00" }, { "name": "setasign/fpdf", @@ -5932,16 +5877,16 @@ }, { "name": "setasign/fpdi", - "version": "v2.6.3", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "67c31f5e50c93c20579ca9e23035d8c540b51941" + "reference": "4b53852fde2734ec6a07e458a085db627c60eada" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/67c31f5e50c93c20579ca9e23035d8c540b51941", - "reference": "67c31f5e50c93c20579ca9e23035d8c540b51941", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/4b53852fde2734ec6a07e458a085db627c60eada", + "reference": "4b53852fde2734ec6a07e458a085db627c60eada", "shasum": "" }, "require": { @@ -5956,7 +5901,7 @@ "setasign/fpdf": "~1.8.6", "setasign/tfpdf": "~1.33", "squizlabs/php_codesniffer": "^3.5", - "tecnickcom/tcpdf": "^6.2" + "tecnickcom/tcpdf": "^6.8" }, "suggest": { "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured." @@ -5992,7 +5937,7 @@ ], "support": { "issues": "https://github.com/Setasign/FPDI/issues", - "source": "https://github.com/Setasign/FPDI/tree/v2.6.3" + "source": "https://github.com/Setasign/FPDI/tree/v2.6.4" }, "funding": [ { @@ -6000,7 +5945,7 @@ "type": "tidelift" } ], - "time": "2025-02-05T13:22:35+00:00" + "time": "2025-08-05T09:57:14+00:00" }, { "name": "spatie/array-to-xml", @@ -6150,16 +6095,16 @@ }, { "name": "symfony/console", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44" + "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44", - "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44", + "url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1", + "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1", "shasum": "" }, "require": { @@ -6224,7 +6169,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.3.0" + "source": "https://github.com/symfony/console/tree/v7.3.2" }, "funding": [ { @@ -6235,12 +6180,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-05-24T10:34:04+00:00" + "time": "2025-07-30T17:13:41+00:00" }, { "name": "symfony/css-selector", @@ -6376,16 +6325,16 @@ }, { "name": "symfony/error-handler", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "cf68d225bc43629de4ff54778029aee6dc191b83" + "reference": "0b31a944fcd8759ae294da4d2808cbc53aebd0c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/cf68d225bc43629de4ff54778029aee6dc191b83", - "reference": "cf68d225bc43629de4ff54778029aee6dc191b83", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/0b31a944fcd8759ae294da4d2808cbc53aebd0c3", + "reference": "0b31a944fcd8759ae294da4d2808cbc53aebd0c3", "shasum": "" }, "require": { @@ -6433,7 +6382,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.3.0" + "source": "https://github.com/symfony/error-handler/tree/v7.3.2" }, "funding": [ { @@ -6444,12 +6393,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-05-29T07:19:49+00:00" + "time": "2025-07-07T08:17:57+00:00" }, { "name": "symfony/event-dispatcher", @@ -6609,16 +6562,16 @@ }, { "name": "symfony/finder", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d" + "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d", - "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d", + "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe", + "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe", "shasum": "" }, "require": { @@ -6653,7 +6606,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.3.0" + "source": "https://github.com/symfony/finder/tree/v7.3.2" }, "funding": [ { @@ -6664,25 +6617,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-12-30T19:00:26+00:00" + "time": "2025-07-15T13:41:35+00:00" }, { "name": "symfony/http-foundation", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "4236baf01609667d53b20371486228231eb135fd" + "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/4236baf01609667d53b20371486228231eb135fd", - "reference": "4236baf01609667d53b20371486228231eb135fd", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6877c122b3a6cc3695849622720054f6e6fa5fa6", + "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6", "shasum": "" }, "require": { @@ -6732,7 +6689,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.3.0" + "source": "https://github.com/symfony/http-foundation/tree/v7.3.2" }, "funding": [ { @@ -6743,25 +6700,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-05-12T14:48:23+00:00" + "time": "2025-07-10T08:47:49+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f" + "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ac7b8e163e8c83dce3abcc055a502d4486051a9f", - "reference": "ac7b8e163e8c83dce3abcc055a502d4486051a9f", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6ecc895559ec0097e221ed2fd5eb44d5fede083c", + "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c", "shasum": "" }, "require": { @@ -6846,7 +6807,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.3.0" + "source": "https://github.com/symfony/http-kernel/tree/v7.3.2" }, "funding": [ { @@ -6857,25 +6818,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-05-29T07:47:32+00:00" + "time": "2025-07-31T10:45:04+00:00" }, { "name": "symfony/mailer", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "0f375bbbde96ae8c78e4aa3e63aabd486e33364c" + "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/0f375bbbde96ae8c78e4aa3e63aabd486e33364c", - "reference": "0f375bbbde96ae8c78e4aa3e63aabd486e33364c", + "url": "https://api.github.com/repos/symfony/mailer/zipball/d43e84d9522345f96ad6283d5dfccc8c1cfc299b", + "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b", "shasum": "" }, "require": { @@ -6926,7 +6891,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.3.0" + "source": "https://github.com/symfony/mailer/tree/v7.3.2" }, "funding": [ { @@ -6937,25 +6902,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-04T09:51:09+00:00" + "time": "2025-07-15T11:36:08+00:00" }, { "name": "symfony/mime", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9" + "reference": "e0a0f859148daf1edf6c60b398eb40bfc96697d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9", - "reference": "0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9", + "url": "https://api.github.com/repos/symfony/mime/zipball/e0a0f859148daf1edf6c60b398eb40bfc96697d1", + "reference": "e0a0f859148daf1edf6c60b398eb40bfc96697d1", "shasum": "" }, "require": { @@ -7010,7 +6979,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.3.0" + "source": "https://github.com/symfony/mime/tree/v7.3.2" }, "funding": [ { @@ -7021,16 +6990,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-19T08:51:26+00:00" + "time": "2025-07-15T13:41:35+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -7089,7 +7062,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" }, "funding": [ { @@ -7100,6 +7073,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -7109,16 +7086,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70", + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70", "shasum": "" }, "require": { @@ -7167,7 +7144,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0" }, "funding": [ { @@ -7178,16 +7155,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-06-27T09:58:17+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", @@ -7250,7 +7231,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.32.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0" }, "funding": [ { @@ -7261,6 +7242,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -7270,7 +7255,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -7331,7 +7316,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" }, "funding": [ { @@ -7342,6 +7327,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -7351,7 +7340,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -7412,7 +7401,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" }, "funding": [ { @@ -7423,6 +7412,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -7432,7 +7425,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -7492,7 +7485,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0" }, "funding": [ { @@ -7503,6 +7496,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -7512,16 +7509,16 @@ }, { "name": "symfony/polyfill-php83", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" + "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", - "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5", + "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5", "shasum": "" }, "require": { @@ -7568,7 +7565,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.32.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0" }, "funding": [ { @@ -7579,16 +7576,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-07-08T02:45:35+00:00" }, { "name": "symfony/polyfill-uuid", - "version": "v1.32.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-uuid.git", @@ -7647,7 +7648,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/polyfill-uuid/tree/v1.32.0" + "source": "https://github.com/symfony/polyfill-uuid/tree/v1.33.0" }, "funding": [ { @@ -7658,6 +7659,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -7811,16 +7816,16 @@ }, { "name": "symfony/routing", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8e213820c5fea844ecea29203d2a308019007c15" + "reference": "7614b8ca5fa89b9cd233e21b627bfc5774f586e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8e213820c5fea844ecea29203d2a308019007c15", - "reference": "8e213820c5fea844ecea29203d2a308019007c15", + "url": "https://api.github.com/repos/symfony/routing/zipball/7614b8ca5fa89b9cd233e21b627bfc5774f586e4", + "reference": "7614b8ca5fa89b9cd233e21b627bfc5774f586e4", "shasum": "" }, "require": { @@ -7872,7 +7877,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.3.0" + "source": "https://github.com/symfony/routing/tree/v7.3.2" }, "funding": [ { @@ -7883,12 +7888,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-05-24T20:43:28+00:00" + "time": "2025-07-15T11:36:08+00:00" }, { "name": "symfony/service-contracts", @@ -7975,16 +7984,16 @@ }, { "name": "symfony/string", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125" + "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125", - "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125", + "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca", + "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca", "shasum": "" }, "require": { @@ -8042,7 +8051,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.3.0" + "source": "https://github.com/symfony/string/tree/v7.3.2" }, "funding": [ { @@ -8053,25 +8062,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-20T20:19:01+00:00" + "time": "2025-07-10T08:47:49+00:00" }, { "name": "symfony/translation", - "version": "v6.4.22", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "7e3b3b7146c6fab36ddff304a8041174bf6e17ad" + "reference": "300b72643e89de0734d99a9e3f8494a3ef6936e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/7e3b3b7146c6fab36ddff304a8041174bf6e17ad", - "reference": "7e3b3b7146c6fab36ddff304a8041174bf6e17ad", + "url": "https://api.github.com/repos/symfony/translation/zipball/300b72643e89de0734d99a9e3f8494a3ef6936e1", + "reference": "300b72643e89de0734d99a9e3f8494a3ef6936e1", "shasum": "" }, "require": { @@ -8137,7 +8150,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.22" + "source": "https://github.com/symfony/translation/tree/v6.4.24" }, "funding": [ { @@ -8148,12 +8161,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-05-29T07:06:44+00:00" + "time": "2025-07-30T17:30:48+00:00" }, { "name": "symfony/translation-contracts", @@ -8235,16 +8252,16 @@ }, { "name": "symfony/uid", - "version": "v7.3.0", + "version": "v7.3.1", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3" + "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/7beeb2b885cd584cd01e126c5777206ae4c3c6a3", - "reference": "7beeb2b885cd584cd01e126c5777206ae4c3c6a3", + "url": "https://api.github.com/repos/symfony/uid/zipball/a69f69f3159b852651a6bf45a9fdd149520525bb", + "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb", "shasum": "" }, "require": { @@ -8289,7 +8306,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v7.3.0" + "source": "https://github.com/symfony/uid/tree/v7.3.1" }, "funding": [ { @@ -8305,20 +8322,20 @@ "type": "tidelift" } ], - "time": "2025-05-24T14:28:13+00:00" + "time": "2025-06-27T19:55:54+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e" + "reference": "53205bea27450dc5c65377518b3275e126d45e75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/548f6760c54197b1084e1e5c71f6d9d523f2f78e", - "reference": "548f6760c54197b1084e1e5c71f6d9d523f2f78e", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/53205bea27450dc5c65377518b3275e126d45e75", + "reference": "53205bea27450dc5c65377518b3275e126d45e75", "shasum": "" }, "require": { @@ -8330,7 +8347,6 @@ "symfony/console": "<6.4" }, "require-dev": { - "ext-iconv": "*", "symfony/console": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0", "symfony/process": "^6.4|^7.0", @@ -8373,7 +8389,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.3.0" + "source": "https://github.com/symfony/var-dumper/tree/v7.3.2" }, "funding": [ { @@ -8384,12 +8400,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-27T18:39:23+00:00" + "time": "2025-07-29T20:02:46+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8801,16 +8821,16 @@ "packages-dev": [ { "name": "barryvdh/laravel-debugbar", - "version": "v3.15.4", + "version": "v3.16.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "c0667ea91f7185f1e074402c5788195e96bf8106" + "reference": "f265cf5e38577d42311f1a90d619bcd3740bea23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c0667ea91f7185f1e074402c5788195e96bf8106", - "reference": "c0667ea91f7185f1e074402c5788195e96bf8106", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/f265cf5e38577d42311f1a90d619bcd3740bea23", + "reference": "f265cf5e38577d42311f1a90d619bcd3740bea23", "shasum": "" }, "require": { @@ -8818,7 +8838,7 @@ "illuminate/session": "^9|^10|^11|^12", "illuminate/support": "^9|^10|^11|^12", "php": "^8.1", - "php-debugbar/php-debugbar": "~2.1.1", + "php-debugbar/php-debugbar": "~2.2.0", "symfony/finder": "^6|^7" }, "require-dev": { @@ -8838,7 +8858,7 @@ ] }, "branch-alias": { - "dev-master": "3.15-dev" + "dev-master": "3.16-dev" } }, "autoload": { @@ -8870,7 +8890,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.15.4" + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.16.0" }, "funding": [ { @@ -8882,24 +8902,24 @@ "type": "github" } ], - "time": "2025-04-16T06:32:06+00:00" + "time": "2025-07-14T11:56:43+00:00" }, { "name": "barryvdh/laravel-ide-helper", - "version": "v3.5.5", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "8d441ec99f8612b942b55f5183151d91591b618a" + "reference": "8d00250cba25728373e92c1d8dcebcbf64623d29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/8d441ec99f8612b942b55f5183151d91591b618a", - "reference": "8d441ec99f8612b942b55f5183151d91591b618a", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/8d00250cba25728373e92c1d8dcebcbf64623d29", + "reference": "8d00250cba25728373e92c1d8dcebcbf64623d29", "shasum": "" }, "require": { - "barryvdh/reflection-docblock": "^2.3", + "barryvdh/reflection-docblock": "^2.4", "composer/class-map-generator": "^1.0", "ext-json": "*", "illuminate/console": "^11.15 || ^12", @@ -8964,7 +8984,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-ide-helper/issues", - "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.5.5" + "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.6.0" }, "funding": [ { @@ -8976,20 +8996,20 @@ "type": "github" } ], - "time": "2025-02-11T13:59:46+00:00" + "time": "2025-07-17T20:11:57+00:00" }, { "name": "barryvdh/reflection-docblock", - "version": "v2.3.1", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "b6ff9f93603561f50e53b64310495d20b8dff5d8" + "reference": "d103774cbe7e94ddee7e4870f97f727b43fe7201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/b6ff9f93603561f50e53b64310495d20b8dff5d8", - "reference": "b6ff9f93603561f50e53b64310495d20b8dff5d8", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/d103774cbe7e94ddee7e4870f97f727b43fe7201", + "reference": "d103774cbe7e94ddee7e4870f97f727b43fe7201", "shasum": "" }, "require": { @@ -9026,9 +9046,9 @@ } ], "support": { - "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.3.1" + "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.4.0" }, - "time": "2025-01-18T19:26:32+00:00" + "time": "2025-07-17T06:07:30+00:00" }, { "name": "brianium/paratest", @@ -9125,16 +9145,16 @@ }, { "name": "composer/class-map-generator", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34" + "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/134b705ddb0025d397d8318a75825fe3c9d1da34", - "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ba9f089655d4cdd64e762a6044f411ccdaec0076", + "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076", "shasum": "" }, "require": { @@ -9178,7 +9198,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.6.1" + "source": "https://github.com/composer/class-map-generator/tree/1.6.2" }, "funding": [ { @@ -9188,13 +9208,9 @@ { "url": "https://github.com/composer", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], - "time": "2025-03-24T13:50:44+00:00" + "time": "2025-08-20T18:52:43+00:00" }, { "name": "fakerphp/faker", @@ -9261,16 +9277,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "8520451a140d3f46ac33042715115e290cf5785f" + "reference": "db9508f7b1474469d9d3c53b86f817e344732678" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", - "reference": "8520451a140d3f46ac33042715115e290cf5785f", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/db9508f7b1474469d9d3c53b86f817e344732678", + "reference": "db9508f7b1474469d9d3c53b86f817e344732678", "shasum": "" }, "require": { @@ -9280,10 +9296,10 @@ "fidry/makefile": "^0.2.0", "fidry/php-cs-fixer-config": "^1.1.2", "phpstan/extension-installer": "^1.2.0", - "phpstan/phpstan": "^1.9.2", - "phpstan/phpstan-deprecation-rules": "^1.0.0", - "phpstan/phpstan-phpunit": "^1.2.2", - "phpstan/phpstan-strict-rules": "^1.4.4", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-deprecation-rules": "^2.0.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", "phpunit/phpunit": "^8.5.31 || ^9.5.26", "webmozarts/strict-phpunit": "^7.5" }, @@ -9310,7 +9326,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.3.0" }, "funding": [ { @@ -9318,20 +9334,20 @@ "type": "github" } ], - "time": "2024-08-06T10:04:20+00:00" + "time": "2025-08-14T07:29:31+00:00" }, { "name": "filp/whoops", - "version": "2.18.2", + "version": "2.18.4", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3" + "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/89dabca1490bc77dbcab41c2b20968c7e44bf7c3", - "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3", + "url": "https://api.github.com/repos/filp/whoops/zipball/d2102955e48b9fd9ab24280a7ad12ed552752c4d", + "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d", "shasum": "" }, "require": { @@ -9381,7 +9397,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.18.2" + "source": "https://github.com/filp/whoops/tree/2.18.4" }, "funding": [ { @@ -9389,7 +9405,7 @@ "type": "github" } ], - "time": "2025-06-11T20:42:19+00:00" + "time": "2025-08-08T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -9504,16 +9520,16 @@ }, { "name": "laravel/pint", - "version": "v1.22.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "941d1927c5ca420c22710e98420287169c7bcaf7" + "reference": "0345f3b05f136801af8c339f9d16ef29e6b4df8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/941d1927c5ca420c22710e98420287169c7bcaf7", - "reference": "941d1927c5ca420c22710e98420287169c7bcaf7", + "url": "https://api.github.com/repos/laravel/pint/zipball/0345f3b05f136801af8c339f9d16ef29e6b4df8a", + "reference": "0345f3b05f136801af8c339f9d16ef29e6b4df8a", "shasum": "" }, "require": { @@ -9524,10 +9540,10 @@ "php": "^8.2.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.75.0", - "illuminate/view": "^11.44.7", - "larastan/larastan": "^3.4.0", - "laravel-zero/framework": "^11.36.1", + "friendsofphp/php-cs-fixer": "^3.82.2", + "illuminate/view": "^11.45.1", + "larastan/larastan": "^3.5.0", + "laravel-zero/framework": "^11.45.0", "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^2.3.1", "pestphp/pest": "^2.36.0" @@ -9537,6 +9553,9 @@ ], "type": "project", "autoload": { + "files": [ + "overrides/Runner/Parallel/ProcessFactory.php" + ], "psr-4": { "App\\": "app/", "Database\\Seeders\\": "database/seeders/", @@ -9566,20 +9585,20 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2025-05-08T08:38:12+00:00" + "time": "2025-07-10T18:09:32+00:00" }, { "name": "laravel/sail", - "version": "v1.43.1", + "version": "v1.44.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "3e7d899232a8c5e3ea4fc6dee7525ad583887e72" + "reference": "a09097bd2a8a38e23ac472fa6a6cf5b0d1c1d3fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/3e7d899232a8c5e3ea4fc6dee7525ad583887e72", - "reference": "3e7d899232a8c5e3ea4fc6dee7525ad583887e72", + "url": "https://api.github.com/repos/laravel/sail/zipball/a09097bd2a8a38e23ac472fa6a6cf5b0d1c1d3fe", + "reference": "a09097bd2a8a38e23ac472fa6a6cf5b0d1c1d3fe", "shasum": "" }, "require": { @@ -9629,7 +9648,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2025-05-19T13:19:21+00:00" + "time": "2025-07-04T16:17:06+00:00" }, { "name": "mockery/mockery", @@ -9716,16 +9735,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.13.1", + "version": "1.13.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c" + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c", - "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { @@ -9764,7 +9783,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" }, "funding": [ { @@ -9772,7 +9791,7 @@ "type": "tidelift" } ], - "time": "2025-04-29T12:36:36+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { "name": "nunomaduro/collision", @@ -10315,16 +10334,16 @@ }, { "name": "php-debugbar/php-debugbar", - "version": "v2.1.6", + "version": "v2.2.4", "source": { "type": "git", "url": "https://github.com/php-debugbar/php-debugbar.git", - "reference": "16fa68da5617220594aa5e33fa9de415f94784a0" + "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/16fa68da5617220594aa5e33fa9de415f94784a0", - "reference": "16fa68da5617220594aa5e33fa9de415f94784a0", + "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/3146d04671f51f69ffec2a4207ac3bdcf13a9f35", + "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35", "shasum": "" }, "require": { @@ -10332,6 +10351,9 @@ "psr/log": "^1|^2|^3", "symfony/var-dumper": "^4|^5|^6|^7" }, + "replace": { + "maximebf/debugbar": "self.version" + }, "require-dev": { "dbrekelmans/bdi": "^1", "phpunit/phpunit": "^8|^9", @@ -10346,7 +10368,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -10379,9 +10401,9 @@ ], "support": { "issues": "https://github.com/php-debugbar/php-debugbar/issues", - "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.1.6" + "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.4" }, - "time": "2025-02-21T17:47:03+00:00" + "time": "2025-07-22T14:01:30+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -10438,16 +10460,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.2", + "version": "5.6.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62" + "reference": "94f8051919d1b0369a6bcc7931d679a511c03fe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/92dde6a5919e34835c506ac8c523ef095a95ed62", - "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94f8051919d1b0369a6bcc7931d679a511c03fe9", + "reference": "94f8051919d1b0369a6bcc7931d679a511c03fe9", "shasum": "" }, "require": { @@ -10496,9 +10518,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.2" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.3" }, - "time": "2025-04-13T19:20:35+00:00" + "time": "2025-08-01T19:43:32+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -10560,16 +10582,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68" + "reference": "b9e61a61e39e02dd90944e9115241c7f7e76bfd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/b9e61a61e39e02dd90944e9115241c7f7e76bfd8", + "reference": "b9e61a61e39e02dd90944e9115241c7f7e76bfd8", "shasum": "" }, "require": { @@ -10601,9 +10623,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.1.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.2.0" }, - "time": "2025-02-19T13:28:12+00:00" + "time": "2025-07-13T07:04:09+00:00" }, { "name": "phpunit/php-code-coverage", @@ -11773,23 +11795,23 @@ }, { "name": "sebastian/recursion-context", - "version": "5.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712" + "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/47e34210757a2f37a97dcd207d032e1b01e64c7a", + "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a", "shasum": "" }, "require": { "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -11824,15 +11846,28 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" } ], - "time": "2023-02-03T07:05:40+00:00" + "time": "2025-08-10T07:50:56+00:00" }, { "name": "sebastian/type", @@ -12325,16 +12360,16 @@ }, { "name": "symfony/yaml", - "version": "v7.3.0", + "version": "v7.3.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "cea40a48279d58dc3efee8112634cb90141156c2" + "reference": "b8d7d868da9eb0919e99c8830431ea087d6aae30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/cea40a48279d58dc3efee8112634cb90141156c2", - "reference": "cea40a48279d58dc3efee8112634cb90141156c2", + "url": "https://api.github.com/repos/symfony/yaml/zipball/b8d7d868da9eb0919e99c8830431ea087d6aae30", + "reference": "b8d7d868da9eb0919e99c8830431ea087d6aae30", "shasum": "" }, "require": { @@ -12377,7 +12412,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.3.0" + "source": "https://github.com/symfony/yaml/tree/v7.3.2" }, "funding": [ { @@ -12388,12 +12423,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-04T10:10:33+00:00" + "time": "2025-07-10T08:47:49+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", diff --git a/config/app.php b/config/app.php index 990e0218..f12baf38 100755 --- a/config/app.php +++ b/config/app.php @@ -52,7 +52,8 @@ return [ | */ 'mode' => env('APP_MODE', 'live'), - 'url' => env('APP_URL', 'https://mivita'), + 'url' => env('APP_URL', 'https://mivita.care'), + 'url_crm' => env('APP_URL_CRM', 'https://my.mivita.care'), 'domain' => env('APP_DOMAIN', 'mivita'), 'tld_care' => env('APP_TLD_CARE', '.local'), 'tld_shop' => env('APP_TLD_SHOP', '.lshop'), @@ -60,7 +61,7 @@ return [ 'pre_url_main' => env('APP_URL_MAIN', ''), 'pre_url_crm' => env('APP_URL_CRM', 'my.'), 'pre_url_portal' => env('APP_URL_PORTAL', 'in.'), - + 'checkout_url' => env('APP_URL_CHECKOUT', 'checkout.'), 'contact_mail' => env('APP_CONTACT_MAIL', 'kontakt@mivita.care'), 'checkout_mail' => env('APP_CHECKOUT_MAIL', 'no-reply@mivita.care'), @@ -185,6 +186,10 @@ return [ */ Laravel\Tinker\TinkerServiceProvider::class, + /* + * DHL Package Service Provider... + */ + Acme\Dhl\DhlServiceProvider::class, /* * Application Service Providers... @@ -195,11 +200,11 @@ return [ App\Providers\EventServiceProvider::class, App\Providers\DomainServiceProvider::class, App\Providers\RouteServiceProvider::class, - Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, Jenssegers\Date\DateServiceProvider::class, Maatwebsite\Excel\ExcelServiceProvider::class, Yajra\DataTables\DataTablesServiceProvider::class, App\Providers\YardServiceProvider::class, + Alban\LaravelCollectiveSpatieHtmlParser\ServiceProvider::class, ], /* @@ -257,6 +262,9 @@ return [ 'Excel' => Maatwebsite\Excel\Facades\Excel::class, 'DataTables' => Yajra\DataTables\Facades\DataTables::class, 'Yard' => App\Services\Facade\Yard::class, + 'DHL' => Acme\Dhl\Facades\DHL::class, + 'Form' => Alban\LaravelCollectiveSpatieHtmlParser\FormFacade::class, + 'Html' => Alban\LaravelCollectiveSpatieHtmlParser\HtmlFacade::class, ], ]; diff --git a/config/dhl.php b/config/dhl.php new file mode 100644 index 00000000..89a7a871 --- /dev/null +++ b/config/dhl.php @@ -0,0 +1,108 @@ + env('DHL_BASE_URL', 'https://api-eu.dhl.com'), + 'api_key' => env('DHL_API_KEY'), + 'username' => env('DHL_USERNAME'), + 'password' => env('DHL_PASSWORD'), + 'billing_number' => env('DHL_BILLING_NUMBER'), + + /* + |-------------------------------------------------------------------------- + | Default Product Settings + |-------------------------------------------------------------------------- + */ + 'default_product' => env('DHL_PRODUCT', 'V01PAK'), + 'label_format' => env('DHL_LABEL_FORMAT', 'PDF'), + 'print_format' => env('DHL_PRINT_FORMAT', 'A4'), + 'retoure_print_format' => env('DHL_RETOURE_PRINT_FORMAT', 'A4'), + 'profile' => env('DHL_PROFILE', 'STANDARD_GRUPPENPROFIL'), + + /* + |-------------------------------------------------------------------------- + | Queue Settings + |-------------------------------------------------------------------------- + */ + 'use_queue' => env('DHL_USE_QUEUE', false), + + /* + |-------------------------------------------------------------------------- + | Webhook Configuration + |-------------------------------------------------------------------------- + */ + 'webhook' => [ + 'enabled' => env('DHL_WEBHOOK_ENABLED', false), + 'secret' => env('DHL_WEBHOOK_SECRET'), + 'route' => env('DHL_WEBHOOK_ROUTE', 'dhl/webhooks/tracking') + ], + + /* + |-------------------------------------------------------------------------- + | Sender Address + |-------------------------------------------------------------------------- + */ + 'sender' => [ + 'company' => env('DHL_SENDER_COMPANY', 'mivita care gmbh'), + 'name' => env('DHL_SENDER_NAME', ''), + 'street' => env('DHL_SENDER_STREET', 'Leinfeld'), + 'houseNumber' => env('DHL_SENDER_STREET_NUMBER', '2'), + 'postalCode' => env('DHL_SENDER_POSTAL_CODE', '87755'), + 'city' => env('DHL_SENDER_CITY', 'Kirchhaslach'), + 'country' => env('DHL_SENDER_COUNTRY', 'DE'), + 'email' => env('DHL_SENDER_EMAIL', 'versand@mivita.care'), + 'phone' => env('DHL_SENDER_PHONE', '+49 123 456789'), + ], + + /* + |-------------------------------------------------------------------------- + | Account Numbers + |-------------------------------------------------------------------------- + */ + 'account_numbers' => [ + 'default' => env('DHL_ACCOUNT_NUMBER_DEFAULT', '63144073550101'), + 'V01PAK' => env('DHL_ACCOUNT_NUMBER_V01PAK', '63144073550101'), // DHL Paket National + 'V62WP' => env('DHL_ACCOUNT_NUMBER_V62WP', '63144073556201'), // Warenpost National + 'V53PAK' => env('DHL_ACCOUNT_NUMBER_V53PAK', '63144073555301'), // DHL Paket International + 'V07PAK' => env('DHL_ACCOUNT_NUMBER_V07PAK', '63144073550701'), // DHL Retoure Online + ], + + /* + |-------------------------------------------------------------------------- + | Logging Settings + |-------------------------------------------------------------------------- + */ + 'logging' => [ + 'enabled' => env('DHL_LOGGING_ENABLED', true), + 'level' => env('DHL_LOGGING_LEVEL', 'info'), + 'channel' => env('DHL_LOGGING_CHANNEL', 'single'), + ], + + /* + |-------------------------------------------------------------------------- + | Legacy Settings (for compatibility) + |-------------------------------------------------------------------------- + */ + 'legacy' => [ + 'api_type' => env('DHL_API_TYPE', 'developer'), + 'api_secret' => env('DHL_API_SECRET'), + 'sandbox' => env('DHL_SANDBOX', true), + 'test_mode' => env('DHL_TEST_MODE', true), + ] +]; diff --git a/config/profanity.php b/config/profanity.php index ddeb5dfd..a9241083 100644 --- a/config/profanity.php +++ b/config/profanity.php @@ -133,5 +133,16 @@ return [ 'mivita', 'shop', 'myaloe', + 'my', + 'in', + 'portal', + 'checkout', + 'login', + 'logout', + 'register', + 'forgot', + 'reset', + 'verify', + 'confirm', ] ]; diff --git a/config/queue.php b/config/queue.php index 391304f3..cc52b0ab 100755 --- a/config/queue.php +++ b/config/queue.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('QUEUE_DRIVER', 'sync'), + 'default' => env('QUEUE_DRIVER', 'database'), /* |-------------------------------------------------------------------------- diff --git a/database/migrations/2025_08_19_155158_create_dhl_shipments_table.php b/database/migrations/2025_08_19_155158_create_dhl_shipments_table.php new file mode 100644 index 00000000..3ff17e46 --- /dev/null +++ b/database/migrations/2025_08_19_155158_create_dhl_shipments_table.php @@ -0,0 +1,109 @@ +id(); + + // Relationship zu ShoppingOrder + $table->unsignedInteger('shopping_order_id'); // int(10) unsigned to match shopping_orders.id + $table->foreign('shopping_order_id')->references('id')->on('shopping_orders')->onDelete('cascade'); + + // DHL Shipment Daten + $table->string('shipment_number')->nullable(); // DHL Sendungsnummer + $table->string('tracking_number')->nullable(); // DHL Tracking-Nummer (kann identisch sein) + + // Sendungstyp: 'outbound' (regulär) oder 'return' (Retoure) + $table->enum('type', ['outbound', 'return'])->default('outbound'); + + // Für Retouren: Verweis auf ursprüngliche Sendung + $table->unsignedBigInteger('related_shipment_id')->nullable(); // id() uses bigInteger + $table->foreign('related_shipment_id')->references('id')->on('dhl_shipments')->onDelete('set null'); + + // Paketdaten + $table->decimal('weight', 8, 2)->default(1.0); // in kg + $table->integer('length')->nullable(); // in cm + $table->integer('width')->nullable(); // in cm + $table->integer('height')->nullable(); // in cm + + // DHL Service-Optionen + $table->string('product_code')->default('V01PAK'); // V01PAK = DHL Paket + $table->json('services')->nullable(); // Zusätzliche Services (Premium, etc.) + + // Labels und Dokumente + $table->string('label_path')->nullable(); // Pfad zum generierten Label + $table->string('label_format')->default('PDF'); // PDF oder ZPL + $table->boolean('label_printed')->default(false); + + // Status-Management + $table->enum('status', [ + 'created', // Sendung erstellt, noch nicht bei DHL + 'submitted', // An DHL übertragen + 'in_transit', // Unterwegs + 'delivered', // Zugestellt + 'returned', // Zurückgeschickt + 'cancelled', // Storniert + 'failed' // Fehler bei Erstellung/Übertragung + ])->default('created'); + + // Tracking-Status (von DHL API) + $table->string('tracking_status')->nullable(); + $table->text('tracking_details')->nullable(); // JSON für detaillierte Tracking-Info + $table->timestamp('last_tracked_at')->nullable(); + + // Empfängeradresse (Kopie für Archivierung) + $table->string('recipient_name'); + $table->string('recipient_company')->nullable(); + $table->string('recipient_street'); + $table->string('recipient_street_number'); + $table->string('recipient_postal_code'); + $table->string('recipient_city'); + $table->string('recipient_state')->nullable(); + $table->string('recipient_country', 2)->default('DE'); + $table->string('recipient_email')->nullable(); + $table->string('recipient_phone')->nullable(); + + // API Response Data (für Debugging und Audit) + $table->json('api_request_data')->nullable(); // Gesendete Daten + $table->json('api_response_data')->nullable(); // Empfangene Antwort + $table->text('api_errors')->nullable(); // Fehlermeldungen + + // Kosten und Abrechnung + $table->decimal('shipping_cost', 10, 2)->nullable(); // Versandkosten + $table->string('currency', 3)->default('EUR'); + + // Zusätzliche Metadaten + $table->text('notes')->nullable(); // Interne Notizen + $table->json('metadata')->nullable(); // Flexible zusätzliche Daten + + // Timestamps + $table->timestamp('shipped_at')->nullable(); // Wann wurde versendet + $table->timestamp('delivered_at')->nullable(); // Wann zugestellt + $table->timestamps(); + + // Indizes für Performance + $table->index('shopping_order_id'); + $table->index('shipment_number'); + $table->index('tracking_number'); + $table->index(['type', 'status']); + $table->index('created_at'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('dhl_shipments'); + } +}; diff --git a/database/migrations/2025_08_22_172138_add_routing_code_to_dhl_package_shipments_table.php b/database/migrations/2025_08_22_172138_add_routing_code_to_dhl_package_shipments_table.php new file mode 100644 index 00000000..c1ee8bf2 --- /dev/null +++ b/database/migrations/2025_08_22_172138_add_routing_code_to_dhl_package_shipments_table.php @@ -0,0 +1,28 @@ +string('routing_code')->nullable()->after('dhl_shipment_no'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('dhl_package_shipments', function (Blueprint $table) { + $table->dropColumn('routing_code'); + }); + } +}; diff --git a/dev/dhl-modul/AKTUALISIERUNG-PAKET-ANSATZ.md b/dev/dhl-modul/AKTUALISIERUNG-PAKET-ANSATZ.md new file mode 100644 index 00000000..6f08c4a6 --- /dev/null +++ b/dev/dhl-modul/AKTUALISIERUNG-PAKET-ANSATZ.md @@ -0,0 +1,151 @@ +# DHL Modul - Aktualisierung auf Paket-Ansatz + +## Überarbeitung: Von SDK zu eigenständigem Laravel-Paket + +**Datum**: $(date '+%Y-%m-%d') +**Grund**: Das christoph-schaeffer/dhl-business-shipping SDK ist veraltet und macht Probleme mit DHL-Login + +## Neue Architektur: packages/acme-laravel-dhl + +### ✅ Durchgeführte Überarbeitungen + +#### 1. Code Refactoring für bessere Lesbarkeit +- **Services vollständig überarbeitet**: + - `ShippingService` - Versandlabel-Erstellung mit klarer Struktur + - `TrackingService` - Tracking-Status mit Bulk-Updates + - `ReturnsService` - Retourenlabel-Management + - `DhlClient` - HTTP-Client mit umfassendem Error-Handling + +- **Verbesserungen**: + - Vollständige PHPDoc-Dokumentation + - Typisierung aller Parameter und Rückgabewerte + - Private Methoden für bessere Code-Organisation + - Validierung aller Eingabedaten + - Exception-Handling mit aussagekräftigen Fehlermeldungen + +#### 2. Datenbankschema an optimierten Plan angepasst +- **Vereinfachtes Schema** entsprechend PLAN-OPTIMIERT.md: + - Eine zentrale `dhl_shipments` Tabelle + - `type` Spalte für Outbound/Return-Unterscheidung + - `related_shipment_id` für Retour-Verknüpfung + - Tracking-Status direkt in Haupttabelle + +- **Migration erstellt**: + - `/database/migrations/2025_01_01_000000_create_dhl_shipments_table.php` + - `/database/migrations/2025_01_01_000200_create_dhl_tracking_events_table.php` + +- **Neue Models**: + - `DhlShipment` - Hauptmodel mit Relationships und Scopes + - `DhlTrackingEvent` - Tracking-Events für Phase 2 + +#### 3. Error Handling und Validation implementiert +- **DhlClient mit robustem Error-Handling**: + - HTTP-Status-Code spezifische Exceptions + - Retry-Mechanismus (3 Versuche) + - Timeout-Handling (30 Sekunden) + - User-Agent für API-Identifikation + +- **Service-Validierung**: + - Eingabedaten-Validierung vor API-Aufrufen + - Konfigurationsprüfung (Billing Number, etc.) + - Aussagekräftige Exception-Messages + +### 🗂️ Neue Paket-Struktur + +``` +packages/acme-laravel-dhl/ +├── composer.json # Laravel-Paket Konfiguration +├── config/dhl.php # DHL API Konfiguration +├── database/migrations/ # Datenbank-Struktur +│ ├── 2025_01_01_000000_create_dhl_shipments_table.php +│ └── 2025_01_01_000200_create_dhl_tracking_events_table.php +├── src/ +│ ├── DhlServiceProvider.php # Laravel Service Provider +│ ├── DhlManager.php # Hauptmanager-Klasse +│ ├── Facades/DHL.php # Laravel Facade +│ ├── Models/ +│ │ ├── DhlShipment.php # Zentrales Shipment-Model +│ │ └── DhlTrackingEvent.php # Tracking-Events +│ ├── Services/ +│ │ ├── ShippingService.php # Versandlabel-Service +│ │ ├── TrackingService.php # Tracking-Service +│ │ └── ReturnsService.php # Retour-Service +│ ├── Support/ +│ │ └── DhlClient.php # HTTP-API-Client +│ └── Http/Controllers/ # Für spätere Web-Integration +└── routes/api.php # API-Routen für Webhooks +``` + +### 📋 Aktualisierter Implementierungsplan + +#### Phase 1: Paket-Integration (2 Schritte) +1. **Paket-Registrierung im Hauptprojekt** + - composer.json Repositories-Eintrag + - Service Provider Registration + - Konfiguration publizieren + +2. **API-Credentials Setup** + - .env Variablen konfigurieren + - Test-Verbindung zur DHL API + +#### Phase 2: Admin-Integration (4 Schritte) +3. **Admin-Controller erstellen** + - DhlShipmentController für Backend + - Integration in bestehende Order-Verwaltung + +4. **Blade-Views für DHL Cockpit** + - Sendungsübersicht mit DataTables + - Label-Download und -Druck + +5. **Queue-Jobs für Async-Processing** + - CreateShipmentJob + - CancelShipmentJob + - CreateReturnLabelJob + +6. **Tracking-Automation** + - UpdateTrackingStatusJob + - Artisan Command für Scheduler + +#### Phase 3: Testing & Finalisierung (2 Schritte) +7. **Unit/Feature Tests** + - Service-Tests mit Mocked API + - Controller-Tests + - Database-Tests + +8. **Documentation & Polish** + - Benutzerhandbuch + - API-Dokumentation + - Performance-Optimierung + +### ⚠️ Breaking Changes zum alten Ansatz + +1. **Namespace geändert**: `App\Services\DhlApiService` → `Acme\Dhl\Services\*` +2. **Datenbank**: `dhl_shipments` statt mehrerer separater Tabellen +3. **Model**: `DhlShipment` statt `DhlShipment` (ähnlich, aber neue Struktur) +4. **API-Integration**: Direkter HTTP-Client statt SDK-Wrapper + +### 🔧 Migration vom alten System + +Falls bereits bestehende DHL-Integration vorhanden: +1. Bestehende Daten nach `dhl_shipments` migrieren +2. Controller-Aufrufe auf neue Services umstellen +3. View-Integrationen aktualisieren + +### 📦 Vorteile des Paket-Ansatzes + +- **Unabhängigkeit**: Keine Abhängigkeit von veralteten SDKs +- **Wartbarkeit**: Sauberer, dokumentierter Code +- **Flexibilität**: Direkter API-Zugang ermöglicht alle DHL-Features +- **Testbarkeit**: Vollständig mockbare Services +- **Laravel-Integration**: Native Laravel-Patterns und Features +- **Wiederverwendbarkeit**: Als eigenständiges Paket nutzbar + +### 🎯 Nächste Schritte + +1. **Paket im Hauptprojekt registrieren** +2. **DHL API-Credentials konfigurieren** +3. **Erste Testlabel erstellen** +4. **Admin-Interface implementieren** +5. **Bestehende Order-Integration anpassen** + +Das überarbeitete System ist nun deutlich stabiler, wartbarer und zukunftssicher. \ No newline at end of file diff --git a/dev/dhl-modul/OPTIMIERUNGEN.md b/dev/dhl-modul/OPTIMIERUNGEN.md new file mode 100644 index 00000000..22a56f85 --- /dev/null +++ b/dev/dhl-modul/OPTIMIERUNGEN.md @@ -0,0 +1,33 @@ +# Optimierungen am DHL-Modul + +## Code-Verbesserungen + +- Erweiterte Logging in allen Services und DhlClient. +- Robuste Payload-Extraktion mit data_get(). +- Exponential Backoff für Rate-Limits in DhlClient. + +## Behebene Fehler + +- Namenskonflikt: Shipment zu DhlShipment geändert. +- Erweiterte Status-Updates in Webhook und TrackingService (mehr Codes gemappt). +- Validierung in cancelLabel: Prüft Existenz und canCancel(). + +## Optionale Queues + +- Neu in config: 'use_queue' => false (Standard: synchron). +- In Services: Wenn true, dispatch Job (z.B. SyncTrackingJob); sonst synchron. +- Für Entwicklung/Erstrollout: Synchron. Bei höherer Last: Aktivieren für Asynchronität. + +## Weitere Dokumentation + +- Aktualisierte README.md und PAKET-INSTALLATION.md mit Queue-Infos. + +## Weitere Fixes + +- DhlClient: Sleep zu usleep geändert mit Cap auf 10 Sekunden. +- ShippingService: HouseNumber required for DHL!, Retry für Storage::put. +- TrackingService: Transaction um firstOrCreate. +- Migration: Kommentar zur anonymen Klasse. +- Status-Mappings: Zentral in DhlShipment, referenziert in TrackingService. +- DhlManager: Descriptive Variablen, Typ-Hints. +- Storage-Retry: 3 Versuche mit Logging in ShippingService. diff --git a/dev/dhl-modul/PAKET-INSTALLATION.md b/dev/dhl-modul/PAKET-INSTALLATION.md new file mode 100644 index 00000000..dcad5779 --- /dev/null +++ b/dev/dhl-modul/PAKET-INSTALLATION.md @@ -0,0 +1,257 @@ +# DHL Paket Installation & Setup + +## 1. Paket im Hauptprojekt registrieren + +### composer.json erweitern + +```json +{ + "repositories": [ + { + "type": "path", + "url": "./packages/acme-laravel-dhl" + } + ], + "require": { + "acme/laravel-dhl": "*" + } +} +``` + +### Installation + +```bash +composer update acme/laravel-dhl +``` + +## 2. Service Provider registrieren + +### config/app.php (falls Auto-Discovery nicht funktioniert) + +```php +'providers' => [ + // ... + Acme\Dhl\DhlServiceProvider::class, +], + +'aliases' => [ + // ... + 'DHL' => Acme\Dhl\Facades\DHL::class, +], +``` + +## 3. Konfiguration publizieren + +```bash +# Konfigurationsdatei publizieren +php artisan vendor:publish --provider="Acme\Dhl\DhlServiceProvider" --tag="config" + +# Migrations ausführen +php artisan migrate +``` + +## 4. Umgebungsvariablen konfigurieren + +### .env erweitern + +```env +# DHL API Configuration +DHL_BASE_URL=https://api-eu.dhl.com +DHL_API_KEY=your_api_key_here +DHL_USERNAME=your_username +DHL_PASSWORD=your_password +DHL_BILLING_NUMBER=your_billing_number + +# DHL Default Settings +DHL_PRODUCT=V01PAK +DHL_LABEL_FORMAT=PDF +DHL_PRINT_FORMAT=A4 +DHL_RETOURE_PRINT_FORMAT=A4 +DHL_PROFILE=STANDARD_GRUPPENPROFIL + +# DHL Webhook (optional) +DHL_WEBHOOK_ENABLED=false +DHL_WEBHOOK_SECRET=your_webhook_secret +DHL_WEBHOOK_ROUTE=dhl/webhooks/tracking + +# DHL Queue Settings (optional) +DHL_USE_QUEUE=false +``` + +## 5. Test-Verbindung prüfen + +### Artisan Command (zu erstellen) + +```bash +php artisan dhl:test-connection +``` + +### Oder via Tinker + +```php +php artisan tinker + +// Service-Container Test +app(Acme\Dhl\Services\ShippingService::class); + +// Model Test +use Acme\Dhl\Models\DhlShipment; +DhlShipment::query()->count(); + +// API-Test (vereinfacht) +// $client = app(Acme\Dhl\Support\DhlClient::class); +// $client->testConnection(); +``` + +## 6. Integration in bestehende Models + +### ShoppingOrder Model erweitern + +```php +use Acme\Dhl\Models\DhlShipment; + +class ShoppingOrder extends Model +{ + /** + * DHL Sendungen für diese Bestellung + */ + public function dhlShipments(): HasMany + { + return $this->hasMany(DhlShipment::class, 'order_id'); + } + + /** + * Ausgehende DHL Sendungen + */ + public function dhlOutboundShipments(): HasMany + { + return $this->dhlShipments()->outbound(); + } + + /** + * DHL Retouren + */ + public function dhlReturns(): HasMany + { + return $this->dhlShipments()->returns(); + } + + /** + * Hat DHL Sendungen + */ + public function hasDhlShipments(): bool + { + return $this->dhlShipments()->exists(); + } + + /** + * Neueste DHL Sendung + */ + public function latestDhlShipment(): ?DhlShipment + { + return $this->dhlShipments() + ->latest() + ->first(); + } +} +``` + +## 7. Verwendung in Controllern + +### Beispiel Controller-Integration + +```php +use Acme\Dhl\Services\ShippingService; +use Acme\Dhl\Services\TrackingService; +use Acme\Dhl\Services\ReturnsService; + +class OrderController extends Controller +{ + public function createDhlLabel( + ShoppingOrder $order, + ShippingService $shippingService + ) { + try { + $result = $shippingService->createLabel([ + 'order_id' => $order->id, + 'shipper' => [ + 'name' => 'Ihre Firma', + 'street' => 'Ihre Straße 123', + 'postalCode' => '12345', + 'city' => 'Ihre Stadt', + 'country' => 'DE' + ], + 'consignee' => [ + 'name' => $order->shipping_name, + 'street' => $order->shipping_street, + 'postalCode' => $order->shipping_zip, + 'city' => $order->shipping_city, + 'country' => $order->shipping_country + ], + 'weight_kg' => $order->total_weight ?? 1.0 + ]); + + return response()->json([ + 'success' => true, + 'shipment_number' => $result['shipmentNumber'], + 'label_path' => $result['label_path'] + ]); + + } catch (Exception $e) { + return response()->json([ + 'success' => false, + 'error' => $e->getMessage() + ], 422); + } + } +} +``` + +## 8. Facade-Verwendung + +```php +use DHL; + +// Label erstellen +$result = DHL::createLabel($orderData); + +// Tracking-Status abrufen +$status = DHL::getTrackingStatus('1234567890'); + +// Retourenlabel erstellen +$return = DHL::createReturn($returnData); +``` + +## Troubleshooting + +### Composer-Probleme + +```bash +# Cache leeren +composer dump-autoload +php artisan config:clear +php artisan cache:clear + +# Paket neu installieren +composer remove acme/laravel-dhl +composer install +``` + +### Migration-Probleme + +```bash +# Migrations-Status prüfen +php artisan migrate:status + +# Rollback und neu migrieren +php artisan migrate:rollback --step=2 +php artisan migrate +``` + +### Service-Provider nicht gefunden + +```bash +# Auto-Discovery cache leeren +composer dump-autoload +php artisan package:discover +``` diff --git a/dev/dhl-modul/PLAN-OPTIMIERT.md b/dev/dhl-modul/PLAN-OPTIMIERT.md new file mode 100644 index 00000000..84a6746d --- /dev/null +++ b/dev/dhl-modul/PLAN-OPTIMIERT.md @@ -0,0 +1,195 @@ +# DHL Versandmodul - Optimierter Programmierplan (MVP) + +## Bewertung der Optimierungsvorschläge + +### ✅ Akzeptierte Optimierungen: + +1. **Vereinfachtes Datenbank-Schema**: Eine `dhl_shipments` Tabelle mit `type` Spalte für Outbound/Return +2. **Tracking vereinfacht**: Aktueller Status in Haupttabelle, separate Events-Tabelle für Phase 2 +3. **Konsolidierte Service-Klasse**: Ein `DhlApiService` statt drei separate Services +4. **Advanced Features verschoben**: Excel Export, Webhooks, Notifications als Phase 2 + +### 🔄 Kleine Anpassungen am Vorschlag: + +- Jobs bleiben getrennt (CreateShipment, Cancel, ReturnLabel) für bessere Queue-Verwaltung +- Tracking-Job für Scheduler-Integration beibehalten +- Admin-Navigation früher implementieren für bessere UX + +--- + +# Finaler Optimierter Plan - DHL Modul (MVP) + +## Phase 1: Fundament und Kernlogik (8 Schritte) + +### 1. Setup & Dependencies ✅ AKTUALISIERT + +- ~~Composer: `dhl-sdk-api-php/dhl-sdk-bcs` installieren~~ (veraltet, Probleme mit DHL-Login) +- **NEUER ANSATZ**: Eigenständiges Laravel-Paket `packages/acme-laravel-dhl` +- Direkte DHL API-Integration über HTTP-Client (Guzzle) +- Queue-System aktivieren (database driver) + +### 2. Konfiguration + +- `config/dhl.php` erstellen (API-Credentials, Absenderadressen) +- Environment-Variablen in `.env` definieren + +### 3. Datenbank & Model ✅ ABGESCHLOSSEN + +- Migration für `dhl_shipments` Tabelle: ✅ + - order_id, dhl_shipment_no, type (outbound/return) + - related_shipment_id (für Retouren), weight_kg, label_path + - status, tracking_status, last_tracked_at + - api_response_data (JSON), created_at, updated_at +- `DhlShipment` Model mit vollständigen Relationships ✅ +- `DhlTrackingEvent` Model für detaillierte Events ✅ + +### 4. Zentraler Service ✅ ABGESCHLOSSEN + +- ~~`DhlApiService` als Wrapper um DHL SDK~~ (SDK-Ansatz verworfen) +- **NEUE STRUKTUR**: + - `DhlClient` - HTTP-Client für API-Kommunikation ✅ + - `ShippingService` - Label-Erstellung und -Verwaltung ✅ + - `TrackingService` - Status-Tracking und -Updates ✅ + - `ReturnsService` - Retourenlabel-Management ✅ +- Vollständige Error-Behandlung und Validation ✅ + +### 5. Queue Jobs + +- `CreateShipmentJob` für asynchrone Label-Erstellung +- `CancelShipmentJob` für Stornierungen +- `CreateReturnLabelJob` für Retourenetiketten + +### 6. Controller Foundation + +- `DhlShipmentController` mit store/show/cancel Methoden +- Basis-Routen in `routes/web.php` + +### 7. Error Handling & Logging ✅ ABGESCHLOSSEN + +- Exception-Handling für DHL API-Fehler ✅ + - HTTP-Status spezifische Exceptions + - Retry-Mechanismus (3x mit 300ms Delay) + - Timeout-Handling (30s) +- Aussagekräftige Fehlermeldungen ✅ +- Validation aller Eingabedaten ✅ + +### 8. Basic Testing + +- Unit-Tests für `DhlApiService` +- Feature-Tests für Controller + +--- + +## Phase 2: Admin-Oberfläche (6 Schritte) + +### 9. Navigation & Layout + +- Admin-Menüpunkt "DHL Cockpit" +- Bootstrap 5 Layout für DHL-Views + +### 10. Cockpit (Zentrale Übersicht) + +- `index()` Methode im Controller +- `cockpit.blade.php` View mit DataTable +- Filter: Datum, Status, Sendungstyp + +### 11. Einzelaktionen + +- "Label herunterladen" Button +- "Sendung stornieren" Button mit Confirmation + +### 12. Batch-Operationen + +- Mehrere Sendungen auswählen +- Stapeldruck von Labels +- Massen-Stornierung + +### 13. Integration in Bestellverwaltung + +- DHL-Button in Bestelldetails +- Direkter Zugang zu Sendungsinformationen + +### 14. Status-Anzeige & Feedback + +- Alert-System für Erfolgsmeldungen/Fehler +- Real-time Status-Updates + +--- + +## Phase 3: Tracking und Retouren (5 Schritte) + +### 15. Tracking-System + +- `UpdateTrackingStatusJob` für automatische Updates +- Artisan Command `dhl:update-tracking` +- Scheduler-Integration + +### 16. Tracking-Anzeige + +- Tracking-Status im Cockpit +- Tracking-Details in Sendungsansicht +- Timeline-View für Sendungsverlauf + +### 17. Retouren-Management + +- Button "Retourenlabel erstellen" +- Retouren-Workflow im Admin +- Verknüpfung Original-Sendung ↔ Retoure + +### 18. Customer-Interface (Basic) + +- Einfache öffentliche Tracking-Seite +- Tracking-Nummer-Eingabe + +### 19. Notifications (Basic) + +- E-Mail bei Sendungserstellung +- E-Mail bei wichtigen Status-Änderungen + +--- + +## Phase 4: Finalisierung & Polish (4 Schritte) + +### 20. Performance-Optimierung + +- Eager Loading für Relationships +- Caching für häufige API-Abfragen +- Database-Indexe + +### 21. Comprehensive Testing + +- Integration-Tests für DHL SDK +- Browser-Tests für Admin-Interface +- Error-Scenario Tests + +### 22. Documentation + +- Benutzerhandbuch für Shop-Mitarbeiter +- Code-Dokumentation +- API-Dokumentation + +### 23. Production-Ready Features + +- Environment-spezifische Konfiguration +- Monitoring & Alerting +- Backup & Recovery-Konzept + +--- + +## Optionale Erweiterungen (Phase 2 des Projekts) + +### Advanced Features (später): + +- Separate `dhl_tracking_events` Tabelle für detaillierte Historie +- Excel/CSV Export von Sendungsdaten +- Webhook-Integration für automatische Updates +- SMS-Notifications +- Erweiterte Reporting-Features +- Multi-Tenant Support +- API für externe Systeme + +--- + +**Total: 23 konkrete Schritte** für ein vollständig funktionsfähiges DHL Versandmodul + +Dieser Plan fokussiert sich auf die Kernfunktionalitäten und liefert schnell ein nutzbares Ergebnis. diff --git a/dev/dhl-modul/README.md b/dev/dhl-modul/README.md new file mode 100644 index 00000000..3fcd1474 --- /dev/null +++ b/dev/dhl-modul/README.md @@ -0,0 +1,120 @@ +# DHL Versandmodul - Entwicklungsdokumentation + +## Projektübersicht + +Laravel 11 DHL Versandmodul als eigenständiges Paket mit direkter DHL API-Integration. + +## Architektur-Überarbeitungen ✅ + +**August 2025**: Wechsel von SDK-Ansatz zu eigenständigem Laravel-Paket + +### Grund für Überarbeitung + +- `christoph-schaeffer/dhl-business-shipping` SDK ist veraltet +- Probleme mit DHL-Login im alten SDK +- Bessere Kontrolle durch direkte API-Integration + +### Neue Architektur + +- **Eigenständiges Laravel-Paket**: `packages/acme-laravel-dhl` +- **Direkte DHL API**: HTTP-Client statt SDK-Wrapper +- **Vereinfachtes Schema**: Eine `dhl_package_shipments` Tabelle für Outbound/Returns +- **Moderne Laravel-Patterns**: Service Provider, Facades, Models + +## Aktueller Entwicklungsstand ✅ + +### Phase 1: Paket-Grundlagen (ABGESCHLOSSEN) + +- ✅ **Code Refactoring**: Services mit besserer Lesbarkeit +- ✅ **Datenbankschema**: Vereinfacht nach optimiertem Plan +- ✅ **Error Handling**: Umfassende Exception-Behandlung +- ✅ **Models**: DhlShipment + DhlTrackingEvent, inkl. Relationen +- ✅ **Services**: ShippingService, TrackingService, ReturnsService +- ✅ **HTTP-Client**: DhlClient mit Retry-Mechanismus + +### Phase 2: Integration (ABGESCHLOSSEN) + +- ✅ **Paket-Registration**: In Hauptprojekt eingebunden +- ✅ **API-Setup**: Credentials und Konfiguration +- ✅ **Admin-Controller**: Backend-Integration +- ✅ **Queue-Jobs**: Asynchrone Verarbeitung + +### Phase 3: Admin-Interface (TEILWEISE ABGESCHLOSSEN) + +- ✅ **DHL Cockpit**: Sendungsübersicht mit serverseitigem DataTables +- ✅ **Label-Management**: Download und Druck +- [ ] **Order-Integration**: DHL-Buttons in Bestellverwaltung + +### Phase 4: Advanced Features (NÄCHSTE SCHRITTE) + +- [ ] **Tracking-Automation**: Scheduler-Integration +- [ ] **Notifications**: E-Mail-Benachrichtigungen +- [ ] **Testing**: Unit/Feature Tests +- [ ] **Documentation**: Benutzerhandbuch + +## Optimierungen und Änderungen (Letzte Updates) + +- **Performance-Boost im Cockpit**: Die Sendungsübersicht wurde auf serverseitiges DataTables umgestellt, was die Ladezeiten bei großen Datenmengen drastisch reduziert. +- **Erweiterte Druckformate**: Das Modul unterstützt jetzt die Konfiguration von `print_format` und `retoure_print_format` via `.env` oder Admin-Einstellungen. Diese werden als Query-Parameter an die DHL API übergeben, um das physische Layout der Etiketten (z.B. A4, 910-300-700) zu steuern. +- **Speicherung des Routing-Codes**: Der `routing_code` (Leitcode) von DHL wird nun aus der API-Antwort extrahiert und in der Datenbank in der Spalte `dhl_package_shipments.routing_code` gespeichert. +- **API-Antwort-Parsing verbessert**: Die Logik wurde angepasst, um die Sendungsdaten korrekt aus dem `items`-Array der API-Antwort zu extrahieren. +- **Code optimiert**: Verbesserte Error-Handling, Logging in Services und Client. +- **Fehler behoben**: Namenskonflikte (Shipment -> DhlShipment), erweiterte Status-Mappings, robuste Validierungen. +- **Optionale Queues**: Konfiguriert via 'use_queue' in `config/dhl.php`. Synchron in Entwicklung, asynchron bei hoher Last. + +## Dateistruktur + +### Aktuelle Dokumentation + +- `AKTUALISIERUNG-PAKET-ANSATZ.md` - Überarbeitungsdetails +- `PLAN-OPTIMIERT.md` - Ursprünglicher Plan (aktualisiert) +- `PAKET-INSTALLATION.md` - Setup-Anleitung +- `OPTIMIERUNGEN.md` - Details zu früheren Optimierungen + +### Paket-Struktur + +``` +packages/acme-laravel-dhl/ +├── config/dhl.php # Konfiguration +├── database/migrations/ # Datenbankstruktur +├── src/ +│ ├── Services/ # Business Logic +│ ├── Models/ # Eloquent Models +│ ├── Support/ # HTTP Client +│ └── DhlServiceProvider.php # Laravel Integration +``` + +## Technische Highlights + +### Moderne Laravel-Integration + +- **PSR-4 Autoloading**: Sauberer Namespace +- **Service Provider**: Auto-Discovery Support +- **Facades**: `DHL::createLabel()` Syntax +- **Config Publishing**: `php artisan vendor:publish` + +### Robuste API-Integration + +- **Retry-Mechanismus**: 3 Versuche mit ansteigendem Delay +- **Timeout-Handling**: 30 Sekunden pro Request +- **HTTP-Status Mapping**: Spezifische Exceptions +- **Request/Response Logging**: Vollständige Nachverfolgung +- **Flexible API-Parameter**: Unterstützt Body-Payload und Query-Parameter bei POST-Requests. + +### Optimiertes Datenbankschema + +- **Eine Haupttabelle**: `dhl_package_shipments` für Outbound + Returns +- **Zusätzliche Felder**: `routing_code` für interne DHL-Logistik +- **Efficient Indexing**: Performance-optimiert +- **JSON-Felder**: Flexible API-Daten-Speicherung +- **Self-References**: Retour-Verknüpfungen + +## Nächste Schritte + +1. **Order-Integration** abschließen (Buttons in Bestelldetails). +2. **Tracking-Automatisierung** implementieren. +3. **Umfassende Tests** für die neuen Features schreiben. + +--- + +**Status**: Admin-Cockpit implementiert und performant, Kernfunktionalität stabil. diff --git a/dev/dhl-modul/SCHRITT-3-COMPLETED.md b/dev/dhl-modul/SCHRITT-3-COMPLETED.md new file mode 100644 index 00000000..dbc99cb7 --- /dev/null +++ b/dev/dhl-modul/SCHRITT-3-COMPLETED.md @@ -0,0 +1,136 @@ +# Schritt 3: Datenbank & Model - ABGESCHLOSSEN ✅ + +## Durchgeführte Arbeiten + +### 3.1 Migration für dhl_shipments Tabelle erstellt ✅ +- **File**: `database/migrations/2025_08_19_155158_create_dhl_shipments_table.php` +- **Status**: Erfolgreich migriert +- **Tabelle**: `dhl_shipments` + +#### Tabellenstruktur: +```sql +- id (bigint unsigned, Primary Key) +- shopping_order_id (int unsigned, Foreign Key -> shopping_orders.id) +- related_shipment_id (bigint unsigned, Self-Reference für Retouren) +- shipment_number (varchar, DHL Sendungsnummer) +- tracking_number (varchar, DHL Tracking-Nummer) +- type (enum: 'outbound', 'return') +- weight, length, width, height (Paketdaten) +- product_code (varchar, DHL Produktcode) +- services (json, Zusätzliche Services) +- label_path, label_format, label_printed (Label-Management) +- status (enum: created, submitted, in_transit, delivered, returned, cancelled, failed) +- tracking_status, tracking_details, last_tracked_at (Tracking) +- recipient_* (vollständige Empfängeradresse) +- api_request_data, api_response_data, api_errors (API Debugging) +- shipping_cost, currency (Kostenabrechnung) +- notes, metadata (Zusätzliche Daten) +- shipped_at, delivered_at (Timestamps) +- created_at, updated_at (Standard Laravel Timestamps) +``` + +#### Indizes: +- shopping_order_id (Performance) +- shipment_number (DHL Suche) +- tracking_number (Tracking-Suche) +- [type, status] (Kombiniert für Filter) +- created_at (Chronologische Sortierung) + +#### Foreign Key Constraints: +- shopping_order_id → shopping_orders.id (CASCADE DELETE) +- related_shipment_id → dhl_shipments.id (SET NULL) + +### 3.2 DhlShipment Model erstellt ✅ +- **File**: `app/Models/DhlShipment.php` +- **Status**: Vollständig implementiert +- **Namespace**: `App\Models\DhlShipment` + +#### Model Features: +- ✅ **Vollständige Eloquent Konfiguration** (fillable, casts, table) +- ✅ **Konstanten für Status und Typen** +- ✅ **Relationships**: belongsTo ShoppingOrder, self-reference für Retouren +- ✅ **Scopes**: outbound(), returns(), active(), trackable() +- ✅ **Helper Methods**: isOutbound(), isReturn(), canBeCancelled(), hasTracking(), hasLabel() +- ✅ **Accessors**: getRecipientAddressAttribute(), getDimensionsAttribute(), getStatusLabelAttribute() +- ✅ **Boot Method**: Setzt Default-Werte aus Konfiguration + +#### Konstanten: +```php +// Typen +const TYPE_OUTBOUND = 'outbound'; +const TYPE_RETURN = 'return'; + +// Status +const STATUS_CREATED = 'created'; +const STATUS_SUBMITTED = 'submitted'; +const STATUS_IN_TRANSIT = 'in_transit'; +const STATUS_DELIVERED = 'delivered'; +const STATUS_RETURNED = 'returned'; +const STATUS_CANCELLED = 'cancelled'; +const STATUS_FAILED = 'failed'; +``` + +### 3.3 ShoppingOrder Model erweitert ✅ +- **File**: `app/Models/ShoppingOrder.php` +- **Erweitert um DHL Relationships** + +#### Neue Methods: +```php +dhlShipments() // Alle DHL Sendungen +dhlOutboundShipments() // Nur Versand-Sendungen +dhlReturnShipments() // Nur Retour-Sendungen +hasDhlShipments(): bool // Prüft ob DHL Sendungen existieren +getLatestDhlShipment() // Neueste DHL Sendung +``` + +## Optimierungen implementiert + +### MVP-Fokus erreicht ✅ +- **Eine zentrale Tabelle** statt separater Tabellen für Retouren +- **Vollständige Empfängeradresse** in der Tabelle (kein Join nötig) +- **JSON-Felder** für flexible API-Daten und Services +- **Self-Reference** für Retouren über `related_shipment_id` + +### Performance optimiert ✅ +- **Strategische Indizes** für häufige Abfragen +- **Efficient Relationships** mit korrekten Foreign Key Typen +- **Scopes** für häufige Filter-Operationen +- **Casts** für automatische Datentyp-Konvertierung + +### Developer Experience ✅ +- **Ausführliche PHPDoc** für IDE-Support +- **Helper Methods** für Business Logic +- **Konstanten** statt Magic Strings +- **Accessors** für formatierte Ausgaben + +## Bugfixes durchgeführt ✅ +- **Foreign Key Type Mismatch** behoben: `unsignedInteger` statt `unsignedBigInteger` für shopping_order_id +- **Migration Konflikt** gelöst: Tabelle manuell entfernt und korrekt migriert + +## Verifikation ✅ +```bash +# Migration erfolgreich +php artisan migrate +# ✅ 2025_08_19_155158_create_dhl_shipments_table: 78.05ms DONE + +# Model lädt korrekt +php artisan tinker --execute="use App\Models\DhlShipment; echo DhlShipment::class;" +# ✅ App\Models\DhlShipment + +# Relationships funktionieren +php artisan tinker --execute="use App\Models\ShoppingOrder; ShoppingOrder::first()->dhlShipments()->count();" +# ✅ 0 (erwartungsgemäß, da noch keine DHL Shipments existieren) +``` + +## Nächste Schritte +- **Schritt 4**: Zentraler `DhlApiService` als Wrapper um das DHL SDK +- Integration der christoph-schaeffer/dhl-business-shipping Library +- Erste API-Verbindung und Test-Calls + +## Files Created/Modified +- ✅ `database/migrations/2025_08_19_155158_create_dhl_shipments_table.php` (neu) +- ✅ `app/Models/DhlShipment.php` (neu) +- ✅ `app/Models/ShoppingOrder.php` (erweitert) + +## Technical Debt: NONE ✨ +Alle Optimierungen erfolgreich implementiert, keine bekannten Probleme. \ No newline at end of file diff --git a/dev/dhl-modul/parcel-de-shipping-v2_2.yaml b/dev/dhl-modul/parcel-de-shipping-v2_2.yaml new file mode 100644 index 00000000..1656ffe8 --- /dev/null +++ b/dev/dhl-modul/parcel-de-shipping-v2_2.yaml @@ -0,0 +1,2273 @@ +openapi: 3.0.1 +info: + title: Parcel DE Shipping API (Post & Parcel Germany) + description: > + Note: This is the specification of the DPDHL Group Parcel DE Shipping API for Post & Parcel Germany. This REST web service allows business customers to create shipping labels on demand. + version: 2.1.13 +servers: + - url: https://api-eu.dhl.com/parcel/de/shipping/v2 + description: Productive Server + - url: https://api-sandbox.dhl.com/parcel/de/shipping/v2 + description: Sandbox Server + +tags: + - name: General + description: Get API version info + - name: Shipments and Labels + description: Order and retrieve shipment labels + - name: Manifests + description: Manifest shipments and retrieve daily manifest lists +paths: + /: + get: + tags: + - General + summary: Return API version + description: > + Returns the current version of the API as major.minor.patch. Furthermore, it will also return more details (semantic version number, revision, environment) of the API layer. + operationId: rootGet + security: [] # No auth + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/ServiceInformation' + '401': + $ref: '#/components/responses/Unauthorized' + '429': + $ref: '#/components/responses/TooManyRequests' + '500': + $ref: '#/components/responses/InternalServerError' + /labels: + get: + tags: + - Shipments and Labels + summary: Download PDF document + description: > + Public download URL for shipment labels and documents. The URL is provided in the response of the POST /orders or GET /orders resources. The document is identified via the token query parameter. There is no additional authorization, the resource URL can be shared. Please protect the URL as needed. The call returns a PDF label. + operationId: getLabel + security: [] # No auth + parameters: + - name: token + in: query + description: Identifies PDF document and requested print settings for download. + required: true + schema: + type: string + responses: + '200': + description: Returns PDF file + content: + application/pdf: + schema: + type: string + format: binary + '404': + $ref: '#/components/responses/Unauthorized' + '429': + $ref: '#/components/responses/TooManyRequests' + '500': + $ref: '#/components/responses/InternalServerError' + /manifests: + get: + tags: + - Manifests + summary: Retrieve daily manifest document + description: Return the manifest document for the specific date (abbreviated ISO8601 format YYYY-MM-DD). If no date is provided, the manifest for today will be returned. The manifest PDF document will list the shipments for your EKP, separated by billing numbers. Potentially, the document is large and response time will reflect this.
Additionally, the response contains a mapping of billing numbers to sheet numbers of the manifest and a mapping of shipment numbers to sheet numbers.
The call can be repeated as often as needed. Should a date be provided which is too old or lies within the future, HTTP 400 is returned. + operationId: getManifests + parameters: + - name: billingNumber + in: query + description: Customer billingNumber number. + required: false + schema: + type: string + - name: date + in: query + schema: + type: string + - name: includeDocs + in: query + description: |- + Legacy name **labelResponseType**. Shipping labels and further shipment documents can be: + * __include__: included as base64 encoded data in the response (default) + * __URL__: provided as URL reference. + Default is include the base64 encoded labels. + schema: + type: string + enum: + - include + - URL + default: include + - name: Accept-Language + in: header + description: Control the APIs response language via locale abbreviation. English (en-US) and german (de-DE) are supported. If not specified, the default is english. + schema: + type: string + example: de-DE + responses: + '200': + description: OK + content: + application/json: + schema: + $ref: '#/components/schemas/SingleManifestResponse' + application/problem+json: + schema: + $ref: '#/components/schemas/SingleManifestResponse' + '400': + $ref: '#/components/responses/BadRequest' + '401': + $ref: '#/components/responses/Unauthorized' + '404': + $ref: '#/components/responses/NotFound' + '429': + $ref: '#/components/responses/TooManyRequests' + '500': + $ref: '#/components/responses/InternalServerError' + post: + tags: + - Manifests + summary: Mark shipments as being ready for shipping + description: |- + Shipments are normally ''closed out'' at a fixed time of the day (such as 6 pm, configured by EKP/account) for the date provided as shipDate in the create call. +
This call allows forcing the closeout for sets of shipments earlier. This will also override the original shipDate. Afterwards, the shipment cannot be changed and the shipment labels cannot be queried anymore (however they may remain cached for limited duration). + Once a shipment has been closed, then calling closeout for the same shipment will result in a warning. The same warning will also be returned if the automatic closeout happened prior to the call. It is however possible to add new shipments, they will be manifested as well and be part of the day's manifest. +
Note on billing: The manifesting step has billing implications. Some products (Parcel International partially) are billed based on the shipment data available to DHL at the end of the day. All other products (including DHL Paket Standard) are billed based on production data. For more details, please contact your account representative. + + #### Request + It's changing the status of the shipment, so parameters are provided in the body or as query parameter. + * ''profile'' attribute (request body parameter) - defines the user group profile. A user group is permitted to specific billing numbers. Shipments are only closed out if they belong to a billing number that the user group profile is entitled to use. This attribute is mandatory. Please use the standard user group profile ''STANDARD_GRUPPENPROFIL'' if no dedicated user group profile is available. + * ''billingNumber'' attribute (query parameter) - defines the billing number for which shipments shall be closed out. If a billing number is set, then only the shipments of that billing number are closed out. In that case no list of specific shipment numbers needs to be passed. + * ''shipmentNumbers'' attribute (request body parameter) - lists the specific shipping numbers of the shipments that shall be closed out. + If all shipments shall be closed, the query parameter ''all'' needs to be set to ''true''. In that case neither a billing number nor a list of shipment numbers need to be passed in the request. + + #### Response + * Closing status for each shipment + operationId: manifestsPost + parameters: + - name: Accept-Language + in: header + description: Control the APIs response language via locale abbreviation. English (en-US) and german (de-DE) are supported. If not specified, the default is english. + schema: + type: string + example: de-DE + - name: all + in: query + description: Specify if all applicable shipments shall be marked as being ready for shipping. + schema: + type: boolean + default: false + requestBody: + description: Manifest request taking multiple input elements + content: + application/json: + schema: + $ref: '#/components/schemas/ShipmentManifestingRequest' + required: true + responses: + '207': + description: Response for manifesting request taking multiple input elements + content: + application/json: + schema: + $ref: '#/components/schemas/MultipleManifestResponse' + application/problem+json: + schema: + $ref: '#/components/schemas/MultipleManifestResponse' + '400': + $ref: '#/components/responses/BadRequest' + '401': + $ref: '#/components/responses/Unauthorized' + '429': + $ref: '#/components/responses/TooManyRequests' + '500': + $ref: '#/components/responses/InternalServerError' + /orders: + get: + tags: + - Shipments and Labels + summary: Retrieve shipment documents - labels and customs documents + description: |- + Returns documents for existing shipment(s). The call accepts multiple shipment numbers and will provide sets of documents for those. The **format (PDF,ZPL)** and **method of delivery (URL, encoded, data)** can be selected for **all** shipments and labels in that call. You cannot chose one format and delivery method for one label and different for another label within the same call. You can also specify if you want regular labels, return labels, cod labels, or customsDoc. Any combination is possible. + + The call returns for each shipment number the status indicator and the selected labels and documents. If a label type (for example a cod label) does not exist for a shipment, it will not be returned. This is not an error. If you were sending multiple shipments, you will get an HTTP 207 response (multistatus) with detailed status for each shipment. Other standard HTTP response codes (200, 400, 401, 429, 500) are possible as well. Labels can be either provided as part of the response (base64 encoded for PDF, text for ZPL) or via URL link for view and download (PDF). Note that the format settings per query parameters apply to the shipping label. Retoure label paper type can be specified separately since a different printer may be used here. If requesting labels to be returned as URL for separate download, the URLs provided can be shared. + operationId: getOrder + parameters: + - name: shipment + in: query + description: This parameter identifies shipments. The parameter can be used multiple times in one request to get the labels and/or documents for up to 30 shipments maximum. Only documents and label for shipments that are not yet closed can be retrieved. + required: true + schema: + type: array + items: + type: string + - name: Accept-Language + in: header + description: Control the APIs response language via locale abbreviation. English (en-US) and german (de-DE) are supported. If not specified, the default is english. + schema: + type: string + example: de-DE + - name: docFormat + in: query + description: '**Defines** the **printable** document format to be used for label and manifest documents.' + schema: + type: string + enum: + - ZPL2 + - PDF + default: PDF + - name: printFormat + in: query + description: "**Defines** the print medium for the shipping label. The different option vary from standard papersizes DIN A4 and DIN A5 to specific label print formats.\_\n\nSpecific laser print formats using DIN A5 blanks are:\n\n* 910-300-600(-oz) (105 x 205mm)\n* 910-300-300(-oz) (105 x 148mm)\n\nSpecific laser print formats **not** using a DIN A5 blank:\n\n* 910-300-610 (105 x 208mm)\n* 100x70mm\n\nSpecific thermal print formats:\n\n* 910-300-600 (103 x 199mm)\n* 910-300-400 (103 x 150mm)\n* 100x70mm\n\nPlease use the different formats as follows. If you do not set the parameter the settings of DHL costumer portal account will be used as default." + schema: + type: string + enum: + - A4 + - 910-300-600 + - 910-300-610 + - 910-300-700 + - 910-300-700-oz + - 910-300-710 + - 910-300-300 + - 910-300-300-oz + - 910-300-400 + - 910-300-410 + - 100x70mm + - name: retourePrintFormat + in: query + description: "**Defines** the print medium for the return shipping label. This parameter is only usable, if you do not use **combined printing**. The different option vary from standard papersizes DIN A4 and DIN A5 to specific label print formats.\_\n\nSpecific laser print formats using DIN A5 blanks are:\n\n* 910-300-600(-oz) (105 x 205mm)\n* 910-300-300(-oz) (105 x 148mm)\n\nSpecific laser print formats **not** using a DIN A5 blank:\n\n* 910-300-610 (105 x 208mm)\n* 100x70mm\n\nSpecific thermal print formats:\n\n* 910-300-600 (103 x 199mm)\n* 910-300-400 (103 x 150mm)\n* 100x70mm\n\nPlease use the different formats as follows. If you do not set the parameter the settings of DHL costumer portal account will be used as default." + schema: + type: string + enum: + - A4 + - 910-300-600 + - 910-300-610 + - 910-300-700 + - 910-300-700-oz + - 910-300-710 + - 910-300-300 + - 910-300-300-oz + - 910-300-400 + - 910-300-410 + - 100x70mm + - name: includeDocs + in: query + description: |- + Legacy name **labelResponseType**. Shipping labels and further shipment documents can be: + * __include__: included as base64 encoded data in the response (default) + * __URL__: provided as URL reference. + Default is include the base64 encoded labels. + schema: + type: string + enum: + - include + - URL + default: include + - name: combine + in: query + description: If set, label and return label for one shipment will be printed as single PDF document with possibly multiple pages. Else, those two labels come as separate documents. The option does not affect customs documents and COD labels. + schema: + type: boolean + default: true + responses: + '200': + description: Success response for requests with a single shipment. + content: + application/json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + '207': + description: Response for requests taking multiple input elements + content: + application/json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + application/problem+json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + '400': + $ref: '#/components/responses/BadRequest' + '401': + $ref: '#/components/responses/Unauthorized' + '404': + $ref: '#/components/responses/NotFound' + '429': + $ref: '#/components/responses/TooManyRequests' + '500': + $ref: '#/components/responses/InternalServerError' + post: + tags: + - Shipments and Labels + summary: 'Create one or more shipments and their documents. (This is the primary call of the API.)' + description: |- + This request is used to create one or more shipments and return corresponding shipment tracking numbers, labels, and documentation. Up to 30 shipments can be created in a single call. + #### Request + The selected products and corresponding billing numbers, as well as the desired services and package details are required to create a shipment. Each shipment can have a dedicated shipper address. The example request body contains sample values for most services. + #### Response + The request will return shipment tracking numbers and the applicable labels for each shipment. If multiple shipments have been included, an HTTP 207 response (multistatus) is returned and holds detailed status for each shipment. Other standard HTTP response codes (401, 500, 400, 200, 429) are possible, too. Labels can be either provided as part of the response (base64 encoded for PDF, text for ZPL) or via URL link for view and download. Note that the format settings per query parameters apply to the shipping label. It may also apply to other labels included, depending on the configuration of your account. Label paper for return shipments can be specified separately since a different printer may be used here. If requesting labels to be provided as URL for separate download, the URLs can be shared. + #### Validation + It is recommended to validate the request first prior to shipment creation by setting the `validate` query parameter to `true`. Especially, during development and test, it is recommended to perform this validation. This functionality supports both + * JSON schema validation (against this API description). During development and test, it is recommended to do this validation. JSON schema is available for local validation + * Dry run against the DHL backend + + If this succeeds, actual shipment creation will also succeed. + operationId: createOrders + parameters: + - name: Accept-Language + in: header + description: Control the APIs response language via locale abbreviation. English (en-US) and german (de-DE) are supported. If not specified, the default is english. + schema: + type: string + example: de-DE + - name: validate + in: query + description: |- + If provided and set to `true`, the input document will be: + * validated against JSON schema (/orders/ endpoint) at the API layer. In case of errors, HTTP 400 and details will be returned. + * validated against the DHL backend. + + In that case, no state changes are happening, no data is stored, shipments neither deleted nor created, no labels being returned. The call will return a status (200, 400) for each shipment element. + schema: + type: boolean + default: false + - name: mustEncode + in: query + description: Legacy name **printOnlyIfCodable**. If set to *true*, labels will only be created if an address is encodable. This is only relevant for German consignee addresses. If set to false or left out, addresses, that are not encodable will be printed even though you receive a warning. + schema: + type: boolean + default: false + - name: includeDocs + in: query + description: |- + Legacy name **labelResponseType**. Shipping labels and further shipment documents can be: + * __include__: included as base64 encoded data in the response (default) + * __URL__: provided as URL reference. + schema: + type: string + enum: + - include + - URL + default: include + - name: docFormat + in: query + description: |- + **Defines** the **printable** document format to be used for label and manifest documents. + schema: + type: string + enum: + - ZPL2 + - PDF + default: PDF + - name: printFormat + in: query + description: |- + **Defines** the print medium for the shipping label. The different option vary from standard paper sizes DIN A4 and DIN A5 to specific label print formats. + + Specific laser print formats using DIN A5 blanks are: + * 910-300-600(-oz) (105 x 205mm) + * 910-300-300(-oz) (105 x 148mm) + + Specific laser print formats **not** using a DIN A5 blank: + * 910-300-610 (105 x 208mm) + * 100x70mm + + Specific thermal print formats: + * 910-300-600 (103 x 199mm) + * 910-300-400 (103 x 150mm) + * 100x70mm + + Please use the different formats as follows. If you do not set the parameter the settings of DHL costumer portal account will be used as default. + schema: + type: string + enum: + - A4 + - 910-300-600 + - 910-300-610 + - 910-300-700 + - 910-300-700-oz + - 910-300-710 + - 910-300-300 + - 910-300-300-oz + - 910-300-400 + - 910-300-410 + - 100x70mm + - name: retourePrintFormat + in: query + description: |- + **Defines** the print medium for the return shipping label. This parameter is only usable, if you do not use **combined printing**. The different option vary from standard paper sizes DIN A4 and DIN A5 to specific label print formats. + + Specific laser print formats using DIN A5 blanks are: + * 910-300-600(-oz) (105 x 205mm) + * 910-300-300(-oz) (105 x 148mm) + + Specific laser print formats **not** using a DIN A5 blank: + * 910-300-610 (105 x 208mm) + * 100x70mm + + Specific thermal print formats: + * 910-300-600 (103 x 199mm) + * 910-300-400 (103 x 150mm) + * 100x70mm + + Please use the different formats as follows. If you do not set the parameter the settings of DHL costumer portal account will be used as default. + schema: + type: string + enum: + - A4 + - 910-300-600 + - 910-300-610 + - 910-300-700 + - 910-300-700-oz + - 910-300-710 + - 910-300-300 + - 910-300-300-oz + - 910-300-400 + - 910-300-410 + - 100x70mm + - name: combine + in: query + description: If set, label and return label for one shipment will be printed as single PDF document with possibly multiple pages. Else, those two labels come as separate documents. The option does not affect customs documents and COD labels. + schema: + type: boolean + default: true + requestBody: + description: Shipment order request. + content: + application/json: + schema: + $ref: '#/components/schemas/ShipmentOrderRequest' + examples: + DHLPaket: + $ref: '#/components/examples/DHLPaket' + DHLPaketInternational: + $ref: '#/components/examples/DHLPaketInternational' + DHLPaketInternationalWithCustoms: + $ref: '#/components/examples/DHLPaketInternationalWithCustoms' + DHLKleinpaket: + $ref: '#/components/examples/DHLKleinpaket' + WarenpostInternationalWithCustoms: + $ref: '#/components/examples/WarenpostInternationalWithCustoms' + required: true + responses: + '200': + description: Success response for requests with a single shipment. + content: + application/json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + application/problem+json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + '207': + description: Response for requests taking multiple input elements + content: + application/json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + application/problem+json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + '400': + $ref: '#/components/responses/BadRequest' + '401': + $ref: '#/components/responses/Unauthorized' + '429': + $ref: '#/components/responses/TooManyRequests' + '500': + $ref: '#/components/responses/InternalServerError' + delete: + tags: + - Shipments and Labels + summary: Delete one or more shipments + description: 'Delete one or more shipments created earlier. Deletion of shipments is only possible prior to them being manifested (closed out, ''Tagesabschluss''). The call will return HTTP 200 (single shipment) or 207 on success, with individual status elements for each shipment. Individual status elements are HTTP 200, 400. 400 will be returned when shipment does not exist (or was already deleted).' + operationId: ordersAccountDelete + parameters: + - name: Accept-Language + in: header + description: Control the APIs response language via locale abbreviation. English (en-US) and german (de-DE) are supported. If not specified, the default is english. + schema: + type: string + example: de-DE + - name: profile + in: query + required: true + description: 'Defines the user group profile. A user group is permitted to specific billing numbers. Shipments are only canceled if they belong to a billing number that the user group profile is entitled to use. This attribute is mandatory. Please use the standard user group profile ''STANDARD_GRUPPENPROFIL'' if no dedicated user group profile is available.' + schema: + type: string + example: 'STANDARD_GRUPPENPROFIL' + - name: shipment + required: true + in: query + description: Shipment number that shall be canceled. If multiple shipments shall be canceled, the parameter must be added multiple times. Up to 30 shipments can be canceled at once. + schema: + type: string + example: '123456789' + responses: + '200': + description: Response for requests with a single element + content: + application/json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + application/problem+json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + '207': + description: Response for requests taking multiple input elements + content: + application/json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + application/problem+json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + '400': + $ref: '#/components/responses/BadRequest' + '401': + $ref: '#/components/responses/Unauthorized' + '429': + $ref: '#/components/responses/TooManyRequests' + '500': + $ref: '#/components/responses/InternalServerError' +components: + schemas: + ServiceInformation: + type: object + description: Response for the API version endpoint detailing version information. + properties: + amp: + type: object + properties: + name: + type: string + description: name of api + example: pp-parcel-shipping-native + env: + type: string + description: environment + example: sandbox + version: + type: string + description: version of api + example: v2.0.4 + rev: + type: string + description: revision + example: 22 + backend: + type: object + properties: + env: + type: string + description: environment + example: sandbox + version: + type: string + description: version of backend + example: v2.1.0 + + Document: + type: object + properties: + b64: + type: string + description: The Base64 encoded byte stream + zpl2: + type: string + description: The document in zpl encoding + url: + type: string + description: URL reference to download document + example: www.dhl.de/download/myobscurelink?label.png + fileFormat: + type: string + description: format of the encoded bytes + example: PDF + enum: + - ZPL2 + - PDF + printFormat: + type: string + description: The print format used. Customs documents and cash on delivery documents can only be returned in format A4. + example: 910-300-700 + enum: + - A4-PT + - A4 + - 910-300-700 + - 910-300-700-oZ/oz + - 910-300-300 + - 910-300-300-oz + - 910-300-710 + - 910-300-600/610 + - 910-300-400/410 + - 100x70mm + description: 'Encoded document. All types of labels and documents.' + RequestStatus: + type: object + description: General status description for the attached response or response item. + required: + - statusCode + - title + properties: + title: + type: string + example: ok + statusCode: + description: The status code of the response. Usually, but not necessarliy the HTTP status code. Same as attribut "status" but deprecated. Do not use. Will be removed in the next major version. + type: integer + format: int32 + example: 200 + status: + description: The status code of the response. Usually, but not necessarliy the HTTP status code. + type: integer + format: int32 + example: 200 + instance: + type: string + description: A URI reference that identifies the specific occurrence of the problem. + detail: + maxLength: 80 + minLength: 0 + type: string + example: The Webservice call ran successfully. + LabelDataResponse: + type: object + properties: + status: + $ref: '#/components/schemas/RequestStatus' + items: + type: array + description: If the request contains a multi element array (e.g. multiple shipments), then the order of the items in the response corresponds to the order of the items in the request. For consistency, if the request contains only one item then the response contains a single element array. + example: + - shipmentNo: 340434310428091700 + routingCode: 40327653113+99000943058020 + sstatus: + title: OK + status: 200 + label: + url: https://api-dev.dhl.com/parcel/de/shipping/v1-feature-order-endpoint/labels?token=x5xzrHE7ctmqPqk33k%2BKkBwbvIfYP4elMQsBFM%2BJOdiT2bmoaXXzris%2Ftz9jBtdVFLY5cCENit0Jnd9aXuxoNEXhP9PQ8tAVdPeXD26RZ6JZqF5NCJlrihrAv1%2FAOzuDPqWJLRVaRq461BpT4bcbzChAAHVg%2FHUaQAkeIkaZ8NqfcxWEQzK1AYJWczpy6sv6 + format: PDF + items: + $ref: '#/components/schemas/ResponseItem' + ResponseItem: + required: + - sstatus + type: object + properties: + shipmentNo: + maxLength: 50 + minLength: 0 + type: string + routingCode: + maxLength: 35 + minLength: 0 + type: string + description: Routing code of the consignee address + returnRoutingCode: + maxLength: 35 + minLength: 0 + type: string + description: Routing code of the return address + returnShipmentNo: + maxLength: 50 + minLength: 0 + type: string + sstatus: + $ref: '#/components/schemas/RequestStatus' + shipmentRefNo: + maxLength: 50 + minLength: 6 + type: string + label: + $ref: '#/components/schemas/Document' + returnLabel: + $ref: '#/components/schemas/Document' + customsDoc: + $ref: '#/components/schemas/Document' + codLabel: + $ref: '#/components/schemas/Document' + validationMessages: + type: array + description: Optional validation messages attached to the shipment. + items: + $ref: '#/components/schemas/ValidationMessageItem' + description: Response for a single shipment containing status, numbers and labels + example: + - shipmentNo: 340434310428091700 + routingCode: 40327653113+99000943058020 + sstatus: + title: OK + status: 200 + label: + url: https://api-dev.dhl.com/parcel/de/shipping/v1-feature-order-endpoint/labels?token=x5xzrHE7ctmqPqk33k%2BKkBwbvIfYP4elMQsBFM%2BJOdiT2bmoaXXzris%2Ftz9jBtdVFLY5cCENit0Jnd9aXuxoNEXhP9PQ8tAVdPeXD26RZ6JZqF5NCJlrihrAv1%2FAOzuDPqWJLRVaRq461BpT4bcbzChAAHVg%2FHUaQAkeIkaZ8NqfcxWEQzK1AYJWczpy6sv6 + format: PDF + ValidationMessageItem: + type: object + properties: + property: + type: string + description: The property that is affected by the validation message. + example: dimension.weight + validationMessage: + type: string + description: The validation message describing the error. + example: The weight is too high + validationState: + type: string + description: The validation state resulting from the error. + example: Error + description: Representation of a validation message of a shipment container containing the most important information. + SingleManifestResponse: + type: object + properties: + status: + $ref: '#/components/schemas/RequestStatus' + manifestDate: + type: string + manifest: + type: array + items: + $ref: '#/components/schemas/Document' + sheetNo: + type: array + items: + $ref: '#/components/schemas/BillingNoToSheetNo' + items: + type: array + items: + $ref: '#/components/schemas/ShipmentNoToSheetNo' + BillingNoToSheetNo: + type: object + properties: + billingNumber: + type: string + sheetNo: + type: string + description: Mapping between billing number and sheet number + ShipmentNoToSheetNo: + type: object + properties: + shipmentNo: + type: string + sheetNo: + type: string + sstatus: + $ref: '#/components/schemas/RequestStatus' + description: Mapping between shipment number and sheet number + MultipleManifestResponse: + type: object + properties: + status: + $ref: '#/components/schemas/RequestStatus' + items: + type: array + items: + $ref: '#/components/schemas/ShortResponseItem' + description: Response of the POST /manifests endpoint containing an overall request status and detailed shipment status. + ShortResponseItem: + required: + - sstatus + type: object + properties: + shipmentNo: + maxLength: 50 + minLength: 0 + type: string + example: '340434310428091700' + sstatus: + $ref: '#/components/schemas/RequestStatus' + description: Response for a single shipment element not containing labels. + ShipmentManifestingRequest: + required: + - profile + type: object + properties: + profile: + maxLength: 35 + minLength: 0 + type: string + shipmentNumbers: + maxItems: 30 + minItems: 1 + type: array + description: List of shipment IDs for manifesting. + items: + type: string + billingNumber: + type: string + description: Customer billingNumber number. + description: List of shipments which shall be manifested. + BankAccount: + required: + - accountHolder + - iban + type: object + properties: + accountHolder: + maxLength: 80 + minLength: 0 + type: string + example: John D. Rockefeller + bankName: + maxLength: 80 + minLength: 0 + type: string + example: The Iron Bank, Braavos + iban: + pattern: '[A-Z]{2,2}[0-9]{2,2}[a-zA-Z0-9]{1,30}' + type: string + example: DE02100100100006820101 + bic: + pattern: '[a-zA-Z0-9]{8,11}' + type: string + example: DEUTDEFFXXX + description: Bank account data used for CoD (Cash on Delivery). + Commodity: + required: + - itemDescription + - itemValue + - itemWeight + - packagedQuantity + type: object + properties: + itemDescription: + maxLength: 256 + minLength: 1 + type: string + example: T-Shirt Boys size 164 yellow + description: A text that describes the commodity item. Only the first 50 characters of the description text is printed on the customs declaration form CN23. + countryOfOrigin: + $ref: '#/components/schemas/Country' + hsCode: + maxLength: 11 + minLength: 6 + type: string + description: Harmonized System Code aka Customs tariff number. + example: '61099090' + packagedQuantity: + type: integer + description: How many items of that type are in the package + format: int32 + example: 1 + itemValue: + $ref: '#/components/schemas/Value' + itemWeight: + $ref: '#/components/schemas/Weight' + description: |- + Commodity line item (e.g. a t-shirt) for international shipments which require individual listing of goods. Each good must contain a description of the item, the amount of the item, the net weight of one single item and the value of one single item. If you ship 5 t-shirts, you need to include the weight and value of one single shirt. The correct final weight and value will be calculated automatically. + The HS Code and the country of origin are optional. + example: + - itemDescription: T-Shirt + hscode: '61099090' + countryOfOrigin: DE + packagedQuantity: 3 + - itemDescription: Book + hscode: '49019900' + packagedQuantity: 1 + Consignee: + type: object + description: Consignee address information. Either a doorstep address (contact address) including contact information or a droppoint address. One of packstation (parcel locker), or post office (postfiliale/retail shop). + oneOf: + - $ref: '#/components/schemas/ContactAddress' + - $ref: '#/components/schemas/Locker' + - $ref: '#/components/schemas/PostOffice' + - $ref: '#/components/schemas/POBox' + ContactAddress: + required: + - addressStreet + - city + - country + - name1 + type: object + properties: + name1: + maxLength: 50 + minLength: 1 + type: string + description: Name1. Line 1 of name information + example: Blumen Krause + name2: + maxLength: 50 + minLength: 1 + type: string + description: An optional, additional line of name information + example: To the attention of Erna. + name3: + maxLength: 50 + minLength: 1 + type: string + description: An optional, additional line of name information + example: Backdrawer all the way back. + dispatchingInformation: + maxLength: 35 + minLength: 1 + type: string + description: An optional, additional line of address. It is printed on the shipping label for international shipments to the following countries only BEL, CZE, NLD. It is positioned below name3 on the label. + example: PO Box, bpack 24/7 + addressStreet: + maxLength: 50 + minLength: 1 + type: string + description: Line 1 of the street address. This is just the street name. Can also include house number. + example: Hauptstrasse + addressHouse: + maxLength: 10 + minLength: 1 + type: string + description: Line 1 of the street address. This is just the house number. Can be added to street name instead. + example: 1a + additionalAddressInformation1: + maxLength: 60 + minLength: 1 + type: string + description: Additional information that is positioned either behind or below addressStreet on international shipment labels. Where exactly it is printed on the label depends on the country. + example: 3. Etage + additionalAddressInformation2: + maxLength: 60 + minLength: 1 + type: string + description: Additional information that is positioned either behind or below addressStreet on international shipment labels. It is printed on shipping labels to the following countries only AUT, CHN, DNK, GBR, HRV, LTU, PRT, ROU, RUS. Where exactly it is printed on the label depends on the country. + example: Apartment 12 + postalCode: + maxLength: 10 + minLength: 3 + pattern: ^[0-9A-Za-z]+([ -]?[0-9A-Za-z]+)*$ + type: string + description: Mandatory for all countries but Ireland that use a postal code system. + example: '53113' + city: + maxLength: 40 + minLength: 1 + type: string + description: city + example: Berlin + state: + maxLength: 20 + minLength: 1 + type: string + description: State, province or territory. For the USA please use the official regional ISO-Codes, e.g. US-AL. + example: NRW + country: + $ref: '#/components/schemas/Country' + contactName: + maxLength: 80 + minLength: 3 + type: string + description: optional contact name. (this is not the primary name printed on label) + example: Konrad Kontaktmann + phone: + maxLength: 20 + minLength: 1 + type: string + description: Please note that, in accordance with Art. 4 No. 11 GDPR, you must obtain the recipient's consent to forward their phone number to Deutsche Post DHL Group. For shipments within Germany, the phone number cannot be transmitted. In some countries the provision of a telephone number and/or e-mail address is mandatory for a delivery to a droppoint. If your recipient has objected to the disclosure of their telephone number and/or e-mail address, the shipment can only be delivered in these countries using the service Premium. + example: +49 170 1234567 + email: + maxLength: 80 + minLength: 3 + type: string + description: "Please note that, in accordance with Art. 4 No. 11 GDPR, you must obtain the recipient's consent to forward their e-mail address to Deutsche Post DHL Group.\_For shipments within Germany, the e-mail address is used to send a DHL Parcel Notification to the recipient. The e-mail address is not mandatory for shipments within Germany. In some countries the provision of a telephone number and/or e-mail address is mandatory for a delivery to a droppoint. If your recipient has objected to the disclosure of their telephone number and/or e-mail address, the shipment can only be delivered in these countries using the service Premium." + example: mustermann@example.com + description: Combines name, address, contact information. The recommended way is to use the mandatory attribute addressStreet and submit the streetname and housenumber together – alternatively addressHouse + addressStreet can be used. For many international addresses there is no house number, please do not set a period or any other sign to indicate that the address does not have a housenumber. + CustomsDetails: + required: + - exportType + - postalCharges + - items + type: object + properties: + invoiceNo: + maxLength: 35 + minLength: 0 + type: string + description: Invoice number + exportType: + type: string + description: This contains the category of goods contained in parcel. + enum: + - OTHER + - PRESENT + - COMMERCIAL_SAMPLE + - DOCUMENT + - RETURN_OF_GOODS + - COMMERCIAL_GOODS + exportDescription: + maxLength: 80 + minLength: 0 + type: string + description: Mandatory if exporttype is 'OTHER' + example: Detailed description for OTHER goods. + shippingConditions: + type: string + description: Aka 'Terms of Trade' aka 'Frankatur'. The attribute is exclusively used for the product Europaket (V54EPAK). DDU is deprecated (use DAP instead). + enum: + - DAP + - DDP + permitNo: + maxLength: 30 + minLength: 0 + type: string + description: Permit number. Very rarely needed. Mostly relevant for higher value goods. An example use case would be an item made from crocodile leather which requires dedicated license / permit identified by that number. + attestationNo: + maxLength: 30 + minLength: 0 + type: string + description: Attest or certification identified by this number. Very rarely needed. An example use case would be a medical shipment referring to an attestation that a certain amount of medicine may be imported within e.g. the current quarter of the year. + hasElectronicExportNotification: + type: boolean + description: flag confirming whether electronic record for export was made + MRN: + type: string + maxLength: 18 + example: "abcd1234567890" + postalCharges: + allOf: + - $ref: '#/components/schemas/Value' + description: Postal charges that have been charged to the recipient. The information must match the information on the invoice. Postal charges are added to the customs value which is the basis for the calculation of import duties. Since 1.1.2021 this information is mandatory according to requirements of the Universal Postal Union. The currency of the postal charges is used throughout the customs declaration form. The currency details of the individual goods items and the currency of the postal charges must match. Otherwise no shipping label will be created. + officeOfOrigin: + maxLength: 35 + minLength: 0 + type: string + description: Deprecated (do not use anymore). Will appear on CN23. + shipperCustomsRef: + description: "Optional. The customs reference is used by customs authorities to identify economics operators an/or other persons involved. With the given reference, granted authorizations and/or relevant processes in customs clearance an/or taxation can be taken into account. Aka Zoll-Nummer or EORI-Number but dependent on destination." + type: string + maxLength: 35 + example: "DE73282932000074" + consigneeCustomsRef: + description: "Optional. The customs reference is used by customs authorities to identify economics operators an/or other persons involved. With the given reference, granted authorizations and/or relevant processes in customs clearance an/or taxation can be taken into account. Aka Zoll-Nummer or EORI-Number but dependent on destination." + type: string + maxLength: 35 + example: "GB73282932000074" + items: + maxItems: 99 + minItems: 1 + type: array + description: Commodity types in that package + example: + - itemDescription: T-Shirt + hscode: '61099090' + countryOfOrigin: DE + packagedQuantity: 3 + - itemDescription: Book + hscode: '49019900' + packagedQuantity: 1 + items: + $ref: '#/components/schemas/Commodity' + description: For international shipments, this section contains information necessary for customs about the exported goods. ExportDocument can contain one or more positions as child element. This data is also transferred as electronic declaration to customs. The custom details are mandatory depending on whether the parcel will go to a country outside the European Customs Union. For DHL Parcel International (V53WPAK) CN23 will returned as a separate document, while for Warenpost International the customs information will be printed onto the shipment label (CN22). + Dimensions: + required: + - height + - length + - uom + - width + type: object + properties: + uom: + type: string + description: Unit of metric, applies to all dimensions contained. + example: cm + enum: + - cm + - mm + height: + type: integer + format: int32 + example: 10 + length: + type: integer + format: int32 + example: 20 + width: + type: integer + format: int32 + example: 15 + description: Physical dimensions (aka 'Gurtmass') of the parcel. If you provide the dimension information, all attributes need to be provided. You cannot provide just the height, for example. If you provide length, width, and height in millimeters, they will be rounded to full cm. + Locker: + required: + - city + - lockerID + - name + - postNumber + - postalCode + type: object + properties: + name: + maxLength: 50 + minLength: 1 + type: string + description: Name + example: Paula Packstation + lockerID: + maximum: 999 + minimum: 100 + type: integer + description: Packstationnummer. Three digit number identifying the parcel locker in conjunction with city and postal code + format: int32 + example: 118 + postNumber: + pattern: ^[0-9]{6,10}$ + type: string + description: postNumber (Postnummer) is the official account number a private DHL Customer gets upon registration. + city: + maxLength: 40 + minLength: 0 + type: string + description: City where the locker is located + example: Berlin + country: + $ref: '#/components/schemas/Country' + postalCode: + maxLength: 10 + minLength: 3 + pattern: ^[0-9A-Za-z]+([ -]?[0-9A-Za-z]+)*$ + type: string + description: Only usable for German Packstation, international lockers cannot be addressed directly. If your customer wishes for international delivery to a droppoint, please use DHL Parcel International (V53WPAK) with the delivery type "Closest Droppoint". + PostOffice: + required: + - city + - name + - postalCode + - retailID + type: object + properties: + name: + maxLength: 50 + minLength: 1 + type: string + description: Name + example: Fritz Filialabholer + retailID: + maximum: 999 + minimum: 401 + type: integer + description: Id or Number of Post office / Filiale / outlet / parcel shop + format: int32 + example: 518 + postNumber: + maxLength: 10 + minLength: 3 + pattern: ^[0-9]{6,10}$ + type: string + description: postNumber (Postnummer) is the official account number a private DHL Customer gets upon registration. To address a post office or retail outlet directly, either the post number or e-mail address of the consignee is needed. + email: + maxLength: 80 + minLength: 3 + type: string + description: Email address of the consignee. To address a post office or retail outlet directly, either the post number or e-mail address of the consignee is needed. + example: mustermann@example.com + city: + maxLength: 80 + minLength: 0 + type: string + description: City where the retail location is + example: Berlin + country: + $ref: '#/components/schemas/Country' + postalCode: + maxLength: 10 + minLength: 3 + pattern: ^[0-9A-Za-z]+([ -]?[0-9A-Za-z]+)*$ + type: string + description: Only usable for German post offices or retail outlets (Paketshops), international postOffices or retail outlets cannot be addressed directly. If your customer wishes for international delivery to a droppoint, please use DHL Parcel International (V53WPAK) with the delivery type "Closest Droppoint". + POBox: + required: + - name1 + - poBoxID + - city + - postalCode + type: object + properties: + name1: + maxLength: 50 + minLength: 1 + type: string + description: Name1. Line 1 of name information + example: Joe Black + name2: + maxLength: 50 + minLength: 1 + type: string + description: An optional, additional line of name information + example: To the attention of Mr. Black. + name3: + maxLength: 50 + minLength: 1 + type: string + description: An optional, additional line of name information + example: Backdrawer all the way back. + poBoxID: + type: integer + format: int32 + description: Number of P.O. Box (Postfach) + email: + maxLength: 80 + minLength: 3 + type: string + description: Email address of the consignee + city: + maxLength: 80 + minLength: 0 + type: string + description: City of the P.O. Box (Postfach) location + example: Berlin + country: + $ref: '#/components/schemas/Country' + postalCode: + maxLength: 10 + minLength: 3 + pattern: ^[0-9A-Za-z]+([ -]?[0-9A-Za-z]+)*$ + type: string + description: Postal code of the P.O. Box (Postfach) location + description: Alternative destination - P.O. Box (Postfach) + Product: + type: string + description: |- + Determines the DHL Paket product to be used. + + * V01PAK: DHL PAKET; + * V53WPAK: DHL PAKET International; + * V54EPAK: DHL Europaket; + * V62WP: Warenpost (will be replaced by DHL Kleinpaket from 1.1.2025); + * V62KP: DHL Kleinpaket; + * V66WPI: Warenpost International + example: V01PAK + enum: + - V01PAK + - V53WPAK + - V54EPAK + - V62WP + - V62KP + - V66WPI + Shipment: + type: object + properties: + product: + $ref: '#/components/schemas/Product' + billingNumber: + pattern: \w{10}\d{2}\w{2} + type: string + description: 14 digit long number that identifies the contract the shipment is booked on. Please note that in rare cases the last to characters can be letters. Digit 11 and digit 12 must correspondent to the number of the product, e.g. 333333333301tt can only be used for the product V01PAK (DHL Paket). + example: 33333333330101 or 333333333362aa + refNo: + maxLength: 35 + minLength: 8 + type: string + description: A reference number that the user can assign for better association purposes. It appears on shipment labels. To use the reference number for tracking purposes, it should be at least 8 characters long and unique. + costCenter: + maxLength: 50 + type: string + description: Textfield that appears on the shipment label. It cannot be used to search for the shipment. + creationSoftware: + type: string + description: Is only to be indicated by DHL partners. + shipDate: + type: string + description: 'Date the shipment is transferred to DHL. The shipment date can be the current date or a date up to a few days in the future. It must not be in the past. Iso format required: yyyy-mm-dd. On the shipment date the shipment will be automatically closed at your end of day closing time.' + format: date + shipper: + description: Shipper information, including contact information and address. Alternatively, a predefined shipper reference can be used. + oneOf: + - $ref: '#/components/schemas/Shipper' + - $ref: '#/components/schemas/ShipperReference' + consignee: + $ref: '#/components/schemas/Consignee' + details: + $ref: '#/components/schemas/ShipmentDetails' + services: + $ref: '#/components/schemas/VAS' + customs: + $ref: '#/components/schemas/CustomsDetails' + description: Container for all shipments. Mixed shipment products per request are supported. Each shipment has a dedicated shipper address (or shipper reference, or both). + ShipmentDetails: + required: + - weight + type: object + properties: + dim: + $ref: '#/components/schemas/Dimensions' + weight: + $ref: '#/components/schemas/Weight' + description: Details for the shipment, such as dimensions, content + ShipmentOrderRequest: + required: + - profile + - shipments + type: object + properties: + profile: + maxLength: 35 + minLength: 0 + type: string + shipments: + maxItems: 30 + minItems: 1 + type: array + description: Shipment array having details for each shipment. + items: + $ref: '#/components/schemas/Shipment' + description: Complex request structure used to create, update, and validate shipment data. Note that most elements are part of the array of shipment items. + Shipper: + type: object + description: Shipper information, including contact information and address. + required: + - addressStreet + - city + - country + - name1 + properties: + name1: + maxLength: 50 + minLength: 1 + type: string + description: Name1. Line 1 of name information + example: Blumen Krause + name2: + maxLength: 50 + minLength: 1 + type: string + description: An optional, additional line of name information + example: To the attention of Erna. + name3: + maxLength: 50 + minLength: 1 + type: string + description: An optional, additional line of name information + example: Backdrawer all the way back. + addressStreet: + maxLength: 50 + minLength: 1 + type: string + description: Line 1 of the street address. This is just the street name. Can also include house number. + example: Hauptstrasse + addressHouse: + maxLength: 10 + minLength: 1 + type: string + description: Line 1 of the street address. This is just the house number. Can be added to street name instead. + example: 1a + postalCode: + maxLength: 10 + minLength: 3 + pattern: ^[0-9A-Za-z]+([ -]?[0-9A-Za-z]+)*$ + type: string + description: Mandatory for all countries but Ireland that use a postal code system. + example: '53113' + city: + maxLength: 40 + minLength: 1 + type: string + description: city + example: Berlin + country: + $ref: '#/components/schemas/Country' + contactName: + maxLength: 80 + minLength: 3 + type: string + description: optional contact name. (this is not the primary name printed on label) + example: Konrad Kontaktmann + email: + maxLength: 80 + minLength: 3 + type: string + description: Optional contact email address of the shipper + example: mustermann@example.com + ShipperReference: + type: object + description: Contains a reference to the Shipper data configured in GKP(Geschäftskundenportal - Business Costumer Portal). Can be used instead of a detailed shipper address. The shipper reference can be used to print a company logo which is configured in GKP onto the label. + required: + - shipperRef + properties: + shipperRef: + maxLength: 50 + minLength: 0 + type: string + description: Reference string to the shipper data configured in GKP(Geschäftskundenportal - Business Costumer Portal). + VAS: + type: object + properties: + preferredNeighbour: + maxLength: 100 + minLength: 0 + type: string + description: Preferred neighbour. Can be specified as text. + example: Please ring at Meier next door + preferredLocation: + maxLength: 100 + minLength: 0 + type: string + description: Preferred location. Can be specified as text. + example: Please leave in carport + visualCheckOfAge: + pattern: A16|A18 + type: string + description: if used it will trigger checking the age of recipient + example: A18 + enum: + - A16 + - A18 + namedPersonOnly: + type: boolean + description: Delivery can only be signed for by yourself personally. + example: true + identCheck: + $ref: '#/components/schemas/VASIdentCheck' + signedForByRecipient: + type: boolean + description: Delivery must be signed for by the recipient and not by DHL staff + example: true + endorsement: + type: string + description: Instructions and endorsement how to treat international undeliverable shipment. By default, shipments are returned if undeliverable. There are country specific rules whether the shipment is returned immediately or after a grace period. + example: RETURN + enum: + - RETURN + - ABANDON + preferredDay: + type: string + description: Preferred day of delivery in format YYYY-MM-DD. Shipper can request a preferred day of delivery. The preferred day should be between 2 and 6 working days after handover to DHL. + format: date + noNeighbourDelivery: + type: boolean + description: Delivery can only be signed for by yourself personally or by members of your household. + example: true + additionalInsurance: + $ref: '#/components/schemas/Value' + bulkyGoods: + type: boolean + description: Leaving this out is same as setting to false. Sperrgut. + example: true + cashOnDelivery: + $ref: '#/components/schemas/VASCashOnDelivery' + individualSenderRequirement: + pattern: '[a-zA-Z0-9]{2}' + type: string + description: Special instructions for delivery. 2 character code, possible values agreed in contract. + example: ZZ + premium: + type: boolean + description: 'Choice of premium vs economy parcel. Availability is country dependent and may be manipulated by DHL if choice is not available. Please review the label.' + example: true + closestDropPoint: + type: boolean + description: 'Closest Droppoint Delivery to the droppoint closest to the address of the recipient of the shipment. For this kind of delivery either the phone number and/or the e-mail address of the receiver is mandatory. For shipments using DHL Paket International it is recommended that you choose one of the three delivery types: Economy, Premium, CDP. Otherwise, the current default for the receiver country will be picked.' + example: true + parcelOutletRouting: + type: string + description: 'Undeliverable domestic shipment can be forwarded and held at retail. Notification to email (fallback: consignee email) will be used.' + example: max.mustermann@example.com + goGreenPlus: + type: boolean + description: 'GoGreen Plus enables sustainable shipping by investing in measures to reduce greenhouse gas emissions at DHL.' + example: true + dhlRetoure: + $ref: '#/components/schemas/VASDhlRetoure' + postalDeliveryDutyPaid: + type: boolean + description: 'All import duties are paid by the shipper.' + example: true + description: Value added services. Please note that services are specific to products and geographies and/or may require individual setup and billing numbers. Please test and contact your account representative in case of questions. + VASCashOnDelivery: + required: + - transferNote1 + type: object + properties: + amount: + $ref: '#/components/schemas/Value' + bankAccount: + $ref: '#/components/schemas/BankAccount' + accountReference: + maxLength: 35 + minLength: 0 + type: string + description: Reference to bank account details. Account references are maintained in customer settings in Post & DHL business customer portal under Ship -> Settings -> Cash on delivery. Please note, that the default account reference is used if the provided account reference does not exist in your customer settings! + transferNote1: + maxLength: 35 + minLength: 0 + type: string + transferNote2: + maxLength: 35 + minLength: 0 + type: string + description: Cash on delivery (Nachnahme). Currency must be Euro. Either bank account information or account reference (from customer profile) must be provided. Transfernote1 + 2 are references transmitted during bank transfer. Providing account information explicitly requires elevated privileges. + VASDhlRetoure: + required: + - billingNumber + type: object + properties: + billingNumber: + pattern: \w{10}\d{2}\w{2} + type: string + refNo: + maxLength: 50 + minLength: 6 + type: string + returnAddress: + $ref: '#/components/schemas/ContactAddress' + goGreenPlus: + type: boolean + description: 'GoGreen Plus enables sustainable shipping by investing in measures to reduce greenhouse gas emissions at DHL.' + example: true + description: Requests return label (aka 'retoure') to be provided. Also requires returnAddress and return billing number. Neither weight nor dimension need to be specified for the retoure (flat rate service). + VASIdentCheck: + required: + - firstName + - lastName + type: object + properties: + firstName: + maxLength: 35 + minLength: 1 + type: string + example: Max + lastName: + maxLength: 35 + minLength: 1 + type: string + example: Mustermann + dateOfBirth: + type: string + description: date of birth, used in conjunction with minimumAge and shipping date. Format yyyy-mm-dd is used. + format: date + minimumAge: + pattern: A16|A18 + type: string + description: Checks if recipient will have reached specified age by shipping date. + example: A18 + enum: + - A16 + - A18 + description: Check the identity of the recipient via name (firstname, lastname), date of birth or age. This uses firstName and lastName as separate attributes since for identity check an automatic split of a one-line name is not considered reliable enough. + Country: + type: string + description: A valid country code consisting of three characters according to ISO 3166-1 alpha-3. + enum: + - ABW + - AFG + - AGO + - AIA + - ALA + - ALB + - AND + - ARE + - ARG + - ARM + - ASM + - ATG + - AUS + - AUT + - AZE + - BDI + - BEL + - BEN + - BES + - BFA + - BGD + - BGR + - BHR + - BHS + - BIH + - BLM + - BLR + - BLZ + - BMU + - BOL + - BRA + - BRB + - BRN + - BTN + - BVT + - BWA + - CAF + - CAN + - CCK + - CHE + - CHL + - CHN + - CIV + - CMR + - COD + - COG + - COK + - COL + - COM + - CPV + - CRI + - CUB + - CUW + - CXR + - CYM + - CYP + - CZE + - DEU + - DJI + - DMA + - DNK + - DOM + - DZA + - ECU + - EGY + - ERI + - ESP + - EST + - ETH + - FIN + - FJI + - FLK + - FRA + - FRO + - FSM + - GAB + - GBR + - GEO + - GGY + - GHA + - GIB + - GIN + - GLP + - GMB + - GNB + - GNQ + - GRC + - GRD + - GRL + - GTM + - GUF + - GUM + - GUY + - HKG + - HMD + - HND + - HRV + - HTI + - HUN + - IDN + - IMN + - IND + - IRL + - IRN + - IRQ + - ISL + - ISR + - ITA + - JAM + - JEY + - JOR + - JPN + - KAZ + - KEN + - KGZ + - KHM + - KIR + - KNA + - KOR + - KWT + - LAO + - LBN + - LBR + - LBY + - LCA + - LIE + - LKA + - LSO + - LTU + - LUX + - LVA + - MAC + - MAF + - MAR + - MCO + - MDA + - MDG + - MDV + - MEX + - MHL + - MKD + - MLI + - MLT + - MMR + - MNE + - MNG + - MNP + - MOZ + - MRT + - MSR + - MTQ + - MUS + - MWI + - MYS + - MYT + - NAM + - NCL + - NER + - NFK + - NGA + - NIC + - NIU + - NLD + - NOR + - NPL + - NRU + - NZL + - OMN + - PAK + - PAN + - PCN + - PER + - PHL + - PLW + - PNG + - POL + - PRI + - PRK + - PRT + - PRY + - PSE + - PYF + - QAT + - REU + - ROU + - RUS + - RWA + - SAU + - SDN + - SEN + - SGP + - SHN + - SJM + - SLB + - SLE + - SLV + - SMR + - SOM + - SPM + - SRB + - SSD + - STP + - SUR + - SVK + - SVN + - SWE + - SWZ + - SXM + - SYC + - SYR + - TCA + - TCD + - TGO + - THA + - TJK + - TKL + - TKM + - TLS + - TON + - TTO + - TUN + - TUR + - TUV + - TWN + - TZA + - UGA + - UKR + - URY + - USA + - UZB + - VAT + - VCT + - VEN + - VGB + - VIR + - VNM + - VUT + - WLF + - WSM + - YEM + - ZAF + - ZMB + - ZWE + - UNKNOWN + + Value: + required: + - currency + - value + type: object + description: Currency and numeric value. + properties: + currency: + type: string + description: iso 4217 3 character currency code accepted. Recommended to use EUR where possible + enum: + - AED + - AFN + - ALL + - AMD + - ANG + - AOA + - ARS + - AUD + - AWG + - AZN + - BAM + - BBD + - BDT + - BGN + - BHD + - BIF + - BMD + - BND + - BOB + - BOV + - BRL + - BSD + - BTN + - BWP + - BYR + - BZD + - CAD + - CDF + - CHE + - CHF + - CHW + - CLF + - CLP + - CNY + - COP + - COU + - CRC + - CUC + - CUP + - CVE + - CZK + - DJF + - DKK + - DOP + - DZD + - EGP + - ERN + - ETB + - EUR + - FJD + - FKP + - GBP + - GEL + - GHS + - GIP + - GMD + - GNF + - GTQ + - GYD + - HKD + - HNL + - HRK + - HTG + - HUF + - IDR + - ILS + - INR + - IQD + - IRR + - ISK + - JMD + - JOD + - JPY + - KES + - KGS + - KHR + - KMF + - KPW + - KRW + - KWD + - KYD + - KZT + - LAK + - LBP + - LKR + - LRD + - LSL + - LTL + - LVL + - LYD + - MAD + - MDL + - MGA + - MKD + - MMK + - MNT + - MOP + - MRO + - MUR + - MVR + - MWK + - MXN + - MXV + - MYR + - MZN + - NAD + - NGN + - NIO + - NOK + - NPR + - NZD + - OMR + - PAB + - PEN + - PGK + - PHP + - PKR + - PLN + - PYG + - QAR + - RON + - RSD + - RUB + - RWF + - SAR + - SBD + - SCR + - SDG + - SEK + - SGD + - SHP + - SLL + - SOS + - SRD + - SSP + - STD + - SYP + - SZL + - THB + - TJS + - TMT + - TND + - TOP + - TRY + - TTD + - TWD + - TZS + - UAH + - UGX + - USD + - USN + - USS + - UYI + - UYU + - UZS + - VEF + - VND + - VUV + - WST + - XAF + - XAG + - XAU + - XBA + - XBB + - XBC + - XBD + - XCD + - XDR + - XFU + - XOF + - XPD + - XPF + - XPT + - XXX + - YER + - ZAR + - ZMW + - UNKNOWN + value: + type: number + description: Numeric value + maximum: 100000 + exclusiveMaximum: false + minimum: 0 + exclusiveMinimum: false + Weight: + required: + - uom + - value + type: object + properties: + uom: + type: string + description: metric unit for weight + example: g + enum: + - g + - kg + value: + maximum: 31500 + exclusiveMaximum: false + minimum: 0 + exclusiveMinimum: false + type: number + example: 500 + description: Weight of item or shipment. Both uom and value are required. + examples: + DHLPaket: + summary: DHL Paket (V01PAK) + description: Order example for DHL Paket (V01PAK) + value: + profile: STANDARD_GRUPPENPROFIL + shipments: + - product: V01PAK + billingNumber: "33333333330102" + refNo: Order No. 1234 + shipper: + name1: My Online Shop GmbH + addressStreet: Sträßchensweg 10 + postalCode: "53113" + city: Bonn + country: DEU + email: max@mustermann.de + phone: +49 123456789 + consignee: + name1: Maria Musterfrau + addressStreet: Kurt-Schumacher-Str. 20 + postalCode: "53113" + city: Bonn + country: DEU + email: maria@musterfrau.de + phone: +49 987654321 + details: + dim: + uom: mm + height: 100 + length: 200 + width: 150 + weight: + uom: g + value: 500 + DHLPaketInternational: + summary: DHL Paket International (V53WPAK) + description: Order example for DHL Paket International (V53WPAK) + value: + profile: STANDARD_GRUPPENPROFIL + shipments: + - product: V53WPAK + billingNumber: "33333333335301" + refNo: Order No. 1234 + shipper: + name1: My Online Shop GmbH + addressStreet: Sträßchensweg 10 + postalCode: "53113" + city: Bonn + country: DEU + email: max@mustermann.de + phone: +49 123456789 + consignee: + name1: Jan Vermeer + addressStreet: Museumstraat + addressHouse: "1" + additionalAddressInformation1: 2. Floor + postalCode: "1071 AA" + city: Amsterdam + country: NLD + email: jan@vermeer.com + phone: +31 888888888 + details: + dim: + uom: mm + height: 100 + length: 200 + width: 150 + weight: + uom: g + value: 500 + DHLPaketInternationalWithCustoms: + summary: DHL Paket International (V53WPAK) with customs + description: Order example for DHL Paket International (V53WPAK) with customs + value: + profile: STANDARD_GRUPPENPROFIL + shipments: + - product: V53WPAK + billingNumber: "33333333335301" + refNo: Order No. 1234 + shipper: + name1: My Online Shop GmbH + addressStreet: Sträßchensweg 10 + postalCode: "53113" + city: Bonn + country: DEU + email: max@mustermann.de + phone: +49 123456789 + consignee: + name1: Joe Black + addressStreet: 10 Downing Street + additionalAddressInformation1: 2. Floor + postalCode: "SW1A 1AA" + city: London + country: GBR + email: joe@black.uk + phone: +44 123456789 + details: + dim: + uom: mm + height: 100 + length: 200 + width: 150 + weight: + uom: g + value: 500 + customs: + exportType: COMMERCIAL_GOODS + postalCharges: + currency: EUR + value: 1 + items: + - itemDescription: Red T-Shirt + packagedQuantity: 1 + hsCode: "123456" + countryOfOrigin: FRA + itemValue: + currency: EUR + value: 10 + itemWeight: + uom: g + value: 400 + services: + endorsement: RETURN + DHLKleinpaket: + summary: DHL Kleinpaket (V62KP) + description: Order example for DHL Kleinpaket (V62KP) + value: + profile: STANDARD_GRUPPENPROFIL + shipments: + - product: V62KP + billingNumber: "33333333336201" + refNo: Order No. 1234 + shipper: + name1: My Online Shop GmbH + addressStreet: Sträßchensweg 10 + postalCode: '53113' + city: Bonn + country: DEU + email: max@mustermann.de + phone: +49 123456789 + consignee: + name1: Maria Musterfrau + addressStreet: Kurt-Schumacher-Str. 20 + postalCode: "53113" + city: Bonn + country: DEU + email: maria@musterfrau.de + phone: +49 987654321 + details: + dim: + uom: cm + height: 1 + length: 10 + width: 15 + weight: + uom: g + value: 500 + WarenpostInternationalWithCustoms: + summary: Warenpost International (V66WPI) with customs + description: Order example for Warenpost International (V66WPI) with customs + value: + profile: STANDARD_GRUPPENPROFIL + shipments: + - product: V66WPI + billingNumber: "33333333336601" + refNo: Order No. 1234 + shipper: + name1: My Online Shop GmbH + addressStreet: Sträßchensweg 10 + postalCode: "53113" + city: Bonn + country: DEU + email: max@mustermann.de + phone: "+49 123456789" + consignee: + name1: Joe Black + addressStreet: 42 Street + additionalAddressInformation1: 2. Floor + postalCode: SW1A 1AA + city: London + country: GBR + email: joe@black.uk + phone: +44 123456789 + details: + dim: + uom: cm + height: 1 + length: 10 + width: 15 + weight: + uom: g + value: 500 + customs: + exportType: PRESENT + postalCharges: + currency: EUR + value: 1 + items: + - itemDescription: Item 1 + packagedQuantity: 1 + hsCode: 123456 + countryOfOrigin: FRA + itemValue: + currency: EUR + value: 10 + itemWeight: + uom: g + value: 300 + services: + endorsement: RETURN + securitySchemes: + BasicAuth: + type: http + scheme: basic + description: Credentials provided here are username and password of the partner system. + ApiKey: + type: apiKey + description: API key to authorize requests. API key can be obtained at [DHL's development + portal](https://developer.dhl.com). + name: dhl-api-key + in: header + OAuth2: + type: oauth2 + description: See https://developer.dhl.com/api-reference/authentication-api-post-parcel-germany. For the POST call to get a token, provide all parameters in the request body. Refer to the above link for details, or to the RFC describing OAuth2 Password Grant. After having obtained the access token, use this as Bearer token in the HTTP authorization header. + flows: + password: + tokenUrl: /parcel/de/account/auth/ropc/v1/token + scopes: {} + responses: + BadRequest: + description: Bad Request + content: + application/problem+json: + schema: + $ref: '#/components/schemas/LabelDataResponse' + Unauthorized: + description: Unauthorized + content: + application/problem+json: + schema: + $ref: '#/components/schemas/RequestStatus' + NotFound: + description: Not Found + content: + application/problem+json: + schema: + $ref: '#/components/schemas/RequestStatus' + TooManyRequests: + description: Too Many Requests + content: + application/problem+json: + schema: + $ref: '#/components/schemas/RequestStatus' + InternalServerError: + description: Internal Server Error + content: + application/problem+json: + schema: + $ref: '#/components/schemas/RequestStatus' +security: + - ApiKey: [] + - BasicAuth: [] + - OAuth2: [] \ No newline at end of file diff --git a/packages/acme-laravel-dhl/README.md b/packages/acme-laravel-dhl/README.md new file mode 100644 index 00000000..561e2995 --- /dev/null +++ b/packages/acme-laravel-dhl/README.md @@ -0,0 +1,199 @@ +# DHL Laravel Package + +A comprehensive Laravel package for DHL shipping, tracking, and returns functionality with direct API integration. + +## Features + +- **Direct DHL API Integration**: No SDK dependencies, full control over API calls +- **German Address Parsing**: Automatic extraction of house numbers from German addresses +- **Queue Support**: Optional asynchronous processing for high-volume operations +- **Comprehensive Tracking**: Full tracking event history and status management +- **Return Label Generation**: Easy return shipment creation +- **Retry Mechanisms**: Built-in retry logic for API calls and file operations +- **Laravel Integration**: Native service providers, facades, and Eloquent models + +## Installation + +### 1. Add to composer.json + +```json +{ + "repositories": [ + { + "type": "path", + "url": "./packages/acme-laravel-dhl" + } + ], + "require": { + "acme/laravel-dhl": "*" + } +} +``` + +### 2. Install the package + +```bash +composer update acme/laravel-dhl +``` + +### 3. Publish configuration and run migrations + +```bash +php artisan vendor:publish --provider="Acme\Dhl\DhlServiceProvider" --tag="config" +php artisan migrate +``` + +## Configuration + +Add the following environment variables to your `.env` file: + +```env +# DHL API Configuration +DHL_BASE_URL=https://api-eu.dhl.com +DHL_API_KEY=your_api_key_here +DHL_USERNAME=your_username +DHL_PASSWORD=your_password +DHL_BILLING_NUMBER=your_billing_number + +# DHL Default Settings +DHL_PRODUCT=V01PAK +DHL_LABEL_FORMAT=PDF +DHL_PROFILE=STANDARD_GRUPPENPROFIL + +# Optional Queue Settings +DHL_USE_QUEUE=false +``` + +## Usage + +### Creating a Shipment Label + +```php +use DHL; + +$orderData = [ + 'order_id' => 12345, + 'weight_kg' => 2.5, + 'shipper' => [ + 'name' => 'Your Company', + 'street' => 'Musterstraße 123', // House number will be auto-parsed + 'postalCode' => '12345', + 'city' => 'Berlin', + 'country' => 'DE' + ], + 'consignee' => [ + 'name' => 'Customer Name', + 'street' => 'Kundenstraße 456', // House number will be auto-parsed + 'postalCode' => '54321', + 'city' => 'Munich', + 'country' => 'DE' + ] +]; + +$result = DHL::createLabel($orderData); +// Returns: ['shipmentNumber' => '123...', 'label_path' => 'dhl/labels/...'] +``` + +### German Address Parsing + +The package automatically handles German address formats by extracting house numbers from the street field: + +```php +// Input: "Musterstraße 123a" +// Parsed to: street="Musterstraße", houseNumber="123a" + +// Supported formats: +"Musterstraße 123" -> street: "Musterstraße", number: "123" +"Am Markt 7" -> street: "Am Markt", number: "7" +"Karl-Marx-Straße 156" -> street: "Karl-Marx-Straße", number: "156" +"Lindenstraße 1-3" -> street: "Lindenstraße", number: "1-3" +"Muster Str. 99" -> street: "Muster Str.", number: "99" +``` + +### Tracking Shipments + +```php +use DHL; + +// Get current tracking status +$status = DHL::track('1234567890123'); + +// Returns detailed tracking information including events +``` + +### Creating Return Labels + +```php +use DHL; + +$returnData = [ + 'original_shipment_id' => 1, + 'return_reason' => 'Customer return', + // ... address data +]; + +$return = DHL::createReturn($returnData); +``` + +### Using Services Directly + +```php +use Acme\Dhl\Services\ShippingService; +use Acme\Dhl\Services\TrackingService; + +// Dependency injection in controllers +public function createLabel(ShippingService $shipping, Request $request) +{ + $result = $shipping->createLabel($request->validated()); + return response()->json($result); +} +``` + +## Database Schema + +The package creates the following tables: + +- `dhl_shipments` - Main shipment records (outbound and returns) +- `dhl_tracking_events` - Tracking event history + +## Queue Configuration + +For high-volume applications, enable queue processing: + +```env +DHL_USE_QUEUE=true +``` + +When enabled, label creation and tracking updates will be processed asynchronously. + +## Error Handling + +The package includes comprehensive error handling: + +- `DhlApiException` - General API errors +- `DhlAuthenticationException` - Authentication failures +- `DhlValidationException` - Data validation errors + +## Testing + +Run the included tests: + +```bash +vendor/bin/phpunit packages/acme-laravel-dhl/tests/ +``` + +## Address Parsing Tests + +The package includes comprehensive tests for German address parsing: + +```bash +vendor/bin/phpunit packages/acme-laravel-dhl/tests/Unit/AddressParserTest.php +``` + +## Logging + +All API calls, address parsing, and errors are logged using Laravel's logging system. Check your logs for debugging information. + +## License + +MIT License diff --git a/packages/acme-laravel-dhl/composer.json b/packages/acme-laravel-dhl/composer.json new file mode 100644 index 00000000..bfd64302 --- /dev/null +++ b/packages/acme-laravel-dhl/composer.json @@ -0,0 +1,30 @@ +{ + "name": "acme/laravel-dhl", + "description": "DHL (Post & Paket DE) Shipping, Returns & Tracking for Laravel.", + "type": "library", + "license": "MIT", + "require": { + "php": "^8.1", + "illuminate/support": "^10.0|^11.0", + "illuminate/http": "^10.0|^11.0", + "illuminate/database": "^10.0|^11.0", + "illuminate/queue": "^10.0|^11.0", + "illuminate/events": "^10.0|^11.0", + "guzzlehttp/guzzle": "^7.0" + }, + "autoload": { + "psr-4": { + "Acme\\Dhl\\": "src/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Acme\\Dhl\\DhlServiceProvider" + ], + "aliases": { + "DHL": "Acme\\Dhl\\Facades\\DHL" + } + } + } +} \ No newline at end of file diff --git a/packages/acme-laravel-dhl/config/dhl.php b/packages/acme-laravel-dhl/config/dhl.php new file mode 100644 index 00000000..1937a156 --- /dev/null +++ b/packages/acme-laravel-dhl/config/dhl.php @@ -0,0 +1,13 @@ + env('DHL_BASE_URL', 'https://api-eu.dhl.com'), + 'api_key' => env('DHL_API_KEY'), + 'username' => env('DHL_USERNAME'), + 'password' => env('DHL_PASSWORD'), + 'billing_number' => env('DHL_BILLING_NUMBER'), + 'default_product' => env('DHL_PRODUCT', 'V01PAK'), + 'label_format' => env('DHL_LABEL_FORMAT', 'PDF'), + 'profile' => env('DHL_PROFILE', 'STANDARD_GRUPPENPROFIL'), + 'webhook' => ['enabled' => env('DHL_WEBHOOK_ENABLED', false), 'secret' => env('DHL_WEBHOOK_SECRET'), 'route' => env('DHL_WEBHOOK_ROUTE', 'dhl/webhooks/tracking')], + 'use_queue' => env('DHL_USE_QUEUE', false), // Set to true to enable queue jobs for async processing +]; diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_dhl_shipments_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_dhl_shipments_table.php new file mode 100644 index 00000000..d185aca3 --- /dev/null +++ b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_dhl_shipments_table.php @@ -0,0 +1,53 @@ +id(); + + // Basic shipment info + $table->unsignedBigInteger('order_id')->nullable()->index(); + $table->string('dhl_shipment_no')->nullable()->index(); + $table->enum('type', ['outbound', 'return'])->default('outbound'); + $table->unsignedBigInteger('related_shipment_id')->nullable()->index(); // For returns + + // Product and billing + $table->string('product_code')->default('V01PAK'); + $table->string('billing_number')->nullable(); + $table->decimal('weight_kg', 8, 3)->nullable(); + + // Label information + $table->string('label_format')->default('PDF'); + $table->string('label_path')->nullable(); + + // Status tracking (simplified) + $table->string('status')->default('created'); // created, in_transit, delivered, canceled, etc. + $table->string('tracking_status')->nullable(); // Last DHL status text + $table->timestamp('last_tracked_at')->nullable(); + + // API response data + $table->json('api_response_data')->nullable(); + + $table->timestamps(); + + // Foreign key constraints + $table->foreign('related_shipment_id')->references('id')->on('dhl_package_shipments')->onDelete('set null'); + + // Indexes for performance + $table->index(['order_id', 'type']); + $table->index(['status', 'created_at']); + }); + } + + public function down(): void + { + Schema::dropIfExists('dhl_package_shipments'); + } +}; diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_shipments_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_shipments_table.php new file mode 100644 index 00000000..f266ba88 --- /dev/null +++ b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_shipments_table.php @@ -0,0 +1,29 @@ +id(); + $t->unsignedBigInteger('order_id')->nullable(); + $t->string('carrier')->default('dhl'); + $t->string('dhl_shipment_no')->nullable()->index(); + $t->string('product_code')->nullable(); + $t->string('billing_number')->nullable(); + $t->decimal('weight_kg', 8, 3)->nullable(); + $t->string('status')->default('created'); + $t->string('label_format')->nullable(); + $t->string('label_path')->nullable(); + $t->json('meta')->nullable(); + $t->timestamps(); + }); + } + public function down(): void + { + Schema::dropIfExists('shipments'); + } +}; diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000100_create_shipment_labels_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000100_create_shipment_labels_table.php new file mode 100644 index 00000000..7f6270a3 --- /dev/null +++ b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000100_create_shipment_labels_table.php @@ -0,0 +1,22 @@ +id(); + $t->foreignId('shipment_id')->constrained('shipments')->cascadeOnDelete(); + $t->string('format')->default('PDF'); + $t->string('path'); + $t->timestamps(); + }); + } + public function down(): void + { + Schema::dropIfExists('shipment_labels'); + } +}; diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_dhl_tracking_events_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_dhl_tracking_events_table.php new file mode 100644 index 00000000..2a0370ac --- /dev/null +++ b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_dhl_tracking_events_table.php @@ -0,0 +1,30 @@ +id(); + $table->unsignedBigInteger('shipment_id')->index(); + $table->string('status_code')->nullable(); + $table->string('status_text')->nullable(); + $table->string('location')->nullable(); + $table->timestamp('event_time')->nullable(); + $table->json('raw')->nullable(); // Full event data from API + $table->timestamps(); + + $table->foreign('shipment_id')->references('id')->on('dhl_package_shipments')->onDelete('cascade'); + $table->index(['shipment_id', 'event_time']); + }); + } + + public function down(): void + { + Schema::dropIfExists('dhl_package_tracking_events'); + } +}; \ No newline at end of file diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_tracking_events_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_tracking_events_table.php new file mode 100644 index 00000000..a736351a --- /dev/null +++ b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_tracking_events_table.php @@ -0,0 +1,24 @@ +id(); + $t->foreignId('shipment_id')->constrained('shipments')->cascadeOnDelete(); + $t->string('status_code')->nullable(); + $t->string('status_text')->nullable(); + $t->string('location')->nullable(); + $t->timestamp('event_time')->nullable(); + $t->json('raw')->nullable(); + }); + } + public function down(): void + { + Schema::dropIfExists('tracking_events'); + } +}; diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000300_create_return_labels_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000300_create_return_labels_table.php new file mode 100644 index 00000000..057a2333 --- /dev/null +++ b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000300_create_return_labels_table.php @@ -0,0 +1,22 @@ +id(); + $t->unsignedBigInteger('order_id')->nullable()->index(); + $t->string('dhl_return_no')->nullable()->index(); + $t->string('label_path')->nullable(); + $t->timestamps(); + }); + } + public function down(): void + { + Schema::dropIfExists('return_labels'); + } +}; diff --git a/packages/acme-laravel-dhl/routes/api.php b/packages/acme-laravel-dhl/routes/api.php new file mode 100644 index 00000000..c26d9b4e --- /dev/null +++ b/packages/acme-laravel-dhl/routes/api.php @@ -0,0 +1,6 @@ +name('dhl.webhook.tracking'); diff --git a/packages/acme-laravel-dhl/src/DhlManager.php b/packages/acme-laravel-dhl/src/DhlManager.php new file mode 100644 index 00000000..05563dd5 --- /dev/null +++ b/packages/acme-laravel-dhl/src/DhlManager.php @@ -0,0 +1,40 @@ +shipping->createLabel($orderData); + } + /** + * @param string $shipmentNumber + * @return bool + */ + public function cancelLabel(string $shipmentNumber): bool + { + return $this->shipping->cancelLabel($shipmentNumber); + } + /** + * @param string $trackingNumber + * @return array + */ + public function track(string $trackingNumber): array + { + return $this->tracking->fetchStatus($trackingNumber); + } + /** + * @param array $returnData + * @return array + */ + public function createReturn(array $returnData): array + { + return $this->returns->createReturn($returnData); + } +} diff --git a/packages/acme-laravel-dhl/src/DhlServiceProvider.php b/packages/acme-laravel-dhl/src/DhlServiceProvider.php new file mode 100644 index 00000000..cee76d99 --- /dev/null +++ b/packages/acme-laravel-dhl/src/DhlServiceProvider.php @@ -0,0 +1,55 @@ +mergeConfigFrom(__DIR__ . '/../config/dhl.php', 'dhl'); + + // Bind DhlClient as a singleton + $this->app->singleton(Support\DhlClient::class, function ($app) { + return new Support\DhlClient( + config('dhl.base_url'), + config('dhl.api_key'), + config('dhl.username'), + config('dhl.password') + ); + }); + + // Bind services as singletons + $this->app->singleton(Services\ShippingService::class, function ($app) { + return new Services\ShippingService($app->make(Support\DhlClient::class)); + }); + + $this->app->singleton(Services\TrackingService::class, function ($app) { + return new Services\TrackingService($app->make(Support\DhlClient::class)); + }); + + $this->app->singleton(Services\ReturnsService::class, function ($app) { + return new Services\ReturnsService($app->make(Support\DhlClient::class)); + }); + + // Bind the main manager class + $this->app->singleton(DhlManager::class, function ($app) { + return new DhlManager( + $app->make(Support\DhlClient::class), + $app->make(Services\ShippingService::class), + $app->make(Services\TrackingService::class), + $app->make(Services\ReturnsService::class) + ); + }); + } + public function boot(): void + { + $this->publishes([__DIR__ . '/../config/dhl.php' => config_path('dhl.php')], 'dhl-config'); + $this->publishes([__DIR__ . '/../database/migrations/' => database_path('migrations')], 'dhl-migrations'); + $this->loadMigrationsFrom(__DIR__ . '/../database/migrations'); + if (config('dhl.webhook.enabled')) { + $this->loadRoutesFrom(__DIR__ . '/../routes/api.php'); + } + } +} diff --git a/packages/acme-laravel-dhl/src/Exceptions/DhlApiException.php b/packages/acme-laravel-dhl/src/Exceptions/DhlApiException.php new file mode 100644 index 00000000..ff78271d --- /dev/null +++ b/packages/acme-laravel-dhl/src/Exceptions/DhlApiException.php @@ -0,0 +1,8 @@ +header('X-DHL-Secret') !== $secret) { + abort(401, 'Invalid webhook secret'); + } + $payload = $r->all(); + Log::info('DHL webhook received', ['payload' => $payload]); + $events = data_get($payload, 'events', []); + foreach ($events as $e) { + $tracking = $e['trackingNumber'] ?? null; + if (!$tracking) continue; + $s = DhlShipment::firstOrCreate(['dhl_shipment_no' => $tracking], ['carrier' => 'dhl', 'status' => 'unknown',]); + DhlTrackingEvent::create(['shipment_id' => $s->id, 'status_code' => $e['statusCode'] ?? null, 'status_text' => $e['status'] ?? null, 'location' => data_get($e, 'location'), 'event_time' => $e['timestamp'] ?? now(), 'raw' => $e,]); + $statusCode = $e['statusCode'] ?? ''; + $newStatus = match (strtolower($statusCode)) { + 'delivered' => 'delivered', + 'returned' => 'returned', + 'exception', 'failed' => 'failed', + 'in_transit', 'transit' => 'in_transit', + default => $s->status + }; + if ($newStatus !== $s->status) { + $s->status = $newStatus; + $s->save(); + Log::info('Webhook updated shipment status', ['tracking' => $tracking, 'newStatus' => $newStatus]); + } + } + return response()->json(['ok' => true]); + } +} diff --git a/packages/acme-laravel-dhl/src/Jobs/CreateReturnLabelJob.php b/packages/acme-laravel-dhl/src/Jobs/CreateReturnLabelJob.php new file mode 100644 index 00000000..d611146e --- /dev/null +++ b/packages/acme-laravel-dhl/src/Jobs/CreateReturnLabelJob.php @@ -0,0 +1,29 @@ +createReturn($this->returnData); + Log::info('Queued return label creation successful'); + } catch (\Exception $e) { + Log::error('Queued return label creation failed', ['error' => $e->getMessage()]); + $this->fail($e); + } + } +} diff --git a/packages/acme-laravel-dhl/src/Jobs/CreateShipmentJob.php b/packages/acme-laravel-dhl/src/Jobs/CreateShipmentJob.php new file mode 100644 index 00000000..43027a83 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Jobs/CreateShipmentJob.php @@ -0,0 +1,29 @@ +createLabel($this->orderData); + Log::info('Queued shipment creation successful'); + } catch (\Exception $e) { + Log::error('Queued shipment creation failed', ['error' => $e->getMessage()]); + $this->fail($e); + } + } +} diff --git a/packages/acme-laravel-dhl/src/Jobs/SyncTrackingJob.php b/packages/acme-laravel-dhl/src/Jobs/SyncTrackingJob.php new file mode 100644 index 00000000..cc0f2b19 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Jobs/SyncTrackingJob.php @@ -0,0 +1,29 @@ +trackingNumbers as $trackingNumber) { + try { + $t->fetchStatus($trackingNumber); + Log::info('Synced tracking', ['trackingNumber' => $trackingNumber]); + } catch (\Exception $e) { + Log::error('Tracking sync failed', ['trackingNumber' => $trackingNumber, 'error' => $e->getMessage()]); + $this->fail($e); + } + } + } +} diff --git a/packages/acme-laravel-dhl/src/Models/DhlShipment.php b/packages/acme-laravel-dhl/src/Models/DhlShipment.php new file mode 100644 index 00000000..89b40633 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Models/DhlShipment.php @@ -0,0 +1,149 @@ + 'array', + 'last_tracked_at' => 'datetime', + 'weight_kg' => 'decimal:3' + ]; + + public const STATUS_MAP = [ + 'pre-transit' => 'created', + 'transit' => 'in_transit', + 'out_for_delivery' => 'out_for_delivery', + 'delivered' => 'delivered', + 'exception' => 'exception', + 'returned' => 'returned', + 'failed' => 'failed', + 'unknown' => 'unknown' + ]; + + /** + * Get the tracking events for this shipment + */ + public function trackingEvents(): HasMany + { + return $this->hasMany(DhlTrackingEvent::class, 'shipment_id'); + } + + /** + * Get the related shopping order for this shipment + */ + public function shoppingOrder(): BelongsTo + { + return $this->belongsTo(ShoppingOrder::class, 'order_id'); + } + + /** + * Get the related shipment (for returns) + */ + public function relatedShipment(): BelongsTo + { + return $this->belongsTo(self::class, 'related_shipment_id'); + } + + /** + * Get returns for this shipment (if this is an outbound shipment) + */ + public function returns(): HasMany + { + return $this->hasMany(self::class, 'related_shipment_id'); + } + + /** + * Scope for outbound shipments + */ + public function scopeOutbound($query) + { + return $query->where('type', 'outbound'); + } + + /** + * Scope for return shipments + */ + public function scopeReturns($query) + { + return $query->where('type', 'return'); + } + + /** + * Scope for shipments by order + */ + public function scopeForOrder($query, int $orderId) + { + return $query->where('order_id', $orderId); + } + + /** + * Check if this is a return shipment + */ + public function isReturn(): bool + { + return $this->type === 'return'; + } + + /** + * Check if this is an outbound shipment + */ + public function isOutbound(): bool + { + return $this->type === 'outbound'; + } + + /** + * Get the latest tracking status + */ + public function getLatestStatus(): ?string + { + return $this->trackingEvents() + ->orderBy('event_time', 'desc') + ->first() + ?->status_text; + } + + /** + * Check if shipment can be canceled + */ + public function canCancel(): bool + { + return in_array($this->status, ['created', 'pending']); + } + + /** + * Check if shipment is delivered + */ + public function isDelivered(): bool + { + return $this->status === 'delivered'; + } +} diff --git a/packages/acme-laravel-dhl/src/Models/DhlTrackingEvent.php b/packages/acme-laravel-dhl/src/Models/DhlTrackingEvent.php new file mode 100644 index 00000000..a0045cc8 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Models/DhlTrackingEvent.php @@ -0,0 +1,52 @@ + 'array', + 'event_time' => 'datetime' + ]; + + /** + * Get the shipment this event belongs to + */ + public function shipment(): BelongsTo + { + return $this->belongsTo(DhlShipment::class, 'shipment_id'); + } + + /** + * Scope for events ordered by time + */ + public function scopeOrderedByTime($query, string $direction = 'desc') + { + return $query->orderBy('event_time', $direction); + } + + /** + * Scope for recent events + */ + public function scopeRecent($query, int $days = 30) + { + return $query->where('event_time', '>=', now()->subDays($days)); + } +} diff --git a/packages/acme-laravel-dhl/src/Models/ReturnLabel.php b/packages/acme-laravel-dhl/src/Models/ReturnLabel.php new file mode 100644 index 00000000..9bf910cc --- /dev/null +++ b/packages/acme-laravel-dhl/src/Models/ReturnLabel.php @@ -0,0 +1,10 @@ + 'array',]; + public function labels() + { + return $this->hasMany(ShipmentLabel::class); + } + public function events() + { + return $this->hasMany(TrackingEvent::class); + } +} diff --git a/packages/acme-laravel-dhl/src/Models/ShipmentLabel.php b/packages/acme-laravel-dhl/src/Models/ShipmentLabel.php new file mode 100644 index 00000000..86f4e24b --- /dev/null +++ b/packages/acme-laravel-dhl/src/Models/ShipmentLabel.php @@ -0,0 +1,14 @@ +belongsTo(Shipment::class); + } +} diff --git a/packages/acme-laravel-dhl/src/Models/TrackingEvent.php b/packages/acme-laravel-dhl/src/Models/TrackingEvent.php new file mode 100644 index 00000000..925f3f00 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Models/TrackingEvent.php @@ -0,0 +1,16 @@ + 'array', 'event_time' => 'datetime',]; + public function shipment() + { + return $this->belongsTo(Shipment::class); + } +} diff --git a/packages/acme-laravel-dhl/src/Services/ReturnsService.php b/packages/acme-laravel-dhl/src/Services/ReturnsService.php new file mode 100644 index 00000000..71e38ec3 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Services/ReturnsService.php @@ -0,0 +1,180 @@ +validateReturnData($returnData); + if (config('dhl.use_queue')) { + CreateReturnLabelJob::dispatch($validatedData); + return ['queued' => true]; + } + + $payload = $this->buildReturnPayload($returnData); + $response = $this->client->request('post', '/parcel/de/returns/v1/labels', $payload); + + $returnNumber = $this->extractReturnNumber($response); + $labelBase64 = $this->extractLabelData($response); + + $labelPath = $this->saveLabelFile($returnNumber, $labelBase64, $payload['labelFormat']); + $returnShipment = $this->createReturnRecord($returnData, $returnNumber, $labelPath, $response); + + Log::info('Created return label', ['returnNumber' => $returnNumber]); + + return [ + 'returnNumber' => $returnNumber, + 'label_path' => $labelPath, + 'returnShipment' => $returnShipment, + 'raw' => $response + ]; + } + + /** + * Get return shipment by return number + * + * @param string $returnNumber DHL return number + * @return DhlShipment|null Return shipment model or null if not found + */ + public function getReturnShipment(string $returnNumber): ?DhlShipment + { + return DhlShipment::where('dhl_shipment_no', $returnNumber) + ->where('type', 'return') + ->first(); + } + + /** + * Get all return shipments for an order + * + * @param int $orderId Order ID + * @return \Illuminate\Database\Eloquent\Collection Return shipments collection + */ + public function getOrderReturns(int $orderId): \Illuminate\Database\Eloquent\Collection + { + return DhlShipment::where('order_id', $orderId) + ->where('type', 'return') + ->get(); + } + + /** + * Get returns for a specific outbound shipment + * + * @param int $shipmentId Original outbound shipment ID + * @return \Illuminate\Database\Eloquent\Collection Related return shipments + */ + public function getShipmentReturns(int $shipmentId): \Illuminate\Database\Eloquent\Collection + { + return DhlShipment::where('related_shipment_id', $shipmentId) + ->where('type', 'return') + ->get(); + } + + /** + * Validate required return data + */ + private function validateReturnData(array $data): array + { + $validator = Validator::make($data, [ + 'original_shipment_id' => 'nullable|integer|exists:dhl_shipments,id', + 'weight_kg' => 'nullable|numeric|min:0.1', + 'shipper' => 'required|array', + 'shipper.name' => 'required|string|max:50', + // Add similar rules as in ShippingService + 'consignee' => 'required|array', + 'consignee.name' => 'required|string|max:50', + // ... more fields + ]); + if ($validator->fails()) { + throw new InvalidArgumentException($validator->errors()->first()); + } + if (empty(config('dhl.billing_number'))) { + throw new InvalidArgumentException('DHL billing number must be configured'); + } + return $validator->validated(); + } + + /** + * Build DHL return API payload + */ + private function buildReturnPayload(array $returnData): array + { + return [ + 'labelFormat' => $returnData['label_format'] ?? 'PDF', + 'shipper' => $returnData['shipper'], + 'consignee' => $returnData['consignee'], + 'billingNumber' => config('dhl.billing_number') + ]; + } + + /** + * Extract return number from API response + */ + private function extractReturnNumber(array $response): ?string + { + return data_get($response, 'returnShipmentNo') + ?? data_get($response, 'shipments.0.returnShipmentNo'); + } + + /** + * Extract base64 label data from API response + */ + private function extractLabelData(array $response): ?string + { + return data_get($response, 'label'); + } + + /** + * Save return label file to storage + */ + private function saveLabelFile(?string $returnNumber, ?string $labelBase64, string $format): ?string + { + if (!$labelBase64 || !$returnNumber) { + return null; + } + + $path = 'dhl/returns/' . $returnNumber . '.' . strtolower($format); + Storage::disk('local')->put($path, base64_decode($labelBase64)); + + return $path; + } + + /** + * Create return shipment database record + */ + private function createReturnRecord(array $returnData, ?string $returnNumber, ?string $labelPath, array $response): DhlShipment + { + return DhlShipment::create([ + 'order_id' => $returnData['order_id'] ?? null, + 'dhl_shipment_no' => $returnNumber, + 'type' => 'return', + 'related_shipment_id' => $returnData['original_shipment_id'] ?? null, + 'label_format' => $returnData['label_format'] ?? 'PDF', + 'label_path' => $labelPath, + 'status' => 'created', + 'api_response_data' => $response + ]); + } +} diff --git a/packages/acme-laravel-dhl/src/Services/ShippingService.php b/packages/acme-laravel-dhl/src/Services/ShippingService.php new file mode 100644 index 00000000..5ffa6e14 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Services/ShippingService.php @@ -0,0 +1,480 @@ +validateOrderData($orderData); + if (config('dhl.use_queue')) { + CreateShipmentJob::dispatch($validatedData); + return ['queued' => true]; + } + + return DB::transaction(function () use ($validatedData) { + $payload = $this->buildShipmentPayload($validatedData); + + // Debug logging: Log the exact payload being sent to DHL API + Log::info('[DHL API] Sending payload to DHL', [ + 'endpoint' => '/parcel/de/shipping/v2/orders', + 'payload' => $payload, + 'payload_json' => json_encode($payload, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) + ]); + + try { + // Build query parameters for print format + $query = array_filter([ + 'printFormat' => $validatedData['print_format'] ?? null, + 'retourePrintFormat' => $validatedData['retoure_print_format'] ?? null, + ]); + + $response = $this->client->request('post', '/parcel/de/shipping/v2/orders', $payload, $query); + + Log::info('[DHL API] Response received', [ + 'response' => $response + ]); + } catch (Exception $e) { + Log::error('[DHL API] Request failed', [ + 'error' => $e->getMessage(), + 'payload' => $payload + ]); + throw $e; + } + + $shipmentNumber = $this->extractShipmentNumber($response); + $labelBase64 = $this->extractLabelData($response); + + $shipment = $this->createShipmentRecord($validatedData, $payload, $response, $shipmentNumber); + $labelPath = $this->saveLabelFile($shipment, $labelBase64, $payload['shipments'][0]['print']['format']); + + Log::info('Created shipment label', ['shipmentNumber' => $shipmentNumber]); + + return [ + 'shipmentNumber' => $shipmentNumber, + 'label_path' => $labelPath, + 'shipment' => $shipment, + 'raw' => $response + ]; + }); + } + + /** + * Cancel an existing DHL shipment + * + * @param string $shipmentNumber DHL shipment number + * @return bool Success status + * @throws Exception When cancellation fails + */ + public function cancelLabel(string $shipmentNumber): bool + { + if (empty($shipmentNumber)) { + throw new InvalidArgumentException('Shipment number is required'); + } + $shipment = DhlShipment::where('dhl_shipment_no', $shipmentNumber)->first(); + if (!$shipment || !$shipment->canCancel()) { + throw new InvalidArgumentException('Shipment cannot be canceled'); + } + $this->client->request('delete', "/parcel/de/shipping/v2/orders/{$shipmentNumber}"); + $shipment->update(['status' => 'canceled']); + Log::info('Canceled shipment', ['shipmentNumber' => $shipmentNumber]); + return true; + } + + /** + * Validate required order data according to DHL API v2 specification + */ + private function validateOrderData(array $data): array + { + // Pre-process German addresses before validation + $data = $this->preprocessAddresses($data); + + $validator = Validator::make($data, [ + 'order_id' => 'nullable|integer', + 'weight_kg' => 'required|numeric|min:0.1|max:31.5', // DHL weight limit + 'product_code' => 'nullable|string|in:V01PAK,V53PAK,V62WP,V07PAK', + 'label_format' => 'nullable|string|in:PDF,ZPL', + 'print_format' => 'nullable|string', // Values like A4, 910-300-700 etc. + 'retoure_print_format' => 'nullable|string', + + // Shipper validation (sender) + 'shipper' => 'required|array', + 'shipper.name' => 'required|string|max:50', + 'shipper.name2' => 'nullable|string|max:50', + 'shipper.street' => 'required|string|max:50', + 'shipper.houseNumber' => 'required|string|max:10', + 'shipper.postalCode' => 'required|string|max:10', + 'shipper.city' => 'required|string|max:50', + 'shipper.country' => 'required|string|size:2', // ISO 3166-1 alpha-2 + 'shipper.email' => 'nullable|email|max:100', + 'shipper.phone' => 'nullable|string|max:20', + + // Consignee validation (recipient) + 'consignee' => 'required|array', + 'consignee.name' => 'required|string|max:50', + 'consignee.name2' => 'nullable|string|max:50', + 'consignee.street' => 'required|string|max:50', + 'consignee.houseNumber' => 'required|string|max:10', + 'consignee.postalCode' => 'required|string|max:10', + 'consignee.city' => 'required|string|max:50', + 'consignee.country' => 'required|string|size:2', + 'consignee.email' => 'nullable|email|max:100', + 'consignee.phone' => 'nullable|string|max:20', + + // Optional dimensions + 'dimensions' => 'nullable|array', + 'dimensions.length' => 'nullable|numeric|min:1|max:120', + 'dimensions.width' => 'nullable|numeric|min:1|max:60', + 'dimensions.height' => 'nullable|numeric|min:1|max:60', + + // Optional services and reference + 'services' => 'nullable|array', + 'reference' => 'nullable|string|max:35', // DHL reference field limit + ]); + + if ($validator->fails()) { + throw new InvalidArgumentException($validator->errors()->first()); + } + + return $validator->validated(); + } + + /** + * Preprocess addresses to extract house numbers from street field + */ + private function preprocessAddresses(array $data): array + { + // Process shipper address + if (isset($data['shipper'])) { + $data['shipper'] = $this->parseAddressFields($data['shipper']); + } + + // Process consignee address + if (isset($data['consignee'])) { + $data['consignee'] = $this->parseAddressFields($data['consignee']); + } + + return $data; + } + + /** + * Parse German address to extract street and house number + */ + private function parseAddressFields(array $addressData): array + { + // If houseNumber is already provided, use it + if (!empty($addressData['houseNumber'])) { + return $addressData; + } + + // If no houseNumber provided, try to parse from street + if (empty($addressData['street'])) { + return $addressData; + } + + $street = trim($addressData['street']); + $parsed = $this->parseGermanAddress($street); + + // Only update if we successfully parsed both parts + if ($parsed['street'] && $parsed['houseNumber']) { + $addressData['street'] = $parsed['street']; + $addressData['houseNumber'] = $parsed['houseNumber']; + + Log::info('Parsed German address', [ + 'original' => $street, + 'parsed_street' => $parsed['street'], + 'parsed_houseNumber' => $parsed['houseNumber'] + ]); + } elseif (!$parsed['houseNumber']) { + // If we can't parse house number, use a default + $addressData['houseNumber'] = '1'; + + Log::warning('Could not parse house number from address, using default', [ + 'street' => $street + ]); + } + + return $addressData; + } + + /** + * Parse German address string to extract street name and house number + * Handles formats like: "Musterstraße 123", "Muster Str. 123a", "Am Markt 1-3" + */ + private function parseGermanAddress(string $address): array + { + $address = trim($address); + + // Pattern to match German addresses + // Captures everything before the last word that contains numbers + $patterns = [ + // "Musterstraße 123a" -> street: "Musterstraße", number: "123a" + '/^(.+?)\s+([0-9]+[a-zA-Z]?)\s*$/', + // "Am Markt 1-3" -> street: "Am Markt", number: "1-3" + '/^(.+?)\s+([0-9]+[-\/][0-9]+[a-zA-Z]?)\s*$/', + // "Muster Str. 123" -> street: "Muster Str.", number: "123" + '/^(.+?)\s+([0-9]+)\s*$/', + ]; + + foreach ($patterns as $pattern) { + if (preg_match($pattern, $address, $matches)) { + return [ + 'street' => trim($matches[1]), + 'houseNumber' => trim($matches[2]) + ]; + } + } + + // If no pattern matches, return original street with empty house number + return [ + 'street' => $address, + 'houseNumber' => null + ]; + } + + /** + * Build DHL API v2 payload from order data + * + * Structure follows official DHL API v2 createOrders specification: + * https://developer.dhl.com/api-reference/parcel-de-shipping-post-parcel-germany-v2 + */ + private function buildShipmentPayload(array $orderData): array + { + $productCode = $orderData['product_code'] ?? config('dhl.default_product', 'V01PAK'); + $billingNumber = $this->getBillingNumberForProduct($productCode); + + $payload = [ + 'profile' => config('dhl.profile', 'STANDARD_GRUPPENPROFIL'), + 'shipments' => [[ + 'product' => $productCode, + 'billingNumber' => $billingNumber, + + // Shipper information (sender) - separate street and house number as per official spec + 'shipper' => array_filter([ + 'name1' => $orderData['shipper']['name'] ?? '', + 'name2' => !empty($orderData['shipper']['name2']) ? $orderData['shipper']['name2'] : null, + 'addressStreet' => $orderData['shipper']['street'] ?? '', + 'addressHouse' => $orderData['shipper']['houseNumber'] ?? null, + 'postalCode' => $orderData['shipper']['postalCode'] ?? '', + 'city' => $orderData['shipper']['city'] ?? '', + 'country' => $this->convertCountryCode($orderData['shipper']['country'] ?? 'DE'), + 'email' => !empty($orderData['shipper']['email']) ? $orderData['shipper']['email'] : null, + 'phone' => !empty($orderData['shipper']['phone']) ? $orderData['shipper']['phone'] : null, + ], function ($value) { + return $value !== null; + }), + + // Consignee information (recipient) - separate street and house number as per official spec + 'consignee' => array_filter([ + 'name1' => $orderData['consignee']['name'] ?? '', + 'name2' => !empty($orderData['consignee']['name2']) ? $orderData['consignee']['name2'] : null, + 'addressStreet' => $orderData['consignee']['street'] ?? '', + 'addressHouse' => $orderData['consignee']['houseNumber'] ?? null, + 'postalCode' => $orderData['consignee']['postalCode'] ?? '', + 'city' => $orderData['consignee']['city'] ?? '', + 'country' => $this->convertCountryCode($orderData['consignee']['country'] ?? 'DE'), + 'email' => !empty($orderData['consignee']['email']) ? $orderData['consignee']['email'] : null, + 'phone' => !empty($orderData['consignee']['phone']) ? $orderData['consignee']['phone'] : null, + ], function ($value) { + return $value !== null; + }), + + 'details' => [ + 'weight' => [ + 'value' => ($orderData['weight_kg'] ?? 1.0) * 1000, // Convert kg to grams + 'uom' => 'g' + ] + ], + + 'print' => [ + 'format' => $orderData['label_format'] ?? config('dhl.label_format', 'PDF') + ] + ]] + ]; + + // Add dimensions if provided (convert cm to mm) + if (!empty($orderData['dimensions'])) { + $payload['shipments'][0]['details']['dim'] = [ + 'uom' => 'mm', + 'length' => ($orderData['dimensions']['length'] ?? 30) * 10, // cm to mm + 'width' => ($orderData['dimensions']['width'] ?? 25) * 10, // cm to mm + 'height' => ($orderData['dimensions']['height'] ?? 10) * 10, // cm to mm + ]; + } + + // Add custom reference if provided + if (!empty($orderData['reference'])) { + $payload['shipments'][0]['refNo'] = $orderData['reference']; + } + + return $payload; + } + + /** + * Convert 2-letter country code to 3-letter country code for DHL API + */ + private function convertCountryCode(string $countryCode): string + { + $countryMap = [ + 'DE' => 'DEU', + 'AT' => 'AUT', + 'CH' => 'CHE', + 'US' => 'USA', + 'GB' => 'GBR', + 'FR' => 'FRA', + 'IT' => 'ITA', + 'ES' => 'ESP', + 'NL' => 'NLD', + 'BE' => 'BEL', + 'PL' => 'POL', + 'CZ' => 'CZE', + 'DK' => 'DNK', + 'SE' => 'SWE', + 'NO' => 'NOR', + ]; + + return $countryMap[strtoupper($countryCode)] ?? 'DEU'; + } + + /** + * Get the correct billing number for the given product code + */ + private function getBillingNumberForProduct(string $productCode): string + { + // Try to get account number from config by product code + $accountNumber = config("dhl.account_numbers.{$productCode}"); + + if ($accountNumber) { + return $accountNumber; + } + + // Try to get from admin settings via Setting model + try { + $settingKey = 'dhl_account_' . strtolower($productCode); + $accountNumber = \App\Models\Setting::getContentBySlug($settingKey); + if ($accountNumber) { + return $accountNumber; + } + } catch (\Exception $e) { + Log::warning('Could not load DHL account number from settings', [ + 'product_code' => $productCode, + 'setting_key' => $settingKey, + 'error' => $e->getMessage() + ]); + } + + // Fallback to default billing number + $defaultBillingNumber = config('dhl.billing_number') ?: config('dhl.account_numbers.default'); + + Log::warning('Using default billing number for product code', [ + 'product_code' => $productCode, + 'billing_number' => $defaultBillingNumber + ]); + + return $defaultBillingNumber; + } + + /** + * Extract shipment number from API response + */ + private function extractShipmentNumber(array $response): ?string + { + return data_get($response, 'items.0.shipmentNo') + ?? data_get($response, 'shipments.0.shipmentNo') + ?? data_get($response, 'shipmentNo') + ?? null; + } + + /** + * Extract base64 label data from API response + */ + private function extractLabelData(array $response): ?string + { + return data_get($response, 'items.0.label.b64') + ?? data_get($response, 'shipments.0.label.b64') + ?? data_get($response, 'shipments.0.label') + ?? data_get($response, 'label'); + } + + /** + * Extract routing code from API response + */ + private function extractRoutingCode(array $response): ?string + { + return data_get($response, 'items.0.routingCode') + ?? data_get($response, 'shipments.0.routingCode') + ?? null; + } + + /** + * Create shipment database record + */ + private function createShipmentRecord(array $orderData, array $payload, array $response, ?string $shipmentNumber): DhlShipment + { + return DhlShipment::create([ + 'order_id' => $orderData['order_id'] ?? null, + 'dhl_shipment_no' => $shipmentNumber, + 'routing_code' => $this->extractRoutingCode($response), + 'type' => 'outbound', + 'product_code' => $payload['shipments'][0]['product'], + 'billing_number' => $payload['shipments'][0]['billingNumber'], + 'weight_kg' => $payload['shipments'][0]['details']['weight']['value'] / 1000, + 'status' => 'created', + 'label_format' => $payload['shipments'][0]['print']['format'], + 'label_path' => null, + 'api_response_data' => $response + ]); + } + + /** + * Save label file to storage and create label record + */ + private function saveLabelFile(DhlShipment $shipment, ?string $labelBase64, string $format): ?string + { + if (!$labelBase64) { + Log::warning('No label data received for shipment', ['shipmentId' => $shipment->id]); + return null; + } + $path = 'dhl/labels/' . $shipment->dhl_shipment_no . '.' . strtolower($format); + $success = false; + for ($attempt = 1; $attempt <= 3; $attempt++) { + try { + Storage::disk('local')->put($path, base64_decode($labelBase64)); + $success = true; + break; + } catch (\Exception $e) { + Log::warning('Storage put failed, retrying', ['attempt' => $attempt, 'error' => $e->getMessage()]); + usleep(1000000); // 1 second in microseconds + } + } + if (!$success) { + throw new \Exception('Failed to save label after 3 attempts'); + } + $shipment->update(['label_path' => $path]); + return $path; + } +} diff --git a/packages/acme-laravel-dhl/src/Services/TrackingService.php b/packages/acme-laravel-dhl/src/Services/TrackingService.php new file mode 100644 index 00000000..df137892 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Services/TrackingService.php @@ -0,0 +1,180 @@ + true]; + } + + $response = $this->client->request('get', '/post-tracking/api/shipments', [], [ + 'trackingNumber' => $trackingNumber + ]); + Log::info('Fetched tracking status', ['trackingNumber' => $trackingNumber]); + + $events = data_get($response, 'shipments.0.events', []); + $shipment = $this->findOrCreateShipment($trackingNumber); + + $this->updateTrackingEvents($shipment, $events); + + return $response; + } + + /** + * Update tracking status for multiple shipments + * + * @param array $trackingNumbers Array of tracking numbers to update + * @return array Results for each tracking number + */ + public function updateMultipleStatus(array $trackingNumbers): array + { + $results = []; + + foreach ($trackingNumbers as $trackingNumber) { + try { + $results[$trackingNumber] = $this->fetchStatus($trackingNumber); + } catch (Exception $e) { + Log::error('Tracking update failed', ['trackingNumber' => $trackingNumber, 'error' => $e->getMessage()]); + $results[$trackingNumber] = ['error' => $e->getMessage()]; + } + } + + return $results; + } + + /** + * Get latest tracking status for a shipment + * + * @param string $trackingNumber DHL tracking number + * @return array|null Latest tracking event or null if not found + */ + public function getLatestStatus(string $trackingNumber): ?array + { + $shipment = DhlShipment::where('dhl_shipment_no', $trackingNumber)->first(); + + if (!$shipment) { + return null; + } + + $latestEvent = $shipment->trackingEvents() + ->orderBy('event_time', 'desc') + ->first(); + + return $latestEvent ? $latestEvent->toArray() : null; + } + + /** + * Find existing shipment or create new one + */ + private function findOrCreateShipment(string $trackingNumber): DhlShipment + { + return DB::transaction(function () use ($trackingNumber) { + return DhlShipment::firstOrCreate( + ['dhl_shipment_no' => $trackingNumber], + [ + 'type' => 'outbound', + 'status' => 'unknown' + ] + ); + }); + } + + /** + * Update tracking events for a shipment + */ + private function updateTrackingEvents(DhlShipment $shipment, array $events): void + { + foreach ($events as $eventData) { + $this->createOrUpdateTrackingEvent($shipment, $eventData); + } + + // Update shipment status based on latest event + $this->updateShipmentStatus($shipment, $events); + } + + /** + * Create or update a tracking event + */ + private function createOrUpdateTrackingEvent(DhlShipment $shipment, array $eventData): void + { + DhlTrackingEvent::updateOrCreate( + [ + 'shipment_id' => $shipment->id, + 'status_code' => $eventData['statusCode'] ?? null, + 'event_time' => $eventData['timestamp'] ?? null + ], + [ + 'status_text' => $eventData['status'] ?? null, + 'location' => $this->extractLocation($eventData), + 'raw' => $eventData + ] + ); + } + + /** + * Extract location from event data + */ + private function extractLocation(array $eventData): ?string + { + return data_get($eventData, 'location.address.addressLocality') + ?? data_get($eventData, 'location') + ?? null; + } + + /** + * Update shipment status based on latest tracking event + */ + private function updateShipmentStatus(DhlShipment $shipment, array $events): void + { + if (empty($events)) { + return; + } + + // Sort events by timestamp to get the latest + usort($events, function ($a, $b) { + return strtotime($b['timestamp'] ?? '0') <=> strtotime($a['timestamp'] ?? '0'); + }); + + $latestEvent = $events[0]; + $statusCode = $latestEvent['statusCode'] ?? null; + + // Map DHL status codes to our internal status + $status = DhlShipment::STATUS_MAP[$statusCode] ?? 'unknown'; + + $shipment->update([ + 'status' => $status, + 'tracking_status' => $latestEvent['status'] ?? null, + 'last_tracked_at' => now() + ]); + Log::info('Updated shipment status', ['shipmentId' => $shipment->id, 'newStatus' => $status]); + } +} diff --git a/packages/acme-laravel-dhl/src/Support/DhlClient.php b/packages/acme-laravel-dhl/src/Support/DhlClient.php new file mode 100644 index 00000000..e92b49a8 --- /dev/null +++ b/packages/acme-laravel-dhl/src/Support/DhlClient.php @@ -0,0 +1,198 @@ +baseUrl) + ->withHeaders($this->buildHeaders()) + ->timeout(30) + ->retry(3, 300, function ($exception, $attempt) { + if ($exception instanceof RequestException && $exception->response->status() === 429) { + $delay = min(1000000 * $attempt, 10000000); // Max 10 seconds + usleep($delay); // Microseconds + return true; + } + return $exception instanceof ConnectionException || + ($exception instanceof RequestException && in_array($exception->response->status(), [500, 502, 503, 504])); + }, false); + + // Add authentication if provided + if ($this->username && $this->password) { + $request = $request->withBasicAuth($this->username, $this->password); + } + + // Make the request + $response = match (strtolower($method)) { + 'get' => $request->get($uri, $query), + 'post' => $request->post($uri . '?' . http_build_query($query), $payload), + 'put' => $request->put($uri, $payload), + 'delete' => $request->delete($uri), + default => throw new Exception("Unsupported HTTP method: {$method}") + }; + + // Handle response + if ($response->failed()) { + // Log additional debug info for 400 errors + if ($response->status() === 400) { + Log::error('[DHL API] HTTP 400 Bad Request Details', [ + 'method' => $method, + 'uri' => $uri, + 'request_payload' => $payload, + 'response_body' => $response->body(), + 'response_json' => $response->json(), + 'status_code' => $response->status(), + 'headers' => $response->headers() + ]); + } + + $this->handleErrorResponse($response, $method, $uri); + } + + return $response->json() ?? []; + } catch (RequestException $e) { + Log::error('DHL API request failed', ['error' => $e->getMessage(), 'method' => $method, 'uri' => $uri]); + throw new DhlApiException("DHL API request failed: {$e->getMessage()}", $e->getCode(), $e); + } catch (Exception $e) { + Log::error('DHL API error', ['error' => $e->getMessage()]); + // Re-throw our own exceptions + if ($e instanceof DhlApiException) { + throw $e; + } + throw new DhlApiException("DHL API error: {$e->getMessage()}", $e->getCode(), $e); + } + } + + /** + * Build HTTP headers for DHL API requests + */ + private function buildHeaders(): array + { + $headers = [ + 'Accept' => 'application/json', + 'Content-Type' => 'application/json', + 'User-Agent' => 'acme-laravel-dhl/1.0' + ]; + + if ($this->apiKey) { + $headers['dhl-api-key'] = $this->apiKey; + } + + return $headers; + } + + /** + * Handle error responses from DHL API + */ + private function handleErrorResponse($response, string $method, string $uri): void + { + $status = $response->status(); + $body = $response->json(); + + $errorMessage = $this->extractErrorMessage($body) ?? "HTTP {$status} error"; + + match (true) { + $status === 401 => throw new DhlAuthenticationException("DHL API authentication failed: {$errorMessage}"), + $status === 403 => throw new DhlAuthenticationException("DHL API access forbidden: {$errorMessage}"), + $status === 404 => throw new DhlApiException("DHL API endpoint not found: {$method} {$uri}"), + $status === 422 => throw new DhlValidationException("DHL API validation error: {$errorMessage}"), + $status === 429 => throw new DhlApiException("DHL API rate limit exceeded. Please try again later."), + $status >= 500 => throw new DhlApiException("DHL API server error: {$errorMessage}"), + default => throw new DhlApiException("DHL API error ({$status}): {$errorMessage}") + }; + } + + /** + * Extract error message from DHL API response + */ + private function extractErrorMessage(?array $body): ?string + { + if (!$body) { + return null; + } + + // Try different possible error message fields + return $body['message'] + ?? $body['error'] + ?? $body['detail'] + ?? data_get($body, 'errors.0.message') + ?? data_get($body, 'error.message') + ?? null; + } + + /** + * Test connection to DHL API + * + * @return bool True if connection successful + */ + public function testConnection(): bool + { + try { + // Check basic connectivity and authentication + // Use the simplest possible endpoint to minimize permission issues + $response = Http::baseUrl($this->baseUrl) + ->withHeaders($this->buildHeaders()) + ->withBasicAuth($this->username, $this->password) + ->timeout(10) + ->get('/'); + + // If we get any response (even 404), the connection and auth are working + if ($response->status() === 401) { + Log::error('DHL API authentication failed: Invalid username/password'); + return false; + } + + if ($response->status() === 403 && str_contains($response->body(), 'api-key')) { + Log::error('DHL API authentication failed: Invalid API key'); + return false; + } + + // Any other response code (including 404, 403 for endpoint access) means connection works + Log::info('DHL API connection test successful', [ + 'status' => $response->status(), + 'has_api_key' => !empty($this->apiKey), + 'has_credentials' => !empty($this->username) && !empty($this->password) + ]); + + return true; + } catch (Exception $e) { + Log::error('DHL API connection test failed', [ + 'error' => $e->getMessage(), + 'base_url' => $this->baseUrl + ]); + return false; + } + } +} diff --git a/packages/acme-laravel-dhl/tests/Unit/AddressParserTest.php b/packages/acme-laravel-dhl/tests/Unit/AddressParserTest.php new file mode 100644 index 00000000..f621a6c7 --- /dev/null +++ b/packages/acme-laravel-dhl/tests/Unit/AddressParserTest.php @@ -0,0 +1,114 @@ +createMock(\Acme\Dhl\Support\DhlClient::class); + $this->shippingService = new ShippingService($mockClient); + + // Make private method accessible for testing + $reflection = new ReflectionClass($this->shippingService); + $this->parseMethod = $reflection->getMethod('parseGermanAddress'); + $this->parseMethod->setAccessible(true); + } + + /** + * Test standard German address formats + */ + public function testStandardGermanAddresses(): void + { + $testCases = [ + // Basic format: Street + Number + 'Musterstraße 123' => ['street' => 'Musterstraße', 'houseNumber' => '123'], + 'Hauptstraße 1' => ['street' => 'Hauptstraße', 'houseNumber' => '1'], + + // With letter suffix + 'Bahnhofstraße 45a' => ['street' => 'Bahnhofstraße', 'houseNumber' => '45a'], + 'Kirchgasse 12B' => ['street' => 'Kirchgasse', 'houseNumber' => '12B'], + + // Multi-word street names + 'Am Markt 7' => ['street' => 'Am Markt', 'houseNumber' => '7'], + 'An der Kirche 23' => ['street' => 'An der Kirche', 'houseNumber' => '23'], + 'Karl-Marx-Straße 156' => ['street' => 'Karl-Marx-Straße', 'houseNumber' => '156'], + + // Range numbers + 'Lindenstraße 1-3' => ['street' => 'Lindenstraße', 'houseNumber' => '1-3'], + 'Gartenweg 12/14' => ['street' => 'Gartenweg', 'houseNumber' => '12/14'], + + // With abbreviations + 'Muster Str. 99' => ['street' => 'Muster Str.', 'houseNumber' => '99'], + 'Berliner Pl. 5' => ['street' => 'Berliner Pl.', 'houseNumber' => '5'], + ]; + + foreach ($testCases as $input => $expected) { + $result = $this->parseMethod->invoke($this->shippingService, $input); + + $this->assertEquals($expected['street'], $result['street'], "Failed parsing street for: {$input}"); + $this->assertEquals($expected['houseNumber'], $result['houseNumber'], "Failed parsing house number for: {$input}"); + } + } + + /** + * Test edge cases and problematic addresses + */ + public function testEdgeCases(): void + { + $edgeCases = [ + // No house number - should return null for houseNumber + 'Musterstraße' => ['street' => 'Musterstraße', 'houseNumber' => null], + 'Am Markt' => ['street' => 'Am Markt', 'houseNumber' => null], + + // Empty string + '' => ['street' => '', 'houseNumber' => null], + + // Only number + '123' => ['street' => '123', 'houseNumber' => null], + + // Multiple spaces + 'Muster Straße 123' => ['street' => 'Muster Straße', 'houseNumber' => '123'], + ]; + + foreach ($edgeCases as $input => $expected) { + $result = $this->parseMethod->invoke($this->shippingService, $input); + + $this->assertEquals($expected['street'], $result['street'], "Failed parsing street for edge case: {$input}"); + $this->assertEquals($expected['houseNumber'], $result['houseNumber'], "Failed parsing house number for edge case: {$input}"); + } + } + + /** + * Test international addresses (should not be parsed) + */ + public function testInternationalAddresses(): void + { + $internationalCases = [ + // English-style addresses + '123 Main Street' => ['street' => '123 Main Street', 'houseNumber' => null], + '456 Oak Avenue' => ['street' => '456 Oak Avenue', 'houseNumber' => null], + ]; + + foreach ($internationalCases as $input => $expected) { + $result = $this->parseMethod->invoke($this->shippingService, $input); + + $this->assertEquals($expected['street'], $result['street'], "International address should not be parsed: {$input}"); + $this->assertEquals($expected['houseNumber'], $result['houseNumber'], "International address should have null house number: {$input}"); + } + } +} \ No newline at end of file diff --git a/packages/laravel-collective-spatie-html-parser/.editorconfig b/packages/laravel-collective-spatie-html-parser/.editorconfig new file mode 100644 index 00000000..6f313c6a --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/.editorconfig @@ -0,0 +1,15 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.yml] +indent_size = 2 diff --git a/packages/laravel-collective-spatie-html-parser/.gitignore b/packages/laravel-collective-spatie-html-parser/.gitignore new file mode 100644 index 00000000..61ead866 --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/.gitignore @@ -0,0 +1 @@ +/vendor diff --git a/packages/laravel-collective-spatie-html-parser/CONTRIBUTING.md b/packages/laravel-collective-spatie-html-parser/CONTRIBUTING.md new file mode 100644 index 00000000..7b648ed7 --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/CONTRIBUTING.md @@ -0,0 +1,23 @@ +# Contributing to laravel-collective-spatie-html-parser + +Thank you for considering contributing to this project! Your contributions help maintain and improve this Laravel compatibility layer, ensuring a smooth transition between the obsolete laravel-collective library to the maintained laravel-spatie-html. This library also helps to that old proyects to be updated to the new versions of Laravel. + +## How to Contribute + +### 1. Submitting a Pull Request (PR) +- Always create your PR against the `develop` branch. +- Use a **descriptive name** and provide a **clear description** of what the PR does (bug fix, new feature, improvement, etc.). +- Once reviewed and approved, I will merge it into `master` and handle the deployment. + +### 2. Reporting Issues +If you encounter a bug but are unable to fix it yourself, you can still help by reporting it: +- Open a new **Issue** in the repository. +- Provide a **detailed description** of the issue. +- Include **steps to reproduce the problem** so others can verify and fix it. + +## Code Style Guidelines +- Follow Laravel’s coding standards and best practices. +- Keep the code clean and well-documented. +- Ensure that new features or fixes do not break existing functionality. + +Thank you for your support and contributions! diff --git a/packages/laravel-collective-spatie-html-parser/LICENCE.md b/packages/laravel-collective-spatie-html-parser/LICENCE.md new file mode 100644 index 00000000..bc49dc08 --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/LICENCE.md @@ -0,0 +1,9 @@ +The MIT License (MIT) + +Copyright © 2024 Christian Albán + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/packages/laravel-collective-spatie-html-parser/README.md b/packages/laravel-collective-spatie-html-parser/README.md new file mode 100644 index 00000000..3dc438fe --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/README.md @@ -0,0 +1,66 @@ +# Laravel Collective to Spatie Laravel HTML Adapter + +This package serves as an adapter to help projects that depend on the obsolete `laravel-collective/html` library. It provides an interface that uses the same syntax as the `Form` class of `laravel-collective/html` to create HTML elements. Under the hood, it utilizes the `spatie/laravel-html` library, which is actively maintained, to generate the HTML elements. This allows projects to update to newer Laravel versions without changing the HTML creation syntax. + +## Features +- Zero configuration needed, works out of the box. +- Uses the same syntax as `laravel-collective/html`. +- Leverages the actively maintained `spatie/laravel-html` library. + +## Available Methods +The following methods can be used and are located in the `src/FormAdapter` directory: + +- `checkbox($name, $value = 1, $checked = null, $options = [])` +- `open(array $options = [])` +- `label($name, $value = null, $options = [], $escape_html = true)` +- `text($name, $value = null, $options = [])` +- `password($name, $options = [])` +- `select($name, $list = [], $selected = null, array $selectAttributes = [], array $optionsAttributes = [], array $optgroupsAttributes = [])` +- `radio($name, $value = null, $checked = null, $options = [])` +- `submit($value = null, $options = [])` +- `close()` +- `input($type, $name, $value = null, $options = [])` +- `search($name, $value = null, $options = [])` +- `model($model, array $options = [])` +- `hidden($name, $value = null, $options = [])` +- `email($name, $value = null, $options = [])` +- `tel($name, $value = null, $options = [])` +- `number($name, $value = null, $options = [])` +- `date($name, $value = null, $options = [])` +- `datetime($name, $value = null, $options = [])` +- `datetimeLocal($name, $value = null, $options = [])` +- `time($name, $value = null, $options = [])` +- `url($name, $value = null, $options = [])` +- `file($name, $options = [])` +- `textarea($name, $value = null, $options = [])` +- `reset($value, $attributes = [])` +- `image($url, $name = null, $attributes = [])` +- `color($name, $value = null, $options = [])` +- `button($value = null, $options = [])` + +## Installation + +To install the package, use composer: + +```sh +composer require alban/laravel-collective-spatie-html-parser +``` + +## Usage + +The methods listed above can be used in the same way as you would use the Form class from laravel-collective. Here is an example in a Blade template: + +```php +{{-- Using the FormAdapter class in a Blade template --}} +{!! Form::text('relationship', $item->client->agent_relationship, ['required', 'class' => 'form-control input-sm']) !!} +``` + +For more examples, please refer to the source code in the `src/FormAdapter.php` class file. + +## License + +This package is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). + +## Contributing + +You are welcome to contribute to this project. Please refer to the [contributing guidelines](CONTRIBUTING.md) for more information. diff --git a/packages/laravel-collective-spatie-html-parser/composer.json b/packages/laravel-collective-spatie-html-parser/composer.json new file mode 100644 index 00000000..6556a3d5 --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/composer.json @@ -0,0 +1,39 @@ +{ + "name": "alban/laravel-collective-spatie-html-parser", + "description": "Adapter class that allows use spatie/laravel-html for old projects that were using the abanondated laravelcollective/html package, and allow to update to new versions of laravel", + "type": "library", + "require": { + "php": "^8.3 | ^8.2 | ^8.0 | ^7.4", + "spatie/laravel-html": "^3.12", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0" + }, + "license": "MIT", + "autoload": { + "psr-4": { + "Alban\\LaravelCollectiveSpatieHtmlParser\\": "src/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider" + ], + "aliases": { + "Form": "Alban\\LaravelCollectiveSpatieHtmlParser\\FormFacade" + } + } + }, + "authors": [ + { + "name": "Christian Albán", + "email": "christianalbanctdb1d@gmail.com" + } + ], + + "minimum-stability": "stable", + "config": { + "allow-plugins": { + "kylekatarnls/update-helper": true + } + } +} diff --git a/packages/laravel-collective-spatie-html-parser/composer.lock b/packages/laravel-collective-spatie-html-parser/composer.lock new file mode 100644 index 00000000..dff9e95e --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/composer.lock @@ -0,0 +1,3375 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + + "content-hash": "23e543978c15a0bc9f94b485c4b6ebd8", + + "packages": [ + { + "name": "carbonphp/carbon-doctrine-types", + "version": "3.2.0", + "source": { + "type": "git", + "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git", + "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d", + "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "conflict": { + "doctrine/dbal": "<4.0.0 || >=5.0.0" + }, + "require-dev": { + "doctrine/dbal": "^4.0.0", + "nesbot/carbon": "^2.71.0 || ^3.0.0", + "phpunit/phpunit": "^10.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Carbon\\Doctrine\\": "src/Carbon/Doctrine/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KyleKatarn", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "Types to use Carbon in Doctrine", + "keywords": [ + "carbon", + "date", + "datetime", + "doctrine", + "time" + ], + "support": { + "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues", + "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0" + }, + "funding": [ + { + "url": "https://github.com/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], + "time": "2024-02-09T16:56:22+00:00" + }, + { + "name": "doctrine/inflector", + "version": "2.0.10", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^11.0", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25 || ^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", + "keywords": [ + "inflection", + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" + ], + "support": { + "issues": "https://github.com/doctrine/inflector/issues", + "source": "https://github.com/doctrine/inflector/tree/2.0.10" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], + "time": "2024-02-18T20:23:39+00:00" + }, + { + "name": "fruitcake/php-cors", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/fruitcake/php-cors.git", + "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b", + "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b", + "shasum": "" + }, + "require": { + "php": "^7.4|^8.0", + "symfony/http-foundation": "^4.4|^5.4|^6|^7" + }, + "require-dev": { + "phpstan/phpstan": "^1.4", + "phpunit/phpunit": "^9", + "squizlabs/php_codesniffer": "^3.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "psr-4": { + "Fruitcake\\Cors\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fruitcake", + "homepage": "https://fruitcake.nl" + }, + { + "name": "Barryvdh", + "email": "barryvdh@gmail.com" + } + ], + "description": "Cross-origin resource sharing library for the Symfony HttpFoundation", + "homepage": "https://github.com/fruitcake/php-cors", + "keywords": [ + "cors", + "laravel", + "symfony" + ], + "support": { + "issues": "https://github.com/fruitcake/php-cors/issues", + "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0" + }, + "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2023-10-12T05:21:21+00:00" + }, + { + "name": "guzzlehttp/guzzle", + "version": "7.9.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "d281ed313b989f213357e3be1a179f02196ac99b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", + "reference": "d281ed313b989f213357e3be1a179f02196ac99b", + "shasum": "" + }, + "require": { + "ext-json": "*", + "guzzlehttp/promises": "^1.5.3 || ^2.0.3", + "guzzlehttp/psr7": "^2.7.0", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "ext-curl": "*", + "guzzle/client-integration-tests": "3.0.2", + "php-http/message-factory": "^1.1", + "phpunit/phpunit": "^8.5.39 || ^9.6.20", + "psr/log": "^1.1 || ^2.0 || ^3.0" + }, + "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", + "psr/log": "Required for using the Log middleware" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "psr-18", + "psr-7", + "rest", + "web service" + ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/7.9.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" + } + ], + "time": "2024-07-24T11:22:20+00:00" + }, + { + "name": "guzzlehttp/promises", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.39 || ^9.6.20" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2024-10-17T10:06:22+00:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.1 || ^2.0", + "ralouphie/getallheaders": "^3.0" + }, + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "http-interop/http-factory-tests": "0.9.0", + "phpunit/phpunit": "^8.5.39 || ^9.6.20" + }, + "suggest": { + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" + ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/2.7.0" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2024-07-18T11:15:46+00:00" + }, + { + "name": "guzzlehttp/uri-template", + "version": "v1.0.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/uri-template.git", + "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c", + "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "symfony/polyfill-php80": "^1.24" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "uri-template/tests": "1.0.0" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\UriTemplate\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + } + ], + "description": "A polyfill class for uri_template of PHP", + "keywords": [ + "guzzlehttp", + "uri-template" + ], + "support": { + "issues": "https://github.com/guzzle/uri-template/issues", + "source": "https://github.com/guzzle/uri-template/tree/v1.0.3" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/uri-template", + "type": "tidelift" + } + ], + "time": "2023-12-03T19:50:20+00:00" + }, + { + "name": "illuminate/collections", + "version": "v11.35.1", + "source": { + "type": "git", + "url": "https://github.com/illuminate/collections.git", + "reference": "b8be9c0fedfc5be1524b290fed640d4b7d42c813" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/collections/zipball/b8be9c0fedfc5be1524b290fed640d4b7d42c813", + "reference": "b8be9c0fedfc5be1524b290fed640d4b7d42c813", + + "shasum": "" + }, + "require": { + "illuminate/conditionable": "^11.0", + "illuminate/contracts": "^11.0", + "illuminate/macroable": "^11.0", + "php": "^8.2" + }, + "suggest": { + "symfony/var-dumper": "Required to use the dump method (^7.0)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php", + "helpers.php" + ], + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Collections package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + + "time": "2024-12-10T14:54:28+00:00" + }, + { + "name": "illuminate/conditionable", + "version": "v11.35.1", + "source": { + "type": "git", + "url": "https://github.com/illuminate/conditionable.git", + "reference": "911df1bda950a3b799cf80671764e34eede131c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/911df1bda950a3b799cf80671764e34eede131c6", + "reference": "911df1bda950a3b799cf80671764e34eede131c6", + + "shasum": "" + }, + "require": { + "php": "^8.0.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Conditionable package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + + "time": "2024-11-21T16:28:56+00:00" + }, + { + "name": "illuminate/contracts", + "version": "v11.35.1", + "source": { + "type": "git", + "url": "https://github.com/illuminate/contracts.git", + "reference": "184317f701ba20ca265e36808ed54b75b115972d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/184317f701ba20ca265e36808ed54b75b115972d", + "reference": "184317f701ba20ca265e36808ed54b75b115972d", + + "shasum": "" + }, + "require": { + "php": "^8.2", + "psr/container": "^1.1.1|^2.0.1", + "psr/simple-cache": "^1.0|^2.0|^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Contracts\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Contracts package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + + "time": "2024-11-25T15:33:38+00:00" + }, + { + "name": "illuminate/filesystem", + "version": "v11.35.1", + "source": { + "type": "git", + "url": "https://github.com/illuminate/filesystem.git", + "reference": "ec19853eaa9e25bbf3e10cf880a3cd0b6a4b75c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/ec19853eaa9e25bbf3e10cf880a3cd0b6a4b75c4", + "reference": "ec19853eaa9e25bbf3e10cf880a3cd0b6a4b75c4", + + "shasum": "" + }, + "require": { + "illuminate/collections": "^11.0", + "illuminate/contracts": "^11.0", + "illuminate/macroable": "^11.0", + "illuminate/support": "^11.0", + "php": "^8.2", + + "symfony/finder": "^7.0.3" + + }, + "suggest": { + "ext-fileinfo": "Required to use the Filesystem class.", + "ext-ftp": "Required to use the Flysystem FTP driver.", + "ext-hash": "Required to use the Filesystem class.", + "illuminate/http": "Required for handling uploaded files (^7.0).", + "league/flysystem": "Required to use the Flysystem local driver (^3.25.1).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).", + "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", + "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).", + "symfony/mime": "Required to enable support for guessing extensions (^7.0)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php" + ], + "psr-4": { + "Illuminate\\Filesystem\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Filesystem package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + + "time": "2024-11-26T14:46:56+00:00" + }, + { + "name": "illuminate/http", + "version": "v11.35.1", + "source": { + "type": "git", + "url": "https://github.com/illuminate/http.git", + "reference": "d19f4b1e3aeb9f8a857c7dc7a26f630b6b7a2785" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/http/zipball/d19f4b1e3aeb9f8a857c7dc7a26f630b6b7a2785", + "reference": "d19f4b1e3aeb9f8a857c7dc7a26f630b6b7a2785", + + "shasum": "" + }, + "require": { + "ext-filter": "*", + "fruitcake/php-cors": "^1.3", + + "guzzlehttp/guzzle": "^7.8.2", + + "guzzlehttp/uri-template": "^1.0", + "illuminate/collections": "^11.0", + "illuminate/macroable": "^11.0", + "illuminate/session": "^11.0", + "illuminate/support": "^11.0", + "php": "^8.2", + + "symfony/http-foundation": "^7.0.3", + "symfony/http-kernel": "^7.0.3", + "symfony/mime": "^7.0.3", + "symfony/polyfill-php83": "^1.31" + + }, + "suggest": { + "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image()." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Http\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Http package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + + "time": "2024-12-11T23:22:44+00:00" + }, + { + "name": "illuminate/macroable", + "version": "v11.35.1", + + "source": { + "type": "git", + "url": "https://github.com/illuminate/macroable.git", + "reference": "e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/macroable/zipball/e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed", + "reference": "e1cb9e51b9ed5d3c9bc1ab431d0a52fe42a990ed", + "shasum": "" + }, + "require": { + "php": "^8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Macroable package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-06-28T20:10:30+00:00" + }, + { + "name": "illuminate/session", + + "version": "v11.35.1", + "source": { + "type": "git", + "url": "https://github.com/illuminate/session.git", + "reference": "49e98e03b4d6c4f089eb9679bad45b78d9d197d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/session/zipball/49e98e03b4d6c4f089eb9679bad45b78d9d197d5", + "reference": "49e98e03b4d6c4f089eb9679bad45b78d9d197d5", + + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-session": "*", + "illuminate/collections": "^11.0", + "illuminate/contracts": "^11.0", + "illuminate/filesystem": "^11.0", + "illuminate/support": "^11.0", + "php": "^8.2", + + "symfony/finder": "^7.0.3", + "symfony/http-foundation": "^7.0.3" + + }, + "suggest": { + "illuminate/console": "Required to use the session:table command (^11.0)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Session\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Session package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + + "time": "2024-12-03T16:20:26+00:00" + }, + { + "name": "illuminate/support", + "version": "v11.35.1", + "source": { + "type": "git", + "url": "https://github.com/illuminate/support.git", + "reference": "bc363403d9ed3214754a0501e33c05d2afcfd474" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/support/zipball/bc363403d9ed3214754a0501e33c05d2afcfd474", + "reference": "bc363403d9ed3214754a0501e33c05d2afcfd474", + + "shasum": "" + }, + "require": { + "doctrine/inflector": "^2.0", + "ext-ctype": "*", + "ext-filter": "*", + "ext-mbstring": "*", + "illuminate/collections": "^11.0", + "illuminate/conditionable": "^11.0", + "illuminate/contracts": "^11.0", + "illuminate/macroable": "^11.0", + + "nesbot/carbon": "^2.72.2|^3.4", + "php": "^8.2", + "voku/portable-ascii": "^2.0.2" + + }, + "conflict": { + "tightenco/collect": "<5.5.33" + }, + "replace": { + "spatie/once": "*" + }, + "suggest": { + + "illuminate/filesystem": "Required to use the Composer class (^11.0).", + + "laravel/serializable-closure": "Required to use the once function (^1.3).", + "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", + "league/uri": "Required to use the Uri class (^7.5.1).", + "ramsey/uuid": "Required to use Str::uuid() (^4.7).", + + "symfony/process": "Required to use the Composer class (^7.0).", + "symfony/uid": "Required to use Str::ulid() (^7.0).", + "symfony/var-dumper": "Required to use the dd function (^7.0).", + "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." + + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php", + "helpers.php" + ], + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Support package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + + "time": "2024-12-11T23:23:18+00:00" + }, + { + "name": "nesbot/carbon", + "version": "3.8.2", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947", + "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947", + + "shasum": "" + }, + "require": { + "carbonphp/carbon-doctrine-types": "<100.0", + "ext-json": "*", + "php": "^8.1", + "psr/clock": "^1.0", + "symfony/clock": "^6.3 || ^7.0", + "symfony/polyfill-mbstring": "^1.0", + "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0" + }, + "provide": { + "psr/clock-implementation": "1.0" + }, + "require-dev": { + "doctrine/dbal": "^3.6.3 || ^4.0", + "doctrine/orm": "^2.15.2 || ^3.0", + "friendsofphp/php-cs-fixer": "^3.57.2", + "kylekatarnls/multi-tester": "^2.5.3", + "ondrejmirtes/better-reflection": "^6.25.0.4", + "phpmd/phpmd": "^2.15.0", + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "^1.11.2", + "phpunit/phpunit": "^10.5.20", + "squizlabs/php_codesniffer": "^3.9.0" + }, + "bin": [ + "bin/carbon" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev", + "dev-2.x": "2.x-dev" + }, + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] + }, + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Carbon\\": "src/Carbon/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Brian Nesbitt", + "email": "brian@nesbot.com", + "homepage": "https://markido.com" + }, + { + "name": "kylekatarnls", + "homepage": "https://github.com/kylekatarnls" + } + ], + "description": "An API extension for DateTime that supports 281 different languages.", + "homepage": "https://carbon.nesbot.com", + "keywords": [ + "date", + "datetime", + "time" + ], + "support": { + "docs": "https://carbon.nesbot.com/docs", + "issues": "https://github.com/briannesbitt/Carbon/issues", + "source": "https://github.com/briannesbitt/Carbon" + }, + "funding": [ + { + "url": "https://github.com/sponsors/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon#sponsor", + "type": "opencollective" + }, + { + "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme", + "type": "tidelift" + } + ], + "time": "2024-11-07T17:46:48+00:00" + }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + + + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "psr/http-client", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client" + }, + "time": "2023-09-23T14:17:50+00:00" + }, + { + "name": "psr/http-factory", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-factory" + }, + "time": "2024-04-15T12:06:14+00:00" + }, + { + "name": "psr/http-message", + "version": "2.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/2.0" + }, + "time": "2023-04-04T09:54:51+00:00" + }, + { + "name": "psr/log", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/3.0.2" + }, + "time": "2024-09-11T13:17:53+00:00" + }, + { + "name": "psr/simple-cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/3.0.0" + }, + "time": "2021-10-29T13:26:27+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "spatie/laravel-html", + "version": "3.11.1", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-html.git", + "reference": "167e5b8243103072155b562e5cc396c90a3c1055" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-html/zipball/167e5b8243103072155b562e5cc396c90a3c1055", + "reference": "167e5b8243103072155b562e5cc396c90a3c1055", + "shasum": "" + }, + "require": { + "illuminate/http": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0", + "php": "^8.2" + }, + "require-dev": { + "mockery/mockery": "^1.3", + "orchestra/testbench": "^8.0|^9.0", + "pestphp/pest": "^2.34" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\Html\\HtmlServiceProvider" + ], + "aliases": { + "Html": "Spatie\\Html\\Facades\\Html" + } + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Spatie\\Html\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sebastian De Deyne", + "email": "sebastian@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + }, + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "A fluent html builder", + "homepage": "https://github.com/spatie/laravel-html", + "keywords": [ + "html", + "spatie" + ], + "support": { + "source": "https://github.com/spatie/laravel-html/tree/3.11.1" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + } + ], + "time": "2024-10-18T14:37:21+00:00" + }, + { + "name": "symfony/clock", + + "version": "v7.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/clock.git", + "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/clock/zipball/b81435fbd6648ea425d1ee96a2d8e68f4ceacd24", + "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24", + + "shasum": "" + }, + "require": { + "php": ">=8.2", + "psr/clock": "^1.0", + "symfony/polyfill-php83": "^1.28" + }, + "provide": { + "psr/clock-implementation": "1.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/now.php" + ], + "psr-4": { + "Symfony\\Component\\Clock\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Decouples applications from the system clock", + "homepage": "https://symfony.com", + "keywords": [ + "clock", + "psr20", + "time" + ], + "support": { + + "source": "https://github.com/symfony/clock/tree/v7.2.0" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-09-25T14:21:43+00:00" + + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.5.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:20:29+00:00" + }, + { + "name": "symfony/error-handler", + + "version": "v7.2.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/error-handler.git", + "reference": "6150b89186573046167796fa5f3f76601d5145f8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/6150b89186573046167796fa5f3f76601d5145f8", + "reference": "6150b89186573046167796fa5f3f76601d5145f8", + + "shasum": "" + }, + "require": { + "php": ">=8.2", + "psr/log": "^1|^2|^3", + "symfony/var-dumper": "^6.4|^7.0" + }, + "conflict": { + "symfony/deprecation-contracts": "<2.5", + "symfony/http-kernel": "<6.4" + }, + "require-dev": { + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/serializer": "^6.4|^7.0" + }, + "bin": [ + "Resources/bin/patch-type-declarations" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\ErrorHandler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to manage errors and ease debugging PHP code", + "homepage": "https://symfony.com", + "support": { + + "source": "https://github.com/symfony/error-handler/tree/v7.2.1" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-12-07T08:50:44+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v7.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1", + "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1", + + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/event-dispatcher-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/dependency-injection": "<6.4", + "symfony/service-contracts": "<2.5" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/error-handler": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/stopwatch": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + + "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-09-25T14:21:43+00:00" + + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v3.5.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", + "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/event-dispatcher": "^1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:20:29+00:00" + }, + { + "name": "symfony/finder", + + "version": "v7.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49", + "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49", + + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "require-dev": { + "symfony/filesystem": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + + "source": "https://github.com/symfony/finder/tree/v7.2.0" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-10-23T06:56:12+00:00" + }, + { + "name": "symfony/http-foundation", + "version": "v7.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-foundation.git", + "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e88a66c3997859532bc2ddd6dd8f35aba2711744", + "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744", + + "shasum": "" + }, + "require": { + "php": ">=8.2", + + "symfony/deprecation-contracts": "^2.5|^3.0", + + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php83": "^1.27" + }, + "conflict": { + "doctrine/dbal": "<3.6", + + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" + + }, + "require-dev": { + "doctrine/dbal": "^3.6|^4", + "predis/predis": "^1.1|^2.0", + + "symfony/cache": "^6.4.12|^7.1.5", + + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/mime": "^6.4|^7.0", + "symfony/rate-limiter": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpFoundation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Defines an object-oriented layer for the HTTP specification", + "homepage": "https://symfony.com", + "support": { + + "source": "https://github.com/symfony/http-foundation/tree/v7.2.0" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-11-13T18:58:46+00:00" + }, + { + "name": "symfony/http-kernel", + "version": "v7.2.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-kernel.git", + "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d8ae58eecae44c8e66833e76cc50a4ad3c002d97", + "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97", + + "shasum": "" + }, + "require": { + "php": ">=8.2", + "psr/log": "^1|^2|^3", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/error-handler": "^6.4|^7.0", + "symfony/event-dispatcher": "^6.4|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "symfony/browser-kit": "<6.4", + "symfony/cache": "<6.4", + "symfony/config": "<6.4", + "symfony/console": "<6.4", + "symfony/dependency-injection": "<6.4", + "symfony/doctrine-bridge": "<6.4", + "symfony/form": "<6.4", + "symfony/http-client": "<6.4", + "symfony/http-client-contracts": "<2.5", + "symfony/mailer": "<6.4", + "symfony/messenger": "<6.4", + "symfony/translation": "<6.4", + "symfony/translation-contracts": "<2.5", + "symfony/twig-bridge": "<6.4", + "symfony/validator": "<6.4", + "symfony/var-dumper": "<6.4", + + "twig/twig": "<3.12" + + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/cache": "^1.0|^2.0|^3.0", + "symfony/browser-kit": "^6.4|^7.0", + "symfony/clock": "^6.4|^7.0", + "symfony/config": "^6.4|^7.0", + "symfony/console": "^6.4|^7.0", + "symfony/css-selector": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/dom-crawler": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/finder": "^6.4|^7.0", + "symfony/http-client-contracts": "^2.5|^3", + "symfony/process": "^6.4|^7.0", + "symfony/property-access": "^7.1", + "symfony/routing": "^6.4|^7.0", + "symfony/serializer": "^7.1", + "symfony/stopwatch": "^6.4|^7.0", + "symfony/translation": "^6.4|^7.0", + "symfony/translation-contracts": "^2.5|^3", + "symfony/uid": "^6.4|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0", + "symfony/var-exporter": "^6.4|^7.0", + + "twig/twig": "^3.12" + + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpKernel\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a structured process for converting a Request into a Response", + "homepage": "https://symfony.com", + "support": { + + "source": "https://github.com/symfony/http-kernel/tree/v7.2.1" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-12-11T12:09:10+00:00" + }, + { + "name": "symfony/mime", + "version": "v7.2.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/mime.git", + "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mime/zipball/7f9617fcf15cb61be30f8b252695ed5e2bfac283", + "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283", + + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0" + }, + "conflict": { + "egulias/email-validator": "~3.0.0", + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/mailer": "<6.4", + "symfony/serializer": "<6.4.3|>7.0,<7.0.3" + }, + "require-dev": { + "egulias/email-validator": "^2.1.10|^3.1|^4", + "league/html-to-markdown": "^5.0", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/property-access": "^6.4|^7.0", + "symfony/property-info": "^6.4|^7.0", + "symfony/serializer": "^6.4.3|^7.0.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mime\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows manipulating MIME messages", + "homepage": "https://symfony.com", + "keywords": [ + "mime", + "mime-type" + ], + "support": { + + "source": "https://github.com/symfony/mime/tree/v7.2.1" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-12-07T08:50:44+00:00" + + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-intl-idn", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "3833d7255cc303546435cb650316bff708a1c75c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-php83", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php83\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/translation", + + "version": "v7.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/dc89e16b44048ceecc879054e5b7f38326ab6cc5", + "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5", + + "shasum": "" + }, + "require": { + "php": ">=8.2", + + "symfony/deprecation-contracts": "^2.5|^3", + + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^2.5|^3.0" + }, + "conflict": { + "symfony/config": "<6.4", + "symfony/console": "<6.4", + "symfony/dependency-injection": "<6.4", + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<6.4", + "symfony/service-contracts": "<2.5", + "symfony/twig-bundle": "<6.4", + "symfony/yaml": "<6.4" + }, + "provide": { + "symfony/translation-implementation": "2.3|3.0" + }, + "require-dev": { + "nikic/php-parser": "^4.18|^5.0", + "psr/log": "^1|^2|^3", + "symfony/config": "^6.4|^7.0", + "symfony/console": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/finder": "^6.4|^7.0", + "symfony/http-client-contracts": "^2.5|^3.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", + "symfony/polyfill-intl-icu": "^1.21", + "symfony/routing": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to internationalize your application", + "homepage": "https://symfony.com", + "support": { + + "source": "https://github.com/symfony/translation/tree/v7.2.0" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-11-12T20:47:56+00:00" + + }, + { + "name": "symfony/translation-contracts", + "version": "v3.5.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation-contracts.git", + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to translation", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:20:29+00:00" + }, + { + "name": "symfony/var-dumper", + + "version": "v7.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6a22929407dec8765d6e2b6ff85b800b245879c", + "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c", + + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/console": "<6.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/uid": "^6.4|^7.0", + "twig/twig": "^3.12" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "support": { + + "source": "https://github.com/symfony/var-dumper/tree/v7.2.0" + + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + + "time": "2024-11-08T15:48:14+00:00" + + }, + { + "name": "voku/portable-ascii", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/voku/portable-ascii.git", + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" + }, + "suggest": { + "ext-intl": "Use Intl for transliterator_transliterate() support" + }, + "type": "library", + "autoload": { + "psr-4": { + "voku\\": "src/voku/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lars Moelleken", + "homepage": "https://www.moelleken.org/" + } + ], + "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", + "homepage": "https://github.com/voku/portable-ascii", + "keywords": [ + "ascii", + "clean", + "php" + ], + "support": { + "issues": "https://github.com/voku/portable-ascii/issues", + "source": "https://github.com/voku/portable-ascii/tree/2.0.3" + }, + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/portable-ascii", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", + "type": "tidelift" + } + ], + "time": "2024-11-21T01:49:47+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": {}, + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^8.2" + }, + "platform-dev": {}, + "plugin-api-version": "2.6.0" +} diff --git a/packages/laravel-collective-spatie-html-parser/src/FormAdapter.php b/packages/laravel-collective-spatie-html-parser/src/FormAdapter.php new file mode 100644 index 00000000..c094ab67 --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/src/FormAdapter.php @@ -0,0 +1,218 @@ +mergeOptions($element, $options); + } + + public function open(array $options = []) + { + $method = array_key_exists('method', $options) ? $options['method'] : 'POST'; + $route = array_key_exists('route', $options) ? $options['route'] : ''; + $files = array_key_exists('files', $options) ? $options['files'] : false; + + unset($options['method'], $options['route'], $options['files']); + + $form = \Html::getFacadeRoot(); + + if (is_array($route) && count($route)) { + $action = array_shift($route); + $form = $form->form($method, route($action, $route)); + } elseif ($route != null && $route != [] && $route != '') { + $form = $form->form($method, route($route)); + } else { + $form = $form->form($method); + } + + if ($files) { + $form = $form->acceptsFiles(); + } + + return $this->mergeOptions($form, $options)->open(); + } + + public function label($name, $value = null, $options = [], $escape_html = true) + { + $element = \Html::label($value, $name); + + return $this->mergeOptions($element, $options); + } + + public function text($name, $value = null, $options = []) + { + $element = \Html::text($name, $value); + + return $this->mergeOptions($element, $options); + } + + public function password($name, $options = []) + { + $element = \Html::password($name); + + return $this->mergeOptions($element, $options); + } + + public function select( + $name, + $list = [], + $selected = null, + array $selectAttributes = [], + array $optionsAttributes = [], + array $optgroupsAttributes = [] + ) { + if (isset($selectAttributes['multiple']) || in_array('multiple', $selectAttributes)) { + $element = \Html::select($name, $list, $selected)->multiple(); + } else { + $element = \Html::select($name, $list, $selected); + } + // $element = \Html::select($name, $list, $selected); + + return $this->mergeOptions($element, $selectAttributes); + } + + + public function radio($name, $value = null, $checked = null, $options = []) + { + $element = \Html::radio($name, $checked, $value); + + return $this->mergeOptions($element, $options); + } + + public function submit($value = null, $options = []) + { + $element = \Html::submit($value); + + return $this->mergeOptions($element, $options); + } + + public function close() + { + \Html::endModel(); + + return \Html::form()->close(); + } + + public function input($type, $name, $value = null, $options = []) + { + $element = \Html::input($type, $name, $value); + + return $this->mergeOptions($element, $options); + } + + public function search($name, $value = null, $options = []) + { + return $this->input('search', $name, $value, $options); + } + + public function model($model, array $options = []) + { + \Html::model($model); + + return $this->open($options); + } + + public function hidden($name, $value = null, $options = []) + { + $element = \Html::hidden($name, $value); + + return $this->mergeOptions($element, $options); + } + + public function email($name, $value = null, $options = []) + { + $element = \Html::email($name, $value); + + return $this->mergeOptions($element, $options); + } + + public function tel($name, $value = null, $options = []) + { + $element = \Html::tel($name, $value); + + return $this->mergeOptions($element, $options); + } + + public function number($name, $value = null, $options = []) + { + return $this->input('number', $name, $value, $options); + } + + public function date($name, $value = null, $options = []) + { + $element = \Html::date($name, $value); + + return $this->mergeOptions($element, $options); + } + + public function datetime($name, $value = null, $options = []) + { + return $this->input('datetime', $name, $value, $options); + } + + public function datetimeLocal($name, $value = null, $options = []) + { + return $this->input('datetime-local', $name, $value, $options); + } + + public function time($name, $value = null, $options = []) + { + $element = \Html::time($name, $value); + + return $this->mergeOptions($element, $options); + } + + public function url($name, $value = null, $options = []) + { + return $this->input('url', $name, $value, $options); + } + + public function file($name, $options = []) + { + $element = \Html::file($name); + + return $this->mergeOptions($element, $options); + } + + public function textarea($name, $value = null, $options = []) + { + $element = \Html::textarea($name, $value); + + return $this->mergeOptions($element, $options); + } + + public function reset($value, $attributes = []) + { + $element = \Html::reset($value); + + return $this->mergeOptions($element, $attributes); + } + + public function image($url, $name = null, $attributes = []) + { + $element = \Html::img($url, $name); + + return $this->mergeOptions($element, $attributes); + } + + public function color($name, $value = null, $options = []) + { + return $this->input('color', $name, $value, $options); + } + + public function button($value = null, $options = []) + { + $element = \Html::button($value); + + return $this->mergeOptions($element, $options); + } +} diff --git a/packages/laravel-collective-spatie-html-parser/src/FormFacade.php b/packages/laravel-collective-spatie-html-parser/src/FormFacade.php new file mode 100644 index 00000000..1ebe332c --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/src/FormFacade.php @@ -0,0 +1,22 @@ +registerFormAdpater(); + $this->registerHtmlAdapter(); + + $this->app->alias('form', FormAdapter::class); + $this->app->alias('html', HtmlAdapter::class); + } + + /** + * Register the HTML adapter instance. + * + * @return void + */ + protected function registerFormAdpater() + { + $this->app->singleton('form', function () { + return new FormAdapter(); + }); + } + + /** + * Register the HTML adapter instance. + * + * @return void + */ + protected function registerHtmlAdapter() + { + $this->app->singleton('html', function () { + return new HtmlAdapter(); + }); + } +} diff --git a/packages/laravel-collective-spatie-html-parser/src/Traits/AttributesUtils.php b/packages/laravel-collective-spatie-html-parser/src/Traits/AttributesUtils.php new file mode 100644 index 00000000..320f3f72 --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/src/Traits/AttributesUtils.php @@ -0,0 +1,35 @@ +addClass($options['class']); + unset($options['class']); + } + + if (isset($options['placeholder'])) { + $newElement = $newElement->placeholder($options['placeholder']); + unset($options['placeholder']); + } + + foreach ($options as $key => $value) { + if (!$value) { + continue; + } + + if (is_numeric($key)) { + $newElement = $newElement->attribute($value, ''); + continue; + } + + $newElement = $newElement->attribute($key, $value); + } + return $newElement; + } +} diff --git a/resources/lang/de/navigation.php b/resources/lang/de/navigation.php index d6cdd0ce..c8ba2988 100644 --- a/resources/lang/de/navigation.php +++ b/resources/lang/de/navigation.php @@ -68,4 +68,6 @@ return array ( 'shop' => 'Shop', 'to_shop' => 'Zum Shop', 'marketingplan' => 'Marketingplan', + 'dhl_cockpit' => 'DHL Cockpit', + 'revenue' => 'Umsatz', ); diff --git a/resources/lang/de/shop.php b/resources/lang/de/shop.php index 6269442f..a4968ef0 100644 --- a/resources/lang/de/shop.php +++ b/resources/lang/de/shop.php @@ -8,6 +8,7 @@ return array ( 'Your Shop' => 'Dein Shop', 'Your Shop Name' => 'Gib deinem Shop einen Namen', 'accept_and_next' => 'akzeptieren und weiter', + 'accept_and_change' => 'akzeptieren und ändern', 'active_since' => 'Aktiv seit', 'available' => 'erreichbar', 'check' => 'prüfen', @@ -16,11 +17,12 @@ return array ( 'name' => 'Name', 'not_available' => 'nicht erreichbar', 'not_available_copy' => 'Bei neu angelegten Shops dauert es einige Minuten, bis die Domain zu erreichen ist. Bitte schaue in einigen Minuten noch einmal nach.', - 'open_copy_1' => 'Wähle das Präfix Deines Shopnamens - z. B. vorname(.mivita.care) - Du musst nicht "mivita.care" eingeben. Wähle einen kurzen und prägnanten Namen, damit Du diese URL auch auf kleinen Werbemitteln unterbringen kannst. Achte auch darauf, dass Du keine Markenrechte Dritter verletzt. Dafür kann MIVITA keine Haftung übernehmen. Daher versucht Phantasiebegriffe zu vermeiden, es sei denn Du hast sie als Marke angemeldet.', - 'open_copy_2' => 'Deine Internetadresse kann später mit „www.“ und ohne aufgerufen werden.', - 'open_note_1' => 'Aus Deinem Shop-Namen wird die Internet-Adresse (Domain) erstellt, mit der Dein Shop aufgerufen werden kann. Wähle Deinen Shop-Namen sorgfältig aus. Dieser ist nur durch die IT änderbar und wir müssten eine Aufwandsentschädigung von 59,50 € erheben.', + 'open_copy_1' => 'Wähle das Präfix Deines Shopnamens - z. B. vorname(.mivita.care).
Du musst nicht "mivita.care" eingeben.

Achte darauf, einen kurzen und prägnanten Namen zu wählen, damit Deine Internetadresse auch auf kleinen Werbemitteln gut Platz findet. Stelle außerdem sicher, dass Du keine Markenrechte Dritter verletzt – dafür kann MIVITA keine Haftung übernehmen. Vermeide daher möglichst Fantasiebegriffe, es sei denn, Du hast diese bereits als Marke angemeldet.', + 'open_copy_2' => 'Deine Internetadresse wird ohne „www.“ aufgerufen: https://deinshopname.mivita.care', + 'open_note_1' => 'Du kannst den Namen Deines Shops jederzeit ändern. Der alte Shopname verfällt jedoch sofort und unwiderruflich. Wenn Du die alte Adresse bereits verteilt hast (z. B. auf Flyern, Visitenkarten oder in sozialen Medien), ist diese danach nicht mehr erreichbar.', 'open_note_hl' => 'WICHTIGER HINWEIS:', - 'open_your_shop' => 'Eröffne Deinen eigenen mivita-Shop.', + 'open_your_shop' => 'Eröffne jetzt Deinen eigenen mivita-Shop!', + 'edit_your_shop' => 'Dein Shop-Name anpassen', 'order_customer' => 'Bestellung Kunde', 'orders_customers' => 'Bestellungen Kunden', 'preview_shop_internet_address' => 'Vorschau Shop-Internet Adresse', @@ -50,6 +52,6 @@ return array ( 'your_city' => 'Dein Ort', 'your_phone_number' => 'Deine Festnetz-Nummer', 'your_mobile_number' => 'Deine Mobil-Nummer', - 'error_subdomain_exists' => 'Fehler: Subdomain existierts bereits, bitte einen neues Namen wählen' - + 'error_subdomain_exists' => 'Fehler: Subdomain existierts bereits, bitte einen neues Namen wählen', + 'your_current_shop_name' => 'Dein aktueller Shop-Name lautet:' ); diff --git a/resources/views/admin/dhl/cockpit.blade.php b/resources/views/admin/dhl/cockpit.blade.php new file mode 100644 index 00000000..718c3e9a --- /dev/null +++ b/resources/views/admin/dhl/cockpit.blade.php @@ -0,0 +1,578 @@ +@extends('layouts.layout-2') + +@section('content') + +

+ + DHL Cockpit +

+ + +
+
+
+
+
+
+
{{ number_format($stats['total_shipments']) }}
+ Sendungen gesamt +
+
+ +
+
+
+
+
+ +
+
+
+
+
+
{{ number_format($stats['pending_shipments']) }}
+ In Bearbeitung +
+
+ +
+
+
+
+
+ +
+
+
+
+
+
{{ number_format($stats['shipped_today']) }}
+ Heute versandt +
+
+ +
+
+
+
+
+ +
+
+
+
+
+
{{ number_format($stats['returns_count']) }}
+ Retouren +
+
+ +
+
+
+
+
+
+ + +
+
+
+ + Filter & Suche +
+
+
+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+
+ + +
+ +
+ + + Zurücksetzen + +
+
+
+
+
+ + +
+
+
+ + Schnellaktionen +
+
+
+
+
+
+
+ +
Neue Sendung erstellen
+

+ Erstellen Sie eine neue DHL-Sendung basierend auf einer bestehenden Bestellung. +

+ +
+
+
+ +
+
+
+ +
Sendung anzeigen
+

+ Suchen und anzeigen einer bestimmten Sendung nach ID oder Tracking-Nummer. +

+
+ +
+
Sendung finden:
+ + Sendungs-ID eingeben + + + Tracking-Nummer eingeben + +
+ + Filter verwenden + +
+
+
+
+
+ +
+
+
+ +
API Login Test
+

+ Überprüfen Sie, ob die in der .env-Datei hinterlegten DHL-Zugangsdaten korrekt sind. +

+ +
+
+
+
+
+
+
+ + +
+
+
+ + Sendungsübersicht +
+ + +
+
+ + + + + + + + + + + + + + + + + + {{-- Data will be loaded by DataTables --}} + +
+ + #TypBestellungKundeSendungsnummerStatusTracking-StatusGewichtErstelltAktionen
+
+ + {{-- Pagination will be handled by DataTables --}} +
+ + +@endsection + +@section('scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/admin/dhl/create.blade.php b/resources/views/admin/dhl/create.blade.php new file mode 100644 index 00000000..87baa81d --- /dev/null +++ b/resources/views/admin/dhl/create.blade.php @@ -0,0 +1,428 @@ +@extends('layouts.layout-2') + +@section('content') + +
+

+ + DHL Sendung erstellen +

+ + Zurück zum Cockpit + +
+ + +
+
+
+ + Bestellinformationen +
+
+
+
+
+ + + + + + + + + + + + + + + + + +
Bestellungs-ID:#{{ $order->id }}
Kunde: + {{ $order->user->first_name ?? '' }} {{ $order->user->last_name ?? '' }} +
+ {{ $order->user->email ?? '' }} +
Bestelldatum:{{ $order->created_at->format('d.m.Y H:i') }}
Bestellwert:{{ number_format($order->order_total, 2) }} €
+
+
+ + + + + + + + + + + + + +
Lieferadresse: + {{ $order->shipping_first_name ?? $order->user->first_name }} {{ $order->shipping_last_name ?? $order->user->last_name }}
+ {{ $order->shipping_street ?? $order->user->street }} {{ $order->shipping_house_number ?? $order->user->house_number }}
+ {{ $order->shipping_postcode ?? $order->user->postcode }} {{ $order->shipping_city ?? $order->user->city }}
+ {{ $order->shippingCountry->name ?? 'Deutschland' }} +
Status: + + {{ $order->status }} + +
Artikel:{{ $order->items->count() }} Artikel
+
+
+
+
+ + +
+
+
+ + Artikel in der Bestellung +
+
+
+
+ + + + + + + + + + + + @php $totalWeight = 0; @endphp + @foreach($order->items as $item) + @php + $itemWeight = ($item->product->weight ?? 0) * $item->qty; + $totalWeight += $itemWeight; + @endphp + + + + + + + + @endforeach + + + + + + + +
ArtikelMengeEinzelpreisGesamtpreisGewicht (kg)
+ {{ $item->product->name ?? 'Unbekanntes Produkt' }} + @if($item->product->number) +
+ Art.-Nr: {{ $item->product->number }} + @endif + 		{{ $item->qty }}{{ number_format($item->price, 2) }} €{{ number_format($item->price * $item->qty, 2) }} €{{ number_format($itemWeight, 3) }}
Geschätztes Gesamtgewicht:{{ number_format($totalWeight, 3) }} kg
+
+
+
+ + +
+
+
+ + Sendung konfigurieren +
+
+
+
+ @csrf + + +
+
+
+ + + + Mindestens 0.1 kg, maximal 31.5 kg (DHL Paket Limit) + +
+ +
+ + + + Standardmäßig DHL Paket für nationale Sendungen + +
+ +
+ + + + Hohe Priorität für dringende Sendungen + +
+
+ +
+
+ + +
+ + + + Startet automatische Sendungsverfolgung nach Erstellung + +
+
+ +
+
+
+ + Versandhinweise +
+
    +
  • Die Sendung wird asynchron erstellt
    • +
  • Sie erhalten eine Benachrichtigung nach Fertigstellung
    • +
  • Das Versandlabel wird automatisch generiert
    • +
  • Bei aktiviertem Auto-Tracking wird die Sendung überwacht
    • + @if($totalWeight > 10) +
  • + + Hohes Gewicht - prüfen Sie die Verpackung +
    • + @endif +
+
+
+
+
+ +
+ +
+
+
+ + * Pflichtfelder | Geschätzte Verarbeitungszeit: 2-5 Minuten + +
+
+ + +
+
+
+
+
+
+ + + + +@endsection + +@section('scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/admin/dhl/modal_create_shipment.blade.php b/resources/views/admin/dhl/modal_create_shipment.blade.php new file mode 100644 index 00000000..afd7677d --- /dev/null +++ b/resources/views/admin/dhl/modal_create_shipment.blade.php @@ -0,0 +1,498 @@ +{{-- + DHL Shipment Creation Modal + + This view is optimized to work with data prepared by DhlModalService. + The service handles address parsing, validation, and data preparation. +--}} + +
+
+
+ + DHL Sendung erstellen +
+ +
+ + {{-- Display any errors at the top --}} + @if(!empty($errors)) +
+ + Fehler: +
    + @foreach($errors as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif + + {{-- Display warnings --}} + @if(!empty($warnings)) +
+ + Achtung: +
    + @foreach($warnings as $warning) +
  • {{ $warning }}
    • + @endforeach +
+
+ @endif + + @if($order) + + @else + {{-- Order Selection when no order ID provided --}} +
+
+ +

Bestellung auswählen

+

Geben Sie eine Bestellungs-ID ein, um eine DHL-Sendung zu erstellen.

+ +
+
+
+
+
+ # +
+ +
+ +
+
+
+ +
+
oder
+ + + In Bestellverwaltung suchen + +
+
+
+
+
+ +
+ +
+ @endif +
+ + \ No newline at end of file diff --git a/resources/views/admin/dhl/show.blade.php b/resources/views/admin/dhl/show.blade.php new file mode 100644 index 00000000..53ca9c21 --- /dev/null +++ b/resources/views/admin/dhl/show.blade.php @@ -0,0 +1,600 @@ +@extends('layouts.layout-2') + +@section('content') + +
+

+ + DHL Sendung #{{ $shipment->id }} + @if($shipment->type == 'return') + + Retoure + + @endif +

+
+ + Zurück zum Cockpit + + @if($shipment->shoppingOrder) + + Bestellung anzeigen + + @endif +
+
+ + +
+
+
+
+
+
+
Status
+ @switch($shipment->status) + @case('pending') +
+ Wartend +
+ @break + @case('created') +
+ Erstellt +
+ @break + @case('shipped') +
+ Versendet +
+ @break + @case('delivered') +
+ Zugestellt +
+ @break + @case('cancelled') +
+ Storniert +
+ @break + @case('failed') +
+ Fehler +
+ @break + @default +
+ {{ $shipment->status }} +
+ @endswitch +
+
+ +
+
+
+
+
+ +
+
+
+
+
+
Sendungsnummer
+
+ @if($shipment->shipment_number) + {{ $shipment->shipment_number }} + @else + Nicht verfügbar + @endif +
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
Tracking-Nummer
+
+ @if($shipment->tracking_number) + {{ $shipment->tracking_number }} +
+ + Verfolgen + + @else + Nicht verfügbar + @endif +
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
Gewicht
+
+ {{ number_format($shipment->weight, 2) }} kg +
+
+
+ +
+
+
+
+
+
+ + +@if($shipment->status != 'cancelled') +
+
+
+ @if($shipment->label_path) + + Label herunterladen + + @endif + + @if($shipment->canCancel()) + + @endif + + @if($shipment->type == 'outbound' && !$shipment->relatedShipment) + + @endif + + @if($shipment->tracking_number) + + @endif +
+
+
+@endif + + +
+ +
+ +
+
+
+ + Sendungsinformationen +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
ID:#{{ $shipment->id }}
Typ: + @if($shipment->type == 'outbound') + + Ausgehend + + @else + + Retoure + + @if($shipment->relatedShipment) +
+ + Bezieht sich auf Sendung + + #{{ $shipment->relatedShipment->id }} + + + @endif + @endif +
Produktcode:{{ $shipment->product_code }}
Label-Format:{{ strtoupper($shipment->label_format) }}
Label gedruckt: + @if($shipment->label_printed) + Ja + @else + Nein + @endif +
+
+
+ + + + + + + + + + @if($shipment->last_tracked_at) + + + + + @endif + @if($shipment->length || $shipment->width || $shipment->height) + + + + + @endif +
Erstellt:{{ $shipment->created_at->format('d.m.Y H:i:s') }}
Letzte Änderung:{{ $shipment->updated_at->format('d.m.Y H:i:s') }}
Letztes Tracking:{{ $shipment->last_tracked_at->format('d.m.Y H:i:s') }}
Abmessungen: + {{ $shipment->length }}×{{ $shipment->width }}×{{ $shipment->height }} cm +
+
+
+
+
+ + + @if($shipment->shoppingOrder) +
+
+
+ + Bestellinformationen +
+
+
+
+
+ + + + + + + + + + + + + +
Bestellungs-ID: + + #{{ $shipment->shoppingOrder->id }} + +
Kunde: + @if($shipment->shoppingOrder->shopping_user) + {{ $shipment->shoppingOrder->shopping_user->billing_firstname }} {{ $shipment->shoppingOrder->shopping_user->billing_lastname }} +
+ {{ $shipment->shoppingOrder->shopping_user->billing_email }} + @else + Unbekannt + @endif +
Bestelldatum:{{ $shipment->shoppingOrder->created_at->format('d.m.Y H:i') }}
+
+
+ + + + + + + + + + + + + +
Bestellwert:{{ number_format($shipment->shoppingOrder->total, 2) }} €
Status: + + {{ $shipment->shoppingOrder->status }} + +
Artikel:{{ $shipment->shoppingOrder->shopping_order_items->count() ?? 0 }} Artikel
+
+
+
+
+ @endif + + + @if($shipment->tracking_status || $shipment->tracking_number) +
+
+
+ + Tracking-Informationen +
+
+
+ @if($shipment->tracking_status) +
+
+ + Aktueller Status: {{ $shipment->tracking_status }} +
+ @if($shipment->last_tracked_at) + + Zuletzt aktualisiert: {{ $shipment->last_tracked_at->format('d.m.Y H:i') }} + + @endif +
+ @endif + + @if($shipment->tracking_number) +
+

Verfolgen Sie diese Sendung direkt bei DHL:

+ + + Bei DHL verfolgen + + + + Lokales Tracking + +
+ @endif +
+
+ @endif +
+ + +
+ + @if($shipment->type == 'outbound' && $shipment->relatedShipments && $shipment->relatedShipments->count() > 0) +
+
+
+ + Verknüpfte Retouren +
+
+
+ @foreach($shipment->relatedShipments as $relatedShipment) +
+
+ + Retoure #{{ $relatedShipment->id }} + +
+ {{ $relatedShipment->created_at->format('d.m.Y H:i') }} +
+ + {{ $relatedShipment->status }} + +
+ @endforeach +
+
+ @endif + + + @if($shipment->services) +
+
+
+ + Zusatzleistungen +
+
+
+ @foreach($shipment->services as $service => $enabled) + @if($enabled) +
{{ $service }}
+ @endif + @endforeach +
+
+ @endif + + + @if($shipment->api_response_data && auth()->user()->isSuperAdmin()) +
+
+
+ + API Response (Debug) +
+
+
+ 
{{ json_encode($shipment->api_response_data, JSON_PRETTY_PRINT) }}
+
+
+ @endif +
+
+ +@endsection + +@section('scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/admin/settings/index.blade.php b/resources/views/admin/settings/index.blade.php index 4bffc87c..aadd12cf 100755 --- a/resources/views/admin/settings/index.blade.php +++ b/resources/views/admin/settings/index.blade.php @@ -107,6 +107,220 @@ + + +
+
+

DHL Versandeinstellungen

+ + @if(Session::has('alert-save-dhl')) + + @endif + + +
+
+
Standard-Einstellungen
+
+
+ + {{ Form::text('settings[dhl_base_url][val]', \App\Models\Setting::getContentBySlug('dhl_base_url') ?: 'https://api-eu.dhl.com', array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_base_url][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_api_key][val]', \App\Models\Setting::getContentBySlug('dhl_api_key'), array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_api_key][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_username][val]', \App\Models\Setting::getContentBySlug('dhl_username'), array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_username][type]', 'text') }} +
+
+ + {{ Form::password('settings[dhl_password][val]', array('class'=>'form-control', 'value' => \App\Models\Setting::getContentBySlug('dhl_password'))) }} + {{ Form::hidden('settings[dhl_password][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_billing_number][val]', \App\Models\Setting::getContentBySlug('dhl_billing_number'), array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_billing_number][type]', 'text') }} +
+
+ + {{ Form::select('settings[dhl_product][val]', [ + 'V01PAK' => 'V01PAK - DHL Paket National', + 'V53PAK' => 'V53PAK - DHL Paket International', + 'V62WP' => 'V62WP - Warenpost National' + ], \App\Models\Setting::getContentBySlug('dhl_product') ?: 'V01PAK', array('class'=>'form-control custom-select')) }} + {{ Form::hidden('settings[dhl_product][type]', 'text') }} +
+
+ + {{ Form::select('settings[dhl_label_format][val]', [ + 'PDF' => 'PDF', + 'ZPL' => 'ZPL' + ], \App\Models\Setting::getContentBySlug('dhl_label_format') ?: 'PDF', array('class'=>'form-control custom-select')) }} + {{ Form::hidden('settings[dhl_label_format][type]', 'text') }} +
+
+ + {{ Form::hidden('settings[dhl_use_queue][type]', 'bool') }} + + Aktiviert: Versandlabel werden im Hintergrund erstellt (erfordert Queue Worker)
+ Deaktiviert: Versandlabel werden sofort erstellt (synchron) + +
+
+ +
+ + +
+
+
Account Nummern für verschiedene Produkte
+
+
+ + {{ Form::text('settings[dhl_account_v01pak][val]', \App\Models\Setting::getContentBySlug('dhl_account_v01pak'), array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_account_v01pak][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_account_v07pak][val]', \App\Models\Setting::getContentBySlug('dhl_account_v07pak'), array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_account_v07pak][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_account_v53pak][val]', \App\Models\Setting::getContentBySlug('dhl_account_v53pak'), array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_account_v53pak][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_account_v62wp][val]', \App\Models\Setting::getContentBySlug('dhl_account_v62wp'), array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_account_v62wp][type]', 'text') }} +
+
+ +
+ + +
+
+
Absenderadresse
+
+
+ + {{ Form::text('settings[dhl_sender_company][val]', \App\Models\Setting::getContentBySlug('dhl_sender_company') ?: 'mivita care gmbh', array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_sender_company][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_sender_name][val]', \App\Models\Setting::getContentBySlug('dhl_sender_name'), array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_sender_name][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_sender_street][val]', \App\Models\Setting::getContentBySlug('dhl_sender_street') ?: 'Leinfeld', array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_sender_street][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_sender_house_number][val]', \App\Models\Setting::getContentBySlug('dhl_sender_house_number') ?: '2', array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_sender_house_number][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_sender_postal_code][val]', \App\Models\Setting::getContentBySlug('dhl_sender_postal_code') ?: '87755', array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_sender_postal_code][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_sender_city][val]', \App\Models\Setting::getContentBySlug('dhl_sender_city') ?: 'Kirchhaslach', array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_sender_city][type]', 'text') }} +
+
+ + {{ Form::select('settings[dhl_sender_country][val]', [ + 'DE' => 'Deutschland', + 'AT' => 'Österreich', + 'CH' => 'Schweiz' + ], \App\Models\Setting::getContentBySlug('dhl_sender_country') ?: 'DE', array('class'=>'form-control custom-select')) }} + {{ Form::hidden('settings[dhl_sender_country][type]', 'text') }} +
+
+ + {{ Form::email('settings[dhl_sender_email][val]', \App\Models\Setting::getContentBySlug('dhl_sender_email') ?: 'versand@mivita.care', array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_sender_email][type]', 'text') }} +
+
+ + {{ Form::text('settings[dhl_sender_phone][val]', \App\Models\Setting::getContentBySlug('dhl_sender_phone') ?: '+49 123 456789', array('class'=>'form-control')) }} + {{ Form::hidden('settings[dhl_sender_phone][type]', 'text') }} +
+
+ + + +
+
+
Papierformat
+
+
+ + {{ Form::select('settings[dhl_print_format][val]', [ + 'A4' => 'Common Label Laserdruck A4 Normalpapier', + '910-300-600' => 'Common Label Thermodruck 103 x 199 mm (910-300-600)', + '910-300-610' => 'Common Label Thermodruck 103 x 199 mm (910-300-610)', + '910-300-700' => 'Common Label Laserdruck 105 x 205 mm (DIN A5 Normalpapier, 910-300-700)', + '910-300-700-oz' => 'Common Label Laserdruck 105 x 205 mm (DIN A5 Normalpapier, 910-300-700) ohne Zusatzetiketten', + '910-300-710' => 'Common Label Laserdruck 105 x 208 mm (910-300-710)', + '910-300-300' => 'Common Label Laserdruck 105 x 148 mm (DIN A5 Normalpapier, 910-300-300)', + '910-300-300-oz' => 'Common Label Laserdruck 105 x 148 mm (DIN A5 Normalpapier, 910-300-300) ohne Zusatzetiketten', + '910-300-400' => 'Common Label Thermodruck 103 x 150 mm (910-300-400)', + '910-300-410' => 'Common Label Thermodruck 103 x 150 mm (910-300-410)', + '100x70mm' => '100x70mm', + ], \App\Models\Setting::getContentBySlug('dhl_print_format') ?: 'A4', array('class'=>'form-control custom-select')) }} + {{ Form::hidden('settings[dhl_print_format][type]', 'text') }} +
+
+ + {{ Form::select('settings[dhl_retoure_print_format][val]', [ + 'A4' => 'Common Label Laserdruck A4 Normalpapier', + '910-300-600' => 'Common Label Thermodruck 103 x 199 mm (910-300-600)', + '910-300-610' => 'Common Label Thermodruck 103 x 199 mm (910-300-610)', + '910-300-700' => 'Common Label Laserdruck 105 x 205 mm (DIN A5 Normalpapier, 910-300-700)', + '910-300-700-oz' => 'Common Label Laserdruck 105 x 205 mm (DIN A5 Normalpapier, 910-300-700) ohne Zusatzetiketten', + '910-300-710' => 'Common Label Laserdruck 105 x 208 mm (910-300-710)', + '910-300-300' => 'Common Label Laserdruck 105 x 148 mm (DIN A5 Normalpapier, 910-300-300)', + '910-300-300-oz' => 'Common Label Laserdruck 105 x 148 mm (DIN A5 Normalpapier, 910-300-300) ohne Zusatzetiketten', + '910-300-400' => 'Common Label Thermodruck 103 x 150 mm (910-300-400)', + '910-300-410' => 'Common Label Thermodruck 103 x 150 mm (910-300-410)', + '100x70mm' => '100x70mm', + ], \App\Models\Setting::getContentBySlug('dhl_retoure_print_format') ?: 'A4', array('class'=>'form-control custom-select')) }} + {{ Form::hidden('settings[dhl_retoure_print_format][type]', 'text') }} +
+
+ + + + + + + + + + +
+
{!! Form::close() !!} diff --git a/resources/views/auth/change.blade.php b/resources/views/auth/change.blade.php index 0d90697f..cd8abcfb 100644 --- a/resources/views/auth/change.blade.php +++ b/resources/views/auth/change.blade.php @@ -40,8 +40,8 @@
- - + +
{{__('portal.back_to_shop')}} diff --git a/resources/views/layouts/includes/layout-sidenav.blade.php b/resources/views/layouts/includes/layout-sidenav.blade.php index a17851bc..703020d0 100755 --- a/resources/views/layouts/includes/layout-sidenav.blade.php +++ b/resources/views/layouts/includes/layout-sidenav.blade.php @@ -212,6 +212,11 @@ +
  • +
    {{ __('navigation.dhl_cockpit') }}
     +
    • + +
  • @@ -302,6 +307,7 @@
    • +
  • diff --git a/resources/views/status/not_found.blade.php b/resources/views/status/not_found.blade.php index 9ecaa475..6085c790 100755 --- a/resources/views/status/not_found.blade.php +++ b/resources/views/status/not_found.blade.php @@ -35,7 +35,7 @@ {{ __('go to login') }} {{ __('create new password') }}
    - {{ __('back to the homepage') }} + {{ __('back to the homepage') }}
    • diff --git a/resources/views/status/status_error.blade.php b/resources/views/status/status_error.blade.php index c4397a5c..0f010b2e 100755 --- a/resources/views/status/status_error.blade.php +++ b/resources/views/status/status_error.blade.php @@ -32,7 +32,7 @@

    {{ __('Page not available') }}

    - {{ __('back to the homepage') }} + {{ __('back to the homepage') }} diff --git a/resources/views/status/status_register.blade.php b/resources/views/status/status_register.blade.php index 8010456e..781e75fb 100755 --- a/resources/views/status/status_register.blade.php +++ b/resources/views/status/status_register.blade.php @@ -33,7 +33,7 @@

    {{ __('Thank you for your registration!') }}

    {{ __('We have sent you an e-mail with a link to activate your data.') }}

    - {{ __('back to the homepage') }} + {{ __('back to the homepage') }} diff --git a/resources/views/status/status_verify.blade.php b/resources/views/status/status_verify.blade.php index 59891e36..58568e16 100755 --- a/resources/views/status/status_verify.blade.php +++ b/resources/views/status/status_verify.blade.php @@ -33,7 +33,7 @@

    {{ __('Now assign a password.') }}

    {{ __('create new password') }}

    - {{ __('back to the homepage') }} + {{ __('back to the homepage') }} diff --git a/resources/views/user/components/user_shop_edit.blade.php b/resources/views/user/components/user_shop_edit.blade.php index 46a637b1..1ffdfe54 100644 --- a/resources/views/user/components/user_shop_edit.blade.php +++ b/resources/views/user/components/user_shop_edit.blade.php @@ -70,6 +70,17 @@
  • +
    {{ __('Status') }}
    +
    + @if($user->shop->getSubdomainAvailable()) + {{ __('shop.available') }} + @else + {{ __('shop.not_available') }} + @endif +
    +
    • + + {{--
  • {{ __('Status') }}
    @if($user->shop->getSubdomainStatus()) @@ -94,17 +105,13 @@ @endif
    +
    • --}} +
  • +
    {{ __('shop.active_since') }}
    +
    • - @if(!$user->shop->getSubdomainStatus() || !$user->shop->getSubdomainAvailable() || !$user->shop->getSubdomainSslSinActive()) -
  • -

    {{ __('shop.not_available_copy') }} - - - -

    - -
    • - @endif
  • {{ __('shop.active_since') }}
    diff --git a/resources/views/user/components/user_shop_edit_name.blade.php b/resources/views/user/components/user_shop_edit_name.blade.php new file mode 100644 index 00000000..77f86a25 --- /dev/null +++ b/resources/views/user/components/user_shop_edit_name.blade.php @@ -0,0 +1,174 @@ +
    +

    {{ __('shop.edit_your_shop') }}

    + + {!! Form::open(['action' => route('user_shop_register_form'), 'class' => 'form-horizontal' , 'id'=>'data-shop-form-validations']) !!} + {{ Form::hidden('user_shop_id', $user_shop_id) }} + + @php + $shop_name_btn_color = 'btn-secondary'; + $shop_name_fa = ''; + $shop_name_form_control = ''; + @endphp + @if(Session::has('shop-name-error')) + @if(Session::get('shop-name-error') == 'check') + @php + $shop_name_btn_color = 'btn-success'; + $shop_name_fa = 'fa-check'; + $shop_name_form_control = ' is-valid'; + @endphp + + @endif + @if(Session::get('shop-name-error') == 'error') + @php + $shop_name_btn_color = 'btn-danger'; + $shop_name_fa = 'fa-times'; + $shop_name_form_control = ' is-invalid'; + @endphp + @endif + @endif + + +

    + {!! __('shop.open_copy_1') !!} +

    + {!! __('shop.open_copy_2') !!} +

    + {{ __('shop.open_note_hl') }}
    + {!! __('shop.open_note_1') !!} +

    + {{ __('shop.your_current_shop_name') }} {{ $user_shop_domain }} +

    +
    +
    + {{ Form::text('user_shop_name', old('user_shop_name'), array('placeholder'=>__('shop.your_shop_name'), 'class'=>'form-control'.$shop_name_form_control.($errors->has('user_shop_name') ? ' is-invalid' : ''), 'id'=>'user_shop_name', 'tabindex' => 2)) }} + + + +
    + @if ($errors->has('user_shop_name')) + + {{ $errors->first('user_shop_name') }} + + @endif +
    +
    + {{ Form::text('preview_user_shop_name', '', array('placeholder'=>__('shop.preview_shop_internet_address'), 'class'=>'form-control', 'id'=>'preview_user_shop_name', 'readonly')) }} +
    +
    + + @if ($errors->has('user_shop_active')) + + {{ $errors->first('user_shop_active') }} + + @endif +
    +
    +
    +   + +
    + + {!! Form::close() !!} + +
    + + diff --git a/resources/views/user/components/user_shop_register.blade.php b/resources/views/user/components/user_shop_register.blade.php index febf78c2..d40f40a2 100644 --- a/resources/views/user/components/user_shop_register.blade.php +++ b/resources/views/user/components/user_shop_register.blade.php @@ -27,9 +27,9 @@

    - {{ __('shop.open_copy_1') }} + {!! __('shop.open_copy_1') !!}

    - {{ __('shop.open_copy_2') }} + {!! __('shop.open_copy_2') !!}

    {{ __('shop.open_note_hl') }}
    {{ __('shop.open_note_1') }} diff --git a/resources/views/user/shop_edit_name.blade.php b/resources/views/user/shop_edit_name.blade.php new file mode 100644 index 00000000..b777f9ed --- /dev/null +++ b/resources/views/user/shop_edit_name.blade.php @@ -0,0 +1,23 @@ +@extends('layouts.layout-2') + +@section('content') + + {{-- @if ($errors->any()) +

    +
    +
    +
      + @foreach ($errors->all() as $error) +
    • {{ $error }}
      • + @endforeach +
    +
    +
    +
    + @endif +--}} +

    + {{ __('navigation.my_shop') }} +

    + @include('user.components.user_shop_edit_name') +@endsection diff --git a/resources/views/web/layouts/includes/footer.blade.php b/resources/views/web/layouts/includes/footer.blade.php index 9321b11e..585961b1 100644 --- a/resources/views/web/layouts/includes/footer.blade.php +++ b/resources/views/web/layouts/includes/footer.blade.php @@ -68,9 +68,10 @@ href="{{url('/geschaeftsmodell/karrierechancen')}}">{{ __('website.career_opportunities') }}
  • {{ __('website.contact') }}
    • -
  • {{ __('website.partner') }}
    • -
  • +
  • {{ __('website.register') }}
    • diff --git a/resources/views/web/user/layouts/includes/footer.blade.php b/resources/views/web/user/layouts/includes/footer.blade.php index adbbaeec..7de8b4ce 100644 --- a/resources/views/web/user/layouts/includes/footer.blade.php +++ b/resources/views/web/user/layouts/includes/footer.blade.php @@ -101,7 +101,7 @@
  • {{ __('website.partner') }}
    • @if($user_shop) -
  • {{ __('website.register') }}
    • @endif diff --git a/routes/domains/crm.php b/routes/domains/crm.php index d481fbfa..cdfce566 100644 --- a/routes/domains/crm.php +++ b/routes/domains/crm.php @@ -11,8 +11,8 @@ /* ROUTING FOR CRM my.mivita / CMS*/ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld_care'))->group(function () { - Route::get('/cron/jobs/action/{action}/{key}', 'CronController@action')->name('cron_jobs_action'); - Route::get('/cron/jobs/run/{key}', 'CronController@runCron')->name('cron_jobs_run'); + // Route::get('/cron/jobs/action/{action}/{key}', 'CronController@action')->name('cron_jobs_action'); + // Route::get('/cron/jobs/run/{key}', 'CronController@runCron')->name('cron_jobs_run'); Auth::routes(); @@ -38,8 +38,6 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld Route::get('/user/update_email_confirm/{token}', 'UserUpdateEmailController@activateMail')->name('user_update_email_confirm'); Route::post('/user/check/mail', 'HomeController@checkMail')->name('user_check_mail'); - Route::get('/register/verify/{confirmationCode}', 'HomeController@verify')->name('register_verify'); - Route::get('/status/register', 'HomeController@statusRegister')->name('status_register'); Route::get('/status/verify', 'HomeController@statusVerify')->name('status_verify'); Route::get('/status/error', 'HomeController@statusError')->name('status_error'); @@ -65,24 +63,14 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld Route::get('/wizard/delete/file/{id}/{relation}', 'WizardController@delete')->name('wizard_delete_file'); - Route::get('/storage/file/{id}/{disk}', function ($id = null, $disk = null) { - // Prüfe ob der Disk existiert und nur 'public' erlaubt ist - if($disk != 'public' || !config("filesystems.disks.{$disk}")){ - abort(404); - } - $file = \App\Models\File::findOrFail($id); - $path = Storage::disk($disk)->path($file->dir . $file->filename); - if (file_exists($path)) { - return Response::file($path); - } - })->name('storage_file'); - - Route::get('/storage/file/{id}/{from}/{do?}', 'FileController@show')->name('storage_file'); + // storage_file Route wurde nach common.php verschoben für domain-übergreifende Nutzung }); Route::group(['middleware' => ['auth:user']], function () { Route::get('storage/{type?}/{file?}', function ($type = null, $file = null) { + $path = ""; + $filename = ""; if ($type == 'xls') { $path = storage_path("app/export/"); $filename = $file . '.xls'; @@ -124,6 +112,7 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld Route::post('/user/shop/store', 'UserShopController@store')->name('user_shop_store'); Route::post('/user/shop/register/form', 'UserShopController@userShopRegisterForm')->name('user_shop_register_form'); Route::post('/user/shop/name/check', 'UserShopController@checkUserShopName')->name('user_shop_name_check'); + Route::get('/user/shop/name/edit', 'UserShopController@editName')->name('user_shop_name_edit'); Route::get('/user/shop/translate', 'UserShopController@translate')->name('user_shop_translate'); Route::post('/user/shop/translate/store', 'UserShopController@translateStore')->name('user_shop_tanslate_store'); Route::post('/user/shop/upload/image', 'UserShopController@uploadImage')->name('user_shop_upload_image'); @@ -278,8 +267,21 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld //products images Route::post('/admin/product/category/image/upload', 'CategoryController@imageUpload')->name('admin_product_category_image_upload'); Route::get('/admin/product/category/image/delete{image_id}/{category_id}', 'CategoryController@imageDelete')->name('admin_product_category_image_delete'); - Route::get('/admin/product/category/image/attribute/{image_id}/{attr}/{val}', 'CategoryController@imageAttribute')->name('admin_product_category_image_attribute'); + // DHL Shipping Routes + Route::prefix('admin/dhl')->group(function () { + Route::get('/', 'DhlShipmentController@index')->name('admin.dhl.cockpit'); + Route::post('/datatable', 'DhlShipmentController@datatable')->name('admin.dhl.datatable'); + Route::get('/shipment/{shipment}', 'DhlShipmentController@show')->name('admin.dhl.show'); + Route::post('/shipment', 'DhlShipmentController@store')->name('admin.dhl.store'); + Route::delete('/shipment/{shipment}/cancel', 'DhlShipmentController@cancel')->name('admin.dhl.cancel'); + Route::post('/shipment/{shipment}/return-label', 'DhlShipmentController@createReturnLabel')->name('admin.dhl.create-return'); + Route::post('/shipment/{shipment}/update-tracking', 'DhlShipmentController@updateTracking')->name('admin.dhl.update-tracking'); + Route::get('/shipment/{shipment}/download-label', 'DhlShipmentController@downloadLabel')->name('admin.dhl.download-label'); + Route::post('/batch-action', 'DhlShipmentController@batchAction')->name('admin.dhl.batch-action'); + Route::post('/test-login', 'DhlShipmentController@testLogin')->name('admin.dhl.test_login'); + Route::get('/public/track', 'DhlShipmentController@track')->name('public.tracking'); + }); //products attributes Route::get('/admin/product/attributes', 'AttributeController@index')->name('admin_product_attributes'); @@ -438,7 +440,6 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld Route::get('/admin/settings', 'SettingController@index')->name('admin_settings'); Route::post('/admin/setting/store', 'SettingController@store')->name('admin_setting_store'); - }); //login pages for sysadmin diff --git a/routes/domains/main.php b/routes/domains/main.php index 3a70d2a6..d9de714d 100644 --- a/routes/domains/main.php +++ b/routes/domains/main.php @@ -17,10 +17,15 @@ Route::get('/agb', 'HomeController@legalAGB')->name('agb'); Route::get('/kontakt', 'Web\ContactController@create')->name('contact_create'); Route::post('/kontakt', 'Web\ContactController@store')->name('contact_store'); -Route::get('/registrierung', 'Web\RegisterController@index')->name('register_user'); -Route::get('/reg/{member_id?}', 'Web\RegisterController@member')->name('register_user_member'); -Route::post('/registrierung', 'Web\RegisterController@register')->name('register_user'); -Route::get('/registrierung/finish', 'Web\RegisterController@finish')->name('register_user_finish'); +// Public DHL Tracking +Route::get('/tracking', 'DhlShipmentController@track')->name('public.tracking'); +Route::post('/tracking', 'DhlShipmentController@track')->name('public.tracking.check'); + +Route::get('/registrierung', 'Web\RegisterController@index')->name('main.register_user'); +Route::get('/reg/{member_id?}', 'Web\RegisterController@member')->name('main.register_user_member'); +Route::post('/registrierung', 'Web\RegisterController@register')->name('main.register_user_post'); +Route::get('/registrierung/finish', 'Web\RegisterController@finish')->name('main.register_user_finish'); Route::get('/', 'Web\SiteController@index')->name('/'); Route::get('/{site}/{subsite?}/{product_slug?}', 'Web\SiteController@site')->name('base.site'); + diff --git a/routes/domains/portal.php b/routes/domains/portal.php index 8a173cb9..ec1f9a51 100644 --- a/routes/domains/portal.php +++ b/routes/domains/portal.php @@ -6,11 +6,12 @@ |-------------------------------------------------------------------------- | */ -use App\Http\Controllers\Portal\AboController; -use App\Http\Controllers\Portal\Auth\LoginController; -use App\Http\Controllers\Portal\CustomerController; +use App\Http\Controllers\FileController; use App\Http\Controllers\Portal\InController; +use App\Http\Controllers\Portal\AboController; use App\Http\Controllers\Portal\OrderController; +use App\Http\Controllers\Portal\CustomerController; +use App\Http\Controllers\Portal\Auth\LoginController; @@ -37,6 +38,7 @@ Route::domain(config('app.pre_url_portal') . config('app.domain') . config('app. // Geschützte Kunden-Routen Route::middleware('auth:customers')->group(function () { + Route::get('portal/dashboard', [InController::class, 'dashboard'])->name('portal.dashboard'); //Route::get('portal/go-to-shop', [InController::class, 'goToShop'])->name('portal.go_to_shop'); Route::get('portal/my-data/edit', [CustomerController::class, 'myDataEdit'])->name('portal.my_data.edit'); diff --git a/routes/shared/common.php b/routes/shared/common.php index 5fce8bf1..584a5e82 100644 --- a/routes/shared/common.php +++ b/routes/shared/common.php @@ -16,37 +16,37 @@ if ($context->type === 'checkout') { // Für Checkout-Domain: Umleitung zur Shop-Domain Route::get('/datenschutz', function () { $domainService = app(\App\Services\DomainService::class); - $shopUrl = $domainService->buildUrl('main-shop', '/datenschutz'); + $shopUrl = $domainService->buildUrl('shop', '/datenschutz'); return redirect()->away($shopUrl); })->name('legal.data-protected'); Route::get('/impressum', function () { $domainService = app(\App\Services\DomainService::class); - $shopUrl = $domainService->buildUrl('main-shop', '/impressum'); + $shopUrl = $domainService->buildUrl('shop', '/impressum'); return redirect()->away($shopUrl); })->name('legal.imprint'); Route::get('/agb', function () { $domainService = app(\App\Services\DomainService::class); - $shopUrl = $domainService->buildUrl('main-shop', '/agb'); + $shopUrl = $domainService->buildUrl('shop', '/agb'); return redirect()->away($shopUrl); })->name('legal.agb'); Route::get('/kontakt', function () { $domainService = app(\App\Services\DomainService::class); - $shopUrl = $domainService->buildUrl('main-shop', '/kontakt'); + $shopUrl = $domainService->buildUrl('shop', '/kontakt'); return redirect()->away($shopUrl); })->name('contact.create'); Route::get('/zahlungsarten', function () { $domainService = app(\App\Services\DomainService::class); - $shopUrl = $domainService->buildUrl('main-shop', '/zahlungsarten'); + $shopUrl = $domainService->buildUrl('shop', '/zahlungsarten'); return redirect()->away($shopUrl); })->name('zahlungsarten'); Route::get('/versandkosten', function () { $domainService = app(\App\Services\DomainService::class); - $shopUrl = $domainService->buildUrl('main-shop', '/versandkosten'); + $shopUrl = $domainService->buildUrl('shop', '/versandkosten'); return redirect()->away($shopUrl); })->name('versandkosten'); } else { @@ -59,37 +59,10 @@ if ($context->type === 'checkout') { Route::get('/zahlungsarten', 'HomeController@zahlungsarten')->name('zahlungsarten'); Route::get('/versandkosten', 'HomeController@versandkosten')->name('versandkosten'); } -//debug subdomain -Route::get('/debug-subdomain', function () { - $domainContext = app(\App\Domain\DomainContext::class); - $domainService = app(\App\Services\DomainService::class); - - return response()->json([ - 'host' => request()->getHost(), - 'headers' => [ - 'X-Forwarded-Host' => request()->header('X-Forwarded-Host'), - 'X-Subdomain' => request()->header('X-Subdomain'), - 'Host' => request()->header('Host'), - ], - 'url' => request()->url(), - 'full_url' => request()->fullUrl(), - 'server' => [ - 'HTTP_HOST' => $_SERVER['HTTP_HOST'] ?? 'not set', - 'SERVER_NAME' => $_SERVER['SERVER_NAME'] ?? 'not set', - ], - 'domain_context' => [ - 'type' => $domainContext->type, - 'host' => $domainContext->host, - 'subdomain' => $domainContext->subdomain, - 'cloudflare_subdomain' => $domainContext->cloudflareSubdomain, - 'effective_subdomain' => $domainContext->getEffectiveSubdomain(), - 'is_cloudflare' => $domainContext->isCloudflareSubdomain(), - 'is_user_shop' => $domainContext->isUserShop(), - 'user_shop_slug' => $domainContext->getUserShopSlug(), - ], - 'parsed_domain' => $domainService->parseDomain(request()->getHost(), request()->header('X-Subdomain')) - ]); -}); + +// File storage route für alle Domains (Rechnungen, Downloads, etc.) +// Auth-Prüfung erfolgt im FileController selbst je nach Kontext +Route::get('/storage/file/{id}/{from}/{do?}', 'FileController@show')->name('storage_file'); // Sprachwechsler Route::post('/change_website_lang', 'Web\SiteController@changeLang')->name('language.change'); @@ -199,3 +172,6 @@ if ($context->type !== 'checkout') { } +Route::get('/register/verify/{confirmationCode}', 'HomeController@verify')->name('register_verify'); + +