diff --git a/app/Console/Commands/S3Cleanup.php b/app/Console/Commands/S3Cleanup.php
index 0397040120de..b629e20f76e5 100644
--- a/app/Console/Commands/S3Cleanup.php
+++ b/app/Console/Commands/S3Cleanup.php
@@ -50,9 +50,9 @@ class S3Cleanup extends Command
      */
     public function handle()
     {
-        if (!Ninja::isHosted()) {
-            return;
-        }
+        // if (!Ninja::isHosted()) {
+        //     return;
+        // }
 
         $c1 = Company::on('db-ninja-01')->pluck('company_key');
         $c2 = Company::on('db-ninja-02')->pluck('company_key');
diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php
index 9e97bad7f522..1cd862cac912 100644
--- a/app/Jobs/Company/CompanyExport.php
+++ b/app/Jobs/Company/CompanyExport.php
@@ -64,7 +64,7 @@ class CompanyExport implements ShouldQueue
     {
         MultiDB::setDb($this->company->db);
 
-        $this->company = Company::query()->where('company_key', $this->company->company_key)->first();
+        // $this->company = Company::query()->where('company_key', $this->company->company_key)->first();
 
         set_time_limit(0);
 
diff --git a/app/Livewire/BillingPortalPurchasev2.php b/app/Livewire/BillingPortalPurchasev2.php
index 33524db77138..b554bbd95497 100644
--- a/app/Livewire/BillingPortalPurchasev2.php
+++ b/app/Livewire/BillingPortalPurchasev2.php
@@ -96,7 +96,8 @@ class BillingPortalPurchasev2 extends Component
      *
      * @var Invoice
      */
-    public $invoice;
+    
+    public \App\Models\Invoice $invoice;
 
     /**
      * Coupon model for user input
@@ -112,6 +113,9 @@ class BillingPortalPurchasev2 extends Component
      */
     public $quantity;
 
+    public $invoice_hashed_id = '';
+
+    public $payable_amount = 0;
     /**
      * First-hit request data (queries, locales...).
      *
@@ -160,7 +164,7 @@ class BillingPortalPurchasev2 extends Component
     public $payment_confirmed = false;
     public $is_eligible = true;
     public $not_eligible_message = '';
-    
+
     public function mount()
     {
         MultiDB::setDb($this->db);
@@ -182,6 +186,9 @@ class BillingPortalPurchasev2 extends Component
         $this->sub_total = 0;
         $this->float_amount_total = 0;
 
+        $this->invoice_hashed_id = '';
+        $this->payable_amount = 0;
+        
         $this->data = [];
 
         $this->price = $this->subscription->price; // ?
@@ -493,6 +500,9 @@ class BillingPortalPurchasev2 extends Component
         $this->payment_method_id = $gateway_type_id;
 
         $this->handleBeforePaymentEvents();
+
+        $this->dispatch('beforePaymentEventsCompleted');
+
     }
 
     /**
@@ -500,7 +510,7 @@ class BillingPortalPurchasev2 extends Component
      *
      * @return self
      */
-    public function handleBeforePaymentEvents() :self
+    public function handleBeforePaymentEvents(): self
     {
         $eligibility_check = $this->subscription->service()->isEligible($this->contact);
 
@@ -520,7 +530,6 @@ class BillingPortalPurchasev2 extends Component
             ]],
             'user_input_promo_code' => $this->coupon,
             'coupon' => empty($this->subscription->promo_code) ? '' : $this->coupon,
-
         ];
 
         $this->invoice = $this->subscription
@@ -532,6 +541,9 @@ class BillingPortalPurchasev2 extends Component
             ->adjustInventory()
             ->save();
 
+        $this->payable_amount = $this->invoice->partial > 0 ? \App\Utils\Number::formatValue($this->invoice->partial, $this->invoice->client->currency()) : \App\Utils\Number::formatValue($this->invoice->balance, $this->invoice->client->currency());
+        $this->invoice_hashed_id = $this->invoice->hashed_id;
+
         Cache::put($this->hash, [
             'subscription_id' => $this->subscription->hashed_id,
             'email' => $this->email ?? $this->contact->email,
@@ -542,8 +554,6 @@ class BillingPortalPurchasev2 extends Component
             'bundle' => $this->bundle,
         ], now()->addMinutes(60));
 
-        $this->dispatch('beforePaymentEventsCompleted');
-
         return $this;
     }
 
diff --git a/resources/views/billing-portal/purchasev2.blade.php b/resources/views/billing-portal/purchasev2.blade.php
index 239d2a271f99..311219516e2c 100644
--- a/resources/views/billing-portal/purchasev2.blade.php
+++ b/resources/views/billing-portal/purchasev2.blade.php
@@ -8,6 +8,8 @@
 @push('footer')
     <script>
         function updateGatewayFields(companyGatewayId, paymentMethodId) {
+            console.log(companyGatewayId, paymentMethodId);
+        
             document.getElementById('company_gateway_id').value = companyGatewayId;
             document.getElementById('payment_method_id').value = paymentMethodId;
         }
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 1d3e167d1f71..225fed232a32 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
@@ -8,27 +8,21 @@
                 </h1>
             </div>
 
-            @if(isset($invoice))
             <div class="flex items-center mt-4 text-sm">
                 <form action="{{ route('client.payments.process', ['hash' => $hash, 'sidebar' => 'hidden']) }}"
                       method="post"
                       id="payment-method-form">
                     @csrf
 
-                    @if($invoice instanceof \App\Models\Invoice)
-                        <input type="hidden" name="invoices[]" value="{{ $invoice->hashed_id }}">
-                        <input type="hidden" name="payable_invoices[0][amount]"
-                               value="{{ $invoice->partial > 0 ? \App\Utils\Number::formatValue($invoice->partial, $invoice->client->currency()) : \App\Utils\Number::formatValue($invoice->balance, $invoice->client->currency()) }}">
-                        <input type="hidden" name="payable_invoices[0][invoice_id]"
-                               value="{{ $invoice->hashed_id }}">
-                    @endif
+                        <input type="hidden" name="invoices[]" value="{{ $invoice_hashed_id }}">
+                        <input type="hidden" name="payable_invoices[0][amount]" value="{{ $payable_amount }}">
+                        <input type="hidden" name="payable_invoices[0][invoice_id]" value="{{ $invoice_hashed_id }}">
 
                     <input type="hidden" name="action" value="payment">
                     <input type="hidden" name="company_gateway_id" value="{{ $company_gateway_id }}"/>
                     <input type="hidden" name="payment_method_id" value="{{ $payment_method_id }}"/>
                 </form>
             </div>
-            @endif
 
             <form wire:submit="submit">
             <!-- Recurring Plan Products-->