diff --git a/VERSION.txt b/VERSION.txt
index 182ea559ba69..f05e61d96326 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.8.2
\ No newline at end of file
+5.8.3
\ No newline at end of file
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/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php
index 455568a0ca15..3f3b57e169e6 100644
--- a/app/Transformers/InvoiceTransformer.php
+++ b/app/Transformers/InvoiceTransformer.php
@@ -132,7 +132,7 @@ class InvoiceTransformer extends EntityTransformer
             'is_amount_discount' => (bool) ($invoice->is_amount_discount ?: false),
             'footer' => $invoice->footer ?: '',
             'partial' => (float) ($invoice->partial ?: 0.0),
-            'partial_due_date' => ($invoice->partial_due_date && $invoice->partial_due_date != "-0001-11-30") ?: '',
+            'partial_due_date' => ($invoice->partial_due_date && $invoice->partial_due_date != "-0001-11-30") ? $invoice->partial_due_date : '',
             'custom_value1' => (string) $invoice->custom_value1 ?: '',
             'custom_value2' => (string) $invoice->custom_value2 ?: '',
             'custom_value3' => (string) $invoice->custom_value3 ?: '',
diff --git a/config/ninja.php b/config/ninja.php
index 81b42bb2675d..65f18806f0a5 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.8.2'),
-    'app_tag' => env('APP_TAG', '5.8.2'),
+    'app_version' => env('APP_VERSION', '5.8.3'),
+    'app_tag' => env('APP_TAG', '5.8.3'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),
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 22ed4940b44c..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-->
@@ -391,17 +385,68 @@
                         <form wire:submit="handleLogin" class="" x-data="otpForm()">
                             <p class="mb-4"></p>
                             <div class="flex justify-between">
-                              <template x-for="(input, index) in length" :key="index">
+                              <!-- <template x-for="(input, index) in length" :key="index"> -->
                                 <input
+                                    id="0"
                                     type="text"
                                     maxlength="1"
                                     class="border border-gray-500 w-10 h-10 text-center text-gray-700"
-                                    :x-ref="index"
+                                    :x-ref="0"
                                     x-on:input="handleInput($event)"
                                     x-on:paste="handlePaste($event)"
                                     x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
                                 />
-                              </template>
+                                <input
+                                    id="1"
+                                    type="text"
+                                    maxlength="1"
+                                    class="border border-gray-500 w-10 h-10 text-center text-gray-700"
+                                    :x-ref="1"
+                                    x-on:input="handleInput($event)"
+                                    x-on:paste="handlePaste($event)"
+                                    x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
+                                />
+                                <input
+                                    id="2"
+                                    type="text"
+                                    maxlength="1"
+                                    class="border border-gray-500 w-10 h-10 text-center text-gray-700"
+                                    :x-ref="2"
+                                    x-on:input="handleInput($event)"
+                                    x-on:paste="handlePaste($event)"
+                                    x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
+                                />
+                                <input
+                                    id="3"
+                                    type="text"
+                                    maxlength="1"
+                                    class="border border-gray-500 w-10 h-10 text-center text-gray-700"
+                                    :x-ref="3"
+                                    x-on:input="handleInput($event)"
+                                    x-on:paste="handlePaste($event)"
+                                    x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
+                                />
+                                <input
+                                    id="4"
+                                    type="text"
+                                    maxlength="1"
+                                    class="border border-gray-500 w-10 h-10 text-center text-gray-700"
+                                    :x-ref="4"
+                                    x-on:input="handleInput($event)"
+                                    x-on:paste="handlePaste($event)"
+                                    x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
+                                />
+                                <input
+                                    id="5"
+                                    type="text"
+                                    maxlength="1"
+                                    class="border border-gray-500 w-10 h-10 text-center text-gray-700"
+                                    :x-ref="5"
+                                    x-on:input="handleInput($event)"
+                                    x-on:paste="handlePaste($event)"
+                                    x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
+                                />
+                              <!-- </template> -->
                             </div>
                             
                         </form>
@@ -430,7 +475,7 @@
                 const input = e.target;
 
                 this.login = Array.from(Array(this.length), (element, i) => {
-                return this.$refs[i].value || "";
+                    return document.getElementById(i.toString()).value || '';
                 }).join("");
 
                 if (input.nextElementSibling && input.value) {
@@ -451,8 +496,17 @@
                 const inputs = Array.from(Array(this.length));
 
                 inputs.forEach((element, i) => {
-                    this.$refs[i].value = paste[i] || '';
+                    document.getElementById(i.toString()).value = paste[i] || '';
                 });
+
+                this.login = Array.from(Array(this.length), (element, i) => {
+                    return document.getElementById(i.toString()).value || '';
+                }).join("");
+
+                if(this.login.length == 6){
+                    this.$wire.handleLogin(this.login);
+                }
+
             },
 
             handleBackspace(e) {