diff --git a/dist/ROI.php b/dist/ROI.php
index 6a6854d..679873b 100644
--- a/dist/ROI.php
+++ b/dist/ROI.php
@@ -1,5 +1,6 @@
 <?php
-// ROI.php – Umsatz/Peak/Histogramm pro Artikel inkl. Bundleanteil
+// ROI.php – Umsatz/Peak/Histogramm pro Artikel inkl. Bundleanteil + Extern-Umsatz
+// + "Slot-Umsatz" (auftragsbasiert, nicht tagesbasiert) inkl. Bundleanteil in Modal
 // liegt in /dist
 
 require('../config.php');
@@ -12,7 +13,6 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
 
 $Epi = new Epirent();
 
@@ -37,22 +37,19 @@ function safeYmd(?string $ymd): ?string {
 }
 
 function ymdToTs(string $ymd): int {
-    // midnight local
-    return (new DateTime($ymd . ' 00:00:00'))->getTimestamp();
+    return (new DateTime($ymd . ' 00:00:00', new DateTimeZone('Europe/Berlin')))->getTimestamp();
 }
 
 function tsToYmd(int $ts): string {
     return (new DateTime('@' . $ts))->setTimezone(new DateTimeZone('Europe/Berlin'))->format('Y-m-d');
 }
 
-function base64Json(array $data): string {
+function base64Json($data): string {
     return base64_encode(json_encode($data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
 }
 
 function apiJsonDecode($raw) {
-    // requestEpiApi kann je nach Implementierung string ODER Stream liefern
     if (is_object($raw)) {
-        // Guzzle Stream etc.
         if (method_exists($raw, 'getContents')) {
             $raw = $raw->getContents();
         } else {
@@ -60,8 +57,7 @@ function apiJsonDecode($raw) {
         }
     }
     if (!is_string($raw)) $raw = (string)$raw;
-    $obj = json_decode($raw);
-    return $obj;
+    return json_decode($raw);
 }
 
 /* =========================
@@ -97,15 +93,12 @@ function getRentPrice(Epirent $Epi, int $productPk): float {
 }
 
 /**
- * Bundle-Komponenten rekursiv auflösen.
+ * WICHTIG: Bundle-Auflösung NUR für virtuelle Bundles.
+ * Damit ist die anteilige Bundlepreis-Berechnung wieder wie in der funktionierenden Version.
+ *
  * Ergebnis: [leafProductPk => amount]
- *
- * WICHTIG (Fix für "UJ90 hat (0)"):
- * - NUR virtuelle Produkte (is_virtual==true) werden expandiert.
- * - Nicht-virtuelle Produkte zählen IMMER als leaf – auch wenn sie materials haben (Zubehör/Case/etc.)
- *
- * - bevorzugt materials_ext.rent_fix (weil rent_fix sauberer ist)
- * - fallback materials
+ * - nur wenn is_virtual == true UND rent_fix/materials vorhanden
+ * - sonst: leaf = [self=>1]
  * - Cycle-Guard über $stack
  */
 function resolveBundleLeafMap(Epirent $Epi, int $productPk, array &$stack = []): array {
@@ -115,7 +108,6 @@ function resolveBundleLeafMap(Epirent $Epi, int $productPk, array &$stack = []):
     if (isset($bundleLeafCache[$productPk])) return $bundleLeafCache[$productPk];
 
     if (isset($stack[$productPk])) {
-        // cycle detected
         return [];
     }
     $stack[$productPk] = true;
@@ -126,7 +118,7 @@ function resolveBundleLeafMap(Epirent $Epi, int $productPk, array &$stack = []):
         return [];
     }
 
-    // ✅ FIX: Nur virtuelle Produkte expandieren
+    // NUR virtuelle Bundles zerlegen
     $isVirtual = (bool)($p->is_virtual ?? false);
     if (!$isVirtual) {
         unset($stack[$productPk]);
@@ -134,17 +126,14 @@ function resolveBundleLeafMap(Epirent $Epi, int $productPk, array &$stack = []):
         return $bundleLeafCache[$productPk];
     }
 
-    // Komponentenliste auslesen (nur für virtuelle Produkte)
     $mats = [];
-
-    // materials_ext.rent_fix bevorzugen
     if (!empty($p->materials_ext) && !empty($p->materials_ext->rent_fix) && is_array($p->materials_ext->rent_fix)) {
         $mats = $p->materials_ext->rent_fix;
     } elseif (!empty($p->materials) && is_array($p->materials)) {
         $mats = $p->materials;
     }
 
-    // Wenn keine Komponenten => leaf
+    // virtuell aber ohne Komponenten => leaf
     if (empty($mats)) {
         unset($stack[$productPk]);
         $bundleLeafCache[$productPk] = [$productPk => 1.0];
@@ -157,7 +146,6 @@ function resolveBundleLeafMap(Epirent $Epi, int $productPk, array &$stack = []):
         $amt = (float)($m->amount ?? 1);
         if ($childPk <= 0 || $amt <= 0) continue;
 
-        // rekursiv
         $childLeaf = resolveBundleLeafMap($Epi, $childPk, $stack);
         foreach ($childLeaf as $leafPk => $leafAmt) {
             if (!isset($leaf[$leafPk])) $leaf[$leafPk] = 0.0;
@@ -167,7 +155,6 @@ function resolveBundleLeafMap(Epirent $Epi, int $productPk, array &$stack = []):
 
     unset($stack[$productPk]);
 
-    // falls aus irgendeinem Grund leer => als leaf behandeln
     if (empty($leaf)) $leaf = [$productPk => 1.0];
 
     $bundleLeafCache[$productPk] = $leaf;
@@ -183,6 +170,11 @@ function allocateBundleRevenue(Epirent $Epi, int $bundlePk, float $bundleRevenue
     $leafMap = resolveBundleLeafMap($Epi, $bundlePk);
     if (empty($leafMap)) return [];
 
+    // wenn NICHT virtuell (leafMap == self) => dann keine Allocation (weil kein Bundle)
+    if (count($leafMap) === 1 && isset($leafMap[$bundlePk])) {
+        return [];
+    }
+
     $weights = [];
     $sumW = 0.0;
 
@@ -193,7 +185,6 @@ function allocateBundleRevenue(Epirent $Epi, int $bundlePk, float $bundleRevenue
         $sumW += $w;
     }
 
-    // fallback: sumW=0 => gleich nach amount
     if ($sumW <= 0.0) {
         $sumAmt = array_sum($leafMap);
         if ($sumAmt <= 0.0) $sumAmt = (float)count($leafMap);
@@ -231,7 +222,7 @@ function getJournalByChapter(Epirent $Epi, int $chapterId): array {
 }
 
 /* =========================
-   Interval aggregation (Peak/Histogram)
+   Interval aggregation (Peak/Histogram) – tagesbasiert (wie gehabt)
    ========================= */
 
 // eventsDirect[productPk][ymd] += deltaQty
@@ -249,7 +240,6 @@ function addIntervalEvent(array &$events, int $productPk, string $startYmd, stri
     $endTs   = ymdToTs($endYmd);
     if ($endTs < $startTs) return;
 
-    // end+1 day
     $endPlusTs = $endTs + 86400;
     $endPlusYmd = tsToYmd($endPlusTs);
 
@@ -261,10 +251,6 @@ function addIntervalEvent(array &$events, int $productPk, string $startYmd, stri
     $events[$productPk][$endPlusYmd] -= $qty;
 }
 
-/**
- * Aus Events Peak + Histogramm berechnen:
- * return ['peak'=>int, 'hist'=>[level=>days]]
- */
 function computePeakAndHistogram(array $eventMap): array {
     if (empty($eventMap)) return ['peak' => 0, 'hist' => []];
 
@@ -273,7 +259,7 @@ function computePeakAndHistogram(array $eventMap): array {
 
     $level = 0.0;
     $peak = 0.0;
-    $hist = []; // [intLevel => floatDays]
+    $hist = [];
 
     for ($i = 0; $i < count($dates); $i++) {
         $d = $dates[$i];
@@ -283,7 +269,6 @@ function computePeakAndHistogram(array $eventMap): array {
         $intLevel = (int)round($level);
         if ($intLevel > $peak) $peak = $intLevel;
 
-        // segment length until next date
         if ($i < count($dates) - 1) {
             $dTs = ymdToTs($d);
             $nTs = ymdToTs($dates[$i + 1]);
@@ -296,7 +281,6 @@ function computePeakAndHistogram(array $eventMap): array {
     }
 
     ksort($hist);
-    // hist days runden
     foreach ($hist as $k => $v) $hist[$k] = (int)round($v);
 
     return ['peak' => (int)$peak, 'hist' => $hist];
@@ -306,13 +290,22 @@ function computePeakAndHistogram(array $eventMap): array {
    Data aggregation
    ========================= */
 
-$rows = []; // Debug rows (HTML only, no excel)
-$pivot = []; // direct revenue per year
-$pivotB = []; // bundle revenue per year (alloc to leaf)
-$meta = []; // product meta [pk=>['product_no'=>..,'title'=>..]]
+$rows = [];        // Debug rows (HTML only)
+$pivot = [];       // direct revenue per year (net)
+$pivotB = [];      // bundle revenue per year allocated to leaf (net)
+$pivotExt = [];    // extern revenue per year (net) direct
+$pivotExtB = [];   // extern revenue per year allocated (net) for virtual bundles
 
+$meta = [];        // product meta [pk=>['product_no'=>..,'title'=>..]]
 $allYears = [];
 
+// Auftragsbasierte "Slots" (direct/incl) pro Produkt
+// slotAgg[productPk]['direct'][slot] += revenue
+// slotAgg[productPk]['incl'][slot]   += revenue
+// slotAgg[productPk]['direct_ext'][slot] += extRevenue
+// slotAgg[productPk]['incl_ext'][slot]   += extRevenue
+$slotAgg = [];
+
 function ensureMeta(Epirent $Epi, int $productPk, int $productNo, string $title): void {
     global $meta;
     if (!isset($meta[$productPk])) {
@@ -333,19 +326,143 @@ function addRevenue(array &$pivotRef, int $productPk, int $year, float $revenueN
 }
 
 /**
- * Eine Artikelzeile (aus Journal ODER direkt) verarbeiten
+ * Extern-Logik:
+ * - Amount External ist eine ANZAHL (nicht Umsatz).
+ * - Wir berechnen extRevenue = sum_total_net * (amount_external / amount_total) (wenn amount_total>0)
+ * - fallback: 0
  */
+function calcExternalRevenueNet(object $li): float {
+    $amountTotal = (float)($li->amount_total ?? 0);
+    $amountExternal = (float)($li->amount_external ?? 0);
+    $net = (float)($li->sum_total_net ?? 0);
+
+    if ($net == 0.0) return 0.0;
+    if ($amountTotal <= 0.0) return 0.0;
+    if ($amountExternal <= 0.0) return 0.0;
+
+    if ($amountExternal > $amountTotal) $amountExternal = $amountTotal;
+
+    return $net * ($amountExternal / $amountTotal);
+}
+
+/* =========================
+   Slot (auftragsbasiert) – Intervall Coloring
+   ========================= */
+
+/**
+ * Intervall-Item für Slotting (ein "Auftragsteil" pro Produkt)
+ */
+function addSlotItem(array &$slotItems, int $productPk, int $invoicePk, int $orderNo, string $startYmd, string $endYmd, float $qty, float $revenueNet, float $extRevenueNet): void {
+    $startYmd = safeYmd($startYmd);
+    $endYmd   = safeYmd($endYmd);
+    if ($productPk <= 0) return;
+    if (!$startYmd || !$endYmd) return;
+    if ($qty <= 0) return;
+
+    $slotItems[$productPk][] = [
+        'invoice_pk' => $invoicePk,
+        'order_no'   => $orderNo,
+        'start_ts'   => ymdToTs($startYmd),
+        'end_ts'     => ymdToTs($endYmd),
+        'qty'        => (float)$qty,
+        'rev'        => (float)$revenueNet,
+        'rev_ext'    => (float)$extRevenueNet,
+        'start_ymd'  => $startYmd,
+        'end_ymd'    => $endYmd,
+    ];
+}
+
+/**
+ * Slotting-Regel:
+ * - Aufträge werden nach start_ts sortiert,
+ * - bei gleichem start: zuerst der der später endet bekommt den "zweiten" Slot (also: end_ts DESC),
+ * - wenn dann noch gleich: nach order_no (oder invoice_pk) ASC.
+ * - Belegung: für qty=2 werden 2 Slots gesucht; wenn Slots frei werden (end < start), wiederverwendbar.
+ *
+ * Umsatzverteilung:
+ * - pro Auftrag & Produkt wird der UMSATZ auf die belegten Slots gleichmäßig verteilt (rev/qty)
+ * - analog für extern-umsatz.
+ */
+function computeOrderBasedSlots(array $itemsForProduct): array {
+    if (empty($itemsForProduct)) return [
+        'direct' => [],
+        'direct_ext' => []
+    ];
+
+    usort($itemsForProduct, function($a, $b){
+        if ($a['start_ts'] !== $b['start_ts']) return $a['start_ts'] <=> $b['start_ts'];
+        if ($a['end_ts'] !== $b['end_ts']) return $b['end_ts'] <=> $a['end_ts']; // später endend zuerst
+        if ($a['order_no'] !== $b['order_no']) return $a['order_no'] <=> $b['order_no'];
+        return $a['invoice_pk'] <=> $b['invoice_pk'];
+    });
+
+    $slotEnd = []; // slotIndex => end_ts
+    $slotRevenue = [];     // slotIndex => revenue
+    $slotRevenueExt = [];  // slotIndex => revenueExt
+
+    foreach ($itemsForProduct as $it) {
+        $qty = (int)round($it['qty']);
+        if ($qty <= 0) continue;
+
+        $revPer = ($it['rev'] ?? 0.0) / $qty;
+        $extPer = ($it['rev_ext'] ?? 0.0) / $qty;
+
+        // finde freie Slots / neue Slots
+        $assigned = [];
+        for ($k=0; $k<$qty; $k++) {
+            $slot = null;
+
+            // freier Slot: end < start
+            foreach ($slotEnd as $idx => $endTs) {
+                if ($endTs < $it['start_ts']) { // streng <, damit gleicher Tag als parallel zählt
+                    $slot = (int)$idx;
+                    break;
+                }
+            }
+            if ($slot === null) {
+                $slot = count($slotEnd) + 1; // Slots sind 1-based
+            }
+
+            // reservieren
+            $slotEnd[$slot] = $it['end_ts'];
+            $assigned[] = $slot;
+
+            // Revenue sammeln
+            if (!isset($slotRevenue[$slot])) $slotRevenue[$slot] = 0.0;
+            if (!isset($slotRevenueExt[$slot])) $slotRevenueExt[$slot] = 0.0;
+            $slotRevenue[$slot] += $revPer;
+            $slotRevenueExt[$slot] += $extPer;
+        }
+    }
+
+    ksort($slotRevenue);
+    ksort($slotRevenueExt);
+
+    // runden (2 Nachkommastellen für Anzeige später, intern float ok)
+    return [
+        'direct' => $slotRevenue,
+        'direct_ext' => $slotRevenueExt
+    ];
+}
+
+/* =========================
+   Prozessierung einer Artikelzeile
+   ========================= */
+
 function processLineItem(
     Epirent $Epi,
     array &$rows,
+    array &$slotItemsDirect,
+    array &$slotItemsIncl,
     int $invoicePk,
+    int $invoiceNo,
     string $invoiceDate,
     int $invoiceYear,
     ?int $chapterId,
     object $li,
     bool $isFromJournal
 ): void {
-    global $pivot, $pivotB, $allYears, $eventsDirect, $eventsIncl;
+    global $pivot, $pivotB, $pivotExt, $pivotExtB, $allYears, $eventsDirect, $eventsIncl;
 
     $type = (int)($li->type ?? -1);
     $productPk = (int)($li->product_pk ?? 0);
@@ -357,36 +474,41 @@ function processLineItem(
     $qty = (float)($li->amount_total ?? 0);
     if ($qty <= 0) $qty = 0.0;
 
-    // Zeitraum (für Peak/Histogramm)
-    $dateStart = (string)($li->date_start ?? '');
-    $dateEnd   = (string)($li->date_end ?? '');
-    $dateStart = safeYmd($dateStart) ?: null;
-    $dateEnd   = safeYmd($dateEnd) ?: null;
+    $dateStart = safeYmd((string)($li->date_start ?? '')) ?: null;
+    $dateEnd   = safeYmd((string)($li->date_end ?? '')) ?: null;
 
-    // Umsatz netto (für Pivot)
     $revenueNet = (float)($li->sum_total_net ?? 0);
+    $extRevenueNet = calcExternalRevenueNet($li);
 
     ensureMeta($Epi, $productPk, $productNo, $title);
 
-    // Jahr: AN RECHNUNGSDATUM gebunden (dein Wunsch)
+    // Jahr: Rechnungsdatum
     $year = $invoiceYear;
     if ($year) $allYears[$year] = true;
 
-    // Direct Umsatz (auch wenn Zeitraum evtl. leer ist)
-    if ($revenueNet != 0.0 && $year) {
-        addRevenue($pivot, $productPk, $year, $revenueNet);
-    }
+    // Direct Umsatz
+    if ($revenueNet != 0.0 && $year) addRevenue($pivot, $productPk, $year, $revenueNet);
 
-    // Direct Auslastung (nur wenn Zeitraum da)
+    // Direct Extern-Umsatz
+    if ($extRevenueNet != 0.0 && $year) addRevenue($pivotExt, $productPk, $year, $extRevenueNet);
+
+    // Peak/Histogram direct + incl (tagesbasiert)
     if ($dateStart && $dateEnd && $qty > 0) {
         addIntervalEvent($eventsDirect, $productPk, $dateStart, $dateEnd, $qty);
         addIntervalEvent($eventsIncl,   $productPk, $dateStart, $dateEnd, $qty);
     }
 
+    // Slotting: direct
+    if ($dateStart && $dateEnd && $qty > 0) {
+        addSlotItem($slotItemsDirect, $productPk, $invoicePk, $invoiceNo, $dateStart, $dateEnd, $qty, $revenueNet, $extRevenueNet);
+        addSlotItem($slotItemsIncl,   $productPk, $invoicePk, $invoiceNo, $dateStart, $dateEnd, $qty, $revenueNet, $extRevenueNet);
+    }
+
     // Debug Row
     $rows[] = [
         'year'        => $year,
         'invoice_pk'  => $invoicePk,
+        'invoice_no'  => $invoiceNo,
         'invoice_date'=> $invoiceDate,
         'chapter_id'  => $chapterId ?? 0,
         'source'      => $isFromJournal ? 'journal' : 'direct',
@@ -397,20 +519,17 @@ function processLineItem(
         'date_end'    => $dateEnd ?? '',
         'qty'         => $qty,
         'revenue_net' => $revenueNet,
+        'ext_rev_net' => $extRevenueNet,
+        'amount_ext'  => (float)($li->amount_external ?? 0),
+        'amount_total'=> (float)($li->amount_total ?? 0),
     ];
 
-    /* ===== Bundle-Auflösung =====
-       - Bundle-Erkennung NUR über is_virtual (Fix!)
-       - Auslastung inkl Bundle: Komponenten bekommen qty*amount über Zeitraum
-       - Umsatz inkl Bundle: Umsatz wird proportional auf Leaf-Produkte verteilt
-    */
-    $p = getProduct($Epi, $productPk);
-    $isBundle = (bool)($p->is_virtual ?? false);  // ✅ FIX: nicht über materials ableiten
+    /* ===== Bundle-Auflösung (nur virtuelle Bundles!) ===== */
+    $leafMap = resolveBundleLeafMap($Epi, $productPk);
+    $isVirtualBundle = !(count($leafMap) === 1 && isset($leafMap[$productPk]) && (float)$leafMap[$productPk] === 1.0);
 
-    if ($isBundle) {
-        $leafMap = resolveBundleLeafMap($Epi, $productPk);
-
-        // Umsatz allokieren
+    if ($isVirtualBundle) {
+        // Umsatz allokieren (inkl Bundle-Anteil)
         if ($revenueNet != 0.0 && $year) {
             $alloc = allocateBundleRevenue($Epi, $productPk, $revenueNet);
             foreach ($alloc as $leafPk => $leafRevenue) {
@@ -420,7 +539,17 @@ function processLineItem(
             }
         }
 
-        // Auslastung allokieren
+        // Extern-Umsatz allokieren (inkl Bundle-Anteil)
+        if ($extRevenueNet != 0.0 && $year) {
+            $allocExt = allocateBundleRevenue($Epi, $productPk, $extRevenueNet);
+            foreach ($allocExt as $leafPk => $leafRevenue) {
+                $leafPk = (int)$leafPk;
+                ensureMeta($Epi, $leafPk, 0, '');
+                addRevenue($pivotExtB, $leafPk, $year, (float)$leafRevenue);
+            }
+        }
+
+        // Auslastung allokieren (Peak/Histogramm inkl Bundle)
         if ($dateStart && $dateEnd && $qty > 0) {
             foreach ($leafMap as $leafPk => $amt) {
                 $leafPk = (int)$leafPk;
@@ -430,13 +559,38 @@ function processLineItem(
                 addIntervalEvent($eventsIncl, $leafPk, $dateStart, $dateEnd, $qty * $amt);
             }
         }
+
+        // Slotting allokieren (inkl Bundle): wir erzeugen SlotItems für Leaf-Produkte
+        if ($dateStart && $dateEnd && $qty > 0) {
+            // Revenue pro "Bundle-Item" wird in allocateBundleRevenue bereits verteilt.
+            $alloc = ($revenueNet != 0.0) ? allocateBundleRevenue($Epi, $productPk, $revenueNet) : [];
+            $allocExt = ($extRevenueNet != 0.0) ? allocateBundleRevenue($Epi, $productPk, $extRevenueNet) : [];
+
+            foreach ($leafMap as $leafPk => $amt) {
+                $leafPk = (int)$leafPk;
+                $amt = (float)$amt;
+                if ($leafPk <= 0 || $amt <= 0) continue;
+
+                $leafRev = (float)($alloc[$leafPk] ?? 0.0);
+                $leafExt = (float)($allocExt[$leafPk] ?? 0.0);
+
+                // qty_leaf = qty * amt
+                $qtyLeaf = $qty * $amt;
+
+                ensureMeta($Epi, $leafPk, 0, '');
+                addSlotItem($slotItemsIncl, $leafPk, $invoicePk, $invoiceNo, $dateStart, $dateEnd, $qtyLeaf, $leafRev, $leafExt);
+            }
+        }
     }
 }
 
 /* =========================
-   1) Invoices holen
+   1) Invoices holen + Daten sammeln
    ========================= */
 
+$slotItemsDirect = []; // productPk => list of intervals
+$slotItemsIncl   = []; // productPk => list of intervals
+
 $invoiceAll = apiJsonDecode($Epi->requestEpiApi('/v1/invoice/all?ir=true&ib=true&cl=' . Epirent_Mandant));
 $invoiceList = ($invoiceAll && ($invoiceAll->success ?? false) && is_array($invoiceAll->payload ?? null)) ? $invoiceAll->payload : [];
 
@@ -450,6 +604,7 @@ foreach ($invoiceList as $inv) {
 
     $invoiceDate = (string)($invObj->invoice_date ?? '');
     $invoiceYear = yearFromDate($invoiceDate) ?? 0;
+    $invoiceNo   = (int)($invObj->invoice_no ?? 0);
 
     $orderItems = $invObj->order_items ?? [];
     if (!is_array($orderItems)) $orderItems = [];
@@ -458,93 +613,128 @@ foreach ($invoiceList as $inv) {
         $oiType = (int)($oi->type ?? -1);
         $oiPk   = (int)($oi->primary_key ?? 0);
 
-        // 1) Kapitel-Zeile (type=5): chid ist primary_key der Kapitelzeile!
+        // Kapitel (type=5): chid ist primary_key der Kapitelzeile
         if ($oiType === 5 && $oiPk > 0) {
             $chapterId = $oiPk;
             $journalItems = getJournalByChapter($Epi, $chapterId);
 
             foreach ($journalItems as $ji) {
-                processLineItem($Epi, $rows, $invoicePk, $invoiceDate, $invoiceYear, $chapterId, $ji, true);
+                processLineItem($Epi, $rows, $slotItemsDirect, $slotItemsIncl, $invoicePk, $invoiceNo, $invoiceDate, $invoiceYear, $chapterId, $ji, true);
             }
             continue;
         }
 
-        // 2) Direkte Artikel-Zeile ohne Kapitel (type=0)
+        // Direkte Artikelposition ohne Kapitel (type=0)
         if ($oiType === 0 && (int)($oi->product_pk ?? 0) > 0) {
-            processLineItem($Epi, $rows, $invoicePk, $invoiceDate, $invoiceYear, null, $oi, false);
+            processLineItem($Epi, $rows, $slotItemsDirect, $slotItemsIncl, $invoicePk, $invoiceNo, $invoiceDate, $invoiceYear, null, $oi, false);
             continue;
         }
-
-        // Andere Typen ignorieren (Zwischensumme etc.)
     }
 }
 
 /* =========================
-   2) Years + Pivot Rows bauen
+   2) Slot Aggregation (auftragsbasiert)
+   ========================= */
+
+foreach ($meta as $productPk => $m) {
+    $productPk = (int)$productPk;
+
+    $resD = computeOrderBasedSlots($slotItemsDirect[$productPk] ?? []);
+    $resI = computeOrderBasedSlots($slotItemsIncl[$productPk] ?? []);
+
+    $slotAgg[$productPk] = [
+        'direct'     => $resD['direct'] ?? [],
+        'incl'       => $resI['direct'] ?? [],
+        'direct_ext' => $resD['direct_ext'] ?? [],
+        'incl_ext'   => $resI['direct_ext'] ?? [],
+    ];
+}
+
+/* =========================
+   3) Years + Pivot Rows bauen
    ========================= */
 
 $years = array_keys($allYears);
 sort($years);
 
-// Pivot Rows: pro Produkt => revenueDirect / revenueIncl und PeakDirect / PeakIncl + Histogramme
 $pivotRows = [];
 
 foreach ($meta as $productPk => $m) {
     $productPk = (int)$productPk;
 
-    // revenue direct/incl
-    $sumDirect = 0.0;
-    $sumIncl = 0.0;
-
     $row = [
         'product_pk' => $productPk,
         'product_no' => (int)($m['product_no'] ?? 0),
         'title'      => (string)($m['title'] ?? ''),
         'years'      => [],
+        'years_ext'  => [],
         'total_direct'=> 0.0,
         'total_incl'  => 0.0,
+        'total_ext_direct'=> 0.0,
+        'total_ext_incl'  => 0.0,
         'peak_direct' => 0,
         'peak_incl'   => 0,
         'hist_direct' => [],
         'hist_incl'   => [],
+        'slots_direct' => $slotAgg[$productPk]['direct'] ?? [],
+        'slots_incl'   => $slotAgg[$productPk]['incl'] ?? [],
+        'slots_direct_ext' => $slotAgg[$productPk]['direct_ext'] ?? [],
+        'slots_incl_ext'   => $slotAgg[$productPk]['incl_ext'] ?? [],
     ];
 
+    $sumDirect = 0.0;
+    $sumIncl = 0.0;
+    $sumExtDirect = 0.0;
+    $sumExtIncl = 0.0;
+
     foreach ($years as $y) {
-        $d = (float)($pivot[$productPk][$y]  ?? 0.0);
-        $b = (float)($pivotB[$productPk][$y] ?? 0.0);
+        $d  = (float)($pivot[$productPk][$y]  ?? 0.0);
+        $b  = (float)($pivotB[$productPk][$y] ?? 0.0);
         $incl = $d + $b;
 
+        $de = (float)($pivotExt[$productPk][$y]  ?? 0.0);
+        $be = (float)($pivotExtB[$productPk][$y] ?? 0.0);
+        $inclE = $de + $be;
+
         $row['years'][$y] = ['direct'=>$d, 'incl'=>$incl];
+        $row['years_ext'][$y] = ['direct'=>$de, 'incl'=>$inclE];
 
         $sumDirect += $d;
         $sumIncl   += $incl;
+        $sumExtDirect += $de;
+        $sumExtIncl   += $inclE;
     }
 
     $row['total_direct'] = $sumDirect;
     $row['total_incl']   = $sumIncl;
+    $row['total_ext_direct'] = $sumExtDirect;
+    $row['total_ext_incl']   = $sumExtIncl;
 
-    // Peak + Histogram
     $pd = computePeakAndHistogram($GLOBALS['eventsDirect'][$productPk] ?? []);
     $pi = computePeakAndHistogram($GLOBALS['eventsIncl'][$productPk] ?? []);
-
     $row['peak_direct'] = (int)$pd['peak'];
     $row['peak_incl']   = (int)$pi['peak'];
     $row['hist_direct'] = $pd['hist'];
     $row['hist_incl']   = $pi['hist'];
 
-    // Nur Produkte zeigen, die überhaupt irgendwo vorkommen (direct oder incl)
-    if ($row['total_direct'] == 0.0 && $row['total_incl'] == 0.0 && $row['peak_direct'] == 0 && $row['peak_incl'] == 0) {
-        continue;
-    }
+    // nur anzeigen, wenn was los ist
+    $hasAny = (
+        $row['total_direct'] != 0.0 ||
+        $row['total_incl'] != 0.0 ||
+        $row['total_ext_direct'] != 0.0 ||
+        $row['total_ext_incl'] != 0.0 ||
+        $row['peak_direct'] != 0 ||
+        $row['peak_incl'] != 0
+    );
+    if (!$hasAny) continue;
 
     $pivotRows[] = $row;
 }
 
-// Sort: nach Total_incl absteigend (inkl Bundle-Anteil ist meist interessanter)
 usort($pivotRows, fn($a,$b) => ($b['total_incl'] <=> $a['total_incl']));
 
 /* =========================
-   3) Excel Export (nur Pivot)
+   4) Excel Export (nur Pivot)
    ========================= */
 
 $exportDir = __DIR__ . '/exports';
@@ -560,10 +750,18 @@ $spreadsheet = new Spreadsheet();
 $sheet = $spreadsheet->getActiveSheet();
 $sheet->setTitle('Pivot');
 
-$cols = ['Produkt-PK','Artikel-Nr','Artikel','Peak','Peak (inkl. Bundle)','Summe','Summe (inkl. Bundle)'];
+$cols = [
+    'Produkt-PK','Artikel-Nr','Artikel',
+    'Peak','Peak (inkl. Bundle)',
+    'Summe','Summe (inkl. Bundle)',
+    'davon extern','davon extern (inkl. Bundle)'
+];
+
 foreach ($years as $y) {
     $cols[] = (string)$y;
     $cols[] = (string)$y . ' (inkl. Bundle)';
+    $cols[] = (string)$y . ' ext';
+    $cols[] = (string)$y . ' ext (inkl. Bundle)';
 }
 
 $colCount = count($cols);
@@ -606,10 +804,21 @@ foreach ($pivotRows as $r) {
     $sheet->getStyle(Coordinate::stringFromColumnIndex($c).$rowIdx)->getNumberFormat()->setFormatCode('#,##0.00 [$€-de-DE]');
     $c++;
 
+    $sheet->setCellValueExplicit(Coordinate::stringFromColumnIndex($c).$rowIdx, (float)$r['total_ext_direct'], DataType::TYPE_NUMERIC);
+    $sheet->getStyle(Coordinate::stringFromColumnIndex($c).$rowIdx)->getNumberFormat()->setFormatCode('#,##0.00 [$€-de-DE]');
+    $c++;
+
+    $sheet->setCellValueExplicit(Coordinate::stringFromColumnIndex($c).$rowIdx, (float)$r['total_ext_incl'], DataType::TYPE_NUMERIC);
+    $sheet->getStyle(Coordinate::stringFromColumnIndex($c).$rowIdx)->getNumberFormat()->setFormatCode('#,##0.00 [$€-de-DE]');
+    $c++;
+
     foreach ($years as $y) {
         $d = (float)$r['years'][$y]['direct'];
         $iVal = (float)$r['years'][$y]['incl'];
 
+        $de = (float)$r['years_ext'][$y]['direct'];
+        $ie = (float)$r['years_ext'][$y]['incl'];
+
         $sheet->setCellValueExplicit(Coordinate::stringFromColumnIndex($c).$rowIdx, $d, DataType::TYPE_NUMERIC);
         $sheet->getStyle(Coordinate::stringFromColumnIndex($c).$rowIdx)->getNumberFormat()->setFormatCode('#,##0.00 [$€-de-DE]');
         $c++;
@@ -617,6 +826,14 @@ foreach ($pivotRows as $r) {
         $sheet->setCellValueExplicit(Coordinate::stringFromColumnIndex($c).$rowIdx, $iVal, DataType::TYPE_NUMERIC);
         $sheet->getStyle(Coordinate::stringFromColumnIndex($c).$rowIdx)->getNumberFormat()->setFormatCode('#,##0.00 [$€-de-DE]');
         $c++;
+
+        $sheet->setCellValueExplicit(Coordinate::stringFromColumnIndex($c).$rowIdx, $de, DataType::TYPE_NUMERIC);
+        $sheet->getStyle(Coordinate::stringFromColumnIndex($c).$rowIdx)->getNumberFormat()->setFormatCode('#,##0.00 [$€-de-DE]');
+        $c++;
+
+        $sheet->setCellValueExplicit(Coordinate::stringFromColumnIndex($c).$rowIdx, $ie, DataType::TYPE_NUMERIC);
+        $sheet->getStyle(Coordinate::stringFromColumnIndex($c).$rowIdx)->getNumberFormat()->setFormatCode('#,##0.00 [$€-de-DE]');
+        $c++;
     }
 
     $rowIdx++;
@@ -625,13 +842,25 @@ foreach ($pivotRows as $r) {
 $sheet->setAutoFilter("A{$headerRow}:{$lastColLetter}{$headerRow}");
 $sheet->freezePane("A" . ($headerRow + 1));
 
-// Save
 $writer = new Xlsx($spreadsheet);
 $writer->save($excelFilePath);
 
 /* =========================
-   4) HTML Ausgabe
+   5) HTML Ausgabe
    ========================= */
+
+function slotsToDisplay(array $slotMap): array {
+    // slotMap: [slot=>revenue]
+    ksort($slotMap);
+    $out = [];
+    foreach ($slotMap as $slot => $rev) {
+        $slot = (int)$slot;
+        if ($slot <= 0) continue;
+        $out[] = ['slot'=>$slot, 'rev'=>(float)$rev];
+    }
+    return $out;
+}
+
 ?>
 <!DOCTYPE html>
 <html lang="de">
@@ -647,14 +876,11 @@ $writer->save($excelFilePath);
     <script src="js/jquery-3.5.1.min.js"></script>
     <script src="https://kit.fontawesome.com/93d71de8bc.js" crossorigin="anonymous"></script>
 
-    <!-- Bootstrap -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
 
-    <!-- DataTables -->
     <script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js" crossorigin="anonymous"></script>
     <script src="https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js" crossorigin="anonymous"></script>
 
-    <!-- Chart.js -->
     <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js" crossorigin="anonymous"></script>
 
     <style>
@@ -662,6 +888,7 @@ $writer->save($excelFilePath);
         .mono { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; }
         .btn-xs { padding:.15rem .4rem; font-size:.78rem; }
         .nowrap { white-space: nowrap; }
+        .small-muted { font-size: .82rem; opacity:.85; }
     </style>
 
     <script>
@@ -705,10 +932,12 @@ $writer->save($excelFilePath);
                                     <th>Artikel</th>
                                     <th class="nowrap">Peak</th>
                                     <th class="nowrap">Summe</th>
+                                    <th class="nowrap">davon extern</th>
                                     <?php foreach ($years as $y): ?>
                                         <th class="nowrap"><?php echo (int)$y; ?></th>
                                     <?php endforeach; ?>
                                     <th class="nowrap">Histogramm</th>
+                                    <th class="nowrap">Slots</th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -722,6 +951,22 @@ $writer->save($excelFilePath);
 
                                         $sumDirect = (float)$r['total_direct'];
                                         $sumIncl   = (float)$r['total_incl'];
+
+                                        $extDirect = (float)$r['total_ext_direct'];
+                                        $extIncl   = (float)$r['total_ext_incl'];
+
+                                        $slotsDirect = slotsToDisplay($r['slots_direct'] ?? []);
+                                        $slotsIncl   = slotsToDisplay($r['slots_incl'] ?? []);
+                                        $slotsDirectExt = slotsToDisplay($r['slots_direct_ext'] ?? []);
+                                        $slotsInclExt   = slotsToDisplay($r['slots_incl_ext'] ?? []);
+
+                                        $slotsPayload = [
+                                            'direct' => $slotsDirect,
+                                            'incl' => $slotsIncl,
+                                            'direct_ext' => $slotsDirectExt,
+                                            'incl_ext' => $slotsInclExt,
+                                        ];
+                                        $slotsB64 = base64Json($slotsPayload);
                                     ?>
                                     <tr>
                                         <td class="mono"><?php echo (int)$r['product_pk']; ?></td>
@@ -742,14 +987,24 @@ $writer->save($excelFilePath);
                                             ?>
                                         </td>
 
+                                        <td class="nowrap">
+                                            <?php
+                                                echo formatEuro($extDirect);
+                                                echo ' <span class="text-muted">(' . formatEuro($extIncl) . ')</span>';
+                                            ?>
+                                        </td>
+
                                         <?php foreach ($years as $y): ?>
                                             <?php
                                                 $d = (float)$r['years'][$y]['direct'];
                                                 $iVal = (float)$r['years'][$y]['incl'];
+
+                                                $de = (float)$r['years_ext'][$y]['direct'];
+                                                $ie = (float)$r['years_ext'][$y]['incl'];
                                             ?>
                                             <td class="nowrap">
-                                                <?php echo formatEuro($d); ?>
-                                                <span class="text-muted">(<?php echo formatEuro($iVal); ?>)</span>
+                                                <div><?php echo formatEuro($d); ?> <span class="text-muted">(<?php echo formatEuro($iVal); ?>)</span></div>
+                                               <!--<div class="small-muted">ext: <?php echo formatEuro($de); ?> <span class="text-muted">(<?php echo formatEuro($ie); ?>)</span></div>-->
                                             </td>
                                         <?php endforeach; ?>
 
@@ -772,13 +1027,26 @@ $writer->save($excelFilePath);
                                                 Histogramm inkl. Bundle
                                             </button>
                                         </td>
+
+                                        <td class="nowrap">
+                                            <button
+                                                class="btn btn-outline-dark btn-xs js-slots"
+                                                data-title="<?php echo htmlspecialchars((string)$r['title']); ?>"
+                                                data-slots="<?php echo htmlspecialchars($slotsB64); ?>">
+                                                Slots (Auftragsbasiert)
+                                            </button>
+                                        </td>
                                     </tr>
                                 <?php endforeach; ?>
                                 </tbody>
                             </table>
+
                             <small class="text-muted">
-                                Jahr-Zuordnung Umsatz: <span class="mono">invoice_date</span> (Rechnungsdatum). Peak/Histogramm: Zeitraum <span class="mono">date_start..date_end</span>.
-                                Werte in Klammern = inkl. Bundle-Anteil.
+                                Jahr-Zuordnung Umsatz: <span class="mono">invoice_date</span>.
+                                Peak/Histogramm: Zeitraum <span class="mono">date_start..date_end</span> (tagesbasiert).
+                                Werte in Klammern = inkl. Bundle-Anteil (nur <b>virtuelle</b> Bundles werden zerlegt).
+                                Extern-Umsatz: <span class="mono">sum_total_net * (amount_external/amount_total)</span> (amount_external ist Menge).
+                                Slots: auftragsbasierte Slotbelegung nach Start, dann Ende DESC, dann Auftragsnr.
                             </small>
                         </div>
                     </div>
@@ -795,6 +1063,7 @@ $writer->save($excelFilePath);
                                 <tr>
                                     <th>Jahr</th>
                                     <th>Invoice</th>
+                                    <th>Rechnungsnr</th>
                                     <th>Rechnungsdatum</th>
                                     <th>Quelle</th>
                                     <th>Chapter</th>
@@ -804,7 +1073,9 @@ $writer->save($excelFilePath);
                                     <th>Start</th>
                                     <th>Ende</th>
                                     <th>Menge</th>
+                                    <th>Ext-Menge</th>
                                     <th>Umsatz netto</th>
+                                    <th>Umsatz extern</th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -812,6 +1083,7 @@ $writer->save($excelFilePath);
                                     <tr>
                                         <td><?php echo (int)$r['year']; ?></td>
                                         <td class="mono"><?php echo (int)$r['invoice_pk']; ?></td>
+                                        <td class="mono"><?php echo (int)$r['invoice_no']; ?></td>
                                         <td class="mono"><?php echo htmlspecialchars((string)$r['invoice_date']); ?></td>
                                         <td><?php echo htmlspecialchars((string)$r['source']); ?></td>
                                         <td class="mono"><?php echo (int)$r['chapter_id']; ?></td>
@@ -821,13 +1093,16 @@ $writer->save($excelFilePath);
                                         <td class="mono"><?php echo htmlspecialchars((string)$r['date_start']); ?></td>
                                         <td class="mono"><?php echo htmlspecialchars((string)$r['date_end']); ?></td>
                                         <td class="mono"><?php echo htmlspecialchars((string)$r['qty']); ?></td>
+                                        <td class="mono"><?php echo htmlspecialchars((string)($r['amount_ext'] ?? '0')); ?></td>
                                         <td class="nowrap"><?php echo formatEuro((float)$r['revenue_net']); ?></td>
+                                        <td class="nowrap"><?php echo formatEuro((float)$r['ext_rev_net']); ?></td>
                                     </tr>
                                 <?php endforeach; ?>
                                 </tbody>
                             </table>
                             <small class="text-muted">
                                 Wenn ein Artikel “ohne Kapitel” fehlt, muss er hier als Quelle <b>direct</b> auftauchen.
+                                Ext-Menge ist Anzahl; Umsatz extern ist anteilig berechnet.
                             </small>
                         </div>
                     </div>
@@ -859,8 +1134,48 @@ $writer->save($excelFilePath);
     </div>
 </div>
 
+<!-- Slots Modal -->
+<div class="modal fade" id="slotsModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Slots</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="mb-2 text-muted">
+                    Slot-Umsatz ist <b>auftragsbasiert</b>: Umsatz einer Position wird gleichmäßig auf die belegten Slots verteilt.
+                    Werte in Klammern = inkl. Bundle-Anteil (nur virtuelle Bundles).
+                </div>
+
+                <div class="table-responsive">
+                    <table class="table table-sm table-bordered" id="slotsTable">
+                        <thead>
+                        <tr>
+                            <th class="nowrap">Slot</th>
+                            <th class="nowrap">Umsatz</th>
+                            <th class="nowrap">Umsatz inkl. Bundle</th>
+                            <th class="nowrap">davon extern</th>
+                            <th class="nowrap">davon extern inkl. Bundle</th>
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                </div>
+
+                <div class="mt-2">
+                    <canvas id="slotsChart" height="130"></canvas>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
 <script>
 let histChart = null;
+let slotsChart = null;
 
 function decodeB64Json(b64) {
     try {
@@ -884,33 +1199,103 @@ function openHistogram(title, mode, peak, histObj) {
     $('#histModal .modal-title').text(`${title} – ${mode === 'incl' ? 'inkl. Bundle' : 'ohne Bundle'}`);
 
     const ctx = document.getElementById('histChart');
-    if (histChart) {
-        histChart.destroy();
-        histChart = null;
-    }
+    if (histChart) { histChart.destroy(); histChart = null; }
 
     histChart = new Chart(ctx, {
+        type: 'bar',
+        data: { labels, datasets: [{ label: 'Tage', data }] },
+        options: {
+            responsive: true,
+            animation: false,
+            scales: { y: { beginAtZero: true, ticks: { precision: 0 } } }
+        }
+    });
+
+    $('#histModal').modal('show');
+}
+
+function fmtEuro(n) {
+    const sign = n < 0 ? '-' : '';
+    n = Math.abs(n);
+    return sign + n.toLocaleString('de-DE', { minimumFractionDigits: 2, maximumFractionDigits: 2 }) + ' €';
+}
+
+function openSlots(title, payload) {
+    $('#slotsModal .modal-title').text(`${title} – Slot-Umsatz (auftragsbasiert)`);
+
+    const direct = payload.direct || [];
+    const incl   = payload.incl || [];
+    const directExt = payload.direct_ext || [];
+    const inclExt   = payload.incl_ext || [];
+
+    // maps slot->rev
+    const mapD = {};
+    const mapI = {};
+    const mapDE = {};
+    const mapIE = {};
+
+    direct.forEach(x => mapD[String(x.slot)] = Number(x.rev || 0));
+    incl.forEach(x => mapI[String(x.slot)] = Number(x.rev || 0));
+    directExt.forEach(x => mapDE[String(x.slot)] = Number(x.rev || 0));
+    inclExt.forEach(x => mapIE[String(x.slot)] = Number(x.rev || 0));
+
+    const slots = new Set([
+        ...Object.keys(mapD), ...Object.keys(mapI),
+        ...Object.keys(mapDE), ...Object.keys(mapIE)
+    ]);
+
+    const slotNums = Array.from(slots).map(s => parseInt(s,10)).filter(n => n>0).sort((a,b)=>a-b);
+
+    const $tb = $('#slotsTable tbody');
+    $tb.empty();
+
+    const labels = [];
+    const dataD = [];
+    const dataI = [];
+
+    slotNums.forEach(s => {
+        const sd = mapD[String(s)] || 0;
+        const si = mapI[String(s)] || 0;
+        const sde = mapDE[String(s)] || 0;
+        const sie = mapIE[String(s)] || 0;
+
+        $tb.append(`
+            <tr>
+                <td class="mono">${s}</td>
+                <td class="nowrap">${fmtEuro(sd)}</td>
+                <td class="nowrap text-muted">(${fmtEuro(si)})</td>
+                <td class="nowrap">${fmtEuro(sde)}</td>
+                <td class="nowrap text-muted">(${fmtEuro(sie)})</td>
+            </tr>
+        `);
+
+        labels.push(String(s));
+        dataD.push(sd);
+        dataI.push(si);
+    });
+
+    const ctx = document.getElementById('slotsChart');
+    if (slotsChart) { slotsChart.destroy(); slotsChart = null; }
+
+    slotsChart = new Chart(ctx, {
         type: 'bar',
         data: {
             labels,
-            datasets: [{
-                label: 'Tage',
-                data
-            }]
+            datasets: [
+                { label: 'Umsatz', data: dataD },
+                { label: 'Umsatz inkl. Bundle', data: dataI }
+            ]
         },
         options: {
             responsive: true,
             animation: false,
             scales: {
-                y: {
-                    beginAtZero: true,
-                    ticks: { precision: 0 }
-                }
+                y: { beginAtZero: true }
             }
         }
     });
 
-    $('#histModal').modal('show');
+    $('#slotsModal').modal('show');
 }
 
 $(function() {
@@ -925,6 +1310,13 @@ $(function() {
         const histObj = decodeB64Json(b64);
         openHistogram(title, mode, peak, histObj);
     });
+
+    $(document).on('click', '.js-slots', function() {
+        const title = $(this).data('title') || '';
+        const b64   = $(this).data('slots') || '';
+        const payload = decodeB64Json(b64);
+        openSlots(title, payload);
+    });
 });
 </script>