23-01-2026
This commit is contained in:
parent
a939cd51ef
commit
a8b395e20d
248 changed files with 29342 additions and 4805 deletions
93
dev/22-01-2026/dhl-cancellation-info.md
Normal file
93
dev/22-01-2026/dhl-cancellation-info.md
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
# DHL Sendungs-Stornierung - Troubleshooting
|
||||
|
||||
## Problem: "RF-UndefinedResource" Fehler
|
||||
|
||||
### Aktuelle Situation:
|
||||
- **Config:** Sandbox-Modus aktiv (`DHL_SANDBOX=true`)
|
||||
- **Base URL:** `https://api-sandbox.dhl.com`
|
||||
- **Sendung:** ID 11, Nr. `0034043333301020021021115`
|
||||
- **Status:** `created` (stornierbar)
|
||||
- **Fehler:** "RF-UndefinedResource"
|
||||
|
||||
### Ursachen:
|
||||
|
||||
#### 1. **Sandbox-Einschränkungen**
|
||||
Im DHL Sandbox-Modus:
|
||||
- Sendungen sind nur für begrenzte Zeit verfügbar
|
||||
- Test-Sendungen werden nach kurzer Zeit automatisch gelöscht
|
||||
- Stornierung ist nur innerhalb weniger Stunden möglich
|
||||
|
||||
#### 2. **Zeitfenster überschritten**
|
||||
- Sendung erstellt: `2026-01-23 13:08:07`
|
||||
- Wenn mehr als 2-3 Stunden vergangen: Nicht mehr stornierbar
|
||||
|
||||
#### 3. **Sandbox vs. Production Mismatch**
|
||||
- Sendung im Sandbox erstellt
|
||||
- Versuch im Production-Modus zu stornieren (oder umgekehrt)
|
||||
|
||||
### Lösungen:
|
||||
|
||||
#### Option 1: Neue Test-Sendung erstellen
|
||||
```bash
|
||||
# Neue Sendung erstellen und SOFORT stornieren (innerhalb von Minuten)
|
||||
# Im DHL Cockpit: Neue Sendung erstellen → Sofort Storno-Button klicken
|
||||
```
|
||||
|
||||
#### Option 2: Production-Modus testen (nur mit echten Credentials!)
|
||||
```env
|
||||
# .env
|
||||
DHL_SANDBOX=false
|
||||
DHL_BASE_URL=https://api-eu.dhl.com
|
||||
DHL_API_KEY=<production_key>
|
||||
DHL_USERNAME=<production_user>
|
||||
DHL_PASSWORD=<production_password>
|
||||
```
|
||||
|
||||
#### Option 3: Status manuell setzen (nur für Entwicklung)
|
||||
```bash
|
||||
php artisan tinker
|
||||
```
|
||||
```php
|
||||
$shipment = Acme\Dhl\Models\DhlShipment::find(11);
|
||||
$shipment->update(['status' => 'canceled']);
|
||||
```
|
||||
|
||||
### Empfehlung:
|
||||
|
||||
**Für Sandbox-Tests:**
|
||||
1. Sendung erstellen
|
||||
2. **SOFORT** (innerhalb von 1-2 Minuten) stornieren
|
||||
3. Nicht länger warten
|
||||
|
||||
**Für Production:**
|
||||
- Stornierung funktioniert zuverlässig innerhalb von 24 Stunden
|
||||
- Sendungen bleiben länger in der API verfügbar
|
||||
|
||||
### Debug-Commands:
|
||||
|
||||
```bash
|
||||
# Prüfe Sendung
|
||||
php artisan tinker --execute="
|
||||
\$s = Acme\Dhl\Models\DhlShipment::find(11);
|
||||
echo 'Status: ' . \$s->status . PHP_EOL;
|
||||
echo 'Created: ' . \$s->created_at . PHP_EOL;
|
||||
echo 'Age: ' . \$s->created_at->diffForHumans() . PHP_EOL;
|
||||
"
|
||||
|
||||
# Prüfe Config
|
||||
php artisan tinker --execute="
|
||||
\$c = (new \App\Http\Controllers\SettingController())->getDhlConfig();
|
||||
echo 'Mode: ' . (\$c['base_url'] == 'https://api-sandbox.dhl.com' ? 'SANDBOX' : 'PRODUCTION') . PHP_EOL;
|
||||
"
|
||||
```
|
||||
|
||||
### Workaround für alte Sandbox-Sendungen:
|
||||
|
||||
Da alte Sandbox-Sendungen nicht mehr storniert werden können, setzen wir den Status manuell:
|
||||
|
||||
```php
|
||||
// Alle alten "created" Sendungen als "failed" markieren
|
||||
Acme\Dhl\Models\DhlShipment::where('status', 'created')
|
||||
->where('created_at', '<', now()->subHours(6))
|
||||
->update(['status' => 'failed']);
|
||||
```
|
||||
362
dev/22-01-2026/dhl-return-label-info.md
Normal file
362
dev/22-01-2026/dhl-return-label-info.md
Normal file
|
|
@ -0,0 +1,362 @@
|
|||
# DHL Return Label (Retourenlabel) - Dokumentation
|
||||
|
||||
## 📦 Übersicht
|
||||
|
||||
Die Return Label Funktionalität ermöglicht es, automatisch Retourenlabels für ausgehende DHL-Sendungen zu erstellen.
|
||||
|
||||
---
|
||||
|
||||
## ✨ Features
|
||||
|
||||
| Feature | Status | Beschreibung |
|
||||
|---------|--------|--------------|
|
||||
| **Button in allen Views** | ✅ | Überall wo DHL Sendungen angezeigt werden |
|
||||
| **Sync/Async Modus** | ✅ | Basierend auf `DHL_USE_QUEUE` Config |
|
||||
| **Adress-Tausch** | ✅ | Kunde wird Absender, Lager wird Empfänger |
|
||||
| **Duplikat-Prüfung** | ✅ | Nur ein Retourenlabel pro Sendung |
|
||||
| **Nur für Outbound** | ✅ | Nur für ausgehende Sendungen verfügbar |
|
||||
| **Package Integration** | ✅ | Nutzt neues `acme-laravel-dhl` Package |
|
||||
|
||||
---
|
||||
|
||||
## 📍 Button Standorte
|
||||
|
||||
### **1. Bestelldetails**
|
||||
```
|
||||
Admin → Bestellungen → Bestellung öffnen
|
||||
→ DHL Sendungen Block → Aktionen
|
||||
|
||||
[👁️] [📥] [🔄] [✉️] [🔙] [❌]
|
||||
↑
|
||||
Return Label Button
|
||||
```
|
||||
|
||||
### **2. DHL Cockpit**
|
||||
```
|
||||
Admin → DHL → Cockpit
|
||||
→ DataTable → Aktionen-Spalte
|
||||
|
||||
Gleiche Buttons wie in Bestelldetails
|
||||
```
|
||||
|
||||
### **3. DHL Detail-Seite**
|
||||
```
|
||||
Admin → DHL → Sendung öffnen
|
||||
→ Aktionsbereich oben
|
||||
|
||||
[🔙 Retourenlabel erstellen]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Button-Bedingungen
|
||||
|
||||
Der Button wird **nur** angezeigt wenn:
|
||||
|
||||
✅ `type` = 'outbound' (ausgehende Sendung)
|
||||
✅ Keine Retoure existiert (`returns->count()` = 0)
|
||||
✅ Admin-Bereich (nicht in User-Views)
|
||||
|
||||
```php
|
||||
@if($shipment->type === 'outbound' && !$shipment->returns->count())
|
||||
<button class="btn btn-outline-info dhl-create-return-btn">
|
||||
<i class="fas fa-undo"></i>
|
||||
</button>
|
||||
@endif
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔄 Workflow
|
||||
|
||||
### **Synchroner Modus** (`DHL_USE_QUEUE=false`)
|
||||
|
||||
```
|
||||
1. Admin klickt "Retourenlabel erstellen"
|
||||
2. Bestätigung: "Möchten Sie ein Retourenlabel erstellen?"
|
||||
3. → JA
|
||||
4. Button: "⏳ Wird erstellt..."
|
||||
5. API-Request direkt an DHL
|
||||
6. ✅ Erfolg: "Retourenlabel wurde erfolgreich erstellt!"
|
||||
7. Seite lädt neu
|
||||
8. Neue Retoure ist sichtbar
|
||||
```
|
||||
|
||||
### **Asynchroner Modus** (`DHL_USE_QUEUE=true`)
|
||||
|
||||
```
|
||||
1. Admin klickt "Retourenlabel erstellen"
|
||||
2. Bestätigung: "Möchten Sie ein Retourenlabel erstellen?"
|
||||
3. → JA
|
||||
4. Button: "⏳ Wird erstellt..."
|
||||
5. Job wird in Queue gestellt
|
||||
6. ✅ Erfolg: "Retourenlabel wird im Hintergrund erstellt"
|
||||
7. Seite lädt neu
|
||||
8. Worker verarbeitet Job
|
||||
9. Retoure wird erstellt
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔧 Technische Details
|
||||
|
||||
### **Controller-Methode**
|
||||
```php
|
||||
// app/Http/Controllers/DhlShipmentController.php
|
||||
public function createReturnLabel(Request $request, DhlShipment $shipment): JsonResponse
|
||||
{
|
||||
// Validierung
|
||||
if ($shipment->type !== 'outbound') { ... }
|
||||
if (existingReturn) { ... }
|
||||
|
||||
// Sync oder Async basierend auf Config
|
||||
if ($useQueue) {
|
||||
CreateReturnLabelJob::dispatch($shipment, $options);
|
||||
} else {
|
||||
$result = $this->createReturnLabelSync($shipment);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### **Job-Klasse**
|
||||
```php
|
||||
// app/Jobs/CreateReturnLabelJob.php
|
||||
class CreateReturnLabelJob implements ShouldQueue
|
||||
{
|
||||
public function handle(): void
|
||||
{
|
||||
// DHL Client initialisieren
|
||||
$dhlClient = new DhlClient(...);
|
||||
$shippingService = new ShippingService($dhlClient);
|
||||
|
||||
// Return Label Daten vorbereiten (Adressen getauscht)
|
||||
$returnData = $this->prepareReturnLabelData($dhlConfig);
|
||||
|
||||
// Label erstellen
|
||||
$result = $shippingService->createLabel($returnData);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### **Adress-Tausch**
|
||||
|
||||
Bei Return Labels werden die Adressen **automatisch getauscht**:
|
||||
|
||||
| Feld | Ausgehende Sendung | Retoure |
|
||||
|------|-------------------|---------|
|
||||
| **Shipper (Absender)** | Unser Lager | **Kunde** |
|
||||
| **Consignee (Empfänger)** | **Kunde** | Unser Lager |
|
||||
|
||||
```php
|
||||
// Shipper: Kunde sendet zurück (aus original recipient)
|
||||
'shipper' => [
|
||||
'name' => 'Max Mustermann',
|
||||
'street' => 'Hauptstraße',
|
||||
'postalCode' => '12345',
|
||||
'city' => 'Berlin',
|
||||
...
|
||||
],
|
||||
|
||||
// Consignee: Unser Lager empfängt (aus DHL settings)
|
||||
'consignee' => [
|
||||
'name' => 'mivita care gmbh',
|
||||
'street' => 'Leinfeld',
|
||||
'postalCode' => '87755',
|
||||
'city' => 'Kirchhaslach',
|
||||
...
|
||||
],
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🚨 Validierung & Fehlerbehandlung
|
||||
|
||||
### **Validierungs-Checks**
|
||||
|
||||
```php
|
||||
// 1. Nur für ausgehende Sendungen
|
||||
if ($shipment->type !== 'outbound') {
|
||||
return 'Retourenlabels können nur für ausgehende Sendungen erstellt werden.';
|
||||
}
|
||||
|
||||
// 2. Keine doppelte Retoure
|
||||
$existingReturn = DhlShipment::where('related_shipment_id', $shipment->id)
|
||||
->where('type', 'return')
|
||||
->first();
|
||||
|
||||
if ($existingReturn) {
|
||||
return 'Für diese Sendung existiert bereits ein Retourenlabel.';
|
||||
}
|
||||
```
|
||||
|
||||
### **Fehlerbehandlung**
|
||||
|
||||
| Szenario | Verhalten |
|
||||
|----------|-----------|
|
||||
| API Timeout | Job wird wiederholt (3x) |
|
||||
| Ungültige Adresse | Fehler + Log-Eintrag |
|
||||
| Netzwerkfehler | Job wird wiederholt |
|
||||
| 3 Fehlversuche | `failed()` Methode aufgerufen |
|
||||
|
||||
---
|
||||
|
||||
## 📊 Database Structure
|
||||
|
||||
### **Retoure-Beziehung**
|
||||
|
||||
```sql
|
||||
-- Ausgehende Sendung
|
||||
id: 123
|
||||
type: 'outbound'
|
||||
related_shipment_id: NULL
|
||||
|
||||
-- Zugehörige Retoure
|
||||
id: 456
|
||||
type: 'return'
|
||||
related_shipment_id: 123 -- Verknüpfung zur Original-Sendung
|
||||
```
|
||||
|
||||
### **Model-Beziehungen**
|
||||
|
||||
```php
|
||||
// In DhlShipment Model
|
||||
public function returns(): HasMany
|
||||
{
|
||||
return $this->hasMany(self::class, 'related_shipment_id');
|
||||
}
|
||||
|
||||
public function relatedShipment(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(self::class, 'related_shipment_id');
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🧪 Testen
|
||||
|
||||
### **Test 1: Retourenlabel erstellen (Sync)**
|
||||
```bash
|
||||
# 1. .env setzen
|
||||
DHL_USE_QUEUE=false
|
||||
|
||||
# 2. Label erstellen für Bestellung
|
||||
Admin → Bestellung #45078 → DHL Label erstellen
|
||||
|
||||
# 3. Return Label erstellen
|
||||
→ Bestellung öffnen
|
||||
→ DHL Sendungen Block
|
||||
→ Button "🔙" klicken
|
||||
→ Bestätigen
|
||||
→ ✅ Retoure sollte sofort erscheinen
|
||||
```
|
||||
|
||||
### **Test 2: Retourenlabel erstellen (Async)**
|
||||
```bash
|
||||
# 1. .env setzen
|
||||
DHL_USE_QUEUE=true
|
||||
|
||||
# 2. Queue Worker starten
|
||||
php artisan queue:work
|
||||
|
||||
# 3. Label erstellen
|
||||
Admin → Bestellung #45078 → Button "🔙" klicken
|
||||
|
||||
# 4. Queue prüfen
|
||||
→ Worker-Log anschauen
|
||||
→ Retoure sollte nach wenigen Sekunden erscheinen
|
||||
```
|
||||
|
||||
### **Test 3: Duplikat-Prüfung**
|
||||
```bash
|
||||
# 1. Retoure erstellen (wie Test 1)
|
||||
# 2. Erneut Button "🔙" klicken
|
||||
# → Fehler: "Für diese Sendung existiert bereits ein Retourenlabel."
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📝 Logs
|
||||
|
||||
### **Erfolgreiche Erstellung**
|
||||
```
|
||||
[DHL Controller] Return label creation job dispatched
|
||||
- original_shipment_id: 123
|
||||
- shipment_number: 00340433333...
|
||||
|
||||
[DHL Queue] Return label created successfully
|
||||
- original_shipment_id: 123
|
||||
- return_shipment_number: 00340433444...
|
||||
```
|
||||
|
||||
### **Fehler**
|
||||
```
|
||||
[DHL Queue] Return label creation failed
|
||||
- original_shipment_id: 123
|
||||
- error: "DHL API error: Invalid address"
|
||||
- attempt: 1/3
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ Konfiguration
|
||||
|
||||
### **Queue-Modus**
|
||||
```env
|
||||
# .env
|
||||
DHL_USE_QUEUE=true # Async (empfohlen für Produktion)
|
||||
DHL_USE_QUEUE=false # Sync (für Testing)
|
||||
```
|
||||
|
||||
### **Queue-Name**
|
||||
```php
|
||||
// Normal Priority
|
||||
$job->onQueue('dhl-returns');
|
||||
|
||||
// High Priority
|
||||
$options['priority'] = 'high';
|
||||
$job->onQueue('high-priority');
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔗 Routes
|
||||
|
||||
```php
|
||||
// routes/domains/crm.php
|
||||
Route::post('/shipment/{shipment}/return-label',
|
||||
'DhlShipmentController@createReturnLabel')
|
||||
->name('admin.dhl.create-return');
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📋 Betroffene Dateien
|
||||
|
||||
| Datei | Änderung |
|
||||
|-------|----------|
|
||||
| `app/Http/Controllers/DhlShipmentController.php` | `createReturnLabel()` + `createReturnLabelSync()` |
|
||||
| `app/Jobs/CreateReturnLabelJob.php` | Aktualisiert für neues Package |
|
||||
| `resources/views/admin/sales/_detail_dhl_shipments.blade.php` | Button + JavaScript Handler |
|
||||
| `resources/views/admin/dhl/show.blade.php` | Button aktiviert |
|
||||
| `resources/views/admin/dhl/cockpit.blade.php` | Button funktioniert bereits |
|
||||
|
||||
---
|
||||
|
||||
## ✅ Checkliste
|
||||
|
||||
- [x] Button in allen DHL Views
|
||||
- [x] JavaScript Handler implementiert
|
||||
- [x] Controller-Methode mit Sync/Async
|
||||
- [x] Job für Queue-Verarbeitung
|
||||
- [x] Adress-Tausch korrekt
|
||||
- [x] Validierung & Fehlerbehandlung
|
||||
- [x] Duplikat-Prüfung
|
||||
- [x] Logging implementiert
|
||||
- [x] Dokumentation erstellt
|
||||
|
||||
---
|
||||
|
||||
## 🎉 Fertig!
|
||||
|
||||
Die Return Label Funktionalität ist vollständig implementiert und einsatzbereit!
|
||||
295
dev/22-01-2026/dhl-tracking-emails.md
Normal file
295
dev/22-01-2026/dhl-tracking-emails.md
Normal file
|
|
@ -0,0 +1,295 @@
|
|||
# DHL Tracking E-Mails - Erweiterte Funktionen
|
||||
|
||||
## 📧 Mehrere Sendungen in einer E-Mail
|
||||
|
||||
### Problem gelöst:
|
||||
Wenn eine Bestellung in **mehrere Pakete** aufgeteilt wird, erhalten Kunden jetzt **eine gesammelte E-Mail** mit allen Tracking-Nummern, statt mehrere einzelne E-Mails.
|
||||
|
||||
---
|
||||
|
||||
## ✨ Neue Features
|
||||
|
||||
### 1. **Automatische Zusammenfassung**
|
||||
Alle Sendungen einer Bestellung werden automatisch in einer E-Mail zusammengefasst:
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────┐
|
||||
│ Deine 3 Sendungen sind unterwegs! │
|
||||
├─────────────────────────────────────┤
|
||||
│ │
|
||||
│ Paket 1 │
|
||||
│ Sendungsnummer: 00340433333... │
|
||||
│ [Sendung bei DHL verfolgen] │
|
||||
│ │
|
||||
│ Paket 2 │
|
||||
│ Sendungsnummer: 00340433334... │
|
||||
│ [Sendung bei DHL verfolgen] │
|
||||
│ │
|
||||
│ Paket 3 │
|
||||
│ Sendungsnummer: 00340433335... │
|
||||
│ [Sendung bei DHL verfolgen] │
|
||||
└─────────────────────────────────────┘
|
||||
```
|
||||
|
||||
### 2. **Intelligente Versand-Logik**
|
||||
- ✅ Sammelt alle Sendungen einer Bestellung
|
||||
- ✅ Versendet eine E-Mail pro Bestellung (nicht pro Paket)
|
||||
- ✅ Markiert alle Sendungen als versendet
|
||||
- ✅ Verhindert doppelte E-Mails
|
||||
|
||||
### 3. **Manuelle Versand-Option**
|
||||
Im Admin unter **DHL Cockpit** oder **Bestelldetails**:
|
||||
- Button "Tracking-E-Mail senden" klicken
|
||||
- Sendet automatisch **alle** Sendungen der Bestellung
|
||||
- Zeigt Anzahl der Sendungen in der Bestätigung
|
||||
|
||||
### 4. **Test-Modus für Cronjob**
|
||||
Testen Sie E-Mails, bevor sie an Kunden gehen!
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Verwendung
|
||||
|
||||
### Manuelle E-Mail versenden (Admin)
|
||||
|
||||
#### Option 1: Aus Bestelldetails
|
||||
1. Bestellung öffnen
|
||||
2. DHL Sendungen-Block scrollen
|
||||
3. Button "📧" klicken
|
||||
4. Alle Sendungen dieser Bestellung werden versendet
|
||||
|
||||
#### Option 2: Aus DHL Cockpit
|
||||
1. DHL Cockpit öffnen
|
||||
2. Sendung finden
|
||||
3. Button "📧" klicken
|
||||
4. Alle Sendungen dieser Bestellung werden versendet
|
||||
|
||||
### Automatischer Cronjob
|
||||
|
||||
#### Standard (täglich 06:00 Uhr)
|
||||
```bash
|
||||
# Läuft automatisch via Cron
|
||||
# Definiert in: app/Console/Kernel.php
|
||||
```
|
||||
|
||||
#### Manuell ausführen
|
||||
```bash
|
||||
# Normale Ausführung
|
||||
php artisan dhl:update-tracking --send-emails
|
||||
|
||||
# Mit Test-E-Mail
|
||||
php artisan dhl:update-tracking --send-emails --test-email=admin@example.com
|
||||
|
||||
# Für bestimmte Bestellung
|
||||
php artisan dhl:update-tracking --send-emails --order=45078
|
||||
|
||||
# Dry-Run (keine Änderungen)
|
||||
php artisan dhl:update-tracking --send-emails --dry-run
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🧪 Test-Optionen
|
||||
|
||||
### Option 1: Test-E-Mail an eigene Adresse
|
||||
```bash
|
||||
php artisan dhl:update-tracking --send-emails --test-email=meine@email.de
|
||||
```
|
||||
✅ Sendet E-Mails an angegebene Adresse statt an Kunden
|
||||
✅ Perfekt zum Testen des Layouts und Inhalts
|
||||
✅ Markiert Sendungen TROTZDEM als versendet
|
||||
|
||||
### Option 2: Dry-Run (Simulation)
|
||||
```bash
|
||||
php artisan dhl:update-tracking --send-emails --dry-run
|
||||
```
|
||||
✅ Simuliert alle Aktionen
|
||||
✅ Sendet KEINE E-Mails
|
||||
✅ Markiert Sendungen NICHT als versendet
|
||||
✅ Zeigt was passieren würde
|
||||
|
||||
### Option 3: Bestimmte Bestellung testen
|
||||
```bash
|
||||
php artisan dhl:update-tracking --send-emails --order=45078 --test-email=test@example.com
|
||||
```
|
||||
✅ Nur für eine Order-ID
|
||||
✅ An Test-Adresse
|
||||
✅ Perfekt für gezielte Tests
|
||||
|
||||
---
|
||||
|
||||
## 📊 Versand-Status in Bestelldetails
|
||||
|
||||
### Anzeige
|
||||
Für jede Sendung wird angezeigt:
|
||||
|
||||
| Sendung | Status | Tracking | **E-Mail** | Aktionen |
|
||||
|---------|--------|----------|------------|----------|
|
||||
| #11 | created | - | ✅ 23.01.2026<br>🤖 Automatisch | 👁️ 📥 📧 |
|
||||
| #12 | in_transit | ... | ✅ 23.01.2026<br>👤 Manuell | 👁️ 📥 🔄 📧 |
|
||||
| #13 | created | - | ⏳ Nicht gesendet | 👁️ 📥 📧 |
|
||||
|
||||
### Informationen
|
||||
- **✅ Datum**: Wann wurde E-Mail versendet
|
||||
- **🤖 Automatisch**: Via Cronjob versendet
|
||||
- **👤 Manuell**: Über Admin-Button versendet
|
||||
- **⏳ Nicht gesendet**: Noch keine E-Mail
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ Technische Details
|
||||
|
||||
### Datenbank-Felder
|
||||
```sql
|
||||
-- dhl_package_shipments Tabelle
|
||||
tracking_email_sent_at TIMESTAMP NULL -- Wann versendet
|
||||
tracking_email_type VARCHAR(20) -- 'auto' oder 'manual'
|
||||
```
|
||||
|
||||
### Mail-Klasse
|
||||
```php
|
||||
// Unterstützt jetzt Collection von Shipments
|
||||
new MailDhlTracking($shipments, $order)
|
||||
|
||||
// Oder einzelne Sendung (backward compatible)
|
||||
new MailDhlTracking($shipment, $order)
|
||||
```
|
||||
|
||||
### Logik
|
||||
```php
|
||||
// Sammelt alle Sendungen einer Bestellung
|
||||
$allShipments = DhlShipment::where('order_id', $order->id)
|
||||
->whereNotNull('dhl_shipment_no')
|
||||
->whereIn('status', ['created', 'in_transit', 'out_for_delivery'])
|
||||
->get();
|
||||
|
||||
// Sendet eine E-Mail mit allen Sendungen
|
||||
Mail::to($email)->send(new MailDhlTracking($allShipments, $order));
|
||||
|
||||
// Markiert alle als versendet
|
||||
foreach ($allShipments as $shipment) {
|
||||
$shipment->markTrackingEmailSent('manual');
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Anwendungsfälle
|
||||
|
||||
### Fall 1: Mehrere Pakete bei Erstellung
|
||||
```
|
||||
1. Admin erstellt 3 Labels für Order #45078
|
||||
2. Alle 3 Labels werden erstellt (Status: created)
|
||||
3. Cronjob läuft (06:00 Uhr)
|
||||
4. Status wird aktualisiert (created → in_transit)
|
||||
5. EINE E-Mail mit allen 3 Sendungen wird versendet
|
||||
```
|
||||
|
||||
### Fall 2: Nachträgliches Label
|
||||
```
|
||||
1. Order #45078 hat bereits 2 Labels (E-Mail bereits versendet)
|
||||
2. Admin erstellt 3. Label
|
||||
3. Admin klickt "📧" Button
|
||||
4. NEUE E-Mail mit allen 3 Sendungen wird versendet
|
||||
```
|
||||
|
||||
### Fall 3: Test vor Produktiv-Einsatz
|
||||
```bash
|
||||
# 1. Test mit eigener E-Mail
|
||||
php artisan dhl:update-tracking --send-emails --test-email=admin@firma.de
|
||||
|
||||
# 2. Prüfen der E-Mail
|
||||
# 3. Bei OK: Cronjob aktivieren (läuft automatisch)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔧 Konfiguration
|
||||
|
||||
### Cronjob-Einstellung
|
||||
```php
|
||||
// app/Console/Kernel.php
|
||||
$schedule->command('dhl:update-tracking --days=14 --send-emails')
|
||||
->dailyAt('06:00')
|
||||
->withoutOverlapping()
|
||||
->runInBackground();
|
||||
```
|
||||
|
||||
### Anpassungen
|
||||
```php
|
||||
// Andere Uhrzeit
|
||||
->dailyAt('08:00')
|
||||
|
||||
// Nur Werktage
|
||||
->weekdays()->at('06:00')
|
||||
|
||||
// Nur wenn Sendungen vorhanden
|
||||
->when(function() {
|
||||
return DhlShipment::active()->count() > 0;
|
||||
})
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📝 Übersetzungen
|
||||
|
||||
Neue Übersetzungs-Keys in `resources/lang/{de,en,es}/email.php`:
|
||||
|
||||
```php
|
||||
'dhl_tracking_subject_multiple' => 'Deine :count Sendungen sind unterwegs'
|
||||
'dhl_tracking_message_multiple' => 'Deine Bestellung wurde in :count Paketen versendet'
|
||||
'dhl_tracking_package_label' => 'Paket :number'
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ✅ Vorteile
|
||||
|
||||
| Vorher | Nachher |
|
||||
|--------|---------|
|
||||
| 3 Pakete = 3 E-Mails | 3 Pakete = 1 E-Mail |
|
||||
| Kunde verwirrt | Kunde hat Überblick |
|
||||
| Einzelne Tracking-Nummern | Alle Nummern auf einen Blick |
|
||||
| Manuell testen schwierig | Test-Modus integriert |
|
||||
| Kein Überblick über Versand | Klare Anzeige in Admin |
|
||||
|
||||
---
|
||||
|
||||
## 🐛 Troubleshooting
|
||||
|
||||
### Problem: E-Mail wird nicht versendet
|
||||
```bash
|
||||
# Prüfen ob Sendungen vorhanden
|
||||
php artisan tinker
|
||||
>>> Acme\Dhl\Models\DhlShipment::active()->count()
|
||||
|
||||
# Prüfen ob E-Mail-Adresse vorhanden
|
||||
>>> $order = App\Models\ShoppingOrder::find(45078);
|
||||
>>> $order->shopping_user->email
|
||||
```
|
||||
|
||||
### Problem: Mehrfache E-Mails
|
||||
```bash
|
||||
# Prüfen welche Sendungen noch keine E-Mail haben
|
||||
php artisan tinker
|
||||
>>> Acme\Dhl\Models\DhlShipment::whereNull('tracking_email_sent_at')->count()
|
||||
```
|
||||
|
||||
### Problem: Test-E-Mail kommt nicht an
|
||||
```bash
|
||||
# Queue prüfen
|
||||
php artisan queue:work --once
|
||||
|
||||
# Logs prüfen
|
||||
tail -f storage/logs/laravel.log
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📞 Support
|
||||
|
||||
Bei Fragen zur Implementierung siehe:
|
||||
- `/dev/22-01-2026/next-steps.md` - Vollständige Dokumentation
|
||||
- `app/Console/Commands/DhlUpdateTracking.php` - Command-Code
|
||||
- `app/Mail/MailDhlTracking.php` - Mail-Klasse
|
||||
- `resources/views/emails/dhl_tracking.blade.php` - E-Mail Template
|
||||
1068
dev/22-01-2026/next-steps.md
Normal file
1068
dev/22-01-2026/next-steps.md
Normal file
File diff suppressed because it is too large
Load diff
161
dev/22-01-2026/packstation-anleitung.md
Normal file
161
dev/22-01-2026/packstation-anleitung.md
Normal file
|
|
@ -0,0 +1,161 @@
|
|||
# DHL Packstation / Paketbox - Korrekte Eingabe
|
||||
|
||||
## ❌ HÄUFIGER FEHLER
|
||||
|
||||
**Fehler:** `Packstation-Nummer muss eine 3-stellige Zahl zwischen 100 und 999 sein`
|
||||
|
||||
**Ursache:** Die Packstation-NUMMER (am Gerät) wird mit der DHL Postnummer (Kundennummer) verwechselt!
|
||||
|
||||
---
|
||||
|
||||
## ✅ KORREKTE EINGABE
|
||||
|
||||
### Was ist was?
|
||||
|
||||
| Feld | Was eintragen | Beispiel | Wo zu finden |
|
||||
|------|---------------|----------|--------------|
|
||||
| **DHL Postnummer** | 6-10-stellige Kundennummer | `1234567890` | DHL App / Registrierung |
|
||||
| **Straße / Nr.** | Packstation + 3-stellige Nummer | `Packstation 145` | Gelbes Schild am Gerät |
|
||||
| **PLZ / Ort** | Standort der Packstation | `12345 Berlin` | Gelbes Schild am Gerät |
|
||||
|
||||
---
|
||||
|
||||
## 📋 SCHRITT-FÜR-SCHRITT ANLEITUNG
|
||||
|
||||
### 1. DHL Postnummer (oben im Formular)
|
||||
```
|
||||
✅ Richtig: 1234567890
|
||||
✅ Richtig: 123456
|
||||
❌ Falsch: 145 (das ist die Packstation-Nummer!)
|
||||
```
|
||||
|
||||
### 2. Lieferadresse → Straße / Nr.
|
||||
```
|
||||
✅ Richtig: Packstation 145
|
||||
✅ Richtig: Paketbox 278
|
||||
❌ Falsch: Packstation 12345 (zu lang!)
|
||||
❌ Falsch: Packstation (Nummer fehlt!)
|
||||
```
|
||||
|
||||
### 3. Lieferadresse → PLZ / Ort
|
||||
```
|
||||
✅ Richtig: 33739 Bielefeld (Standort der Packstation)
|
||||
❌ Falsch: 10115 Berlin (Ihre Wohnadresse)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔍 WO FINDE ICH DIE NUMMERN?
|
||||
|
||||
### Packstation-Nummer (3-stellig: 100-999)
|
||||
📍 **Am gelben DHL-Schild** auf dem Packstation-Gerät
|
||||
```
|
||||
┌─────────────────────────┐
|
||||
│ DHL Packstation │
|
||||
│ Nr. 145 │ ← DIESE NUMMER!
|
||||
│ Hauptstraße 1 │
|
||||
│ 12345 Beispielstadt │
|
||||
└─────────────────────────┘
|
||||
```
|
||||
|
||||
### DHL Postnummer (6-10-stellig)
|
||||
📱 **In der DHL App** unter "Mein Konto" → "Postnummer"
|
||||
🌐 **Auf dhl.de** nach der Registrierung
|
||||
📧 **Per E-Mail** nach Aktivierung
|
||||
|
||||
---
|
||||
|
||||
## 💡 BEISPIELE
|
||||
|
||||
### Beispiel 1: Standard Packstation
|
||||
```
|
||||
[Formular]
|
||||
DHL Postnummer: 1234567890
|
||||
──────────────────────────────
|
||||
Straße / Nr.: Packstation 145
|
||||
PLZ: 33739
|
||||
Ort: Bielefeld
|
||||
```
|
||||
|
||||
### Beispiel 2: Paketbox
|
||||
```
|
||||
[Formular]
|
||||
DHL Postnummer: 9876543210
|
||||
──────────────────────────────
|
||||
Straße / Nr.: Paketbox 278
|
||||
PLZ: 10115
|
||||
Ort: Berlin
|
||||
```
|
||||
|
||||
### Beispiel 3: Kurze Postnummer (auch gültig)
|
||||
```
|
||||
[Formular]
|
||||
DHL Postnummer: 123456
|
||||
──────────────────────────────
|
||||
Straße / Nr.: Packstation 500
|
||||
PLZ: 80331
|
||||
Ort: München
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ HÄUFIGE FEHLER & LÖSUNGEN
|
||||
|
||||
| Fehler | Problem | Lösung |
|
||||
|--------|---------|--------|
|
||||
| "lockerID must be 100-999" | Packstation-Nummer zu lang/kurz | Nur 3 Ziffern eingeben (z.B. "145") |
|
||||
| "postNumber must be 6-10 digits" | Postnummer zu kurz/lang | 6-10 Ziffern, keine Leerzeichen |
|
||||
| "RF-UndefinedResource" | Packstation existiert nicht | PLZ & Ort der Packstation prüfen |
|
||||
|
||||
---
|
||||
|
||||
## 🛠️ TECHNISCHE DETAILS (für Entwickler)
|
||||
|
||||
### DHL API v2 Locker Schema
|
||||
```json
|
||||
{
|
||||
"consignee": {
|
||||
"name": "Max Mustermann",
|
||||
"lockerID": 145, // Integer 100-999
|
||||
"postNumber": "1234567890", // String 6-10 digits
|
||||
"postalCode": "12345",
|
||||
"city": "Beispielstadt",
|
||||
"country": "DEU"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Validierung
|
||||
```php
|
||||
// Packstation-Nummer: 3-stellig
|
||||
if ($lockerID < 100 || $lockerID > 999) {
|
||||
throw new InvalidArgumentException('Packstation-Nummer muss 3-stellig sein');
|
||||
}
|
||||
|
||||
// DHL Postnummer: 6-10 Ziffern
|
||||
if (!preg_match('/^[0-9]{6,10}$/', $postNumber)) {
|
||||
throw new InvalidArgumentException('DHL Postnummer muss 6-10 Ziffern haben');
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 CHECKLISTE VOR DEM ABSENDEN
|
||||
|
||||
- [ ] DHL Postnummer ist 6-10-stellig (z.B. `1234567890`)
|
||||
- [ ] Straße enthält "Packstation" + 3-stellige Nummer (z.B. `Packstation 145`)
|
||||
- [ ] PLZ + Ort ist der **Standort der Packstation**, nicht Ihre Wohnadresse
|
||||
- [ ] Alle Felder sind ausgefüllt
|
||||
|
||||
---
|
||||
|
||||
## 📞 SUPPORT
|
||||
|
||||
Bei Fragen zur DHL Postnummer:
|
||||
- 📞 DHL Hotline: 0228 4333112
|
||||
- 🌐 dhl.de/packstation
|
||||
- 📱 DHL App → Mein Konto
|
||||
|
||||
Bei technischen Problemen:
|
||||
- Prüfen Sie zuerst die Eingabe anhand dieser Anleitung
|
||||
- Screenshots des Fehlers und der Eingabe helfen bei der Fehlersuche
|
||||
384
dev/23-01-2026/dhl-return-label-api-fix.md
Normal file
384
dev/23-01-2026/dhl-return-label-api-fix.md
Normal file
|
|
@ -0,0 +1,384 @@
|
|||
# DHL Return Label API Fix
|
||||
|
||||
**Datum:** 23.01.2026
|
||||
**Problem:** Return-Label-Erstellung schlug fehl mit "DHL API error (400): 0 of 1 shipment successfully printed."
|
||||
**Status:** ✅ Behoben
|
||||
|
||||
## Problem-Analyse
|
||||
|
||||
### Ursprüngliches Problem
|
||||
|
||||
Der Code verwendete `ShippingService::createLabel()` für Return-Labels, aber:
|
||||
|
||||
1. **Falscher API-Endpunkt:**
|
||||
- Normale Sendungen: `POST /parcel/de/shipping/v2/orders`
|
||||
- Return-Labels: `POST /parcel/de/returns/v1/labels`
|
||||
|
||||
2. **Falsche Payload-Struktur:**
|
||||
- ShippingService nutzt `product`, `shipments[]`, detaillierte Dimensions
|
||||
- ReturnsService benötigt `shipper`, `receiver`, `billingNumber`
|
||||
|
||||
3. **Falsche Adress-Felder:**
|
||||
- ShippingService: `name`, `street`, `houseNumber`
|
||||
- Returns API: `name1`, `addressStreet`, `addressHouse`
|
||||
|
||||
## Lösung
|
||||
|
||||
### 1. Controller Änderungen
|
||||
|
||||
**Datei:** `app/Http/Controllers/DhlShipmentController.php`
|
||||
|
||||
**Vorher:**
|
||||
```php
|
||||
$shippingService = new \Acme\Dhl\Services\ShippingService($dhlClient);
|
||||
$result = $shippingService->createLabel($returnData);
|
||||
```
|
||||
|
||||
**Nachher:**
|
||||
```php
|
||||
$returnsService = new \Acme\Dhl\Services\ReturnsService($dhlClient);
|
||||
$result = $returnsService->createReturn($returnData);
|
||||
```
|
||||
|
||||
### 2. Job Änderungen
|
||||
|
||||
**Datei:** `app/Jobs/CreateReturnLabelJob.php`
|
||||
|
||||
**Änderungen:**
|
||||
- Import geändert: `use Acme\Dhl\Services\ReturnsService;`
|
||||
- Service gewechselt: `new ReturnsService($dhlClient)`
|
||||
- Methode geändert: `$returnsService->createReturn($returnData)`
|
||||
- Entfernt: `product_code`, `dimensions`, `reference`
|
||||
- Country-Format: `'DE'` → `'DEU'` (ISO 3166-1 alpha-3)
|
||||
|
||||
### 3. ReturnsService Verbesserungen
|
||||
|
||||
**Datei:** `packages/acme-laravel-dhl/src/Services/ReturnsService.php`
|
||||
|
||||
#### Verbesserte Validierung:
|
||||
```php
|
||||
private function validateReturnData(array $data): array
|
||||
{
|
||||
$validator = Validator::make($data, [
|
||||
'order_id' => 'nullable|integer',
|
||||
'original_shipment_id' => 'nullable|integer',
|
||||
'weight_kg' => 'nullable|numeric|min:0.1',
|
||||
'label_format' => 'nullable|string|in:PDF,PNG,ZPL',
|
||||
|
||||
// Shipper validierung
|
||||
'shipper' => 'required|array',
|
||||
'shipper.name' => 'required|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' => 'nullable|string|size:3',
|
||||
|
||||
// Consignee validierung
|
||||
'consignee' => 'required|array',
|
||||
'consignee.name' => 'required|string|max:50',
|
||||
// ... etc
|
||||
]);
|
||||
}
|
||||
```
|
||||
|
||||
#### Korrekte API-Payload:
|
||||
```php
|
||||
private function buildReturnPayload(array $returnData): array
|
||||
{
|
||||
return [
|
||||
'receiverId' => 'DEDE',
|
||||
'customerReference' => 'Return-' . $order_id,
|
||||
'shipmentReference' => 'Return-Order-' . $order_id,
|
||||
'billingNumber' => $billingNumber,
|
||||
'shipper' => [
|
||||
'name1' => $customer_name,
|
||||
'addressStreet' => $street,
|
||||
'addressHouse' => $houseNumber,
|
||||
'postalCode' => $postalCode,
|
||||
'city' => $city,
|
||||
'country' => 'DEU',
|
||||
// ...
|
||||
],
|
||||
'receiver' => [
|
||||
'name1' => $warehouse_name,
|
||||
'addressStreet' => $street,
|
||||
'addressHouse' => $houseNumber,
|
||||
// ...
|
||||
],
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
## API-Unterschiede
|
||||
|
||||
### Normale Sendung (Outbound)
|
||||
|
||||
**Endpunkt:** `POST /parcel/de/shipping/v2/orders`
|
||||
|
||||
**Payload:**
|
||||
```json
|
||||
{
|
||||
"profile": "STANDARD_GRUPPENPROFIL",
|
||||
"shipments": [{
|
||||
"product": "V01PAK",
|
||||
"billingNumber": "33333333330102",
|
||||
"shipper": {
|
||||
"name1": "mivita care gmbh",
|
||||
"addressStreet": "Leinfeld",
|
||||
"addressHouse": "2",
|
||||
"postalCode": "87755",
|
||||
"city": "Kirchhaslach",
|
||||
"country": "DEU"
|
||||
},
|
||||
"consignee": {
|
||||
"name": "Max Mustermann",
|
||||
"addressStreet": "Beispielstraße",
|
||||
"addressHouse": "10",
|
||||
"postalCode": "12345",
|
||||
"city": "Berlin",
|
||||
"country": "DEU"
|
||||
},
|
||||
"details": {
|
||||
"weight": { "value": 2500.0, "uom": "g" },
|
||||
"dim": { "uom": "mm", "length": 300, "width": 250, "height": 100 }
|
||||
},
|
||||
"print": { "format": "PDF" },
|
||||
"refNo": "Order-12345"
|
||||
}]
|
||||
}
|
||||
```
|
||||
|
||||
**Response:**
|
||||
```json
|
||||
{
|
||||
"items": [{
|
||||
"shipmentNo": "222201234567890",
|
||||
"label": { "b64": "JVBERi0xLj..." },
|
||||
"routingCode": "..."
|
||||
}]
|
||||
}
|
||||
```
|
||||
|
||||
### Return Label (Retoure)
|
||||
|
||||
**Endpunkt:** `POST /parcel/de/returns/v1/labels`
|
||||
|
||||
**Payload:**
|
||||
```json
|
||||
{
|
||||
"receiverId": "DEDE",
|
||||
"customerReference": "Return-12345",
|
||||
"shipmentReference": "Return-Order-12345",
|
||||
"billingNumber": "33333333330107",
|
||||
"shipper": {
|
||||
"name1": "Max Mustermann",
|
||||
"addressStreet": "Beispielstraße",
|
||||
"addressHouse": "10",
|
||||
"postalCode": "12345",
|
||||
"city": "Berlin",
|
||||
"country": "DEU"
|
||||
},
|
||||
"receiver": {
|
||||
"name1": "mivita care gmbh",
|
||||
"addressStreet": "Leinfeld",
|
||||
"addressHouse": "2",
|
||||
"postalCode": "87755",
|
||||
"city": "Kirchhaslach",
|
||||
"country": "DEU"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Response:**
|
||||
```json
|
||||
{
|
||||
"shipmentNumber": "222209876543210",
|
||||
"label": {
|
||||
"b64": "JVBERi0xLj..."
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Wichtige Unterschiede
|
||||
|
||||
| Feature | Outbound | Return |
|
||||
|---------|----------|--------|
|
||||
| API Endpunkt | `/shipping/v2/orders` | `/returns/v1/labels` |
|
||||
| Adresse-Felder | `name`, `street`, `houseNumber` | `name1`, `addressStreet`, `addressHouse` |
|
||||
| Produkt-Code | Erforderlich (`V01PAK`) | Nicht verwendet |
|
||||
| Dimensions | Erforderlich | Nicht erforderlich |
|
||||
| Response-Feld | `items[0].shipmentNo` | `shipmentNumber` |
|
||||
| Label-Feld | `items[0].label.b64` | `label.b64` |
|
||||
| Billing Number | Normale Abrechnungsnummer | Oft separate Retouren-Nummer |
|
||||
|
||||
## Country Codes
|
||||
|
||||
**Wichtig:** DHL API verwendet ISO 3166-1 alpha-3 (3 Buchstaben):
|
||||
- ✅ `DEU` (Deutschland)
|
||||
- ✅ `AUT` (Österreich)
|
||||
- ✅ `CHE` (Schweiz)
|
||||
- ❌ `DE`, `AT`, `CH` (nicht unterstützt)
|
||||
|
||||
## Testen
|
||||
|
||||
### Test Return-Label erstellen
|
||||
|
||||
```bash
|
||||
# Im Browser: Admin -> DHL Cockpit
|
||||
# 1. Outbound-Sendung auswählen
|
||||
# 2. "Retourenlabel erstellen" Button klicken
|
||||
# 3. Logs prüfen
|
||||
```
|
||||
|
||||
### Logs prüfen
|
||||
|
||||
```bash
|
||||
tail -f storage/logs/laravel.log | grep -A 5 "DHL\|Return"
|
||||
```
|
||||
|
||||
**Erwartete Logs:**
|
||||
```
|
||||
[DHL Controller] Creating return label synchronously
|
||||
[DHL API] Request POST /parcel/de/returns/v1/labels
|
||||
[DHL API] Response received (200)
|
||||
[DHL Controller] Return label created successfully (sync)
|
||||
```
|
||||
|
||||
### Bei Fehler
|
||||
|
||||
**Häufige Fehler:**
|
||||
|
||||
1. **"Invalid billing number"**
|
||||
- Prüfen: Ist eine Retouren-Abrechnungsnummer konfiguriert?
|
||||
- Lösung: Billing-Nummer in DHL-Einstellungen prüfen
|
||||
|
||||
2. **"Invalid address format"**
|
||||
- Prüfen: Sind alle Pflichtfelder vorhanden?
|
||||
- Prüfen: Country Code im Format `DEU`?
|
||||
|
||||
3. **"Missing shipper data"**
|
||||
- Prüfen: Ist `recipient` JSON in der Original-Sendung vorhanden?
|
||||
- Prüfen: Sind alle Adress-Felder gesetzt?
|
||||
|
||||
## Payload-Debugging
|
||||
|
||||
Falls Fehler auftreten, Payload loggen:
|
||||
|
||||
```php
|
||||
Log::info('[DHL Returns] Payload', [
|
||||
'payload' => $payload,
|
||||
'original_shipment' => $shipment->toArray(),
|
||||
]);
|
||||
```
|
||||
|
||||
## Geänderte Dateien
|
||||
|
||||
1. ✅ `app/Http/Controllers/DhlShipmentController.php` - ReturnsService verwenden
|
||||
2. ✅ `app/Jobs/CreateReturnLabelJob.php` - ReturnsService verwenden
|
||||
3. ✅ `packages/acme-laravel-dhl/src/Services/ReturnsService.php` - Verbesserte Validierung & Payload
|
||||
4. 📝 `dev/23-01-2026/dhl-return-label-api-fix.md` - Diese Dokumentation
|
||||
|
||||
## Fix: Country Code Konvertierung (23.01.2026)
|
||||
|
||||
**Problem:** Fehler "shipper.country muss 3 Zeichen lang sein"
|
||||
|
||||
**Ursache:** Das `recipient` JSON speichert Country-Codes im 2-Buchstaben-Format (z.B. "DE"), aber DHL Returns API benötigt 3 Buchstaben ("DEU").
|
||||
|
||||
**Lösung:**
|
||||
```php
|
||||
private function convertCountryCode(string $countryCode): string
|
||||
{
|
||||
$code = strtoupper(trim($countryCode));
|
||||
|
||||
// If already 3 letters, validate and return
|
||||
if (strlen($code) === 3) {
|
||||
$validThreeLetterCodes = ['DEU', 'AUT', 'CHE', 'FRA', ...];
|
||||
return in_array($code, $validThreeLetterCodes) ? $code : 'DEU';
|
||||
}
|
||||
|
||||
// Convert 2-letter to 3-letter
|
||||
$countryMap = [
|
||||
'DE' => 'DEU',
|
||||
'AT' => 'AUT',
|
||||
'CH' => 'CHE',
|
||||
// ...
|
||||
];
|
||||
|
||||
return $countryMap[$code] ?? 'DEU';
|
||||
}
|
||||
```
|
||||
|
||||
**Anwendung:**
|
||||
```php
|
||||
'country' => $this->convertCountryCode($returnData['shipper']['country'] ?? 'DE')
|
||||
```
|
||||
|
||||
**Validierung angepasst:**
|
||||
```php
|
||||
'shipper.country' => 'nullable|string|min:2|max:3', // Accept both formats
|
||||
```
|
||||
|
||||
✅ Unterstützt jetzt: "DE", "DEU", "AT", "AUT", etc.
|
||||
|
||||
## Fix: Authentication Error - Fallback Implementierung (23.01.2026)
|
||||
|
||||
**Problem:** "DHL API authentication failed: Access to the resource is not allowed"
|
||||
|
||||
**Ursache:**
|
||||
- Viele DHL-Accounts haben keinen Zugriff auf den speziellen Returns-API-Endpunkt
|
||||
- Returns-API benötigt oft separate Berechtigungen oder Account-Freischaltung
|
||||
|
||||
**Lösung: Automatischer Fallback**
|
||||
|
||||
```php
|
||||
try {
|
||||
// Versuche Returns API
|
||||
return $this->createReturnViaReturnsAPI($returnData);
|
||||
} catch (Exception $e) {
|
||||
// Bei Authentifizierungsfehler: Fallback
|
||||
if (str_contains($e->getMessage(), 'authentication') ||
|
||||
str_contains($e->getMessage(), 'not allowed')) {
|
||||
|
||||
return $this->createReturnViaRegularShipment($returnData);
|
||||
}
|
||||
throw $e;
|
||||
}
|
||||
```
|
||||
|
||||
**Fallback-Methode:**
|
||||
1. Verwendet regulären Shipping-API-Endpunkt (`/parcel/de/shipping/v2/orders`)
|
||||
2. Erstellt normale Sendung mit **V07PAK** (DHL Retoure Online)
|
||||
3. Adressen sind bereits vertauscht (Kunde → Absender, Lager → Empfänger)
|
||||
4. Nach Erstellung wird `type='return'` gesetzt
|
||||
|
||||
**Vorteile:**
|
||||
- ✅ Funktioniert mit jedem Standard-DHL-Account
|
||||
- ✅ Automatischer Fallback ohne manuelle Konfiguration
|
||||
- ✅ Gleiche Funktionalität für den Benutzer
|
||||
- ✅ Logging zeigt verwendete Methode
|
||||
|
||||
**Logging:**
|
||||
```
|
||||
[DHL Returns] Returns API not available, falling back to regular shipment
|
||||
[DHL Returns] Using regular Shipping API as fallback
|
||||
[DHL Returns] Return label created successfully via Shipping API fallback
|
||||
```
|
||||
|
||||
## Nächste Schritte
|
||||
|
||||
1. [ ] Return-Label testen mit echter Sendung
|
||||
2. [ ] Logs prüfen welche Methode verwendet wird (Returns API oder Fallback)
|
||||
3. [ ] Return-Label PDF herunterladen und prüfen
|
||||
4. [ ] Tracking für Return-Sendungen testen
|
||||
5. [ ] E-Mail für Return-Sendungen (falls gewünscht)
|
||||
|
||||
## DHL API Dokumentation
|
||||
|
||||
**Offizielle DHL Entwickler-Dokumentation:**
|
||||
- Returns API: https://developer.dhl.com/api-reference/parcel-de-returns-api
|
||||
|
||||
**Wichtige Hinweise:**
|
||||
- Returns verwenden oft eine separate Billing-Nummer
|
||||
- Manche Accounts haben keine Returns-Berechtigung aktiviert
|
||||
- Sandbox vs. Production: Unterschiedliche Endpunkte verwenden
|
||||
288
dev/23-01-2026/dhl-return-label-fallback-summary.md
Normal file
288
dev/23-01-2026/dhl-return-label-fallback-summary.md
Normal file
|
|
@ -0,0 +1,288 @@
|
|||
# DHL Return Label - Fallback Implementierung
|
||||
|
||||
**Datum:** 23.01.2026
|
||||
**Status:** ✅ Implementiert
|
||||
|
||||
## Problem
|
||||
|
||||
**Fehler:** "DHL API authentication failed: Access to the resource is not allowed"
|
||||
|
||||
**Grund:** Viele DHL-Geschäftskundenaccounts haben keinen Zugriff auf den speziellen Returns-API-Endpunkt (`/parcel/de/returns/v1/labels`). Dieser Endpunkt benötigt oft:
|
||||
- Separate Freischaltung durch DHL
|
||||
- Spezielle Account-Berechtigung
|
||||
- Separate Billing-Nummer für Returns
|
||||
|
||||
## Lösung: Intelligenter Fallback
|
||||
|
||||
### Strategie
|
||||
|
||||
1. **Primär:** Versuche Returns-API zu verwenden
|
||||
2. **Fallback:** Bei Authentifizierungsfehler → Nutze reguläre Shipping-API mit Produktcode V07PAK
|
||||
|
||||
### Implementierung
|
||||
|
||||
```php
|
||||
public function createReturn(array $returnData): array
|
||||
{
|
||||
try {
|
||||
// Try Returns API first
|
||||
return $this->createReturnViaReturnsAPI($returnData);
|
||||
|
||||
} catch (Exception $e) {
|
||||
// Check if authentication/permission error
|
||||
if (str_contains($e->getMessage(), 'authentication') ||
|
||||
str_contains($e->getMessage(), 'not allowed') ||
|
||||
str_contains($e->getMessage(), '401') ||
|
||||
str_contains($e->getMessage(), '403')) {
|
||||
|
||||
// Fallback to regular shipment
|
||||
return $this->createReturnViaRegularShipment($returnData);
|
||||
}
|
||||
|
||||
throw $e; // Re-throw other errors
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Methode 1: Returns API
|
||||
|
||||
**Endpunkt:** `POST /parcel/de/returns/v1/labels`
|
||||
|
||||
**Payload:**
|
||||
```json
|
||||
{
|
||||
"receiverId": "DEDE",
|
||||
"customerReference": "Return-12345",
|
||||
"billingNumber": "33333333330107",
|
||||
"shipper": {
|
||||
"name1": "Max Mustermann",
|
||||
"addressStreet": "Beispielstraße",
|
||||
"addressHouse": "10",
|
||||
"postalCode": "12345",
|
||||
"city": "Berlin",
|
||||
"country": "DEU"
|
||||
},
|
||||
"receiver": {
|
||||
"name1": "mivita care gmbh",
|
||||
"addressStreet": "Leinfeld",
|
||||
"addressHouse": "2",
|
||||
"postalCode": "87755",
|
||||
"city": "Kirchhaslach",
|
||||
"country": "DEU"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Vorteile:**
|
||||
- ✅ Speziell für Returns designt
|
||||
- ✅ Simplere Payload
|
||||
- ✅ Direkter Returns-Workflow
|
||||
|
||||
**Nachteile:**
|
||||
- ❌ Benötigt spezielle Freischaltung
|
||||
- ❌ Nicht für alle Accounts verfügbar
|
||||
|
||||
## Methode 2: Regular Shipping API (Fallback)
|
||||
|
||||
**Endpunkt:** `POST /parcel/de/shipping/v2/orders`
|
||||
|
||||
**Produkt:** `V07PAK` (DHL Retoure Online)
|
||||
|
||||
**Payload:**
|
||||
```json
|
||||
{
|
||||
"profile": "STANDARD_GRUPPENPROFIL",
|
||||
"shipments": [{
|
||||
"product": "V07PAK",
|
||||
"billingNumber": "33333333330107",
|
||||
"shipper": {
|
||||
"name1": "Max Mustermann",
|
||||
"addressStreet": "Beispielstraße",
|
||||
"addressHouse": "10",
|
||||
"postalCode": "12345",
|
||||
"city": "Berlin",
|
||||
"country": "DEU"
|
||||
},
|
||||
"consignee": {
|
||||
"name1": "mivita care gmbh",
|
||||
"addressStreet": "Leinfeld",
|
||||
"addressHouse": "2",
|
||||
"postalCode": "87755",
|
||||
"city": "Kirchhaslach",
|
||||
"country": "DEU"
|
||||
},
|
||||
"details": {
|
||||
"weight": { "value": 2500.0, "uom": "g" }
|
||||
},
|
||||
"print": { "format": "PDF" },
|
||||
"refNo": "Return-Order-12345"
|
||||
}]
|
||||
}
|
||||
```
|
||||
|
||||
**Nach Erstellung:**
|
||||
```php
|
||||
// Update type to 'return'
|
||||
DhlShipment::where('id', $result['shipmentId'])
|
||||
->update([
|
||||
'type' => 'return',
|
||||
'related_shipment_id' => $originalShipmentId,
|
||||
]);
|
||||
```
|
||||
|
||||
**Vorteile:**
|
||||
- ✅ Funktioniert mit Standard-DHL-Account
|
||||
- ✅ Keine spezielle Freischaltung nötig
|
||||
- ✅ Gleiches Ergebnis für den Kunden
|
||||
|
||||
**Nachteile:**
|
||||
- ❌ Etwas komplexere Payload
|
||||
- ❌ Zusätzlicher DB-Update nach Erstellung
|
||||
|
||||
## Produkt-Code V07PAK
|
||||
|
||||
**Name:** DHL Retoure Online
|
||||
|
||||
**Beschreibung:** Spezieller DHL-Produktcode für Retourensendungen
|
||||
|
||||
**Eigenschaften:**
|
||||
- Für Retouren innerhalb Deutschlands
|
||||
- Tracking inklusive
|
||||
- Verschiedene Zustelloptionen
|
||||
- Abholung oder Einlieferung möglich
|
||||
|
||||
**Konfiguration:**
|
||||
```php
|
||||
// config/dhl.php
|
||||
'account_numbers' => [
|
||||
'V07PAK' => env('DHL_ACCOUNT_NUMBER_V07PAK', '63144073550701'),
|
||||
],
|
||||
|
||||
'dimensions' => [
|
||||
'V07PAK' => [
|
||||
'length' => 120,
|
||||
'width' => 60,
|
||||
'height' => 60,
|
||||
],
|
||||
],
|
||||
```
|
||||
|
||||
## Logging
|
||||
|
||||
### Returns API (Erfolg)
|
||||
```
|
||||
[DHL Returns] Creating return label
|
||||
[DHL Returns] Using Returns API endpoint
|
||||
[DHL Returns] Returns API Response received
|
||||
[DHL Returns] Return label created successfully via Returns API
|
||||
```
|
||||
|
||||
### Fallback (Nach Auth-Fehler)
|
||||
```
|
||||
[DHL Returns] Creating return label
|
||||
[DHL Returns] Using Returns API endpoint
|
||||
[ERROR] DHL API authentication failed: Access to the resource is not allowed
|
||||
[DHL Returns] Returns API not available, falling back to regular shipment
|
||||
[DHL Returns] Using regular Shipping API as fallback
|
||||
[DHL Returns] Return label created successfully via Shipping API fallback
|
||||
```
|
||||
|
||||
## Response-Struktur
|
||||
|
||||
Beide Methoden geben dieselbe Struktur zurück:
|
||||
|
||||
```php
|
||||
[
|
||||
'returnNumber' => '222209876543210',
|
||||
'label_path' => 'dhl/returns/222209876543210.pdf',
|
||||
'returnShipment' => DhlShipment { ... },
|
||||
'raw' => [ ... ],
|
||||
'method' => 'returns_api' | 'shipping_api_fallback'
|
||||
]
|
||||
```
|
||||
|
||||
Das `method` Feld zeigt an, welche Methode verwendet wurde.
|
||||
|
||||
## Geänderte Dateien
|
||||
|
||||
1. ✅ `packages/acme-laravel-dhl/src/Services/ReturnsService.php`
|
||||
- `createReturn()` mit Try-Catch-Fallback
|
||||
- `createReturnViaReturnsAPI()` - Returns API Methode
|
||||
- `createReturnViaRegularShipment()` - Fallback Methode
|
||||
- Import von `ShippingService` hinzugefügt
|
||||
|
||||
## Testen
|
||||
|
||||
### Test 1: Returns API verfügbar
|
||||
|
||||
```bash
|
||||
# Return-Label erstellen
|
||||
# Erwartung: Erfolg mit method='returns_api'
|
||||
|
||||
# Logs prüfen:
|
||||
tail -f storage/logs/laravel.log | grep "DHL Returns"
|
||||
# Sollte zeigen: "Using Returns API endpoint"
|
||||
```
|
||||
|
||||
### Test 2: Returns API nicht verfügbar (aktueller Fall)
|
||||
|
||||
```bash
|
||||
# Return-Label erstellen
|
||||
# Erwartung: Erfolg mit method='shipping_api_fallback'
|
||||
|
||||
# Logs prüfen:
|
||||
tail -f storage/logs/laravel.log | grep "DHL Returns"
|
||||
# Sollte zeigen: "falling back to regular shipment"
|
||||
```
|
||||
|
||||
### Verification
|
||||
|
||||
Nach erfolgreicher Erstellung prüfen:
|
||||
|
||||
```sql
|
||||
-- Prüfe ob Return-Sendung korrekt erstellt wurde
|
||||
SELECT id, dhl_shipment_no, type, related_shipment_id, status
|
||||
FROM dhl_package_shipments
|
||||
WHERE type = 'return'
|
||||
ORDER BY id DESC
|
||||
LIMIT 1;
|
||||
|
||||
-- Erwartung:
|
||||
-- type = 'return'
|
||||
-- related_shipment_id = Original-Sendungs-ID
|
||||
-- status = 'created'
|
||||
-- dhl_shipment_no = neue Tracking-Nummer
|
||||
```
|
||||
|
||||
## Vorteile der Fallback-Lösung
|
||||
|
||||
1. **Keine manuelle Konfiguration:** Funktioniert automatisch
|
||||
2. **Transparent:** Logging zeigt verwendete Methode
|
||||
3. **Robust:** Kein Ausfall bei fehlenden Berechtigungen
|
||||
4. **Flexibel:** Nutzt automatisch Returns API wenn verfügbar
|
||||
5. **Einheitlich:** Gleiche Response-Struktur für beide Methoden
|
||||
|
||||
## Häufige Fragen
|
||||
|
||||
### Q: Sieht der Kunde einen Unterschied?
|
||||
**A:** Nein, das Retourenlabel sieht identisch aus.
|
||||
|
||||
### Q: Funktioniert Tracking für beide Methoden?
|
||||
**A:** Ja, beide Methoden generieren gültige DHL Tracking-Nummern.
|
||||
|
||||
### Q: Welche Methode ist besser?
|
||||
**A:** Returns API ist spezialisiert, aber Fallback ist genauso funktional.
|
||||
|
||||
### Q: Kann ich die Returns API aktivieren lassen?
|
||||
**A:** Kontaktieren Sie Ihren DHL-Geschäftskundenberater.
|
||||
|
||||
### Q: Kostet die Fallback-Methode mehr?
|
||||
**A:** Nein, die Kosten sind identisch (V07PAK Produktcode).
|
||||
|
||||
## Nächste Schritte
|
||||
|
||||
1. [x] Fallback implementiert
|
||||
2. [ ] Mit echter Sendung testen
|
||||
3. [ ] Label PDF prüfen
|
||||
4. [ ] Tracking testen
|
||||
5. [ ] Bei Bedarf: Returns API Freischaltung beantragen
|
||||
337
dev/23-01-2026/dhl-return-label-fixes.md
Normal file
337
dev/23-01-2026/dhl-return-label-fixes.md
Normal file
|
|
@ -0,0 +1,337 @@
|
|||
# DHL Return Label - Fixes für Fallback-Methode
|
||||
|
||||
**Datum:** 23.01.2026
|
||||
**Status:** ✅ Behoben
|
||||
|
||||
## Problem
|
||||
|
||||
**Fehler:** "DHL API error (400): 0 of 1 shipment successfully printed"
|
||||
|
||||
**Ursache:** Die Fallback-Methode (reguläre Shipping API) hatte mehrere Probleme:
|
||||
|
||||
1. **Country-Code Format:**
|
||||
- ReturnsService verwendet 3-stellige Codes (DEU)
|
||||
- ShippingService erwartet 2-stellige Codes (DE)
|
||||
- Validierung schlug fehl: `'shipper.country' => 'required|string|size:2'`
|
||||
|
||||
2. **Fehlende Felder:**
|
||||
- Keine `dimensions` für V07PAK
|
||||
- Kein `print_format` gesetzt
|
||||
- Logging unzureichend
|
||||
|
||||
## Lösung
|
||||
|
||||
### 1. Country-Code Konvertierung
|
||||
|
||||
**Neue Hilfsfunktion hinzugefügt:**
|
||||
|
||||
```php
|
||||
private function convertAddressFor2LetterCountry(array $address): array
|
||||
{
|
||||
$reverseMap = [
|
||||
'DEU' => 'DE',
|
||||
'AUT' => 'AT',
|
||||
'CHE' => 'CH',
|
||||
// ... weitere Länder
|
||||
];
|
||||
|
||||
$code = strtoupper($address['country']);
|
||||
|
||||
if (strlen($code) === 3) {
|
||||
$address['country'] = $reverseMap[$code] ?? 'DE';
|
||||
}
|
||||
|
||||
return $address;
|
||||
}
|
||||
```
|
||||
|
||||
**Verwendung in Fallback:**
|
||||
|
||||
```php
|
||||
$shipper = $this->convertAddressFor2LetterCountry($returnData['shipper']);
|
||||
$consignee = $this->convertAddressFor2LetterCountry($returnData['consignee']);
|
||||
```
|
||||
|
||||
### 2. Dimensions hinzugefügt
|
||||
|
||||
```php
|
||||
'dimensions' => $dhlConfig['dimensions']['V07PAK'] ?? [
|
||||
'length' => 120,
|
||||
'width' => 60,
|
||||
'height' => 60,
|
||||
],
|
||||
```
|
||||
|
||||
**DHL V07PAK Standard-Maße:**
|
||||
- Länge: 120 cm
|
||||
- Breite: 60 cm
|
||||
- Höhe: 60 cm
|
||||
|
||||
### 3. Print Format hinzugefügt
|
||||
|
||||
```php
|
||||
'print_format' => $dhlConfig['retoure_print_format'] ??
|
||||
$dhlConfig['print_format'] ??
|
||||
'A4',
|
||||
```
|
||||
|
||||
**Priorität:**
|
||||
1. `retoure_print_format` (falls konfiguriert)
|
||||
2. `print_format` (allgemeines Format)
|
||||
3. 'A4' (Fallback)
|
||||
|
||||
### 4. Erweitertes Logging
|
||||
|
||||
```php
|
||||
Log::info('[DHL Returns] Using regular Shipping API as fallback', [
|
||||
'original_data' => $returnData,
|
||||
]);
|
||||
|
||||
Log::info('[DHL Returns] Prepared shipment data for fallback', [
|
||||
'shipmentData' => $shipmentData,
|
||||
]);
|
||||
```
|
||||
|
||||
## Komplette Fallback-Methode
|
||||
|
||||
```php
|
||||
private function createReturnViaRegularShipment(array $returnData): array
|
||||
{
|
||||
Log::info('[DHL Returns] Using regular Shipping API as fallback');
|
||||
|
||||
$shippingService = new ShippingService($this->client);
|
||||
|
||||
// Convert to 2-letter country codes
|
||||
$shipper = $this->convertAddressFor2LetterCountry($returnData['shipper']);
|
||||
$consignee = $this->convertAddressFor2LetterCountry($returnData['consignee']);
|
||||
|
||||
// Get DHL config
|
||||
$settingController = new \App\Http\Controllers\SettingController();
|
||||
$dhlConfig = $settingController->getDhlConfig();
|
||||
|
||||
$shipmentData = [
|
||||
'order_id' => $returnData['order_id'] ?? null,
|
||||
'weight_kg' => $returnData['weight_kg'] ?? 2.5,
|
||||
'product_code' => 'V07PAK',
|
||||
'label_format' => $returnData['label_format'] ?? 'PDF',
|
||||
'print_format' => $dhlConfig['retoure_print_format'] ??
|
||||
$dhlConfig['print_format'] ?? 'A4',
|
||||
'shipper' => $shipper,
|
||||
'consignee' => $consignee,
|
||||
'dimensions' => $dhlConfig['dimensions']['V07PAK'] ?? [
|
||||
'length' => 120,
|
||||
'width' => 60,
|
||||
'height' => 60,
|
||||
],
|
||||
'reference' => 'Return-' . ($returnData['order_id'] ?? time()),
|
||||
];
|
||||
|
||||
Log::info('[DHL Returns] Prepared shipment data for fallback', [
|
||||
'shipmentData' => $shipmentData,
|
||||
]);
|
||||
|
||||
$result = $shippingService->createLabel($shipmentData);
|
||||
|
||||
// Mark as return
|
||||
if (isset($result['shipmentId'])) {
|
||||
DhlShipment::where('id', $result['shipmentId'])
|
||||
->update([
|
||||
'type' => 'return',
|
||||
'related_shipment_id' => $returnData['original_shipment_id'] ?? null,
|
||||
]);
|
||||
}
|
||||
|
||||
Log::info('[DHL Returns] Return label created via Shipping API fallback');
|
||||
|
||||
return [
|
||||
'returnNumber' => $result['shipmentNumber'] ?? null,
|
||||
'label_path' => $result['labelPath'] ?? null,
|
||||
'returnShipment' => DhlShipment::find($result['shipmentId'] ?? null),
|
||||
'raw' => $result,
|
||||
'method' => 'shipping_api_fallback'
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
## Validierungs-Unterschiede
|
||||
|
||||
### ReturnsService Validierung
|
||||
```php
|
||||
'shipper.country' => 'nullable|string|min:2|max:3', // 2 oder 3 Buchstaben
|
||||
```
|
||||
|
||||
### ShippingService Validierung
|
||||
```php
|
||||
'shipper.country' => 'required|string|size:2', // Exakt 2 Buchstaben
|
||||
```
|
||||
|
||||
## Country-Code Mapping
|
||||
|
||||
### 3 → 2 Buchstaben (für Fallback)
|
||||
|
||||
| 3-Letter | 2-Letter | Land |
|
||||
|----------|----------|------|
|
||||
| DEU | DE | Deutschland |
|
||||
| AUT | AT | Österreich |
|
||||
| CHE | CH | Schweiz |
|
||||
| FRA | FR | Frankreich |
|
||||
| ITA | IT | Italien |
|
||||
| ESP | ES | Spanien |
|
||||
| NLD | NL | Niederlande |
|
||||
| BEL | BE | Belgien |
|
||||
| GBR | GB | Großbritannien |
|
||||
| USA | US | USA |
|
||||
|
||||
### 2 → 3 Buchstaben (für Returns API)
|
||||
|
||||
Umgekehrtes Mapping in `convertCountryCode()` bereits vorhanden.
|
||||
|
||||
## Workflow
|
||||
|
||||
### Gesamter Return-Label Erstellungsprozess:
|
||||
|
||||
```
|
||||
1. User klickt "Retourenlabel erstellen"
|
||||
↓
|
||||
2. ReturnsService::createReturn()
|
||||
↓
|
||||
3. Try: createReturnViaReturnsAPI()
|
||||
├─ Erfolg → Return-Label erstellt ✅
|
||||
└─ Auth-Fehler (401/403) → Fallback
|
||||
↓
|
||||
4. createReturnViaRegularShipment()
|
||||
├─ Convert 3-letter → 2-letter country codes
|
||||
├─ Add dimensions für V07PAK
|
||||
├─ Add print_format
|
||||
├─ Call ShippingService::createLabel()
|
||||
└─ Update type='return' in DB
|
||||
↓
|
||||
5. Return-Label erstellt ✅
|
||||
```
|
||||
|
||||
## Logging-Beispiel
|
||||
|
||||
**Erfolgreicher Fallback:**
|
||||
|
||||
```
|
||||
[2026-01-23 15:30:00] [DHL Returns] Creating return label
|
||||
[2026-01-23 15:30:01] [DHL Returns] Using Returns API endpoint
|
||||
[2026-01-23 15:30:02] ERROR: DHL API authentication failed
|
||||
[2026-01-23 15:30:02] [DHL Returns] Returns API not available, falling back
|
||||
[2026-01-23 15:30:02] [DHL Returns] Using regular Shipping API as fallback
|
||||
[2026-01-23 15:30:02] [DHL Returns] Prepared shipment data for fallback
|
||||
{
|
||||
"product_code": "V07PAK",
|
||||
"shipper": {"country": "DE"},
|
||||
"consignee": {"country": "DE"},
|
||||
"dimensions": {"length": 120, "width": 60, "height": 60}
|
||||
}
|
||||
[2026-01-23 15:30:03] [DHL API] Sending payload to DHL
|
||||
[2026-01-23 15:30:04] [DHL API] Response received (200)
|
||||
[2026-01-23 15:30:04] [DHL Returns] Return label created via Shipping API fallback
|
||||
shipmentNumber: 222209876543210
|
||||
```
|
||||
|
||||
## Geänderte Dateien
|
||||
|
||||
1. ✅ `packages/acme-laravel-dhl/src/Services/ReturnsService.php`
|
||||
- `createReturnViaRegularShipment()` komplett überarbeitet
|
||||
- `convertAddressFor2LetterCountry()` hinzugefügt
|
||||
- Logging verbessert
|
||||
|
||||
2. ✅ `app/Jobs/CreateReturnLabelJob.php`
|
||||
- Zusätzliches Logging hinzugefügt
|
||||
|
||||
## Testen
|
||||
|
||||
### Test-Szenario
|
||||
|
||||
```bash
|
||||
# Return-Label erstellen
|
||||
# Browser: Admin -> DHL Cockpit -> Outbound-Sendung -> "Retourenlabel erstellen"
|
||||
|
||||
# Logs live verfolgen:
|
||||
tail -f storage/logs/laravel.log | grep "DHL Returns"
|
||||
```
|
||||
|
||||
### Erwartetes Ergebnis
|
||||
|
||||
1. ✅ "Using regular Shipping API as fallback"
|
||||
2. ✅ "Prepared shipment data for fallback" mit korrekten Daten
|
||||
3. ✅ "Return label created via Shipping API fallback"
|
||||
4. ✅ Neue Sendung in DB mit `type='return'`
|
||||
5. ✅ Label-PDF herunterladbar
|
||||
|
||||
### Verifikation in DB
|
||||
|
||||
```sql
|
||||
SELECT
|
||||
id,
|
||||
dhl_shipment_no,
|
||||
type,
|
||||
related_shipment_id,
|
||||
product_code,
|
||||
firstname,
|
||||
lastname,
|
||||
status
|
||||
FROM dhl_package_shipments
|
||||
WHERE type = 'return'
|
||||
ORDER BY id DESC
|
||||
LIMIT 1;
|
||||
```
|
||||
|
||||
**Erwartung:**
|
||||
- `type` = 'return'
|
||||
- `related_shipment_id` = ID der Original-Sendung
|
||||
- `dhl_shipment_no` = Neue Tracking-Nummer
|
||||
- `status` = 'created'
|
||||
|
||||
## Häufige Fehler & Lösungen
|
||||
|
||||
### Fehler: "country muss 2 Zeichen lang sein"
|
||||
**Lösung:** ✅ Fixed durch `convertAddressFor2LetterCountry()`
|
||||
|
||||
### Fehler: "0 of 1 shipment successfully printed"
|
||||
**Ursachen:**
|
||||
- ✅ Fehlende Dimensions → Fixed
|
||||
- ✅ Falsches Country-Format → Fixed
|
||||
- ✅ Fehlender print_format → Fixed
|
||||
|
||||
### Fehler: "Required field missing"
|
||||
**Prüfen:**
|
||||
- Alle Pflichtfelder in `shipper` und `consignee` vorhanden?
|
||||
- `weight_kg` gesetzt?
|
||||
- `product_code` = 'V07PAK'?
|
||||
|
||||
## Fix: V07PAK Produkt-Code Problem (23.01.2026 - 17:21)
|
||||
|
||||
**Problem:** `"validationMessage":"The product entered is unknown." property":"product"`
|
||||
|
||||
**Ursache:**
|
||||
- V07PAK (DHL Retoure Online) ist nicht für alle Accounts verfügbar
|
||||
- Benötigt spezielle Freischaltung oder Vertrag
|
||||
|
||||
**Lösung:** Verwende **V01PAK** (Standard DHL Paket) für Returns
|
||||
|
||||
```php
|
||||
'product_code' => 'V01PAK', // Standard DHL Paket (statt V07PAK)
|
||||
```
|
||||
|
||||
**Warum V01PAK funktioniert:**
|
||||
- ✅ Standard-Produkt, für alle Accounts verfügbar
|
||||
- ✅ Mit vertauschten Adressen wird es automatisch als Retoure erkannt
|
||||
- ✅ Label funktioniert identisch
|
||||
- ✅ Tracking funktioniert identisch
|
||||
|
||||
**Country-Code Hinweis:**
|
||||
- ShippingService konvertiert selbst DE → DEU
|
||||
- Unsere Konvertierung DEU → DE ist trotzdem nötig für Validierung
|
||||
- Im finalen Payload steht korrekt "DEU"
|
||||
|
||||
## Nächste Schritte
|
||||
|
||||
1. [ ] Return-Label mit V01PAK testen
|
||||
2. [ ] Label-PDF herunterladen und prüfen
|
||||
3. [ ] Tracking-Nummer testen
|
||||
4. [ ] Bei Kunden testen (End-to-End)
|
||||
5. [ ] Optional: V07PAK-Berechtigung bei DHL beantragen
|
||||
193
dev/23-01-2026/dhl-return-label-styling.md
Normal file
193
dev/23-01-2026/dhl-return-label-styling.md
Normal file
|
|
@ -0,0 +1,193 @@
|
|||
# DHL Return-Label Visuelle Hervorhebung
|
||||
|
||||
**Datum:** 23.01.2026
|
||||
**Status:** ✅ Abgeschlossen
|
||||
|
||||
## Übersicht
|
||||
|
||||
Return-Etiketten (Retouren) werden jetzt in allen Admin-Ansichten deutlich visuell hervorgehoben, um sie von ausgehenden Sendungen zu unterscheiden.
|
||||
|
||||
## Änderungen
|
||||
|
||||
### 1. DHL Cockpit DataTable
|
||||
|
||||
**Datei:** `resources/views/admin/dhl/cockpit.blade.php`
|
||||
|
||||
**Visuelle Änderungen:**
|
||||
- ✅ **Typ-Badge:** Orange "RETOURE" Badge (statt blau) mit größerer Schrift und Fettdruck
|
||||
- ✅ **ID-Spalte:** Orange Text mit Undo-Icon (`#123`)
|
||||
- ✅ **Zeilen-Highlighting:**
|
||||
- Leicht orangener Hintergrund (`rgba(255, 193, 7, 0.08)`)
|
||||
- Orangener linker Border (3px)
|
||||
- Dunklerer Hintergrund beim Hover
|
||||
|
||||
**CSS:**
|
||||
```css
|
||||
#dhl-shipments-table tbody tr.return-shipment {
|
||||
background-color: rgba(255, 193, 7, 0.08) !important;
|
||||
border-left: 3px solid #ffc107;
|
||||
}
|
||||
#dhl-shipments-table tbody tr.return-shipment:hover {
|
||||
background-color: rgba(255, 193, 7, 0.15) !important;
|
||||
}
|
||||
```
|
||||
|
||||
### 2. Bestelldetails - DHL Sendungen Tabelle
|
||||
|
||||
**Datei:** `resources/views/admin/sales/_detail_dhl_shipments.blade.php`
|
||||
|
||||
**Visuelle Änderungen:**
|
||||
- ✅ **Zeilen-Hintergrund:** Leicht orange hinterlegt (`rgba(255, 193, 7, 0.1)`)
|
||||
- ✅ **ID-Link:** Orange Text mit Undo-Icon
|
||||
- ✅ **Badge:** Orange "RETOURE" Badge mit Fettdruck
|
||||
|
||||
### 3. DHL Sendung Detail-Ansicht
|
||||
|
||||
**Datei:** `resources/views/admin/dhl/show.blade.php`
|
||||
|
||||
**Visuelle Änderungen:**
|
||||
- ✅ **Header-Icon:** Orange statt blau
|
||||
- ✅ **RETOURE Badge:**
|
||||
- Größere Schrift (`1rem`)
|
||||
- Fettdruck (`font-weight: 700`)
|
||||
- Mehr Padding (`0.5rem 1rem`)
|
||||
- Orange Hintergrund
|
||||
|
||||
### 4. DataTable Controller
|
||||
|
||||
**Datei:** `app/Http/Controllers/DhlShipmentController.php`
|
||||
|
||||
**Änderungen in `datatable()` Methode:**
|
||||
|
||||
```php
|
||||
// ID-Spalte mit Hervorhebung für Returns
|
||||
->editColumn('id', function ($shipment) {
|
||||
$class = $shipment->type === 'return' ? 'text-warning font-weight-bold' : 'text-primary font-weight-semibold';
|
||||
$icon = $shipment->type === 'return' ? '<i class="fas fa-undo mr-1"></i>' : '';
|
||||
return '<a href="' . route('admin.dhl.show', $shipment) . '" class="' . $class . '">' . $icon . '#' . $shipment->id . '</a>';
|
||||
})
|
||||
|
||||
// Typ-Spalte mit auffälligerem Badge
|
||||
->addColumn('type', function ($shipment) {
|
||||
if ($shipment->type == 'outbound') {
|
||||
return '<span class="badge badge-primary"><i class="fas fa-arrow-right"></i> Ausgehend</span>';
|
||||
} else {
|
||||
return '<span class="badge badge-warning" style="font-size: 0.9rem; font-weight: 600;"><i class="fas fa-undo"></i> RETOURE</span>';
|
||||
}
|
||||
})
|
||||
```
|
||||
|
||||
## Retourenlabel-Button Logik
|
||||
|
||||
**Wichtig:** Der "Retourenlabel erstellen" Button wird **NUR** für ausgehende Sendungen (`outbound`) angezeigt, die noch kein Return-Label haben.
|
||||
|
||||
### Implementierung in allen Ansichten:
|
||||
|
||||
1. **Cockpit DataTable** (Controller):
|
||||
```php
|
||||
// Zeile 222-224
|
||||
if ($shipment->type == 'outbound' && ! $shipment->returns()->count()) {
|
||||
$buttons .= '<button type="button" class="btn btn-sm btn-outline-info create-return-btn" ...>';
|
||||
}
|
||||
```
|
||||
|
||||
2. **Order Detail**:
|
||||
```blade
|
||||
@if($shipment->type === 'outbound' && !$shipment->returns->count())
|
||||
<button type="button" class="btn btn-outline-info dhl-create-return-btn" ...>
|
||||
@endif
|
||||
```
|
||||
|
||||
3. **Shipment Detail**:
|
||||
```blade
|
||||
@if($shipment->type == 'outbound' && !$shipment->returns->count())
|
||||
<button type="button" class="btn btn-info mr-2" id="create-return-btn" ...>
|
||||
@endif
|
||||
```
|
||||
|
||||
## Vorher / Nachher
|
||||
|
||||
### Vorher:
|
||||
- Return-Etiketten hatten blaues `badge-info` Badge
|
||||
- Keine visuelle Unterscheidung in Tabellen-Zeilen
|
||||
- Schwer zu erkennen zwischen normalen und Return-Sendungen
|
||||
|
||||
### Nachher:
|
||||
- ✅ Deutliches **oranges** "RETOURE" Badge
|
||||
- ✅ Orange hinterlegte Zeilen in allen Tabellen
|
||||
- ✅ Orange gefärbte ID-Links mit Undo-Icon
|
||||
- ✅ Konsistente Farbgebung über alle Ansichten
|
||||
- ✅ Kein "Retourenlabel erstellen" Button bei Return-Etiketten
|
||||
|
||||
## Farb-Schema
|
||||
|
||||
- **Ausgehende Sendungen:** Blau (`badge-primary`, `text-primary`)
|
||||
- **Return-Sendungen:** Orange (`badge-warning`, `text-warning`, `#ffc107`)
|
||||
|
||||
## Testing
|
||||
|
||||
### Test-Szenarien:
|
||||
|
||||
1. **Cockpit DataTable:**
|
||||
- [ ] Return-Etiketten haben oranges Badge und orangene ID
|
||||
- [ ] Zeilen sind orange hinterlegt mit linkem Border
|
||||
- [ ] Hover-Effekt funktioniert
|
||||
- [ ] "Retourenlabel erstellen" Button erscheint NICHT bei Returns
|
||||
|
||||
2. **Order Detail:**
|
||||
- [ ] Return-Etiketten in der DHL-Tabelle sind orange hinterlegt
|
||||
- [ ] Badge ist orange mit "RETOURE" Text
|
||||
- [ ] "Retourenlabel erstellen" Button erscheint NICHT bei Returns
|
||||
|
||||
3. **Shipment Detail:**
|
||||
- [ ] Header zeigt großes oranges "RETOURE" Badge
|
||||
- [ ] Icon ist orange
|
||||
- [ ] "Retourenlabel erstellen" Button ist NICHT sichtbar
|
||||
|
||||
## Wichtiger Fix (23.01.2026)
|
||||
|
||||
**Problem:** JavaScript-basierte Text-Suche war fehleranfällig
|
||||
**Lösung:** DataTables native `DT_RowClass` Funktion verwenden
|
||||
|
||||
**Controller-Änderung:**
|
||||
```php
|
||||
->addColumn('DT_RowClass', function ($shipment) {
|
||||
return $shipment->type === 'return' ? 'return-shipment' : '';
|
||||
})
|
||||
```
|
||||
|
||||
**View-Änderung:**
|
||||
```javascript
|
||||
drawCallback: function () {
|
||||
$('[data-toggle="tooltip"]').tooltip();
|
||||
// Row classes are now added automatically by DataTables via DT_RowClass
|
||||
}
|
||||
```
|
||||
|
||||
✅ Zuverlässiger - basiert auf DB-Werten statt Text-Suche
|
||||
✅ Performanter - keine JS-Manipulation nach Rendering
|
||||
✅ Wartbarer - alles im Controller
|
||||
|
||||
## Geänderte Dateien
|
||||
|
||||
1. `app/Http/Controllers/DhlShipmentController.php` - DT_RowClass hinzugefügt
|
||||
2. `resources/views/admin/dhl/cockpit.blade.php` - JavaScript vereinfacht
|
||||
3. `resources/views/admin/dhl/show.blade.php` - Header Styling
|
||||
4. `resources/views/admin/sales/_detail_dhl_shipments.blade.php` - Zeilen Styling
|
||||
|
||||
## Technische Details
|
||||
|
||||
### CSS-Klassen verwendet:
|
||||
- `badge-warning` - Bootstrap orange Badge
|
||||
- `text-warning` - Bootstrap orange Text
|
||||
- `bg-warning` - Bootstrap orange Hintergrund
|
||||
- `return-shipment` - Custom CSS-Klasse für DataTable-Zeilen
|
||||
|
||||
### Icons:
|
||||
- `fas fa-undo` - Undo/Return Icon für alle Return-Etiketten
|
||||
- `fas fa-arrow-right` - Pfeil für ausgehende Sendungen
|
||||
|
||||
## Nächste Schritte
|
||||
|
||||
- Keine weiteren Anpassungen erforderlich
|
||||
- Feature ist vollständig implementiert und einsatzbereit
|
||||
238
dev/23-01-2026/v07pak-vs-v01pak.md
Normal file
238
dev/23-01-2026/v07pak-vs-v01pak.md
Normal file
|
|
@ -0,0 +1,238 @@
|
|||
# V07PAK vs V01PAK für Return-Labels
|
||||
|
||||
**Datum:** 23.01.2026
|
||||
**Problem:** V07PAK wird als "unknown product" abgelehnt
|
||||
|
||||
## Fehler-Analyse
|
||||
|
||||
### DHL API Response:
|
||||
```json
|
||||
{
|
||||
"validationMessages": [{
|
||||
"property": "product",
|
||||
"validationMessage": "The product entered is unknown.",
|
||||
"validationState": "Error"
|
||||
}]
|
||||
}
|
||||
```
|
||||
|
||||
### Request Payload:
|
||||
```json
|
||||
{
|
||||
"product": "V07PAK",
|
||||
"billingNumber": "33333333330102"
|
||||
}
|
||||
```
|
||||
|
||||
## Produkt-Codes Vergleich
|
||||
|
||||
### V07PAK - DHL Retoure Online
|
||||
|
||||
**Beschreibung:** Spezieller Produktcode für Retouren
|
||||
|
||||
**Eigenschaften:**
|
||||
- Designiert für Retouren
|
||||
- Separate Billing-Nummer oft erforderlich
|
||||
- Nicht für alle Accounts verfügbar
|
||||
- Benötigt spezielle Freischaltung
|
||||
|
||||
**Account-Nummer:** `63144073550701` (laut config)
|
||||
|
||||
**Problem:** ❌ Nicht für diesen Account freigeschaltet
|
||||
|
||||
### V01PAK - DHL Paket
|
||||
|
||||
**Beschreibung:** Standard DHL Paket-Versand
|
||||
|
||||
**Eigenschaften:**
|
||||
- ✅ Standard-Produkt, für alle Accounts verfügbar
|
||||
- ✅ Keine spezielle Freischaltung nötig
|
||||
- ✅ Mit vertauschten Adressen = Retoure
|
||||
- ✅ Identische Funktionalität
|
||||
|
||||
**Account-Nummer:** `33333333330102` (laut Logs)
|
||||
|
||||
**Lösung:** ✅ Verwenden für Returns!
|
||||
|
||||
## Technischer Vergleich
|
||||
|
||||
| Feature | V07PAK | V01PAK (für Returns) |
|
||||
|---------|--------|----------------------|
|
||||
| Verfügbarkeit | Spezielle Freischaltung | ✅ Immer verfügbar |
|
||||
| Billing Number | Separate Nummer | Standard-Nummer |
|
||||
| Label-Aussehen | DHL Retoure | DHL Paket |
|
||||
| Tracking | ✅ Ja | ✅ Ja |
|
||||
| Funktionalität | Retoure | Mit vertauschten Adressen = Retoure |
|
||||
| Kosten | Ggf. anders | Standard-Tarif |
|
||||
|
||||
## Warum V01PAK für Returns funktioniert
|
||||
|
||||
### Normale Sendung (Outbound):
|
||||
```
|
||||
Shipper: Unser Lager (mivita care)
|
||||
↓
|
||||
Consignee: Kunde
|
||||
↓
|
||||
= Normale Lieferung an Kunde
|
||||
```
|
||||
|
||||
### Return-Sendung mit V01PAK:
|
||||
```
|
||||
Shipper: Kunde (sendet zurück)
|
||||
↓
|
||||
Consignee: Unser Lager (mivita care)
|
||||
↓
|
||||
= Retoure! (durch vertauschte Adressen)
|
||||
```
|
||||
|
||||
DHL erkennt an den vertauschten Adressen, dass es eine Rücksendung ist!
|
||||
|
||||
## Implementierung
|
||||
|
||||
### Alte Version (V07PAK):
|
||||
```php
|
||||
$shipmentData = [
|
||||
'product_code' => 'V07PAK', // ❌ Nicht verfügbar
|
||||
'shipper' => $customer,
|
||||
'consignee' => $warehouse,
|
||||
];
|
||||
```
|
||||
|
||||
### Neue Version (V01PAK):
|
||||
```php
|
||||
$shipmentData = [
|
||||
'product_code' => 'V01PAK', // ✅ Funktioniert!
|
||||
'shipper' => $customer, // Kunde als Absender
|
||||
'consignee' => $warehouse, // Lager als Empfänger
|
||||
];
|
||||
// Nach Erstellung:
|
||||
DB::update(['type' => 'return']); // Markierung als Retoure
|
||||
```
|
||||
|
||||
## DHL Produktcodes Übersicht
|
||||
|
||||
| Code | Name | Verwendung |
|
||||
|------|------|------------|
|
||||
| V01PAK | DHL Paket | Standard Paketversand (auch für Returns!) |
|
||||
| V53PAK | DHL Paket International | Internationaler Versand |
|
||||
| V62WP | Warenpost | Kleinteile bis 1kg |
|
||||
| V07PAK | DHL Retoure Online | Spezial-Retouren (oft nicht verfügbar) |
|
||||
|
||||
## Konfiguration
|
||||
|
||||
### config/dhl.php
|
||||
```php
|
||||
'account_numbers' => [
|
||||
'V01PAK' => env('DHL_ACCOUNT_NUMBER_V01PAK', '33333333330102'),
|
||||
'V07PAK' => env('DHL_ACCOUNT_NUMBER_V07PAK', '63144073550701'),
|
||||
// ...
|
||||
],
|
||||
|
||||
'dimensions' => [
|
||||
'V01PAK' => ['length' => 120, 'width' => 60, 'height' => 60],
|
||||
'V07PAK' => ['length' => 120, 'width' => 60, 'height' => 60],
|
||||
// Gleiche Maße!
|
||||
],
|
||||
```
|
||||
|
||||
## Fallback-Änderung
|
||||
|
||||
### ReturnsService.php
|
||||
|
||||
```php
|
||||
private function createReturnViaRegularShipment(array $returnData): array
|
||||
{
|
||||
$shipmentData = [
|
||||
// Geändert von V07PAK zu V01PAK
|
||||
'product_code' => 'V01PAK', // ✅ Standard DHL Paket
|
||||
|
||||
// Shipper = Kunde (sendet zurück)
|
||||
'shipper' => $customer,
|
||||
|
||||
// Consignee = Lager (empfängt Retoure)
|
||||
'consignee' => $warehouse,
|
||||
|
||||
// V01PAK Dimensions
|
||||
'dimensions' => [
|
||||
'length' => 120,
|
||||
'width' => 60,
|
||||
'height' => 60,
|
||||
],
|
||||
];
|
||||
|
||||
$result = $shippingService->createLabel($shipmentData);
|
||||
|
||||
// Wichtig: Als Retoure markieren!
|
||||
DhlShipment::find($result['shipmentId'])
|
||||
->update(['type' => 'return']);
|
||||
}
|
||||
```
|
||||
|
||||
## Label-Unterschiede
|
||||
|
||||
### V07PAK Label (falls verfügbar):
|
||||
- ❓ "DHL Retoure Online" Logo
|
||||
- ❓ Spezielle Retouren-Kennzeichnung
|
||||
- ❓ Evtl. andere Barcode-Formatierung
|
||||
|
||||
### V01PAK Label (als Retoure):
|
||||
- ✅ Standard "DHL Paket" Logo
|
||||
- ✅ Normale Tracking-Nummer
|
||||
- ✅ Kunde als Absender sichtbar
|
||||
- ✅ **Funktioniert identisch für Tracking & Zustellung**
|
||||
|
||||
## Vorteile V01PAK Lösung
|
||||
|
||||
1. ✅ **Sofort verfügbar** - Keine Freischaltung nötig
|
||||
2. ✅ **Keine Extra-Kosten** - Standard-Tarif
|
||||
3. ✅ **Identische Funktion** - Tracking & Zustellung gleich
|
||||
4. ✅ **Einfachere Verwaltung** - Eine Billing-Nummer
|
||||
5. ✅ **Weniger Fehler** - Kein "unknown product"
|
||||
|
||||
## Nachteile V01PAK Lösung
|
||||
|
||||
1. ❌ Keine spezielle "Retoure" Kennzeichnung auf Label
|
||||
2. ❌ Evtl. andere Abrechnung als V07PAK
|
||||
3. ❌ Nicht sofort als Retoure erkennbar (nur im System via `type='return'`)
|
||||
|
||||
## Tracking
|
||||
|
||||
**Beide Produktcodes generieren gültige DHL Tracking-Nummern:**
|
||||
|
||||
- Format: `222201234567890` (15 Stellen)
|
||||
- Tracking-URL: `https://www.dhl.de/de/privatkunden/pakete-empfangen/verfolgen.html?piececode=...`
|
||||
- Funktioniert identisch für V01PAK und V07PAK
|
||||
|
||||
## Empfehlung
|
||||
|
||||
### Kurzfristig (Aktuell):
|
||||
✅ **V01PAK verwenden**
|
||||
- Funktioniert sofort
|
||||
- Keine Änderungen am Account nötig
|
||||
- Identische Funktionalität
|
||||
|
||||
### Langfristig (Optional):
|
||||
📞 **V07PAK beantragen bei DHL**
|
||||
- Kontakt: DHL Geschäftskundenberater
|
||||
- Vorteile: Spezielle Retouren-Kennzeichnung
|
||||
- Evtl. bessere Abrechnung
|
||||
|
||||
## Testing
|
||||
|
||||
```bash
|
||||
# Return-Label erstellen mit V01PAK
|
||||
# Erwartung: Erfolg!
|
||||
|
||||
# Logs prüfen:
|
||||
tail -f storage/logs/laravel.log | grep "DHL"
|
||||
|
||||
# Erwartete Ausgabe:
|
||||
# [DHL Returns] Using regular Shipping API as fallback
|
||||
# [DHL API] Sending payload {"product":"V01PAK",...}
|
||||
# [DHL API] Response received (200)
|
||||
# [DHL Returns] Return label created successfully ✅
|
||||
```
|
||||
|
||||
## Fazit
|
||||
|
||||
V01PAK ist die praktische Lösung für Return-Labels wenn V07PAK nicht verfügbar ist. Die Funktionalität ist identisch, nur die Label-Optik unterscheidet sich minimal.
|
||||
1583
dev/Growth-Bonus.md
Normal file
1583
dev/Growth-Bonus.md
Normal file
File diff suppressed because it is too large
Load diff
405
dev/buinessPlan/BusinessUserItem.php
Normal file
405
dev/buinessPlan/BusinessUserItem.php
Normal file
|
|
@ -0,0 +1,405 @@
|
|||
<?php
|
||||
namespace App\Services\BusinessPlan;
|
||||
|
||||
use App\User;
|
||||
use stdClass;
|
||||
use Carbon\Carbon;
|
||||
use App\Models\UserLevel;
|
||||
use App\Models\UserBusiness;
|
||||
use App\Services\TranslationHelper;
|
||||
use App\Models\UserBusinessStructure;
|
||||
|
||||
|
||||
class BusinessUserItem
|
||||
{
|
||||
public $businessUserItems = [];
|
||||
|
||||
private $date;
|
||||
private $b_user;
|
||||
private $user_level_active_pos;
|
||||
|
||||
|
||||
|
||||
public function __construct($date)
|
||||
{
|
||||
$this->date = $date;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function makeUser($user_id){
|
||||
|
||||
//check for user an load is saved
|
||||
$this->b_user = UserBusiness::where('user_id', $user_id)->where('month', $this->date->month)->where('year', $this->date->year)->first();
|
||||
if($this->b_user !== null){
|
||||
return;
|
||||
}
|
||||
//read User here, can delete in stored data.
|
||||
$user = User::find($user_id);
|
||||
if(!$user){
|
||||
return;
|
||||
}
|
||||
$user_level_active = $user->user_level ? $user->user_level : null;
|
||||
$this->user_level_active_pos = $user_level_active ? $user_level_active->pos : 0;
|
||||
$this->b_user = new UserBusiness();
|
||||
$fill = [
|
||||
'user_id' => $user->id,
|
||||
'month' => $this->date->month,
|
||||
'year' => $this->date->year,
|
||||
'm_level_id' => $user->m_level,
|
||||
'user_level_name' => $user_level_active ? $user_level_active->name : '',
|
||||
'active_account' => $user->payment_account ? Carbon::parse($user->payment_account)->gt(Carbon::parse($this->date->start_date)) : false,
|
||||
'payment_account_date' => $user->payment_account ? $user->getPaymentAccountDateFormat(false) : NULL,
|
||||
'active_date' => $user->active_date ? $user->active_date : NULL,
|
||||
'm_account' => $user->account->m_account,
|
||||
'email' => $user->email,
|
||||
'first_name' => $user->account->first_name,
|
||||
'last_name' => $user->account->last_name,
|
||||
'user_birthday' => $user->account->birthday,
|
||||
'user_phone' => $user->account->getPhoneNumber(),
|
||||
|
||||
'sales_volume_KP_points' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_KP_points'),
|
||||
'sales_volume_TP_points' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_TP_points'),
|
||||
'sales_volume_points_shop' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_points_shop'),
|
||||
|
||||
'sales_volume_points_KP_sum' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_points_KP_sum'), //KP + Shop Points
|
||||
'sales_volume_points_TP_sum' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_points_TP_sum'), //TP + Shop Points
|
||||
|
||||
'sales_volume_total' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_total'),
|
||||
'sales_volume_total_shop' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_total_shop'),
|
||||
'sales_volume_total_sum' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_total_sum'),
|
||||
|
||||
'margin' => $user_level_active ? $user_level_active->margin : 0, //is fix Rabatt für Kundenbestellungen
|
||||
'margin_shop' => $user_level_active ? $user_level_active->margin_shop : 0, //is fix Rabatt für Shopbestellungen
|
||||
'qual_kp' => $user_level_active ? $user_level_active->qual_kp : 0, //KP Kundenpoints from level
|
||||
'qual_pp' => $user_level_active ? $user_level_active->qual_pp : 0, //PP Payline Points from level
|
||||
|
||||
'payline_points' => 0,
|
||||
'commission_pp_total' => 0,
|
||||
'commission_shop_sales' => 0,
|
||||
'commission_growth_total' => 0,
|
||||
'version' => 2,
|
||||
];
|
||||
$this->b_user->fill($fill);
|
||||
$this->b_user->business_lines = [];
|
||||
$this->b_user->user_items = [];
|
||||
$this->b_user->commission_shop_sales = round($this->b_user->sales_volume_total_shop / 100 * $this->b_user->margin_shop, 2);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function getSalesVolumeTotalMargin(){
|
||||
return $this->b_user->getSalesVolumeTotalMargin();
|
||||
}
|
||||
|
||||
public function addUserID(){
|
||||
TreeCalcBot::addUserID($this->b_user->user_id);
|
||||
}
|
||||
|
||||
public function getBUser(){
|
||||
return $this->b_user;
|
||||
}
|
||||
|
||||
public function addBusinessLineToUser($line, $obj){
|
||||
$this->b_user->business_lines[$line] = $obj;
|
||||
}
|
||||
|
||||
public function addBusinessLinePoints($line, $points){
|
||||
$obj = $this->business_lines[$line];
|
||||
$obj->points += $points;
|
||||
$this->b_user->business_lines[$line] = $obj;
|
||||
}
|
||||
|
||||
public function addTotalTP($points){
|
||||
$this->b_user->total_pp += $points;
|
||||
}
|
||||
|
||||
public function isQualKP(){
|
||||
return ($this->sales_volume_points_KP_sum >= $this->qual_kp) ? true : false;
|
||||
}
|
||||
|
||||
public function isQualLevel(){
|
||||
return ($this->qual_user_level) ? true : false;
|
||||
}
|
||||
|
||||
public function isQualEqualLevel(){
|
||||
if($this->qual_user_level){
|
||||
return ($this->m_level_id == $this->qual_user_level['id']) ? true : false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function getQualLevelPaylines(){
|
||||
if($this->qual_user_level){
|
||||
return $this->qual_user_level['paylines'];
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public function isQualLevelGrowth($line){
|
||||
if(isset($this->business_lines[$line])){
|
||||
$object = $this->business_lines[$line];
|
||||
if(isset($object->growth_bonus)){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
public function getRestQualKP(){
|
||||
$ret = $this->sales_volume_points_KP_sum - $this->qual_kp;
|
||||
return $ret > 0 ? $ret : 0;
|
||||
}
|
||||
|
||||
public function getCommissionTotal(){
|
||||
return round($this->commission_shop_sales + $this->commission_pp_total + $this->commission_growth_total, 2);
|
||||
}
|
||||
//Provisierungslevel brechnen, Berechnung der Provisionen nach Level
|
||||
public function calcQualPP(){
|
||||
|
||||
//das ist der erreichte Provisierungslevel, nach paylinePoints und KP
|
||||
$qualUserLevel = $this->calcuQualLevel();
|
||||
if($qualUserLevel !== NULL){
|
||||
//prüfe einen Aufsieg im KarriereLevel
|
||||
$this->setNextUserLevel();
|
||||
$this->b_user->qual_user_level = $qualUserLevel->toArray();
|
||||
//setzen nächsten ProvisionsLevel wenn not isQualEqualLevel
|
||||
$this->setQualNextLevel();
|
||||
//Berechnung der Provisionen in der Payline
|
||||
$commission_pp_total = 0;
|
||||
$commission_growth_total = 0;
|
||||
for ($i=1; $i <= $qualUserLevel->paylines ; $i++) {
|
||||
if(isset($this->business_lines[$i])){
|
||||
$object = $this->business_lines[$i];
|
||||
$object->margin = $this->qual_user_level['pr_line_'.$i]; //provision in %
|
||||
$object->commission = round($object->points / 100 * $object->margin, 2); //provision in points/euro
|
||||
$object->payline = true;
|
||||
$commission_pp_total += $object->commission;
|
||||
$this->b_user->business_lines[$i] = $object;
|
||||
}
|
||||
}
|
||||
//Berechnung der Provisionen nach WB
|
||||
if($qualUserLevel->growth_bonus){
|
||||
//['growth_bonus'] //
|
||||
$payline = (int) $this->b_user->qual_user_level['paylines'] + 1;
|
||||
$maxlines = count($this->business_lines) + 1;
|
||||
$growth_bonus = (float) $this->b_user->qual_user_level['growth_bonus'];
|
||||
|
||||
for ($i=$payline; $i <= $maxlines ; $i++) {
|
||||
if(isset($this->business_lines[$i])){
|
||||
$object = $this->business_lines[$i];
|
||||
$object->margin = $growth_bonus; //provision in %
|
||||
$object->commission = round($object->points / 100 * $object->margin, 2); //provision in points/euro
|
||||
$object->growth_bonus = true;
|
||||
$commission_growth_total += $object->commission;
|
||||
$this->b_user->business_lines[$i] = $object;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
$this->b_user->commission_pp_total = $commission_pp_total;
|
||||
$this->b_user->commission_growth_total = $commission_growth_total;
|
||||
|
||||
}else{
|
||||
//erste Provisierungslevel als next setzen, hat keine oder wenig points
|
||||
$qualUserLevelNext = UserLevel::where('pos', '=', 1)->orderBy('qual_pp', 'asc')->first();
|
||||
if($qualUserLevelNext){
|
||||
$this->b_user->qual_user_level_next = $qualUserLevelNext->toArray();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
//qualifikation nach qual_kp (KundenPoints) und qual_pp (PaylinePoints)
|
||||
public function calcuQualLevel(){
|
||||
//alle levels wo die qual_kp erreicht ist, sortiert nach Rang >
|
||||
$qualUserLevels = UserLevel::where('qual_kp', '<=', $this->sales_volume_points_KP_sum)->where('pos', '<=', $this->user_level_active_pos)->orderBy('qual_pp', 'desc')->get();
|
||||
foreach($qualUserLevels as $qualUserLevel){
|
||||
//brechnet die Points nach der Payline
|
||||
$payline_points = $this->getPointsforPayline($qualUserLevel->paylines);
|
||||
$payline_points_qual_kp = $payline_points + $this->getRestQualKP();
|
||||
if($payline_points_qual_kp >= $qualUserLevel->qual_pp){
|
||||
//match payline_points erreicht, ist der akutelle Level für die Provision
|
||||
$this->b_user->payline_points = $payline_points;
|
||||
$this->b_user->payline_points_qual_kp = $payline_points_qual_kp;
|
||||
|
||||
return $qualUserLevel;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
// PaylinePoints nach paylines / welche ebenen gezählt werden, 3,4,5,6 ...
|
||||
private function getPointsforPayline($paylines){
|
||||
$payline_points = 0;
|
||||
for ($i=1; $i <= $paylines ; $i++) {
|
||||
if(isset($this->business_lines[$i])){
|
||||
$payline_points += $this->business_lines[$i]->points;
|
||||
}
|
||||
}
|
||||
return $payline_points;
|
||||
}
|
||||
//wenn nicht erreicht, was wäre der nächste Provisionslevel?
|
||||
private function setQualNextLevel(){
|
||||
if(!$this->isQualEqualLevel()){
|
||||
$qualUserLevelNext = UserLevel::where('id', '=', $this->b_user->qual_user_level['next_id'])->orderBy('qual_pp', 'asc')->first();
|
||||
if($qualUserLevelNext){
|
||||
$this->b_user->qual_user_level_next = $qualUserLevelNext->toArray();
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function setNextUserLevel(){
|
||||
// $this->b_user->payline_points_qual_kp // das sind die Payline Points + Rest KP
|
||||
//$this->b_user->total_qual_pp = $this->total_pp + $this->getRestQualKP(); //hier werden alle Linien TP gezähle
|
||||
//$this->b_user->total_qual_pp = $this->total_pp + $this->getRestQualKP(); //hier werden alle Linien TP gezähle
|
||||
|
||||
$nextQualUserLevel = UserLevel::where('qual_pp', '<=', $this->payline_points_qual_kp)->where('pos', '>', $this->user_level_active_pos)->orderBy('qual_pp', 'desc')->first();
|
||||
if($nextQualUserLevel && $this->isQualKP()){
|
||||
$this->b_user->next_qual_user_level = $nextQualUserLevel->toArray();
|
||||
}else{
|
||||
//wenn nicht erreicht, was wäre der nächste Karrierelevel?
|
||||
$nextCanUserLevel = UserLevel::where('pos', '>', $this->user_level_active_pos)->orderBy('qual_pp', 'asc')->first();
|
||||
if($nextCanUserLevel){
|
||||
$this->b_user->next_can_user_level = $nextCanUserLevel->toArray();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*public function storeUser(){
|
||||
$this->b_user->user_items = $this->storeUserItems($this->businessUserItems, 1);
|
||||
$this->b_user->save();
|
||||
}
|
||||
|
||||
private function storeUserItems($userItems, $line){
|
||||
$ret = [];
|
||||
foreach($userItems as $userItem){
|
||||
$temp = null;
|
||||
if(count($userItem->businessUserItems) > 0){
|
||||
$temp = $this->storeUserItems($userItem->businessUserItems, $line+1);
|
||||
}
|
||||
$obj = new stdClass();
|
||||
$obj->user_id = $userItem->user_id;
|
||||
$obj->line = $line;
|
||||
$obj->points = $userItem->sales_volume_points_sum;
|
||||
$obj->parents = $temp;
|
||||
$ret[] = $obj;
|
||||
}
|
||||
return $ret;
|
||||
}*/
|
||||
|
||||
public function readParentsBusinessUsers(){
|
||||
|
||||
$users = User::with('account')->select('users.*')
|
||||
->where('users.deleted_at', '=', null)
|
||||
->where('users.id', '!=', 1)
|
||||
->where('users.admin', "<", 4)
|
||||
->where('users.m_level', "!=", null)
|
||||
->where('users.m_sponsor', "=", $this->b_user->user_id) //<- need the id for parents / sponsors
|
||||
->where('users.payment_account', "!=", null)
|
||||
->where('users.active_date', "<=", $this->date->end_date) // wurde in dem Monat freigeschaltet
|
||||
->get();
|
||||
|
||||
if($users){
|
||||
foreach($users as $user){
|
||||
$BusinessUserItem = new BusinessUserItem($this->date);
|
||||
$BusinessUserItem->makeUser($user->id);
|
||||
$BusinessUserItem->addUserID();
|
||||
$this->businessUserItems[] = $BusinessUserItem;
|
||||
}
|
||||
}
|
||||
foreach($this->businessUserItems as $businessUserItem){
|
||||
$businessUserItem->readParentsBusinessUsers();
|
||||
}
|
||||
}
|
||||
|
||||
public function readStoredParentsBusinessUsers($structure){
|
||||
|
||||
$parents = $this->findParentsBusinessOnStored($this->b_user->user_id, $structure);
|
||||
if($parents){
|
||||
foreach($parents as $obj){
|
||||
$BusinessUserItem = new BusinessUserItem($this->date);
|
||||
$BusinessUserItem->makeUser($obj->user_id);
|
||||
$BusinessUserItem->addUserID();
|
||||
$this->businessUserItems[] = $BusinessUserItem;
|
||||
}
|
||||
foreach($this->businessUserItems as $businessUserItem){
|
||||
$businessUserItem->readStoredParentsBusinessUsers($parents);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function findParentsBusinessOnStored($user_id, $structures){
|
||||
if($structures){
|
||||
foreach($structures as $obj){
|
||||
if($user_id === $obj->user_id){
|
||||
return $obj->parents;
|
||||
}
|
||||
if($obj->parents){
|
||||
if($ret = $this->findParentsBusinessOnStored($user_id, $obj->parents)){
|
||||
return $ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public function checkSponsor($user){
|
||||
|
||||
//check is store? has ID
|
||||
if($this->b_user->isSave()){
|
||||
return;
|
||||
}
|
||||
$sponsor = new stdClass();
|
||||
|
||||
$sponsor->is_sponsor = false;
|
||||
$sponsor->user_id = false;
|
||||
$sponsor->first_name = '';
|
||||
$sponsor->last_name = '';
|
||||
$sponsor->email = '';
|
||||
$sponsor->m_account = '';
|
||||
$sponsor->full_name = 'Keinen Sponsor zugewiesen';
|
||||
|
||||
if($user->m_sponsor){
|
||||
|
||||
if($user->user_sponsor){
|
||||
$sponsor->is_sponsor = true;
|
||||
$sponsor->user_id = $user->user_sponsor->id;
|
||||
if($user->user_sponsor->account){
|
||||
$sponsor->full_name = substr('Sponsor: '.$user->user_sponsor->account->first_name.' '.$user->user_sponsor->account->last_name.' | '.$user->user_sponsor->email.' | '.$user->user_sponsor->account->m_account, 0, 250);
|
||||
$sponsor->first_name = $user->user_sponsor->account->last_name;
|
||||
$sponsor->last_name = $user->user_sponsor->account->first_name;
|
||||
$sponsor->m_account = $user->user_sponsor->account->m_account;
|
||||
}else{
|
||||
$sponsor->full_name = 'Sponsor: '.$user->user_sponsor->email;
|
||||
}
|
||||
$sponsor->email = $user->user_sponsor->email;
|
||||
}else{
|
||||
$sponsor->full_name = 'Sponsor wurde gelöscht.';
|
||||
}
|
||||
}
|
||||
$this->b_user->sponsor = $sponsor;
|
||||
return;
|
||||
}
|
||||
|
||||
public function isSave(){
|
||||
return $this->b_user->isSave();
|
||||
}
|
||||
|
||||
public function __get($property) {
|
||||
if($this->b_user === null){
|
||||
return null;
|
||||
}
|
||||
if (property_exists($this->b_user, $property)) {
|
||||
return $this->b_user->$property;
|
||||
}
|
||||
if (isset($this->b_user->{$property})) {
|
||||
return $this->b_user->{$property};
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
391
dev/buinessPlan/TreeCalcBot.php
Normal file
391
dev/buinessPlan/TreeCalcBot.php
Normal file
|
|
@ -0,0 +1,391 @@
|
|||
<?php
|
||||
namespace App\Services\BusinessPlan;
|
||||
|
||||
use App\User;
|
||||
use stdClass;
|
||||
use Carbon;
|
||||
use App\Models\UserBusinessStructure;
|
||||
|
||||
class TreeCalcBot
|
||||
{
|
||||
public $date;
|
||||
public $business_user;
|
||||
|
||||
public $business_users = [];
|
||||
public $parentless = [];
|
||||
|
||||
private $sponsor;
|
||||
private $init_from;
|
||||
private static $userIDs = [];
|
||||
|
||||
public static function addUserID($id){
|
||||
self::$userIDs[$id] = $id;
|
||||
}
|
||||
|
||||
public function __construct($month, $year, $init_from = 'member')
|
||||
{
|
||||
$this->date = new stdClass();
|
||||
$date = Carbon::parse($year.'-'.$month.'-1');
|
||||
$this->date->month = $month;
|
||||
$this->date->year = $year;
|
||||
$this->date->start_date = $date->format('Y-m-d H:i:s');
|
||||
$this->date->end_date = $date->endOfMonth()->format('Y-m-d H:i:s');
|
||||
$this->init_from = $init_from;
|
||||
|
||||
}
|
||||
|
||||
public function initStructureAdmin($check = true, $forceLiveCalculation = false)
|
||||
{
|
||||
//check is month is saved.
|
||||
if($check && $UserBusinessStructure = self::isFromStored($this->date->month, $this->date->year)){
|
||||
$this->readStoredRootUsers($UserBusinessStructure);
|
||||
$this->readStoredParentsUsers($UserBusinessStructure);
|
||||
$this->readStoredParentlessUser($UserBusinessStructure);
|
||||
}else{
|
||||
$this->readRootUsers();
|
||||
$this->readParentsUsers();
|
||||
$this->readParentlessUser();
|
||||
}
|
||||
}
|
||||
|
||||
public function initStructureUser($user_id)
|
||||
{
|
||||
|
||||
$BusinessUserItem = new BusinessUserItem($this->date);
|
||||
$BusinessUserItem->makeUser($user_id);
|
||||
$BusinessUserItem->addUserID();
|
||||
$this->business_users[] = $BusinessUserItem;
|
||||
|
||||
//check is month is saved.
|
||||
if($UserBusinessStructure = self::isFromStored($this->date->month, $this->date->year)){
|
||||
$this->readStoredParentsUsers($UserBusinessStructure);
|
||||
|
||||
if(isset($this->business_users[0]) && $this->business_users[0]->sponsor){
|
||||
$this->readStoredSponsorUser($this->business_users[0]->sponsor->user_id);
|
||||
}
|
||||
}else{
|
||||
$this->readParentsUsers();
|
||||
$this->readSponsorUser($user_id);
|
||||
}
|
||||
}
|
||||
|
||||
public function initBusinesslUserDetail($user)
|
||||
{
|
||||
$this->business_user = new BusinessUserItem($this->date);
|
||||
$this->business_user->makeUser($user->id);
|
||||
$this->business_user->checkSponsor($user);
|
||||
if(!$this->business_user->isSave()){
|
||||
//Aufbau der Struktur für den User in die unendliche Tiefe.
|
||||
$this->business_user->readParentsBusinessUsers();
|
||||
//calculate Points in Lines
|
||||
if(count($this->business_user->businessUserItems) > 0){
|
||||
$this->calcUserPoints($this->business_user->businessUserItems, 1);
|
||||
}
|
||||
//qualifikation nach qual_kp (KundenPoints) und qual_pp (PaylinePoints)
|
||||
$this->business_user->calcQualPP();
|
||||
}
|
||||
}
|
||||
|
||||
/*public function storeBusinesslUser()
|
||||
{
|
||||
$this->business_user->storeUser();
|
||||
}*/
|
||||
|
||||
public static function isFromStored($month, $year){
|
||||
//when is stored an completed
|
||||
$UserBusinessStructure = UserBusinessStructure::where('year', $year)->where('month', $month)->first();
|
||||
if($UserBusinessStructure && $UserBusinessStructure->completed){
|
||||
return $UserBusinessStructure;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private function calcUserPoints($businessUserItems, $line){
|
||||
if(!isset($this->business_user->business_lines[$line])){
|
||||
$obj = new stdClass();
|
||||
$obj->points = 0;
|
||||
$this->business_user->addBusinessLineToUser($line, $obj);
|
||||
}
|
||||
foreach($businessUserItems as $business_user_item){
|
||||
if(count($business_user_item->businessUserItems) > 0){
|
||||
$this->calcUserPoints($business_user_item->businessUserItems, $line+1);
|
||||
}
|
||||
//business_lines points nach line
|
||||
$this->business_user->addBusinessLinePoints($line, $business_user_item->sales_volume_points_TP_sum); //TP + Shop Points
|
||||
//total_pp gesamte Punkte
|
||||
$this->business_user->addTotalTP($business_user_item->sales_volume_points_TP_sum); //TP + Shop Points
|
||||
}
|
||||
}
|
||||
|
||||
public function getGrowthBonus(){
|
||||
if(count($this->business_user->business_lines) > 6){
|
||||
$b_lines = $this->business_user->business_lines->toArray();
|
||||
return array_slice($b_lines, 6);
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
|
||||
public function getKeybyLine($line, $key){
|
||||
if($this->business_user->business_lines){
|
||||
$b_lines = $this->business_user->business_lines;
|
||||
if(isset($b_lines[$line])){
|
||||
if($b_lines[$line] instanceof stdClass){
|
||||
if(isset($b_lines[$line]->{$key})){
|
||||
return $b_lines[$line]->{$key};
|
||||
}
|
||||
}else{
|
||||
if(isset($b_lines[$line][$key])){
|
||||
return $b_lines[$line][$key];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
//* reading from current*//
|
||||
private function readRootUsers(){
|
||||
$users = User::with('account')->select('users.*')
|
||||
->where('users.deleted_at', '=', null)
|
||||
->where('users.id', '!=', 1)
|
||||
->where('users.admin', "<", 4)
|
||||
->where('users.m_level', "!=", null)
|
||||
->where('users.m_sponsor', "=", null)
|
||||
->where('users.payment_account', "!=", null)
|
||||
->where('users.active_date', "<=", $this->date->end_date)
|
||||
->get();
|
||||
if($users){
|
||||
foreach($users as $user){
|
||||
$BusinessUserItem = new BusinessUserItem($this->date);
|
||||
$BusinessUserItem->makeUser($user->id);
|
||||
$BusinessUserItem->addUserID();
|
||||
$this->business_users[] = $BusinessUserItem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function readParentsUsers(){
|
||||
foreach($this->business_users as $business_user){
|
||||
$business_user->readParentsBusinessUsers();
|
||||
}
|
||||
}
|
||||
|
||||
private function readParentlessUser(){
|
||||
$users = User::with('account')->select('users.*')
|
||||
->where('users.deleted_at', '=', null)
|
||||
->where('users.id', '!=', 1)
|
||||
->where('users.admin', "<", 4)
|
||||
->where('users.payment_account', "!=", null)
|
||||
->where('users.active_date', "<=", $this->date->end_date)
|
||||
->get();
|
||||
|
||||
foreach($users as $user){
|
||||
if(!isset(self::$userIDs[$user->id])){
|
||||
$BusinessUserItem = new BusinessUserItem($this->date);
|
||||
$BusinessUserItem->makeUser($user->id);
|
||||
$this->parentless[] = $BusinessUserItem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//* reading from stored*//
|
||||
private function readStoredRootUsers(UserBusinessStructure $userBusinessStructure){
|
||||
//first level is root
|
||||
if($userBusinessStructure->structure){
|
||||
foreach($userBusinessStructure->structure as $obj){
|
||||
$BusinessUserItem = new BusinessUserItem($this->date);
|
||||
$BusinessUserItem->makeUser($obj->user_id);
|
||||
$BusinessUserItem->addUserID();
|
||||
$this->business_users[] = $BusinessUserItem;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function readStoredParentsUsers(UserBusinessStructure $userBusinessStructure){
|
||||
foreach($this->business_users as $business_user){
|
||||
$business_user->readStoredParentsBusinessUsers($userBusinessStructure->structure);
|
||||
}
|
||||
}
|
||||
|
||||
private function readStoredParentlessUser(UserBusinessStructure $userBusinessStructure){
|
||||
if($userBusinessStructure->parentless){
|
||||
foreach($userBusinessStructure->parentless as $obj){
|
||||
if(!isset(self::$userIDs[$obj->user_id])){
|
||||
$BusinessUserItem = new BusinessUserItem($this->date);
|
||||
$BusinessUserItem->makeUser($obj->user_id);
|
||||
$this->parentless[] = $BusinessUserItem;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function readSponsorUser($user_id){
|
||||
$user = User::find($user_id);
|
||||
$userSponsor = User::find($user->m_sponsor);
|
||||
if($userSponsor){
|
||||
$this->sponsor = new BusinessUserItem($this->date);
|
||||
$this->sponsor->makeUser($userSponsor->id);
|
||||
}
|
||||
}
|
||||
|
||||
public function readStoredSponsorUser($user_id){
|
||||
|
||||
$this->sponsor = new BusinessUserItem($this->date);
|
||||
$this->sponsor->makeUser($user_id);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function getItems(){
|
||||
return $this->business_users;
|
||||
}
|
||||
|
||||
public function makeHtmlTree(){
|
||||
$deep = 0;
|
||||
$ret = '<ol class="dd-list">';
|
||||
foreach($this->business_users as $business_user){
|
||||
$ret .= $this->addItem($business_user, $deep);
|
||||
|
||||
}
|
||||
$ret .= '</ol>';
|
||||
return $ret;
|
||||
}
|
||||
|
||||
private function addItem($item, $deep){
|
||||
|
||||
$button = '';
|
||||
|
||||
if(($this->init_from === 'admin' && \Auth::user()->isAdmin()) || ($this->init_from === 'member')){ // && \Auth::user()->id === $item->user_id
|
||||
$button = ' | <button type="button" class="btn icon-btn btn-xs btn-secondary" data-toggle="modal" data-target="#modals-load-content"
|
||||
data-id="'.$item->user_id.'"
|
||||
data-action="business-user-detail"
|
||||
data-back=""
|
||||
data-modal="modal-xl"
|
||||
data-init_from="'.$this->init_from .'"
|
||||
data-route="'.route('modal_load').'"><span class="fa fa-calculator"></span></button>';
|
||||
}
|
||||
return '<li class="dd-item dd-nodrag" data-id="'.$item->user_id.'">'.
|
||||
'<div class="dd-handle">
|
||||
<div class="media align-items-center">
|
||||
<div class="d-flex flex-column justify-content-center align-items-center">
|
||||
'.(($deep > 0) ? '<div class="text-large font-weight-bolder line-height-1 my-2 text-secondary badge badge-outline-secondary">'.$deep.'</div>' : '').'
|
||||
</div>
|
||||
<div class="media-body ml-2">
|
||||
<span class="'.($item->active_account ? '' : 'text-muted').'">
|
||||
<a href="#" class="text-black" data-toggle="modal" data-target="#modals-load-content" data-id="'.$item->user_id.'" data-action="business-user-show" data-back="" data-modal="modal-md" data-init_from="'.$this->init_from .'" data-route="'.route('modal_load').'">
|
||||
<span class="mr-1 ion ion-ios-contact '.($item->active_account ? 'text-primary' : 'text-danger').'"></span> <strong>'.$item->first_name.' '.$item->last_name.'</strong>
|
||||
</a>
|
||||
<a href="mailto: '.$item->email.'">'.$item->email.'</a>
|
||||
'.($item->user_birthday ? ' | <i class="ion ion-ios-gift text-primary"></i> '.$item->user_birthday : '').'
|
||||
'.($item->user_phone ? ' | <i class="ion ion-ios-call text-primary"></i> '.$item->user_phone : '').'
|
||||
<span class="badge badge-outline-default '.($item->active_account ? '' : 'text-muted').'">'.\App\Services\TranslationHelper::transUserLevelName($item->user_level_name).' | '.$item->m_account.'</span>
|
||||
<br><span class="small">'.
|
||||
($item->active_account ?
|
||||
'<strong>'.__('team.total_points').': '.$item->sales_volume_points_KP_sum.'</strong> | '.__('team.e').': '.$item->sales_volume_KP_points.' | '.__('team.s').': '.$item->sales_volume_points_shop.' <strong>
|
||||
| '.__('team.net_turnover').': '.formatNumber($item->sales_volume_total_sum).' €</strong> | '.__('team.e').': '.formatNumber($item->sales_volume_total).' € | '.__('team.s').': '.formatNumber($item->sales_volume_total_shop).' €'.
|
||||
$button
|
||||
:
|
||||
__('team.account_to').': '.$item->payment_account_date).
|
||||
'</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>'.
|
||||
$this->addParentItem($item, $deep).
|
||||
'</li>';
|
||||
|
||||
}
|
||||
|
||||
private function addParentItem($item, $deep){
|
||||
if($item->businessUserItems){
|
||||
$ret = '<ol class="dd-list dd-nodrag">';
|
||||
foreach($item->businessUserItems as $parent){
|
||||
$ret .= $this->addItem($parent, $deep+1);
|
||||
}
|
||||
$ret .='</ol>';
|
||||
return $ret;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
public function isParentless(){
|
||||
return $this->parentless ? true : false;
|
||||
}
|
||||
|
||||
public function makeParentlessHtml(){
|
||||
$ret = "";
|
||||
foreach($this->parentless as $item){
|
||||
$ret .= '<li class="dd-item dd-nodrag" data-id="'.$item->user_id.'">'.
|
||||
'<div class="dd-handle">
|
||||
<span class="'.($item->active_account ? '' : 'text-muted').'">
|
||||
<a href="#" class="text-black" data-toggle="modal" data-target="#modals-load-content" data-id="'.$item->user_id.'" data-action="business-user-show" data-back="" data-modal="modal-md" data-init_from="'.$this->init_from .'" data-route="'.route('modal_load').'">
|
||||
<span class="mr-1 ion ion-ios-contact '.($item->active_account ? 'text-primary' : 'text-danger').'"></span> <strong>'.$item->first_name.' '.$item->last_name.'</strong>
|
||||
</a>
|
||||
<a href="mailto: '.$item->email.'">'.$item->email.'</a>
|
||||
'.($item->user_birthday ? ' | <i class="ion ion-ios-gift text-primary"></i> '.$item->user_birthday : '').'
|
||||
'.($item->user_phone ? ' | <i class="ion ion-ios-call text-primary"></i> '.$item->user_phone : '').'
|
||||
<span class="badge badge-outline-default '.($item->active_account ? '' : 'text-muted').'">'.\App\Services\TranslationHelper::transUserLevelName($item->user_level_name).' | '.$item->m_account.'</span>
|
||||
<br><span class="small">'.
|
||||
($item->active_account ?
|
||||
'<strong>'.__('team.total_points').': '.$item->sales_volume_points_KP_sum.'</strong> | '.__('team.e').': '.$item->sales_volume_KP_points.' | '.__('team.s').': '.$item->sales_volume_points_shop.' <strong>
|
||||
| '.__('team.net_turnover').': '.formatNumber($item->sales_volume_total_sum).' €</strong> | '.__('team.e').': '.formatNumber($item->sales_volume_total).' € | '.__('team.s').': '.formatNumber($item->sales_volume_total_shop).' €'.
|
||||
' | <button type="button" class="btn icon-btn btn-xs btn-secondary" data-toggle="modal" data-target="#modals-load-content"
|
||||
data-id="'.$item->user_id.'"
|
||||
data-action="business-user-detail"
|
||||
data-back=""
|
||||
data-modal="modal-xl"
|
||||
data-route="'.route('modal_load').'"><span class="fa fa-calculator"></span></button>'
|
||||
:
|
||||
__('team.account_to').' '.$item->payment_account_date).
|
||||
'<br>'.$item->m_sponsor_name.
|
||||
'</span>
|
||||
</span>
|
||||
</div>'.
|
||||
'</li>';
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
public function makeSponsorHtml(){
|
||||
|
||||
if($this->sponsor){
|
||||
//' | <a href="' . route('admin_business_user_detail', [$this->sponsor->id]) . '" class="btn icon-btn btn-xs btn-secondary"><span class="fa fa-calculator"></span></a>'
|
||||
$ret = '<li class="dd-item dd-nodrag" data-id="">'.
|
||||
'<div class="dd-handle">
|
||||
<span class="'.($this->sponsor->active_account ? '' : 'text-muted').'">
|
||||
<a href="#" class="text-black" data-toggle="modal" data-target="#modals-load-content" data-id="'.$this->sponsor->user_id.'" data-action="business-user-show" data-back="" data-init_from="'.$this->init_from .'" data-modal="modal-md" data-route="'.route('modal_load').'">
|
||||
<span class="mr-1 ion ion-ios-contact '.($this->sponsor->active_account ? 'text-primary' : 'text-danger').'"></span> <strong>'.$this->sponsor->first_name.' '.$this->sponsor->last_name.'</strong>
|
||||
</a>
|
||||
<a href="mailto: '.$this->sponsor->email.'">'.$this->sponsor->email.'</a>
|
||||
'.($this->sponsor->user_birthday ? ' | <i class="ion ion-ios-gift text-primary"></i> '.$this->sponsor->user_birthday : '').'
|
||||
'.($this->sponsor->user_phone ? ' | <i class="ion ion-ios-call text-primary"></i> '.$this->sponsor->user_phone : '').'
|
||||
<span class="badge badge-outline-default '.($this->sponsor->active_account ? '' : 'text-muted').'">'.\App\Services\TranslationHelper::transUserLevelName($this->sponsor->user_level_name).' | '.$this->sponsor->m_account.'</span>';
|
||||
|
||||
if($this->init_from === 'admin'){
|
||||
$ret .= '<br><span class="small">'.
|
||||
($this->sponsor->active_account ?
|
||||
'<strong>'.__('team.total_points').': '.$this->sponsor->sales_volume_points_KP_sum.'</strong> | '.__('team.e').': '.$this->sponsor->sales_volume_KP_points.' | '.__('team.s').': '.$this->sponsor->sales_volume_points_shop.' <strong>
|
||||
| '.__('team.net_turnover').': '.formatNumber($this->sponsor->sales_volume_total_sum).' €</strong> | '.__('team.e').': '.formatNumber($this->sponsor->sales_volume_total).' € | '.__('team.s').': '.formatNumber($this->sponsor->sales_volume_total_shop).' €'
|
||||
:
|
||||
__('team.account_to').' '.$this->sponsor->payment_account_date).
|
||||
'</span>';
|
||||
}
|
||||
$ret .= '</span>
|
||||
</div>
|
||||
</li>';
|
||||
|
||||
return $ret;
|
||||
}
|
||||
return __('team.no_sponsor_assigned');
|
||||
}
|
||||
|
||||
}
|
||||
1271
dev/buinessPlan/_bak/BusinessUserItemOptimized.php
Normal file
1271
dev/buinessPlan/_bak/BusinessUserItemOptimized.php
Normal file
File diff suppressed because it is too large
Load diff
399
dev/buinessPlan/_bak/Growth-Bonus.md
Normal file
399
dev/buinessPlan/_bak/Growth-Bonus.md
Normal file
|
|
@ -0,0 +1,399 @@
|
|||
# Funktionsweise: Tiefenbonus (Growth Bonus)
|
||||
|
||||
## ⚠️ WICHTIG: Bug-Fix November 2025
|
||||
|
||||
### Das Problem (vor November 2025)
|
||||
|
||||
Die Payline-Prozentsätze (`pr_line_1` bis `pr_line_6`) in der Datenbank enthielten **bereits den Growth Bonus**.
|
||||
|
||||
**Beispiel Gold Member (falsche Berechnung):**
|
||||
|
||||
| Ebene | Wert in DB (`pr_line_X`) | Was ausgezahlt wurde | Was korrekt gewesen wäre |
|
||||
| ------- | ------------------------ | -------------------- | ------------------------------ |
|
||||
| Ebene 1 | 9% | 9% | 7% Payline + 2% Growth = 9% |
|
||||
| Ebene 2 | 9% | 9% | 7% Payline + 2% Growth = 9% |
|
||||
| Ebene 3 | 9% | 9% | 7% Payline + 2% Growth = 9% |
|
||||
| Ebene 4 | 6% | 6% | 4% Payline + 2% Growth = 6% |
|
||||
| Ebene 5 | 4% | 4% | 2% Payline + 2% Growth = 4% |
|
||||
| Ebene 6 | 4% | 4% | 2% Payline + 2% Growth = 4% |
|
||||
| Ebene 7 | - | 2% (Growth nochmal!) | 2% Growth (nur mit Differenz!) |
|
||||
|
||||
**Problem:** Der Growth Bonus wurde **doppelt gezählt**:
|
||||
|
||||
1. Einmal IN den Payline-Prozentsätzen (pr_line_1 = 9% statt 7%)
|
||||
2. Nochmal SEPARAT auf Ebenen ab 7+ (Legacy-Berechnung)
|
||||
|
||||
### Die Lösung (ab November 2025)
|
||||
|
||||
1. **Payline-Prozentsätze korrigiert:** `pr_line_X` enthält NUR den Payline-Anteil
|
||||
2. **Growth Bonus separat:** Wird mit Differenz-Logik berechnet
|
||||
3. **Einmal pro Bein:** Growth Bonus wird nur EINMAL pro Firstline-Zweig ausgezahlt
|
||||
|
||||
**Beispiel Gold Member (korrekte Berechnung):**
|
||||
|
||||
| Ebene | Payline (`pr_line_X`) | Growth Bonus (separat) | Gesamt |
|
||||
| -------- | --------------------- | ---------------------- | ------ |
|
||||
| Ebene 1 | 7% | +2% (Differenz-Logik) | 9% |
|
||||
| Ebene 2 | 7% | +2% | 9% |
|
||||
| Ebene 3 | 7% | +2% | 9% |
|
||||
| Ebene 4 | 4% | +2% | 6% |
|
||||
| Ebene 5 | 2% | +2% | 4% |
|
||||
| Ebene 6 | 2% | +2% | 4% |
|
||||
| Ebene 7+ | - | +2% (Differenz-Logik) | 2% |
|
||||
|
||||
**Wichtig:** Der Growth Bonus wird NUR ausgezahlt, wenn kein gleichrangiger oder höherer Partner in der Downline ist (Differenz-Berechnung)!
|
||||
|
||||
---
|
||||
|
||||
## Differenz-Logik (ab November 2025)
|
||||
|
||||
Der Tiefenbonus ist ein **Differenz-Bonus**, der **sofort ab der 1. Ebene** beginnt.
|
||||
|
||||
Es gilt das Prinzip: **"Jeder Partner schützt sein eigenes Team-Volumen."**
|
||||
|
||||
### 1. Die Grundregel
|
||||
|
||||
- **Start:** Der Bonus berechnet sich auf Points ab der **1. Ebene** (direkte Downline).
|
||||
- **Anspruch:** Ein Partner erhält seinen Status-Prozentsatz auf alle Points in seiner Linie, **bis** er auf einen Partner trifft, der selbst einen Status-Anspruch hat.
|
||||
- **Blockade:** Sobald ein Partner in der Downline einen Anspruch hat, zieht er diesen von der Upline ab (Differenz-Rechnung).
|
||||
- **⚠️ WICHTIG - Erreichtes Qualifikations-Level:** Die Blockade erfolgt NUR basierend auf dem **in dem Monat tatsächlich erreichten Level** (`qual_user_level`), NICHT auf dem aktuellen Karriere-Level des Partners!
|
||||
|
||||
### 1.1 Erreichte Qualifikation vs. Aktuelles Level
|
||||
|
||||
Ein Partner kann ein bestimmtes Karriere-Level (z.B. Gold) haben, aber in einem Monat die Qualifikationsvoraussetzungen nicht erfüllen. In diesem Fall:
|
||||
|
||||
| Situation | Aktuelles Level | Erreicht in Monat | Blockiert mit |
|
||||
| --------- | --------------- | ----------------- | ------------- |
|
||||
| Fall A | Gold (2%) | Gold qualifiziert | 2% ✅ |
|
||||
| Fall B | Gold (2%) | Team Leader (0%) | 0% ❌ |
|
||||
| Fall C | Team Leader | Silber (1.5%) | 1.5% ✅ |
|
||||
|
||||
**Technische Umsetzung:**
|
||||
|
||||
- Die Methode `getQualifiedGrowthBonus()` in `BusinessUserItemOptimized` gibt den Growth Bonus basierend auf dem **erreichten Qualifikations-Level** (`qual_user_level`) zurück.
|
||||
- Die alte Methode `getActiveGrowthBonus()` gibt den Growth Bonus basierend auf dem **aktuellen Karriere-Level** zurück (NUR für Legacy-Berechnungen!).
|
||||
- Der `GrowthBonusCalculator` verwendet ab November 2025 ausschließlich `getQualifiedGrowthBonus()`.
|
||||
|
||||
---
|
||||
|
||||
### 2. Die Differenz (Der Normalfall)
|
||||
|
||||
Points entstehen irgendwo im Team von **Partner B** (egal ob in B's Ebene 1 oder B's Ebene 50).
|
||||
|
||||
**Die Verteilung:**
|
||||
|
||||
1. **Sicht Partner B (Silber):**
|
||||
|
||||
- Er hat Anspruch auf **1,5 %** auf sein gesamtes Team.
|
||||
- Da unter ihm (Partner C) niemand einen Status hat, der etwas wegnehmen könnte, erhält B die vollen **1,5 %**.
|
||||
- Damit sind 1,5 % des "Kuchens" verteilt.
|
||||
|
||||
2. **Sicht Partner A (Diamant):**
|
||||
- Du hast Anspruch auf **2,5 %**.
|
||||
- Du schaust auf die Linie von Partner B.
|
||||
- Partner B hat den Status Silber und beansprucht damit **1,5 %** für sich und sein ganzes Team.
|
||||
- **Deine Rechnung:** 2,5 % (Dein Anspruch) - 1,5 % (Anspruch B) = **1,0 %**.
|
||||
- **Ergebnis:** Du erhältst auf das gesamte Volumen unter Partner B exakt **1,0 %**.
|
||||
|
||||
---
|
||||
|
||||
### 2. Das "GAP" (Die direkte Ebene)
|
||||
|
||||
Da der Bonus ab Ebene 1 beginnt, entsteht das GAP (die Auszahlung trotz gleichem Rang) immer am **Eigenumsatz des Partners**:
|
||||
|
||||
- **Partner A** (Diamant, 2,5 %) ist Sponsor von **Partner B** (Diamant, 2,5 %).
|
||||
- **Punkte von B (Eigenbestellung/Kunden):**
|
||||
- Partner B erhält darauf _keinen_ Tiefenbonus (man kriegt keinen Tiefenbonus auf sich selbst).
|
||||
- Partner B zieht also **0 %** vom Topf ab.
|
||||
- **Partner A erhält die vollen 2,5 % auf die Punkte von B.**
|
||||
- **Punkte UNTER B (Team von B):**
|
||||
- Partner B greift hier zu (Start ab Ebene 1) und nimmt sich **2,5 %**.
|
||||
- Partner A rechnet: 2,5 % - 2,5 % = **0 %**.
|
||||
- **Partner A ist hier blockiert.**
|
||||
|
||||
> Fazit: Bei gleichem Rang verdient man nur an den direkten Points des Partners (GAP), aber nicht mehr an dessen Team.
|
||||
|
||||
---
|
||||
|
||||
### 3. Das Szenario (A -> B -> F)
|
||||
|
||||
Wir schauen uns deine Struktur mit 3 Diamanten in einer Linie an. Alle haben Anspruch auf **2,5 %**.
|
||||
|
||||
- **Partner A** (Ebene 1)
|
||||
- **Partner B** (Ebene 2, direkt unter A)
|
||||
- ... dazwischen Berater ohne Status ...
|
||||
- **Partner F** (Ebene 6, unter B)
|
||||
- ... Punkte entstehen unter F ...
|
||||
|
||||
### Bereich 1: Punkte von Partner B
|
||||
|
||||
- Das ist für **A** die Ebene 1.
|
||||
- B blockiert nicht (da Eigenumsatz).
|
||||
- **Ergebnis:** **A erhält 2,5 %**.
|
||||
|
||||
### Bereich 2: Punkte ZWISCHEN B und F (Ebene 3 bis 6)
|
||||
|
||||
- Hier entstehen Punkte im Team von B.
|
||||
- **Sicht B:** Er ist qualifiziert (Start ab Ebene 1). Er nimmt sich **2,5 %**.
|
||||
- **Sicht A:** Er hat Anspruch auf 2,5 %. B hat aber schon 2,5 % genommen. Differenz = 0 %.
|
||||
- **Ergebnis:** **B erhält 2,5 %**. A geht leer aus.
|
||||
|
||||
### Bereich 3: Punkte von Partner F
|
||||
|
||||
- Das ist für **B** eine Ebene in seiner Downline.
|
||||
- F blockiert hier noch nicht (Eigenumsatz).
|
||||
- **Ergebnis:** **B erhält 2,5 %** auf die Punkte von F.
|
||||
|
||||
### Bereich 4: Punkte UNTER F (ab Ebene 7)
|
||||
|
||||
- Hier entstehen Punkte im Team von F.
|
||||
- **Sicht F:** Er ist qualifiziert (Start ab Ebene 1). Er nimmt sich **2,5 %**.
|
||||
- **Sicht B:** Anspruch 2,5 %. F hat schon 2,5 % genommen. Differenz = 0 %.
|
||||
- **Sicht A:** Anspruch 2,5 %. B (und F) haben alles genommen. Differenz = 0 %.
|
||||
- **Ergebnis:** **F erhält 2,5 %**. B und A gehen leer aus.
|
||||
|
||||
---
|
||||
|
||||
### 4. Zusammenfassung für die IT-Logik
|
||||
|
||||
1. **Trigger:** Ein Umsatz (Points) entsteht bei User X.
|
||||
2. **Schleife:** Gehe die Upline hoch (Sponsor -> Sponsor...).
|
||||
3. **Prüfung:**
|
||||
- Hat der Upline-Partner einen Status? (z.B. Diamant).
|
||||
- (Keine Prüfung auf Ebene mehr nötig, da Start immer ab Ebene 1).
|
||||
4. **Rechnung:**
|
||||
- Auszahlung = Mein %-Satz - Bereits verteilter %-Satz.
|
||||
- Wenn Auszahlung > 0: Speichern.
|
||||
- Setze `Bereits verteilter %-Satz` auf den neuen Wert (also `Mein %-Satz`).
|
||||
|
||||
---
|
||||
|
||||
## Code-Implementierung
|
||||
|
||||
Diese Implementierung nutzt eine **rekursive Aggregation von Volumen nach "Schutz-Level"**.
|
||||
Anstatt für jede Transaktion die Upline hochzulaufen ("Push"), holt sich der User die aggregierten Volumina seiner Downline gruppiert nach dem bereits beanspruchten Prozentsatz ("Pull").
|
||||
|
||||
### A. Neue Methode `getVolumeByProtectionLevel()`
|
||||
|
||||
Diese Methode liefert ein Array zurück, das das Volumen nach "bereits verteiltem Prozentsatz" gruppiert.
|
||||
Format: `['0.0' => 1000, '1.5' => 5000, ...]`
|
||||
|
||||
```php
|
||||
/**
|
||||
* Liefert das Volumen der Downline gruppiert nach dem "bereits verteilten Prozentsatz" (Protection Level).
|
||||
* Rekursive Funktion, die die "Differenz-Logik" vorbereitet.
|
||||
*
|
||||
* @return array<string, float> Key = Protected Percent, Value = Volume Points
|
||||
*/
|
||||
public function getVolumeByProtectionLevel(): array
|
||||
{
|
||||
$volumes = [];
|
||||
|
||||
// 1. Eigenes Volumen (Unprotected / GAP)
|
||||
// Man selbst schützt seinen eigenen Umsatz NICHT vor der Upline.
|
||||
// Daher Start mit Protection Level 0.0 (oder dem was von unten kommt, aber hier ist es ja Eigenumsatz)
|
||||
|
||||
// WICHTIG: Wir nutzen das Feld, das auch TreeCalcBot für die Punkte nutzt
|
||||
// sales_volume_points_TP_sum scheint in der DB/Model Logik für das relevante Volumen zu stehen
|
||||
$ownVolume = (float) ($this->b_user->sales_volume_points_TP_sum ?? 0);
|
||||
|
||||
if ($ownVolume > 0) {
|
||||
$key = '0.0';
|
||||
if (!isset($volumes[$key])) $volumes[$key] = 0.0;
|
||||
$volumes[$key] += $ownVolume;
|
||||
}
|
||||
|
||||
// 2. Mein Schutz-Level ermitteln
|
||||
// Das ist der Prozentsatz, den ICH auf mein Team beanspruche.
|
||||
// Alles Volumen, das durch MICH hindurch zur Upline fließt, hat mindestens diesen Schutz-Level.
|
||||
$myProtectionPercent = 0.0;
|
||||
if ($this->isQualLevel()) {
|
||||
$qual = $this->b_user->qual_user_level;
|
||||
if (!empty($qual['growth_bonus'])) {
|
||||
$myProtectionPercent = (float) $qual['growth_bonus'];
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Kinder verarbeiten
|
||||
if (!empty($this->businessUserItems)) {
|
||||
foreach ($this->businessUserItems as $childItem) {
|
||||
|
||||
// Rekursion: Hol dir die Volumen-Töpfe aus der Downline
|
||||
// Hinweis: Hier muss sichergestellt sein, dass die Kinder geladen sind.
|
||||
// initBusinesslUserDetail lädt normalerweise die Struktur.
|
||||
|
||||
// Falls Kinder nicht geladen sind, müssten sie hier theoretisch geladen werden.
|
||||
// Wir gehen davon aus, dass die Struktur bereits rekursiv via readParentsBusinessUsers geladen wurde.
|
||||
|
||||
$childVolumes = $childItem->getVolumeByProtectionLevel();
|
||||
|
||||
// 4. Schutz-Level anwenden (Aggregation)
|
||||
foreach ($childVolumes as $protectedPercentStr => $vol) {
|
||||
$incomingProtection = (float) $protectedPercentStr;
|
||||
|
||||
// Das Volumen ist bereits mit $incomingProtection geschützt.
|
||||
// Da es nun durch MICH fließt, erhöht sich der Schutz auf MEINEN Level (falls meiner höher ist).
|
||||
$effectiveProtection = max($incomingProtection, $myProtectionPercent);
|
||||
|
||||
$newKey = (string) $effectiveProtection;
|
||||
|
||||
if (!isset($volumes[$newKey])) $volumes[$newKey] = 0.0;
|
||||
$volumes[$newKey] += $vol;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $volumes;
|
||||
}
|
||||
```
|
||||
|
||||
### B. Neue Methode `calculateGrowthBonusRecursive()`
|
||||
|
||||
Diese Methode ersetzt die bisherige Berechnung und nutzt die oben definierte Aggregation.
|
||||
|
||||
```php
|
||||
/**
|
||||
* Berechnet den Growth Bonus (Tiefenbonus) basierend auf der Differenz-Logik.
|
||||
*/
|
||||
private function calculateGrowthBonusRecursive($qualUserLevel): float
|
||||
{
|
||||
if (empty($qualUserLevel->growth_bonus) || $qualUserLevel->growth_bonus <= 0) {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
$myGrowthPercent = (float) $qualUserLevel->growth_bonus;
|
||||
$totalGrowthBonus = 0.0;
|
||||
|
||||
// Wir iterieren über alle direkten Beine (Firstlines)
|
||||
foreach ($this->businessUserItems as $childItem) {
|
||||
|
||||
// Volumen-Verteilung aus diesem Bein abrufen
|
||||
// Das Kind liefert uns: "Hier sind 1000 Punkte geschützt mit 0%, 5000 Punkte geschützt mit 1.5%"
|
||||
$volumeDistribution = $childItem->getVolumeByProtectionLevel();
|
||||
|
||||
foreach ($volumeDistribution as $protectedPercentStr => $volume) {
|
||||
$alreadyDistributedPercent = (float) $protectedPercentStr;
|
||||
|
||||
// Differenz berechnen
|
||||
// Mein Anspruch MINUS was schon verteilt wurde
|
||||
$mySharePercent = max(0, $myGrowthPercent - $alreadyDistributedPercent);
|
||||
|
||||
if ($mySharePercent > 0) {
|
||||
$commission = round($volume / 100 * $mySharePercent, 2);
|
||||
$totalGrowthBonus += $commission;
|
||||
|
||||
// Optional Logging
|
||||
// \Log::debug("Growth Bonus: User {$this->b_user->user_id} earns {$mySharePercent}% on {$volume} pts (Protected: {$alreadyDistributedPercent}%) from leg {$childItem->b_user->user_id}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $totalGrowthBonus;
|
||||
}
|
||||
```
|
||||
|
||||
### C. Integration in `calculateCommissions`
|
||||
|
||||
```php
|
||||
private function calculateCommissions($qualUserLevel): void
|
||||
{
|
||||
$commission_pp_total = 0;
|
||||
|
||||
// 1. Normale Unilevel Provision (Payline) - NUR pr_line_X Werte
|
||||
for ($i = 1; $i <= $qualUserLevel->paylines; $i++) {
|
||||
if (isset($this->b_user->business_lines[$i])) {
|
||||
$object = $this->b_user->business_lines[$i];
|
||||
$margin = (float) $this->b_user->qual_user_level['pr_line_' . $i];
|
||||
|
||||
$points = is_array($object) ? ((float)($object['points'] ?? 0)) : ((float)($object->points ?? 0));
|
||||
|
||||
$commission = round($points / 100 * $margin, 2);
|
||||
$commission_pp_total += $commission;
|
||||
|
||||
// Rückschreiben
|
||||
if (is_array($object)) {
|
||||
$object['margin'] = $margin;
|
||||
$object['commission'] = $commission;
|
||||
$object['payline'] = true;
|
||||
} else {
|
||||
$object->margin = $margin;
|
||||
$object->commission = $commission;
|
||||
$object->payline = true;
|
||||
}
|
||||
$this->b_user->business_lines[$i] = $object;
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Growth Bonus - Unterscheidung Legacy vs. Neu
|
||||
$commission_growth_total = 0;
|
||||
|
||||
if (!empty($qualUserLevel->growth_bonus)) {
|
||||
// Stichtag: 01.11.2025
|
||||
$isLegacy = ($this->date->year < 2025) ||
|
||||
($this->date->year == 2025 && $this->date->month < 11);
|
||||
|
||||
if ($isLegacy) {
|
||||
// ALT: Pauschal ab Ebene paylines+1 (FALSCH - doppelte Auszahlung!)
|
||||
$commission_growth_total = $this->calculateLegacyGrowthBonus($qualUserLevel);
|
||||
} else {
|
||||
// NEU: Differenz-Logik via GrowthBonusCalculator
|
||||
$commission_growth_total = $this->calculateGrowthBonusRecursive($qualUserLevel);
|
||||
}
|
||||
}
|
||||
|
||||
$this->b_user->commission_pp_total = $commission_pp_total;
|
||||
$this->b_user->commission_growth_total = $commission_growth_total;
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Legacy-Berechnung (vor November 2025) - DEPRECATED
|
||||
|
||||
**⚠️ Diese Logik war FALSCH und führte zu doppelter Auszahlung!**
|
||||
|
||||
```php
|
||||
/**
|
||||
* ALT: Pauschal Growth Bonus ab Ebene paylines+1
|
||||
* PROBLEM: Growth Bonus war bereits in pr_line_X enthalten!
|
||||
*/
|
||||
private function calculateLegacyGrowthBonus($qualUserLevel): float
|
||||
{
|
||||
$commission_growth_total = 0;
|
||||
|
||||
// Start ab Ebene paylines+1 (z.B. 7 bei Gold)
|
||||
$payline = (int) ($this->b_user->qual_user_level['paylines'] ?? 0) + 1;
|
||||
$maxlines = count($this->b_user->business_lines ?? []) + 1;
|
||||
$growth_bonus = (float) ($this->b_user->qual_user_level['growth_bonus'] ?? 0);
|
||||
|
||||
// Auf JEDE Ebene ab payline wird der volle Growth Bonus gezahlt
|
||||
// OHNE Differenz-Prüfung = FALSCH!
|
||||
for ($i = $payline; $i <= $maxlines; $i++) {
|
||||
if (isset($this->b_user->business_lines[$i])) {
|
||||
$points = $this->b_user->business_lines[$i]['points'] ?? 0;
|
||||
$commission = round($points / 100 * $growth_bonus, 2);
|
||||
$commission_growth_total += $commission;
|
||||
}
|
||||
}
|
||||
|
||||
return $commission_growth_total;
|
||||
}
|
||||
```
|
||||
|
||||
**Warum war das falsch?**
|
||||
|
||||
1. `pr_line_1` bei Gold = 9% (enthielt bereits 2% Growth Bonus)
|
||||
2. Growth Bonus wurde ab Ebene 7 NOCHMAL mit 2% berechnet
|
||||
3. = **Doppelte Auszahlung** auf tieferen Ebenen
|
||||
|
||||
---
|
||||
|
||||
## Neue Berechnung (ab November 2025) - KORREKT
|
||||
|
||||
Der `GrowthBonusCalculator` verwendet die Differenz-Logik:
|
||||
|
||||
1. **Aggregation:** Sammelt Volumen gruppiert nach "Schutz-Level"
|
||||
2. **Differenz:** Berechnet nur die Differenz (mein Anspruch - bereits verteilt)
|
||||
3. **Einmal pro Bein:** Growth Bonus wird nur einmal pro Firstline-Zweig ausgezahlt
|
||||
|
||||
Siehe `GrowthBonusCalculator.php` für die Implementation.
|
||||
318
dev/buinessPlan/_bak/GrowthBonusCalculator.php
Normal file
318
dev/buinessPlan/_bak/GrowthBonusCalculator.php
Normal file
|
|
@ -0,0 +1,318 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\BusinessPlan;
|
||||
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
/**
|
||||
* Service für die Berechnung des Growth Bonus (Tiefenbonus)
|
||||
* Implementiert die Differenz-Bonus-Logik ab Ebene 1
|
||||
*/
|
||||
class GrowthBonusCalculator
|
||||
{
|
||||
/**
|
||||
* Berechnet den Growth Bonus für einen BusinessUserItemOptimized
|
||||
*
|
||||
* @param BusinessUserItemOptimized $userItem Der User, für den der Bonus berechnet wird
|
||||
* @param object $qualUserLevel Das Qualifikations-Level-Objekt des Users
|
||||
* @return float Der berechnete Bonus
|
||||
*/
|
||||
public function calculate(BusinessUserItemOptimized $userItem, $qualUserLevel): float
|
||||
{
|
||||
// Basis-Check: Hat der User überhaupt Anspruch auf Growth Bonus?
|
||||
if (empty($qualUserLevel->growth_bonus) || $qualUserLevel->growth_bonus <= 0) {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
// Falls keine direkte Downline-Struktur geladen ist, kann kein Growth Bonus berechnet werden
|
||||
if (empty($userItem->businessUserItems) && !empty($userItem->business_lines)) {
|
||||
Log::warning("GrowthBonusCalculator: Growth Bonus calculation requires loaded child structure (businessUserItems is empty for user {$userItem->user_id})");
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
return $this->calculateRecursive($userItem, $qualUserLevel);
|
||||
}
|
||||
|
||||
/**
|
||||
* Führt die eigentliche Berechnung basierend auf der Differenz-Logik durch
|
||||
*/
|
||||
private function calculateRecursive(BusinessUserItemOptimized $userItem, $qualUserLevel): float
|
||||
{
|
||||
$myGrowthPercent = (float) $qualUserLevel->growth_bonus;
|
||||
$totalGrowthBonus = 0.0;
|
||||
|
||||
// Iteriere über alle direkten Beine (Firstlines)
|
||||
foreach ($userItem->businessUserItems as $childItem) {
|
||||
|
||||
// Hole die Volumen-Verteilung aus diesem Bein
|
||||
// Array-Format: ['0.0' => 1000, '1.5' => 5000]
|
||||
// Bedeutung: 1000 Punkte sind mit 0% geschützt, 5000 Punkte mit 1.5%
|
||||
$volumeDistribution = $this->getVolumeByProtectionLevel($childItem);
|
||||
|
||||
foreach ($volumeDistribution as $protectedPercentStr => $volume) {
|
||||
$alreadyDistributedPercent = (float) $protectedPercentStr;
|
||||
|
||||
// Differenz berechnen: Mein Anspruch MINUS was schon verteilt wurde
|
||||
$mySharePercent = max(0, $myGrowthPercent - $alreadyDistributedPercent);
|
||||
|
||||
if ($mySharePercent > 0) {
|
||||
$commission = round($volume / 100 * $mySharePercent, 2);
|
||||
$totalGrowthBonus += $commission;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $totalGrowthBonus;
|
||||
}
|
||||
|
||||
/**
|
||||
* Liefert detaillierte Informationen zur Berechnung für die Anzeige
|
||||
*
|
||||
* @return array Detaillierte Aufschlüsselung pro Bein
|
||||
*/
|
||||
public function getCalculationDetails(BusinessUserItemOptimized $userItem, $qualUserLevel): array
|
||||
{
|
||||
$details = [];
|
||||
if (empty($qualUserLevel->growth_bonus) || $qualUserLevel->growth_bonus <= 0) {
|
||||
return $details;
|
||||
}
|
||||
|
||||
$myGrowthPercent = (float) $qualUserLevel->growth_bonus;
|
||||
|
||||
// Iteriere über alle direkten Beine (Firstlines)
|
||||
foreach ($userItem->businessUserItems as $childItem) {
|
||||
$legDetails = [
|
||||
'user_id' => $childItem->user_id,
|
||||
'first_name' => $childItem->first_name,
|
||||
'last_name' => $childItem->last_name,
|
||||
'level_name' => $childItem->user_level_name,
|
||||
'volume_distribution' => [],
|
||||
'total_commission' => 0.0,
|
||||
'total_volume' => 0.0
|
||||
];
|
||||
|
||||
$volumeDistribution = $this->getVolumeByProtectionLevel($childItem);
|
||||
|
||||
foreach ($volumeDistribution as $protectedPercentStr => $volume) {
|
||||
$alreadyDistributedPercent = (float) $protectedPercentStr;
|
||||
$mySharePercent = max(0, $myGrowthPercent - $alreadyDistributedPercent);
|
||||
$commission = 0.0;
|
||||
|
||||
if ($mySharePercent > 0) {
|
||||
$commission = round($volume / 100 * $mySharePercent, 2);
|
||||
}
|
||||
|
||||
$legDetails['volume_distribution'][] = [
|
||||
'protected_percent' => $alreadyDistributedPercent,
|
||||
'volume' => $volume,
|
||||
'my_share_percent' => $mySharePercent,
|
||||
'commission' => $commission
|
||||
];
|
||||
|
||||
$legDetails['total_commission'] += $commission;
|
||||
$legDetails['total_volume'] += $volume;
|
||||
}
|
||||
|
||||
// Sortiere nach Protection Level
|
||||
usort($legDetails['volume_distribution'], function ($a, $b) {
|
||||
return $a['protected_percent'] <=> $b['protected_percent'];
|
||||
});
|
||||
|
||||
if ($legDetails['total_volume'] > 0) {
|
||||
$details[] = $legDetails;
|
||||
}
|
||||
}
|
||||
|
||||
// Sortiere Beine nach höchster Provision
|
||||
usort($details, function ($a, $b) {
|
||||
return $b['total_commission'] <=> $a['total_commission'];
|
||||
});
|
||||
|
||||
return $details;
|
||||
}
|
||||
|
||||
/**
|
||||
* Liefert eine Matrix-Sicht für die detaillierte Darstellung
|
||||
* Zeilen = Beine (Legs), Spalten = Ebenen (Levels)
|
||||
*/
|
||||
public function getMatrixDetails(BusinessUserItemOptimized $userItem, $qualUserLevel): array
|
||||
{
|
||||
$details = [];
|
||||
if (empty($qualUserLevel->growth_bonus) || $qualUserLevel->growth_bonus <= 0) {
|
||||
return $details;
|
||||
}
|
||||
|
||||
$myGrowthPercent = (float) $qualUserLevel->growth_bonus;
|
||||
|
||||
foreach ($userItem->businessUserItems as $childItem) {
|
||||
|
||||
$legData = [
|
||||
'user' => [
|
||||
'id' => $childItem->user_id,
|
||||
'name' => $childItem->first_name . ' ' . $childItem->last_name,
|
||||
'level' => $childItem->user_level_name
|
||||
],
|
||||
'levels' => [],
|
||||
'total_commission' => 0.0,
|
||||
'total_volume' => 0.0
|
||||
];
|
||||
|
||||
// Rekursiv die Ebenen dieses Beins einsammeln
|
||||
// Start bei Ebene 1 (das ist das Kind selbst)
|
||||
// Initial Protection ist 0 (vom Upline/Mir kommt kein Schutz, der relevant wäre, da ICH ja der Empfänger bin)
|
||||
$this->collectLegLevels($childItem, 1, 0.0, $myGrowthPercent, $legData);
|
||||
|
||||
if (!empty($legData['levels'])) {
|
||||
// Sortieren nach Ebenen-Index
|
||||
ksort($legData['levels']);
|
||||
$details[] = $legData;
|
||||
}
|
||||
}
|
||||
|
||||
// Sortieren nach Gesamt-Provision
|
||||
usort($details, function ($a, $b) {
|
||||
return $b['total_commission'] <=> $a['total_commission'];
|
||||
});
|
||||
|
||||
return $details;
|
||||
}
|
||||
|
||||
/**
|
||||
* Rekursive Hilfsfunktion für Matrix-Daten
|
||||
*/
|
||||
private function collectLegLevels(BusinessUserItemOptimized $item, int $level, float $incomingProtection, float $myPercent, array &$legData)
|
||||
{
|
||||
// 1. Eigenen Status ermitteln (Schutz für Downline)
|
||||
// WICHTIG: Nutze getQualifiedGrowthBonus() für das ERREICHTE Qualifikations-Level des Monats
|
||||
// Nicht getActiveGrowthBonus() verwenden, da das das aktuelle Karriere-Level wäre!
|
||||
$userProtection = $item->getQualifiedGrowthBonus();
|
||||
$userLevelName = '';
|
||||
|
||||
if ($userProtection > 0) {
|
||||
$qual = $item->getQualUserLevel();
|
||||
$userLevelName = is_array($qual) ? ($qual['name'] ?? '') : ($qual->name ?? '');
|
||||
}
|
||||
|
||||
// Berechnung für diesen User (Ebene)
|
||||
$volume = (float) ($item->sales_volume_points_TP_sum ?? 0);
|
||||
|
||||
// Auch User ohne Volumen in die Matrix aufnehmen, wenn sie einen Status haben (Blocker sichtbar machen)
|
||||
// Aber wir brauchen Volumen für die Relevanz. Wenn Volumen 0, dann ist der Block hier (noch) egal,
|
||||
// wirkt aber auf die Ebenen darunter.
|
||||
|
||||
if ($volume > 0 || $userProtection > 0) {
|
||||
// WICHTIG: Der effektive Schutz ist das MAXIMUM aus:
|
||||
// - Schutz von oben ($incomingProtection)
|
||||
// - Eigener Schutz des Users ($userProtection)
|
||||
// Der User schützt sein EIGENES Volumen mit seinem eigenen Growth Bonus!
|
||||
$effectiveProtection = max($incomingProtection, $userProtection);
|
||||
$diffPercent = max(0, $myPercent - $effectiveProtection);
|
||||
$commission = round($volume / 100 * $diffPercent, 2);
|
||||
|
||||
if (!isset($legData['levels'][$level])) {
|
||||
$legData['levels'][$level] = [
|
||||
'volume' => 0.0,
|
||||
'commission' => 0.0,
|
||||
'details' => [],
|
||||
'has_blocker' => false, // Flag für UI
|
||||
'blocker_name' => ''
|
||||
];
|
||||
}
|
||||
|
||||
$legData['levels'][$level]['volume'] += $volume;
|
||||
$legData['levels'][$level]['commission'] += $commission;
|
||||
|
||||
// Markiere Blocker
|
||||
if ($userProtection > 0) {
|
||||
$legData['levels'][$level]['has_blocker'] = true;
|
||||
$legData['levels'][$level]['blocker_name'] = $userLevelName . ' (' . $userProtection . '%)';
|
||||
}
|
||||
|
||||
// Detail-Information für Hover/Debug
|
||||
$legData['levels'][$level]['details'][] = [
|
||||
'u' => $item->user_id,
|
||||
'n' => $item->first_name . ' ' . $item->last_name, // Name für Tooltip
|
||||
'v' => $volume,
|
||||
'p_in' => $incomingProtection,
|
||||
'p_own' => $userProtection,
|
||||
'pct' => $diffPercent
|
||||
];
|
||||
|
||||
$legData['total_volume'] += $volume;
|
||||
$legData['total_commission'] += $commission;
|
||||
}
|
||||
|
||||
// Protection für nächste Ebene: Maximum aus was von oben kam und was dieser User beansprucht
|
||||
$nextProtection = max($incomingProtection, $userProtection);
|
||||
|
||||
// Rekursion (Begrenzt auf 30 Ebenen für Anzeige)
|
||||
if ($level < 30 && !empty($item->businessUserItems)) {
|
||||
foreach ($item->businessUserItems as $child) {
|
||||
$this->collectLegLevels($child, $level + 1, $nextProtection, $myPercent, $legData);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Liefert das Volumen der Downline eines Users gruppiert nach dem "bereits verteilten Prozentsatz" (Protection Level).
|
||||
* Rekursive Funktion, die die "Differenz-Logik" vorbereitet.
|
||||
*
|
||||
* @param BusinessUserItemOptimized $item
|
||||
* @return array<string, float> Key = Protected Percent, Value = Volume Points
|
||||
*/
|
||||
public function getVolumeByProtectionLevel(BusinessUserItemOptimized $item): array
|
||||
{
|
||||
// WICHTIG: Nur calcQualPP aufrufen wenn KEINE gespeicherten Daten vorhanden sind
|
||||
// Bei gespeicherten Daten ist qual_user_level bereits vorhanden, auch wenn qualificationCalculated=false
|
||||
if (!$item->isQualificationCalculated() && !$item->isQualLevel()) {
|
||||
$item->calcQualPP();
|
||||
}
|
||||
|
||||
$volumes = [];
|
||||
|
||||
// 1. Eigenes Volumen (Unprotected / GAP)
|
||||
// Man selbst schützt seinen eigenen Umsatz NICHT vor der Upline.
|
||||
// Daher Start mit Protection Level 0.0
|
||||
$ownVolume = (float) ($item->sales_volume_points_TP_sum ?? 0);
|
||||
|
||||
if ($ownVolume > 0) {
|
||||
$key = '0.0';
|
||||
$volumes[$key] = $ownVolume;
|
||||
}
|
||||
|
||||
// 2. Mein Schutz-Level ermitteln (für das Volumen, das durch mich hindurch fließt)
|
||||
// WICHTIG: Nutze getQualifiedGrowthBonus() für das ERREICHTE Qualifikations-Level des Monats
|
||||
// Nicht getActiveGrowthBonus() verwenden, da das das aktuelle Karriere-Level wäre!
|
||||
$myProtectionPercent = $item->getQualifiedGrowthBonus();
|
||||
|
||||
// Debug-Logging für Troubleshooting
|
||||
Log::debug("GrowthBonusCalculator: User {$item->user_id} - qualifiedGrowthBonus={$myProtectionPercent}%, activeGrowthBonus={$item->getActiveGrowthBonus()}%, isQualLevel=" . ($item->isQualLevel() ? 'true' : 'false'));
|
||||
|
||||
// 3. Rekursive Aggregation der Kinder
|
||||
if (!empty($item->businessUserItems)) {
|
||||
foreach ($item->businessUserItems as $childItem) {
|
||||
|
||||
// Rekursiver Aufruf
|
||||
$childVolumes = $this->getVolumeByProtectionLevel($childItem);
|
||||
|
||||
// 4. Schutz-Level anwenden und aggregieren
|
||||
foreach ($childVolumes as $protectedPercentStr => $vol) {
|
||||
$incomingProtection = (float) $protectedPercentStr;
|
||||
|
||||
// Das Volumen ist bereits mit $incomingProtection geschützt.
|
||||
// Da es nun durch diesen User fließt, erhöht sich der Schutz auf dessen Level (falls höher).
|
||||
$effectiveProtection = max($incomingProtection, $myProtectionPercent);
|
||||
|
||||
$newKey = (string) $effectiveProtection;
|
||||
|
||||
if (!isset($volumes[$newKey])) {
|
||||
$volumes[$newKey] = 0.0;
|
||||
}
|
||||
$volumes[$newKey] += $vol;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $volumes;
|
||||
}
|
||||
}
|
||||
263
dev/buinessPlan/_bak/SalesPointsVolume.php
Normal file
263
dev/buinessPlan/_bak/SalesPointsVolume.php
Normal file
|
|
@ -0,0 +1,263 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services\BusinessPlan;
|
||||
|
||||
use App\User;
|
||||
use stdClass;
|
||||
use App\Services\Util;
|
||||
use App\Models\ShoppingOrder;
|
||||
use App\Models\UserSalesVolume;
|
||||
use App\Events\BusinessDataChanged;
|
||||
|
||||
class SalesPointsVolume
|
||||
{
|
||||
|
||||
public static function changeSalesPointsVolumeUser(ShoppingOrder $shoppingOrder, $to_user_id)
|
||||
{
|
||||
|
||||
if ($shoppingOrder->user_sales_volume) {
|
||||
$to_user_id = intval($to_user_id);
|
||||
if ($shoppingOrder->user_sales_volume->user_id === $to_user_id) {
|
||||
\Session()->flash('alert-error', 'Keine Änderung: selber Berater');
|
||||
return;
|
||||
}
|
||||
if (!$shoppingOrder->user_sales_volume->isCurrentMonthYear()) {
|
||||
\Session()->flash('alert-error', 'Änderung muss im selben Monat sein');
|
||||
return;
|
||||
}
|
||||
|
||||
$month = $shoppingOrder->user_sales_volume->month;
|
||||
$year = $shoppingOrder->user_sales_volume->year;
|
||||
$form_user_id = $shoppingOrder->user_sales_volume->user_id;
|
||||
|
||||
$to_user = User::find($to_user_id);
|
||||
$form_user = User::find($form_user_id);
|
||||
|
||||
$shoppingOrder->user_sales_volume->user_id = $to_user_id;
|
||||
$shoppingOrder->user_sales_volume->message = 'zugewiesen: ' . date('d.m.Y');
|
||||
|
||||
$syslog = $shoppingOrder->user_sales_volume->syslog;
|
||||
$from_email = $form_user ? $form_user->email : '';
|
||||
$to_email = $to_user ? $to_user->email : '';
|
||||
$syslog[date('d.m.Y-h:i:s')] = 'change form: #' . $form_user_id . ' ' . $from_email . ' to: #' . $to_user_id . ' ' . $to_email;
|
||||
$shoppingOrder->user_sales_volume->syslog = $syslog;
|
||||
|
||||
$shoppingOrder->user_sales_volume->save();
|
||||
|
||||
//recalculate
|
||||
self::reCalculateSalesPointsVolume($to_user_id, $month, $year);
|
||||
self::reCalculateSalesPointsVolume($form_user_id, $month, $year);
|
||||
\Session()->flash('alert-save', true);
|
||||
}
|
||||
}
|
||||
|
||||
private static function add_KP_TP_Points($userSalesVolume, $month_points)
|
||||
{
|
||||
if ($userSalesVolume->status_points === 2) { //KP
|
||||
$month_points->KP += $userSalesVolume->points;
|
||||
} else {
|
||||
// === 1 //TP + KP
|
||||
$month_points->KP += $userSalesVolume->points;
|
||||
$month_points->TP += $userSalesVolume->points;
|
||||
}
|
||||
return $month_points;
|
||||
}
|
||||
|
||||
public static function reCalculateSalesPointsVolume($user_id, $month, $year)
|
||||
{
|
||||
|
||||
$userSalesVolumes = UserSalesVolume::where('user_id', $user_id)->where('month', $month)->where('year', $year)->orderBy('id', 'ASC')->get();
|
||||
$month_points = new stdClass();
|
||||
$month_points->KP = 0;
|
||||
$month_points->TP = 0;
|
||||
$month_total_net = 0;
|
||||
$month_shop_points = 0;
|
||||
$month_shop_total_net = 0;
|
||||
//TDOO Status === 3???
|
||||
|
||||
foreach ($userSalesVolumes as $userSalesVolume) {
|
||||
switch ($userSalesVolume->status) {
|
||||
case 1: //Bestellung Berater
|
||||
$month_points = self::add_KP_TP_Points($userSalesVolume, $month_points);
|
||||
$month_total_net += $userSalesVolume->total_net;
|
||||
break;
|
||||
case 2: //Shop
|
||||
$month_shop_points += $userSalesVolume->points;
|
||||
$month_shop_total_net += $userSalesVolume->total_net;
|
||||
break;
|
||||
case 4: //Gutschrift
|
||||
$month_points = self::add_KP_TP_Points($userSalesVolume, $month_points);
|
||||
|
||||
if ($userSalesVolume->status_turnover === 2) {
|
||||
$month_shop_total_net += $userSalesVolume->total_net;
|
||||
//ggf hier zu den Shop Points zählen wäre aber immer KP + TP kann nicht keine trennung bei month_shop_points
|
||||
} else {
|
||||
$month_total_net += $userSalesVolume->total_net;
|
||||
}
|
||||
|
||||
break;
|
||||
case 5: //Registrierung
|
||||
$month_points = self::add_KP_TP_Points($userSalesVolume, $month_points);
|
||||
$month_total_net += $userSalesVolume->total_net;
|
||||
break;
|
||||
}
|
||||
$userSalesVolume->month_shop_points = $month_shop_points;
|
||||
$userSalesVolume->month_shop_total_net = $month_shop_total_net;
|
||||
$userSalesVolume->month_KP_points = $month_points->KP;
|
||||
$userSalesVolume->month_TP_points = $month_points->TP;
|
||||
$userSalesVolume->month_total_net = $month_total_net;
|
||||
$userSalesVolume->save();
|
||||
}
|
||||
|
||||
// Event für Business-Neuberechnung (Bubble Up zur Upline)
|
||||
if ($user_id) {
|
||||
event(new BusinessDataChanged($user_id, BusinessDataChanged::TYPE_SALES_VOLUME, (int)$month, (int)$year));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static function addSalesPointsVolumeUser(ShoppingOrder $shoppingOrder)
|
||||
{
|
||||
|
||||
/*
|
||||
status
|
||||
1 => 'hinzugefügt aus Bestellung',
|
||||
2 => 'hinzugefügt aus Shop',
|
||||
3 => 'hinzugefügt aus Shop / pending',
|
||||
*/
|
||||
|
||||
$status = self::getStatusByOrderPaymentFor($shoppingOrder);
|
||||
$user_id = $shoppingOrder->auth_user_id ? $shoppingOrder->auth_user_id : $shoppingOrder->member_id;
|
||||
//akuteller tag / Monat.
|
||||
$month = date('m');
|
||||
$year = date('Y');
|
||||
$date = date('d.m.Y');
|
||||
|
||||
|
||||
if ($status === 3) { //shop bestellung User pending if is_like
|
||||
$user_id = NULL;
|
||||
}
|
||||
$user_sales_volume = UserSalesVolume::create([
|
||||
'user_id' => $user_id,
|
||||
'shopping_order_id' => $shoppingOrder->id,
|
||||
'month' => $month,
|
||||
'year' => $year,
|
||||
'date' => $date,
|
||||
'points' => $shoppingOrder->points,
|
||||
'total_net' => $shoppingOrder->subtotal,
|
||||
'status_points' => 1, //KP + TP
|
||||
'message' => '',
|
||||
'status' => $status,
|
||||
]);
|
||||
|
||||
if ($status !== 3) {
|
||||
self::reCalculateSalesPointsVolume($user_sales_volume->user_id, $user_sales_volume->month, $user_sales_volume->year);
|
||||
}
|
||||
|
||||
return $user_sales_volume;
|
||||
}
|
||||
|
||||
public static function setToUserAndReCalculate(UserSalesVolume $user_sales_volume, $user_id)
|
||||
{
|
||||
|
||||
//set month year date new, calculate it in the currently month!
|
||||
//If the month has changed, it can no longer be added to the month before
|
||||
$month = date('m');
|
||||
$year = date('Y');
|
||||
$date = date('d.m.Y');
|
||||
|
||||
$user_sales_volume->user_id = $user_id;
|
||||
$user_sales_volume->month = $month;
|
||||
$user_sales_volume->year = $year;
|
||||
$user_sales_volume->date = $date;
|
||||
$user_sales_volume->status = 2; //hinzugefügt aus Shop can only Pending
|
||||
$user_sales_volume->save();
|
||||
|
||||
self::reCalculateSalesPointsVolume($user_id, $month, $year);
|
||||
}
|
||||
|
||||
public static function getStatusByOrderPaymentFor(ShoppingOrder $shoppingOrder)
|
||||
{
|
||||
if ($shoppingOrder->payment_for) {
|
||||
if ($shoppingOrder->payment_for === 6) { //Kunde-Shop
|
||||
if ($shoppingOrder->shopping_user && $shoppingOrder->shopping_user->is_like) {
|
||||
return 3; //shop Kunden, berater zuordnen <- need?
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
public static function editSalesPointsVolume($data)
|
||||
{
|
||||
$user_sales_volume = UserSalesVolume::findOrFail($data['id']);
|
||||
if (!$user_sales_volume->isCurrentMonthYear()) {
|
||||
\Session()->flash('alert-error', 'Änderung muss im selben Monat sein');
|
||||
return;
|
||||
}
|
||||
$old_points = $user_sales_volume->points;
|
||||
$old_total_net = $user_sales_volume->total_net;
|
||||
$user_sales_volume->total_net = Util::reFormatNumber($data['total_net']);
|
||||
$user_sales_volume->points = Util::reFormatNumber($data['points']);
|
||||
|
||||
$user_sales_volume->message = 'geändert: ' . date('d.m.Y');
|
||||
$user_sales_volume->info = $data['info'];
|
||||
$user_sales_volume->status_points = $data['status_points'];
|
||||
$user_sales_volume->status_turnover = isset($data['status_turnover']) ? intval($data['status_turnover']) : null;
|
||||
|
||||
$syslog = $user_sales_volume->syslog;
|
||||
$syslog[date('d.m.Y-h:i:s')] = 'edit points: #' . $old_points . ' ' . $user_sales_volume->points . ' total: #' . $old_total_net . ' ' . $user_sales_volume->total_net;
|
||||
$user_sales_volume->syslog = $syslog;
|
||||
|
||||
$user_sales_volume->save();
|
||||
|
||||
self::reCalculateSalesPointsVolume($user_sales_volume->user_id, $user_sales_volume->month, $user_sales_volume->year);
|
||||
|
||||
\Session()->flash('alert-success', "Points geändert");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
public static function addSalesPointsVolume($data)
|
||||
{
|
||||
|
||||
if (!isset($data['user_id'])) {
|
||||
\Session()->flash('alert-error', 'Kein Berater ausgewählt');
|
||||
return;
|
||||
}
|
||||
$user = User::findOrFail($data['user_id']);
|
||||
$month = date('m');
|
||||
$year = date('Y');
|
||||
$date = date('d.m.Y');
|
||||
|
||||
$total_net = isset($data['total_net']) ? Util::reFormatNumber($data['total_net']) : 0;
|
||||
$points = isset($data['points']) ? Util::reFormatNumber($data['points']) : 0;
|
||||
$syslog[date('d.m.Y-h:i:s')] = 'add points: #' . $points . ' total: #' . $total_net;
|
||||
$status = isset($data['status']) ? intval($data['status']) : 4;
|
||||
$status_turnover = isset($data['status_turnover']) ? intval($data['status_turnover']) : null;
|
||||
|
||||
$user_sales_volume = UserSalesVolume::create([
|
||||
'user_id' => $user->id,
|
||||
'shopping_order_id' => null,
|
||||
'month' => $month,
|
||||
'year' => $year,
|
||||
'date' => $date,
|
||||
'points' => $points,
|
||||
'status_points' => $data['status_points'],
|
||||
'status_turnover' => $status_turnover,
|
||||
'total_net' => $total_net,
|
||||
'message' => 'hinzugefügt: ' . date('d.m.Y'),
|
||||
'info' => $data['info'],
|
||||
'syslog' => $syslog,
|
||||
'status' => $status,
|
||||
]);
|
||||
|
||||
|
||||
self::reCalculateSalesPointsVolume($user_sales_volume->user_id, $user_sales_volume->month, $user_sales_volume->year);
|
||||
|
||||
\Session()->flash('alert-success', "Points hinzugefügt");
|
||||
}
|
||||
}
|
||||
1080
dev/buinessPlan/_bak/TreeCalcBotOptimized.php
Normal file
1080
dev/buinessPlan/_bak/TreeCalcBotOptimized.php
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue