Abo Einmalprodukte: Review-Gate (VIP), Verbindlichkeit & Summen-Layout

- Live-Review-Gate: Einmalprodukte nur fuer VIP im Sales Center sichtbar, Portal ausgeblendet (AboHelper::isOneTimeFeatureVisible + Gates in Controllern) - Nur verbindlich bestaetigte Einmal-Artikel fliessen in die Lieferung; Service-Helfer confirmedItems/pendingItems/pendingGross - Footer-Layout der Einmalprodukt-Liste: bestaetigte Summe + Gesamtbetrag, Trennstrich, offener Betrag und neue Gesamtsumme (dunkelgruen) - Uebersetzungen DE/EN/ES/FR (onetime_new_total u.a.), Tests angepasst/ergaenzt Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-08 14:59:22 +00:00 · 2026-06-08 14:59:22 +00:00 · 8288ea59ac
commit 8288ea59ac
parent 2269ce031f
16 changed files with 356 additions and 46 deletions
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@ -11,6 +11,7 @@ use App\Models\UserAbo;
 use App\Models\UserCredit;
 use App\Models\UserLevel;
 use App\Models\UserSalesVolume;
+use App\Services\AboHelper;
 use App\Services\BusinessPlan\TreeCalcBot;
 use App\Services\BusinessPlan\TreeCalcBotOptimized;
 use App\Services\DhlModalService;
@ -172,6 +173,7 @@ class ModalController extends Controller
            }
            if ($data['action'] === 'abo-add-onetime') {
                $user_abo = UserAbo::find($data['id']);
+                abort_unless($user_abo && AboHelper::isOneTimeFeatureVisible($user_abo), 403);
                $ret = view('user.abo.modal_abo_onetime_products', compact('data', 'user_abo'))->render();
            }

--- a/app/Http/Controllers/Portal/AboController.php
+++ b/app/Http/Controllers/Portal/AboController.php
@ -73,7 +73,7 @@ class AboController extends Controller
        AboOrderCart::makeOrderYard($user_abo);
        $baseCompCount = Yard::instance(AboOrderCart::INSTANCE)->getNumComp();

-        $oneTimeWindowOpen = AboHelper::isOneTimeWindowOpen($user_abo);
+        $oneTimeWindowOpen = AboHelper::isOneTimeFeatureVisible($user_abo);
        if ($oneTimeWindowOpen) {
            AboOrderCart::addOneTimeItemsToYard($user_abo);
            AboOrderCart::checkNumOfCompProducts($user_abo);
@ -211,7 +211,7 @@ class AboController extends Controller
                AboOrderCart::initYard($user_abo);
                AboOrderCart::makeOrderYard($user_abo);
                $baseCompCount = Yard::instance(AboOrderCart::INSTANCE)->getNumComp();
-                if (AboHelper::isOneTimeWindowOpen($user_abo)) {
+                if (AboHelper::isOneTimeFeatureVisible($user_abo)) {
                    AboOrderCart::addOneTimeItemsToYard($user_abo->fresh());
                }
                AboOrderCart::checkNumOfCompProducts($user_abo);
@ -221,7 +221,7 @@ class AboController extends Controller
                $html_cart = view('admin.abo._order_abo_show', [
                    'user_abo' => $user_abo,
                    'error_message' => $error_message,
-                    'split_mode' => AboHelper::isOneTimeWindowOpen($user_abo),
+                    'split_mode' => AboHelper::isOneTimeFeatureVisible($user_abo),
                    'summary' => $summary,
                    'add_only_mode' => $isAddOnlyMode,
                ])->render();
@ -325,6 +325,7 @@ class AboController extends Controller
            if ($data['action'] === 'abo-add-onetime') {
                $user_abo = UserAbo::find($data['id']);
                $this->checkPortalPermission($user_abo);
+                abort_unless(AboHelper::isOneTimeFeatureVisible($user_abo), 403);
                $ret = view('user.abo.modal_abo_onetime_products', compact('data', 'user_abo'))->render();
            }
            if ($data['action'] === 'abo_update_settings') {
@ -352,7 +353,7 @@ class AboController extends Controller
        $this->checkPortalPermission($user_abo);
        $isAddOnlyMode = AboHelper::isAddOnlyMode($user_abo, $view);

-        if (! AboHelper::isOneTimeWindowOpen($user_abo)) {
+        if (! AboHelper::isOneTimeFeatureVisible($user_abo)) {
            return response()->json([
                'response' => false,
                'message' => __('abo.onetime_window_closed'),
@ -404,6 +405,8 @@ class AboController extends Controller
        $user_abo = UserAbo::findOrFail($user_abo_id);
        $this->checkPortalPermission($user_abo);

+        abort_unless(AboHelper::isOneTimeFeatureVisible($user_abo), 403);
+
        AboOrderCart::initYard($user_abo);

        $query = Product::select('products.*')
--- a/app/Http/Controllers/User/AboController.php
+++ b/app/Http/Controllers/User/AboController.php
@ -89,7 +89,7 @@ class AboController extends Controller
        AboOrderCart::makeOrderYard($user_abo);
        $baseCompCount = Yard::instance(AboOrderCart::INSTANCE)->getNumComp();

-        $oneTimeWindowOpen = AboHelper::isOneTimeWindowOpen($user_abo);
+        $oneTimeWindowOpen = AboHelper::isOneTimeFeatureVisible($user_abo);
        if ($oneTimeWindowOpen) {
            AboOrderCart::addOneTimeItemsToYard($user_abo);
            AboOrderCart::checkNumOfCompProducts($user_abo);
@ -233,7 +233,7 @@ class AboController extends Controller
                AboOrderCart::initYard($user_abo);
                AboOrderCart::makeOrderYard($user_abo); // reCalculateShippingPrice
                $baseCompCount = Yard::instance(AboOrderCart::INSTANCE)->getNumComp();
-                if (AboHelper::isOneTimeWindowOpen($user_abo)) {
+                if (AboHelper::isOneTimeFeatureVisible($user_abo)) {
                    AboOrderCart::addOneTimeItemsToYard($user_abo->fresh());
                }
                AboOrderCart::checkNumOfCompProducts($user_abo); // after reCalculateShippingPrice check it and remove or add comp product
@ -246,7 +246,7 @@ class AboController extends Controller
                $html_cart = view('admin.abo._order_abo_show', [
                    'user_abo' => $user_abo,
                    'error_message' => $error_message,
-                    'split_mode' => AboHelper::isOneTimeWindowOpen($user_abo),
+                    'split_mode' => AboHelper::isOneTimeFeatureVisible($user_abo),
                    'summary' => $summary,
                    'add_only_mode' => $isAddOnlyMode,
                ])->render();
@ -273,7 +273,7 @@ class AboController extends Controller
        $editView = \Auth::user()?->isAdmin() ? 'admin' : $view;
        $isAddOnlyMode = AboHelper::isAddOnlyMode($user_abo, $editView);

-        if (! AboHelper::isOneTimeWindowOpen($user_abo)) {
+        if (! AboHelper::isOneTimeFeatureVisible($user_abo)) {
            return response()->json([
                'response' => false,
                'message' => __('abo.onetime_window_closed'),
@ -448,6 +448,8 @@ class AboController extends Controller
    {
        $user_abo = UserAbo::findOrFail($user_abo_id);

+        abort_unless(AboHelper::isOneTimeFeatureVisible($user_abo), 403);
+
        AboOrderCart::initYard($user_abo);

        $show_on_ids = $user_abo->is_for === 'me' ? ['2'] : ['3'];
--- a/app/Services/AboHelper.php
+++ b/app/Services/AboHelper.php
@ -157,10 +157,10 @@ class AboHelper
    public static function getAboTypeBadge($abo_type)
    {
        if ($abo_type === 'base') {
-            return '<span class="badge badge-pill badge-warning"><i class="fas fa-star"></i> '.__('abo.'.$abo_type).'</span></a>';
+            return '<span class="badge badge-pill badge-warning"><i class="fas fa-star"></i> ' . __('abo.' . $abo_type) . '</span></a>';
        }
        if ($abo_type === 'upgrade') {
-            return '<span class="badge badge-pill badge-info"><i class="far fa-star"></i> '.__('abo.'.$abo_type).'</span></a>';
+            return '<span class="badge badge-pill badge-info"><i class="far fa-star"></i> ' . __('abo.' . $abo_type) . '</span></a>';
        }

        return '';
@ -209,6 +209,27 @@ class AboHelper
        return $daysUntilExecution <= self::getOneTimeWindowDays();
    }

+    /**
+     * Sichtbarkeit des Einmalprodukte-Features während der Live-Abstimmung.
+     *
+     * Temporäre Einschränkung: Das Feature wird vorerst nur VIP-Usern (Admins)
+     * im Sales Center angezeigt. Das Endkunden-Portal läuft über den
+     * `customers`-Guard und hat keinen VIP-User auf dem `user`-Guard, daher
+     * bleibt das Feature dort vollständig ausgeblendet. Nach Abschluss der
+     * Abstimmung kann diese Methode wieder auf reines isOneTimeWindowOpen()
+     * zurückgesetzt werden, um das Feature für alle freizuschalten.
+     */
+    public static function isOneTimeFeatureVisible(UserAbo $userAbo): bool
+    {
+        /* if (! self::isOneTimeWindowOpen($userAbo)) {
+            return false;
+        }*/
+
+        $user = \Auth::guard('user')->user();
+
+        return $user instanceof User && $user->isVIP();
+    }
+
    public static function getFirstAboDate($date, $abo_interval)
    {
        $reference = Carbon::parse($date)->startOfDay();
@ -391,7 +412,7 @@ class AboHelper
    {
        $ret = [];
        foreach (self::$txaction_filter_text as $key => $val) {
-            $ret[$key] = trans('payment.'.$val);
+            $ret[$key] = trans('payment.' . $val);
        }

        return $ret;
--- a/app/Services/AboOneTimeService.php
+++ b/app/Services/AboOneTimeService.php
@ -158,6 +158,40 @@ class AboOneTimeService
        return null;
    }

+    /**
+     * Verbindlich bestätigte Einmal-Artikel (werden mit der nächsten Lieferung versandt).
+     *
+     * @return \Illuminate\Support\Collection<int, UserAboOneTimeItem>
+     */
+    public static function confirmedItems(UserAbo $userAbo): \Illuminate\Support\Collection
+    {
+        return $userAbo->one_time_items()
+            ->with('product')
+            ->get()
+            ->filter(fn (UserAboOneTimeItem $item): bool => $item->isConfirmed())
+            ->values();
+    }
+
+    /**
+     * Noch nicht bestätigte Einmal-Artikel (Entwurf, nicht verbindlich).
+     *
+     * @return \Illuminate\Support\Collection<int, UserAboOneTimeItem>
+     */
+    public static function pendingItems(UserAbo $userAbo): \Illuminate\Support\Collection
+    {
+        return $userAbo->one_time_items()
+            ->with('product')
+            ->get()
+            ->reject(fn (UserAboOneTimeItem $item): bool => $item->isConfirmed())
+            ->values();
+    }
+
+    public static function pendingGross(UserAbo $userAbo): float
+    {
+        return round(self::pendingItems($userAbo)
+            ->sum(fn (UserAboOneTimeItem $item): float => (float) $item->price * (int) $item->qty), 2);
+    }
+
    public static function hasUnconfirmedChanges(UserAbo $userAbo): bool
    {
        return UserAboOneTimeItem::withTrashed()
--- a/app/Services/AboOrderCart.php
+++ b/app/Services/AboOrderCart.php
@ -246,7 +246,14 @@ class AboOrderCart

        $yard = Yard::instance(self::INSTANCE);

-        foreach ($user_abo->one_time_items()->get() as $item) {
+        // Nur verbindlich bestätigte Einmal-Artikel fließen in die nächste Lieferung
+        // (Snapshot-Menge == bestätigte Menge). Unbestätigte Entwürfe bleiben außen vor.
+        $confirmedItems = $user_abo->one_time_items()
+            ->whereNotNull('confirmed_at')
+            ->whereColumn('confirmed_qty', 'qty')
+            ->get();
+
+        foreach ($confirmedItems as $item) {
            $product = Product::find($item->product_id);
            if (! $product) {
                continue;
--- a/dev/2026-06-05/ENTWICKLUNGSPLAN-ABO-EINMALPRODUKTE.md
+++ b/dev/2026-06-05/ENTWICKLUNGSPLAN-ABO-EINMALPRODUKTE.md
@ -385,3 +385,5 @@ Der bestehende Retry ist Admin-manuell (`AboRetryPaymentService`). Eine **automa
 | 2026-06-05 | UI/Consent | Rechtssicheres Modal für dauerhafte Abo-Mengenerhöhungen zentralisiert (`_confirm_add_modal`): Artikel-/Mengenänderung, Zusatzkosten, neuer Gesamtbetrag, Lieferdatum, AGB/Widerruf, Button „Zahlungspflichtig aktualisieren" (9.13) | ERLEDIGT |
 | 2026-06-05 | UI/Onetime | Confirm-/Discard-State für Einmalprodukte: `confirmed_qty`/`confirmed_at`, Aktionen `confirm`/`discard`, rechtliche Bestätigungsfläche, Erfolgshinweis nach Speichern und Rücksprung auf ungespeichert bei späteren Änderungen | ERLEDIGT |
 | 2026-06-05 | UI/Summen | Abo-Split-Liste zeigt neben der Abo-Zwischensumme auch die Endsumme der nächsten Lieferung; kombinierte Summen-Card optisch hervorgehoben; letzte Prüfung: 8 View-Tests / 28 Assertions grün | ERLEDIGT |
+| 2026-06-08 | Onetime/Verbindlichkeit | **Nur Bestätigtes ist verbindlich:** `AboOrderCart::addOneTimeItemsToYard()` lädt nur noch verbindlich bestätigte Einmal-Artikel (`confirmed_at` gesetzt **und** `confirmed_qty === qty`) → Liefer-/Abbuchungsbetrag, Versand, Gewicht und Comp-Produkte basieren ausschließlich auf bestätigten Artikeln (greift automatisch in Phase 4). Unbestätigte Artikel bleiben als offener Entwurf erhalten (Entscheidung „keep_pending"). Neue Service-Helfer `confirmedItems()`/`pendingItems()`/`pendingGross()`. View `_order_onetime_show` zeigt Status-Badge je Position (Bestätigt/Noch zu bestätigen), getrennte Zwischensummen (bestätigt vs. offen) + Hinweis, dass bereits bestätigte Produkte unabhängig versandt werden. 8 neue/angepasste Tests (51 gesamt grün). **Hinweis:** Die in `isOneTimeFeatureVisible()` zwischenzeitlich auskommentierte Fensterprüfung wurde wiederhergestellt | ERLEDIGT |
+| 2026-06-08 | Review-Gate | **Temporäre Live-Sichtbarkeit für Abstimmung:** Einmalprodukte-Feature über `AboHelper::isOneTimeFeatureVisible()` nur für VIP-User (`isVIP()` = `admin>=1`) im Sales Center sichtbar; Endkunden-Portal (customers-Guard, kein VIP) komplett ausgeblendet. Gates in `User\AboController` (detail/update/oneTime/oneTimeDatatable), `Portal\AboController` (myAbo/update/oneTime/oneTimeDatatable/modalLoad), `ModalController` (abo-add-onetime). Reversibel: Methode später auf reines `isOneTimeWindowOpen()` zurücksetzen + Portal reaktivieren. 4 neue Tests (47 gesamt grün) | ERLEDIGT |
--- a/resources/lang/de/abo.php
+++ b/resources/lang/de/abo.php
@ -114,6 +114,12 @@ return [
    'onetime_reset_hint' => 'Einmalige Produkte werden nur deiner nächsten Lieferung beigelegt und danach automatisch wieder aus dem Abo entfernt.',
    'add_onetime_product' => 'Einmaliges Produkt hinzufügen',
    'onetime_subtotal' => 'Zwischensumme einmalige Produkte',
+    'onetime_confirmed_subtotal' => 'Zwischensumme bestätigt (wird versandt)',
+    'onetime_pending_subtotal' => 'Noch zu bestätigen (nicht verbindlich)',
+    'onetime_new_total' => 'Neue Gesamtsumme nach Bestätigung',
+    'onetime_status_confirmed' => 'Bestätigt',
+    'onetime_status_pending' => 'Noch zu bestätigen',
+    'onetime_pending_hint' => 'Bereits bestätigte Produkte werden mit der nächsten Lieferung versandt – unabhängig davon, ob du diese neuen Produkte bestätigst.',
    'onetime_next_delivery_total' => 'Gesamtbetrag der nächsten Lieferung (Abo + Einmalig)',
    'onetime_legal_notice' => 'Die hinzugefügten Produkte werden einmalig am :nextBillingDate versendet. Es gelten unsere :agb und die :withdrawal.',
    'onetime_discard_changes' => 'Änderungen verwerfen',
--- a/resources/lang/en/abo.php
+++ b/resources/lang/en/abo.php
@ -105,6 +105,12 @@ return [
    'onetime_reset_hint' => 'One-time products are added only to your next delivery and are automatically removed from the subscription afterwards.',
    'add_onetime_product' => 'Add one-time product',
    'onetime_subtotal' => 'Subtotal one-time products',
+    'onetime_confirmed_subtotal' => 'Subtotal confirmed (will be shipped)',
+    'onetime_pending_subtotal' => 'Pending confirmation (not binding)',
+    'onetime_new_total' => 'New total after confirmation',
+    'onetime_status_confirmed' => 'Confirmed',
+    'onetime_status_pending' => 'To be confirmed',
+    'onetime_pending_hint' => 'Products you have already confirmed will be shipped with your next delivery, regardless of whether you confirm these new products.',
    'onetime_next_delivery_total' => 'Total amount of next delivery (subscription + one-time)',
    'onetime_legal_notice' => 'The added products will be shipped once on :nextBillingDate. Our :agb and :withdrawal apply.',
    'onetime_discard_changes' => 'Discard changes',
--- a/resources/lang/es/abo.php
+++ b/resources/lang/es/abo.php
@ -105,6 +105,12 @@ return [
    'onetime_reset_hint' => 'Los productos únicos solo se añaden a su próxima entrega y después se eliminan automáticamente de la suscripción.',
    'add_onetime_product' => 'Añadir producto único',
    'onetime_subtotal' => 'Subtotal productos únicos',
+    'onetime_confirmed_subtotal' => 'Subtotal confirmado (se enviará)',
+    'onetime_pending_subtotal' => 'Pendiente de confirmar (no vinculante)',
+    'onetime_new_total' => 'Nuevo total tras la confirmación',
+    'onetime_status_confirmed' => 'Confirmado',
+    'onetime_status_pending' => 'Por confirmar',
+    'onetime_pending_hint' => 'Los productos que ya has confirmado se enviarán con tu próxima entrega, independientemente de si confirmas estos nuevos productos.',
    'onetime_next_delivery_total' => 'Importe total de la próxima entrega (suscripción + único)',
    'onetime_legal_notice' => 'Los productos añadidos se enviarán una sola vez el :nextBillingDate. Se aplican nuestros :agb y el :withdrawal.',
    'onetime_discard_changes' => 'Descartar cambios',
--- a/resources/lang/fr/abo.php
+++ b/resources/lang/fr/abo.php
@ -114,6 +114,12 @@ return [
    'onetime_reset_hint' => 'Les produits ponctuels sont ajoutés uniquement à votre prochaine livraison puis supprimés automatiquement de l\'abonnement.',
    'add_onetime_product' => 'Ajouter un produit ponctuel',
    'onetime_subtotal' => 'Sous-total produits ponctuels',
+    'onetime_confirmed_subtotal' => 'Sous-total confirmé (sera expédié)',
+    'onetime_pending_subtotal' => 'À confirmer (non contraignant)',
+    'onetime_new_total' => 'Nouveau total après confirmation',
+    'onetime_status_confirmed' => 'Confirmé',
+    'onetime_status_pending' => 'À confirmer',
+    'onetime_pending_hint' => 'Les produits déjà confirmés seront expédiés avec votre prochaine livraison, que vous confirmiez ou non ces nouveaux produits.',
    'onetime_next_delivery_total' => 'Montant total de la prochaine livraison (abonnement + ponctuel)',
    'onetime_legal_notice' => 'Les produits ajoutés seront expédiés une seule fois le :nextBillingDate. Nos :agb et le :withdrawal s’appliquent.',
    'onetime_discard_changes' => 'Annuler les modifications',
--- a/resources/views/admin/abo/_order_combined_summary.blade.php
+++ b/resources/views/admin/abo/_order_combined_summary.blade.php
@ -5,10 +5,10 @@
 <div class="card-header bg-primary text-white">
    <h5 class="font-weight-semibold mb-0">{{ __('abo.combined_summary_hl') }}</h5>
 </div>
-<div class="card-body bg-light">
+<div class="card-body bg-warning-light" style="background-color: rgba(227, 227, 54, 0.5) !important;">
    <table class="table table-product m-0">
        <tbody>
-            @if(($summary['one_time']['gross'] ?? 0) > 0)
+            @if (($summary['one_time']['gross'] ?? 0) > 0)
                <tr>
                    <td class="small"><strong>{{ __('abo.onetime_subtotal') }}:</strong></td>
                    <td class="text-right small">{{ formatNumber($summary['one_time']['gross']) }} €</td>
@ -20,30 +20,37 @@
            </tr>
            <tr>
                <td class="small no-border-top"><strong>{{ __('Delivery country') }}:</strong></td>
-                <td class="text-right small no-border-top">{{ Yard::instance($cartInstance)->getShippingCountryName() }}</td>
+                <td class="text-right small no-border-top">{{ Yard::instance($cartInstance)->getShippingCountryName() }}
+                </td>
            </tr>
            <tr>
                <td class="small no-border-top"><strong>{{ __('order.shipping_costs') }}:</strong></td>
-                <td class="text-right small no-border-top">{{ $taxFree ? Yard::instance($cartInstance)->shippingNet() : Yard::instance($cartInstance)->shipping() }} €</td>
+                <td class="text-right small no-border-top">
+                    {{ $taxFree ? Yard::instance($cartInstance)->shippingNet() : Yard::instance($cartInstance)->shipping() }}
+                    €</td>
            </tr>
-            @if($taxFree)
+            @if ($taxFree)
                <tr>
                    <td class="small no-border-top"><strong>{{ __('order.sum_net') }}:</strong></td>
-                    <td class="text-right small no-border-top">{{ Yard::instance($cartInstance)->subtotalWithShipping() }} €</td>
+                    <td class="text-right small no-border-top">
+                        {{ Yard::instance($cartInstance)->subtotalWithShipping() }} €</td>
                </tr>
            @else
                <tr>
                    <td class="small no-border-top"><strong>{{ __('order.total_without_VAT') }}:</strong></td>
-                    <td class="text-right small no-border-top">{{ Yard::instance($cartInstance)->subtotalWithShipping() }} €</td>
+                    <td class="text-right small no-border-top">
+                        {{ Yard::instance($cartInstance)->subtotalWithShipping() }} €</td>
                </tr>
                <tr>
                    <td class="small no-border-top"><strong>{{ __('order.plus_VAT') }}:</strong></td>
-                    <td class="text-right small no-border-top">{{ Yard::instance($cartInstance)->taxWithShipping() }} €</td>
+                    <td class="text-right small no-border-top">{{ Yard::instance($cartInstance)->taxWithShipping() }} €
+                    </td>
                </tr>
            @endif
            <tr class="bg-white">
                <td class="pt-2 pb-2"><strong>{{ __('order.total_sum') }}:</strong></td>
-                <td class="text-right font-weight-bold pt-2 pb-2">{{ Yard::instance($cartInstance)->totalWithShipping() }} €</td>
+                <td class="text-right font-weight-bold pt-2 pb-2">
+                    {{ Yard::instance($cartInstance)->totalWithShipping() }} €</td>
            </tr>
        </tbody>
    </table>
--- a/resources/views/admin/abo/_order_onetime_show.blade.php
+++ b/resources/views/admin/abo/_order_onetime_show.blade.php
@ -2,11 +2,13 @@
    $one_time_items = $user_abo->one_time_items()->with('product')->get();
    $hasOneTimeChanges = \App\Services\AboOneTimeService::hasUnconfirmedChanges($user_abo);
    $hasConfirmedOneTimeItems = \App\Services\AboOneTimeService::hasConfirmedItems($user_abo);
-    $oneTimeGross = $summary['one_time']['gross'] ?? 0;
+    $hasBindingConfirmed = \App\Services\AboOneTimeService::confirmedItems($user_abo)->isNotEmpty();
+    $confirmedGross = $summary['one_time']['gross'] ?? 0;
+    $pendingGross = \App\Services\AboOneTimeService::pendingGross($user_abo);
    $nextDeliveryTotal = $summary['total_with_shipping'] ?? 0;
    $oneTimeConfirmationState = $hasOneTimeChanges ? 'changed' : ($hasConfirmedOneTimeItems ? 'confirmed' : 'empty');
@endphp
-@if(isset($error_message) && $error_message)
+@if (isset($error_message) && $error_message)
    <div class="alert alert-danger mt-2" id="insert_onetime_error_message">{{ $error_message }}</div>
@endif
 <div class="table-responsive">
@ -23,30 +25,48 @@
            @forelse($one_time_items as $one_time_item)
                <tr>
                    <td>
-                        @if($one_time_item->product && count($one_time_item->product->images))
-                            <img class="img-fluid img-extra" alt="" src="{{ route('product_image', [$one_time_item->product->images->first()->slug]) }}">
+                        @if ($one_time_item->product && count($one_time_item->product->images))
+                            <img class="img-fluid img-extra" alt=""
+                                src="{{ route('product_image', [$one_time_item->product->images->first()->slug]) }}">
                        @endif
                    </td>
                    <td class="min-width-80">
                        <strong>{{ $one_time_item->product?->getLang('name') }}</strong>
-                        <span class="badge badge-pill badge-warning"><i class="fa fa-bolt"></i> {{ __('abo.onetime_badge') }}</span>
+                        <span class="badge badge-pill badge-warning"><i class="fa fa-bolt"></i>
+                            {{ __('abo.onetime_badge') }}</span>
+                        @if ($one_time_item->isConfirmed())
+                            <span class="badge badge-pill badge-success"><i class="fa fa-check"></i>
+                                {{ __('abo.onetime_status_confirmed') }}</span>
+                        @else
+                            <span class="badge badge-pill badge-secondary"><i class="fa fa-clock"></i>
+                                {{ __('abo.onetime_status_pending') }}</span>
+                        @endif
                        <div class="text-body">
                            <div>{{ __('order.content') }}: {{ $one_time_item->product?->contents }}</div>
                            <div>{{ __('order.art_no') }}: {{ $one_time_item->product?->number }}</div>
                        </div>
                        <div class="options">
-                            <a href="#" class="auto-delete-product remove_onetime_from_cart product-tooltip" data-onetime-item-id="{{ $one_time_item->id }}"><i class="fa fa-times"></i> {{ __('order.article_remove') }}</a>
+                            <a href="#" class="auto-delete-product remove_onetime_from_cart product-tooltip"
+                                data-onetime-item-id="{{ $one_time_item->id }}"><i class="fa fa-times"></i>
+                                {{ __('order.article_remove') }}</a>
                        </div>
                    </td>
                    <td>
                        <div class="no-line-break input-group-min-w">
                            <div class="input-group d-inline-flex w-auto">
                                <span class="input-group-prepend">
-                                    <button type="button" class="btn btn-secondary icon-btn md-btn-extra onetime-remove-from-basket" data-onetime-item-id="{{ $one_time_item->id }}">-</button>
+                                    <button type="button"
+                                        class="btn btn-secondary icon-btn md-btn-extra onetime-remove-from-basket"
+                                        data-onetime-item-id="{{ $one_time_item->id }}">-</button>
                                </span>
-                                <input type="text" class="form-control text-center input-extra onetime-input-onchange" name="onetime_qty_{{ $one_time_item->id }}" data-onetime-item-id="{{ $one_time_item->id }}" value="{{ $one_time_item->qty }}">
+                                <input type="text"
+                                    class="form-control text-center input-extra onetime-input-onchange"
+                                    name="onetime_qty_{{ $one_time_item->id }}"
+                                    data-onetime-item-id="{{ $one_time_item->id }}" value="{{ $one_time_item->qty }}">
                                <span class="input-group-append">
-                                    <button type="button" class="btn btn-secondary icon-btn md-btn-extra onetime-add-from-basket" data-onetime-item-id="{{ $one_time_item->id }}">+</button>
+                                    <button type="button"
+                                        class="btn btn-secondary icon-btn md-btn-extra onetime-add-from-basket"
+                                        data-onetime-item-id="{{ $one_time_item->id }}">+</button>
                                </span>
                            </div>
                        </div>
@ -63,31 +83,67 @@
        </tbody>
        <tfoot>
            <tr>
-                <td colspan="4"><hr></td>
+                <td colspan="4">
+                    <hr>
+                </td>
            </tr>
-            <tr>
-                <td colspan="3" class="text-right small"><strong>{{ __('abo.onetime_subtotal') }}:</strong></td>
-                <td class="text-right small">{{ formatNumber($summary['one_time']['gross'] ?? 0) }} €</td>
-            </tr>
-            @if($oneTimeGross > 0 || $hasOneTimeChanges || $hasConfirmedOneTimeItems)
+            @if ($hasBindingConfirmed)
                <tr>
-                    <td colspan="3" class="text-right small no-border-top"><strong>{{ __('abo.onetime_next_delivery_total') }}:</strong></td>
+                    <td colspan="3" class="text-right small">
+                        <strong>{{ __('abo.onetime_confirmed_subtotal') }}:</strong>
+                    </td>
+                    <td class="text-right small">{{ formatNumber($confirmedGross) }} €</td>
+                </tr>
+                <tr>
+                    <td colspan="3" class="text-right small no-border-top">
+                        <strong>{{ __('abo.onetime_next_delivery_total') }}:</strong>
+                    </td>
                    <td class="text-right small no-border-top">{{ formatNumber($nextDeliveryTotal) }} €</td>
                </tr>
            @endif
+            @if ($pendingGross > 0)
+                @if ($hasBindingConfirmed)
+                    <tr>
+                        <td colspan="4">
+                            <hr>
+                        </td>
+                    </tr>
+                @endif
+                <tr>
+                    <td colspan="3" class="text-right small no-border-top text-danger">
+                        <strong>{{ __('abo.onetime_pending_subtotal') }}:</strong>
+                    </td>
+                    <td class="text-right small no-border-top text-danger">+
+                        {{ formatNumber($pendingGross) }} €</td>
+                </tr>
+                <tr>
+                    <td colspan="3" class="text-right no-border-top text-danger">
+                        <strong>{{ __('abo.onetime_new_total') }}:</strong>
+                    </td>
+                    <td class="text-right no-border-top font-weight-bold text-danger">
+                        {{ formatNumber(($hasBindingConfirmed ? $confirmedGross : 0) + $pendingGross) }} €</td>
+                </tr>
+            @endif
        </tfoot>
    </table>
 </div>
-@if($oneTimeGross > 0 || $hasOneTimeChanges || $hasConfirmedOneTimeItems)
-    <div class="mt-3" id="onetime_confirmation_block" data-confirmation-state="{{ $oneTimeConfirmationState }}" aria-live="polite">
+@if ($one_time_items->count() > 0)
+    <div class="mt-3" id="onetime_confirmation_block" data-confirmation-state="{{ $oneTimeConfirmationState }}"
+        aria-live="polite">
+
        <p class="small text-muted mb-2">
            {!! __('abo.onetime_legal_notice', [
                'nextBillingDate' => $user_abo->next_date ?: __('abo.confirm_next_delivery_unknown'),
-                'agb' => '<a href="'.url('/agb').'" target="_blank">'.__('abo.confirm_terms_link').'</a>',
-                'withdrawal' => '<a href="'.asset('download/mivita_widerruf_formular.pdf').'" target="_blank">'.__('abo.confirm_withdrawal_link').'</a>',
+                'agb' => '<a href="' . url('/agb') . '" target="_blank">' . __('abo.confirm_terms_link') . '</a>',
+                'withdrawal' =>
+                    '<a href="' .
+                    asset('download/mivita_widerruf_formular.pdf') .
+                    '" target="_blank">' .
+                    __('abo.confirm_withdrawal_link') .
+                    '</a>',
            ]) !!}
        </p>
-        @if($hasOneTimeChanges)
+        @if ($hasOneTimeChanges)
            <div class="d-flex flex-wrap justify-content-end">
                <button type="button" class="btn btn-default mr-2 mb-2 onetime-discard-changes">
                    {{ __('abo.onetime_discard_changes') }}
@ -101,5 +157,9 @@
                <span aria-hidden="true">&check;</span> {{ __('abo.onetime_confirm_success') }}
            </div>
        @endif
+        @if ($hasOneTimeChanges && $hasConfirmedOneTimeItems)
+            <hr>
+            <div class="alert alert-info small mb-2">{{ __('abo.onetime_pending_hint') }}</div>
+        @endif
    </div>
@endif
--- a/tests/Feature/AboOneTimeServiceTest.php
+++ b/tests/Feature/AboOneTimeServiceTest.php
@ -129,6 +129,71 @@ describe('AboOneTimeService', function () {

        expect($this->service->handleAction($abo, ['action' => 'foo']))->toBe(__('abo.onetime_action_invalid'));
    });
+
+    it('trennt bestätigte und offene Einmal-Artikel inkl. offener Zwischensumme', function () {
+        $abo = makeMeAbo();
+        $confirmed = makeProduct(['2'], 119, 19);
+        $pending = makeProduct(['2'], 50, 19);
+
+        UserAboOneTimeItem::create([
+            'user_abo_id' => $abo->id, 'product_id' => $confirmed->id,
+            'qty' => 1, 'confirmed_qty' => 1, 'confirmed_at' => now(),
+            'price' => 119.0, 'tax_rate' => 19.0, 'status' => 1,
+        ]);
+        UserAboOneTimeItem::create([
+            'user_abo_id' => $abo->id, 'product_id' => $pending->id,
+            'qty' => 2, 'price' => 50.0, 'tax_rate' => 19.0, 'status' => 0,
+        ]);
+
+        expect(AboOneTimeService::confirmedItems($abo)->count())->toBe(1)
+            ->and(AboOneTimeService::pendingItems($abo)->count())->toBe(1)
+            ->and(AboOneTimeService::pendingGross($abo))->toBe(100.0);
+    });
+
+    it('behandelt einen geänderten bestätigten Artikel als offen', function () {
+        $abo = makeMeAbo();
+        $product = makeProduct(['2'], 119, 19);
+
+        UserAboOneTimeItem::create([
+            'user_abo_id' => $abo->id, 'product_id' => $product->id,
+            'qty' => 3, 'confirmed_qty' => 1, 'confirmed_at' => now(),
+            'price' => 119.0, 'tax_rate' => 19.0, 'status' => 0,
+        ]);
+
+        expect(AboOneTimeService::confirmedItems($abo)->count())->toBe(0)
+            ->and(AboOneTimeService::pendingItems($abo)->count())->toBe(1)
+            ->and(AboOneTimeService::pendingGross($abo))->toBe(357.0);
+    });
+});
+
+describe('AboOrderCart::addOneTimeItemsToYard', function () {
+    beforeEach(fn () => makeShopEnv());
+
+    it('lädt nur verbindlich bestätigte Einmal-Artikel in den Warenkorb', function () {
+        $abo = makeMeAbo();
+        $confirmed = makeProduct(['2'], 119, 19);
+        $pending = makeProduct(['2'], 50, 19);
+
+        UserAboOneTimeItem::create([
+            'user_abo_id' => $abo->id, 'product_id' => $confirmed->id,
+            'qty' => 1, 'confirmed_qty' => 1, 'confirmed_at' => now(),
+            'price' => 119.0, 'tax_rate' => 19.0, 'status' => 1,
+        ]);
+        UserAboOneTimeItem::create([
+            'user_abo_id' => $abo->id, 'product_id' => $pending->id,
+            'qty' => 1, 'price' => 50.0, 'tax_rate' => 19.0, 'status' => 0,
+        ]);
+
+        $yard = Yard::instance(AboOrderCart::INSTANCE);
+        $yard->destroy();
+
+        AboOrderCart::addOneTimeItemsToYard($abo->fresh());
+
+        expect($yard->content()->count())->toBe(1)
+            ->and((int) $yard->content()->first()->id)->toBe($confirmed->id);
+
+        $yard->destroy();
+    });
 });

 describe('AboOrderCart::buildOneTimeSnapshot', function () {
--- a/tests/Feature/AboOneTimeViewTest.php
+++ b/tests/Feature/AboOneTimeViewTest.php
@ -9,7 +9,7 @@ uses(Tests\TestCase::class, RefreshDatabase::class);
 describe('Abo Einmal-Produkte Views', function () {
    beforeEach(fn () => makeShopEnv());

-    it('rendert die Einmal-Produktliste mit Position und Zwischensumme', function () {
+    it('rendert die Einmal-Produktliste mit Position und offener Zwischensumme', function () {
        $abo = makeMeAbo();
        $product = makeProduct(['2'], 119, 19);

@ -21,7 +21,7 @@ describe('Abo Einmal-Produkte Views', function () {
            'price_net' => 100.0,
            'tax_rate' => 19.0,
            'tax' => 19.0,
-            'status' => 1,
+            'status' => 0,
        ]);

        $summary = ['one_time' => ['gross' => 238.0, 'net' => 200.0, 'tax' => 38.0]];
@ -32,10 +32,50 @@ describe('Abo Einmal-Produkte Views', function () {
        ])->render();

        expect($html)->toContain($product->getLang('name'))
-            ->and($html)->toContain(__('abo.onetime_subtotal'))
+            ->and($html)->toContain(__('abo.onetime_pending_subtotal'))
+            ->and($html)->toContain(__('abo.onetime_status_pending'))
            ->and($html)->toContain('238,00');
    });

+    it('zeigt bestätigte und offene Artikel mit getrennten Zwischensummen', function () {
+        $abo = makeMeAbo();
+        $confirmed = makeProduct(['2'], 119, 19);
+        $pending = makeProduct(['2'], 50, 19);
+
+        UserAboOneTimeItem::create([
+            'user_abo_id' => $abo->id,
+            'product_id' => $confirmed->id,
+            'qty' => 1,
+            'confirmed_qty' => 1,
+            'confirmed_at' => now(),
+            'price' => 119.0,
+            'tax_rate' => 19.0,
+            'status' => 1,
+        ]);
+        UserAboOneTimeItem::create([
+            'user_abo_id' => $abo->id,
+            'product_id' => $pending->id,
+            'qty' => 1,
+            'price' => 50.0,
+            'tax_rate' => 19.0,
+            'status' => 0,
+        ]);
+
+        $html = view('admin.abo._order_onetime_show', [
+            'user_abo' => $abo->fresh(),
+            'summary' => ['one_time' => ['gross' => 119.0], 'total_with_shipping' => 219.0],
+        ])->render();
+
+        expect($html)->toContain(__('abo.onetime_confirmed_subtotal'))
+            ->and($html)->toContain(__('abo.onetime_pending_subtotal'))
+            ->and($html)->toContain(__('abo.onetime_new_total'))
+            ->and($html)->toContain(__('abo.onetime_status_confirmed'))
+            ->and($html)->toContain(__('abo.onetime_status_pending'))
+            ->and($html)->toContain(__('abo.onetime_pending_hint'))
+            ->and($html)->toContain('50,00')
+            ->and($html)->toContain('169,00');
+    });
+
    it('zeigt bei unbestätigten Einmal-Artikeln die Bestätigungsbuttons', function () {
        $abo = makeMeAbo();
        $product = makeProduct(['2'], 119, 19);
@ -56,7 +96,7 @@ describe('Abo Einmal-Produkte Views', function () {
            'summary' => ['one_time' => ['gross' => 119.0], 'total_with_shipping' => 219.0],
        ])->render();

-        expect($html)->toContain(__('abo.onetime_next_delivery_total'))
+        expect($html)->toContain(__('abo.onetime_pending_subtotal'))
            ->and($html)->toContain(__('abo.onetime_legal_notice', [
                'nextBillingDate' => $abo->next_date,
                'agb' => '<a href="'.url('/agb').'" target="_blank">'.__('abo.confirm_terms_link').'</a>',
--- a/tests/Feature/AboOneTimeWindowTest.php
+++ b/tests/Feature/AboOneTimeWindowTest.php
@ -5,6 +5,7 @@ use App\Models\ShoppingOrderItem;
 use App\Models\UserAbo;
 use App\Models\UserAboOneTimeItem;
 use App\Services\AboHelper;
+use App\User;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;

@ -82,6 +83,48 @@ describe('isOneTimeWindowOpen', function () {
    });
 });

+describe('isOneTimeFeatureVisible', function () {
+    it('ist sichtbar, wenn das Fenster offen ist und ein VIP-User (Admin) eingeloggt ist', function () {
+        $vip = new User;
+        $vip->admin = 1;
+        $this->actingAs($vip, 'user');
+
+        $abo = new UserAbo;
+        $abo->next_date = now()->addDays(2); // innerhalb des 4-Tage-Fensters
+
+        expect(AboHelper::isOneTimeFeatureVisible($abo))->toBeTrue();
+    });
+
+    it('ist nicht sichtbar für eingeloggte Nicht-VIP-User', function () {
+        $user = new User;
+        $user->admin = 0;
+        $this->actingAs($user, 'user');
+
+        $abo = new UserAbo;
+        $abo->next_date = now()->addDays(2);
+
+        expect(AboHelper::isOneTimeFeatureVisible($abo))->toBeFalse();
+    });
+
+    it('ist nicht sichtbar ohne User auf dem user-Guard (Portal/Endkunde)', function () {
+        $abo = new UserAbo;
+        $abo->next_date = now()->addDays(2);
+
+        expect(AboHelper::isOneTimeFeatureVisible($abo))->toBeFalse();
+    });
+
+    it('ist nicht sichtbar bei geschlossenem Fenster, auch für VIP-User', function () {
+        $vip = new User;
+        $vip->admin = 1;
+        $this->actingAs($vip, 'user');
+
+        $abo = new UserAbo;
+        $abo->next_date = now()->addDays(30); // außerhalb des Fensters
+
+        expect(AboHelper::isOneTimeFeatureVisible($abo))->toBeFalse();
+    });
+});
+
 describe('UserAboOneTimeItem Model', function () {
    it('definiert die Beziehung one_time_items auf UserAbo', function () {
        $relation = (new UserAbo)->one_time_items();