From 212f5920e0cafbe61568559dd0edcc64bd746265 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 1 Mar 2023 19:14:04 +1100
Subject: [PATCH] Minor fixes for subscriptions v2

---
 app/Http/Livewire/BillingPortalPurchasev2.php |  3 +++
 .../billing-portal-purchasev2.blade.php       | 25 ++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index e3dce5a479ea..612dfd5b8209 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -173,6 +173,9 @@ class BillingPortalPurchasev2 extends Component
             $this->authenticated = true;
             $this->payment_started = true;
         }
+        else {
+            $this->bundle = collect();
+        }
 
         $this->discount = 0;
         $this->sub_total = 0;
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
index cd2eee01fd45..d3417dded2f0 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
@@ -268,27 +268,28 @@
                 @endif
 
                 <div class="border-gray-200 border-opacity-50 mt-4">
-                    @if($discount)
                     <div class="flex font-semibold justify-between py-1 text-sm uppercase">
+                        <span>{{ ctrans('texts.one_time_purchases') }}</span>
+                        <span>{{ $non_recurring_total }}</span>
+                    </div>
+                    
+                    <div class="flex font-semibold justify-between py-1 text-sm uppercase">
+                        <span>{{ ctrans('texts.recurring_purchases') }}</span>
+                        <span>{{ $recurring_total }}</span>
+                    </div>
+
+
+                    @if($discount)
+                    <!-- <div class="flex font-semibold justify-between py-1 text-sm uppercase">
                         <span>{{ ctrans('texts.subtotal') }}</span>
                         <span>{{ $sub_total }}</span>
-                    </div>
+                    </div> -->
                     <div class="flex font-semibold justify-between py-1 text-sm uppercase">
                         <span>{{ ctrans('texts.discount') }}</span>
                         <span>{{ $discount }}</span>
                     </div>
                     @endif
 
-                    <div class="flex font-semibold justify-between py-1 text-sm uppercase border-t-2">
-                        <span>{{ ctrans('texts.one_time_purchases') }}</span>
-                        <span>{{ $non_recurring_total }}</span>
-                    </div>
-                    
-                    <div class="flex font-semibold justify-between py-1 text-sm uppercase border-t-2">
-                        <span>{{ ctrans('texts.recurring_purchases') }}</span>
-                        <span>{{ $recurring_total }}</span>
-                    </div>
-
                     <div class="flex font-semibold justify-between py-1 text-sm uppercase border-t-2">
                         <span>{{ ctrans('texts.total') }}</span>
                         <span>{{ $total }}</span>