From 1ca6810132ff45d8aaf07f641d882acc58965f3b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 16:50:48 +1100
Subject: [PATCH] Subscriptions v2

---
 app/Http/Livewire/BillingPortalPurchasev2.php | 16 ++---
 app/Services/Invoice/UpdateReminder.php       |  2 -
 .../billing-portal-purchasev2.blade.php       | 63 +++++++++++--------
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index 4a6bea54f8e0..4f0569f2fcf7 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -222,24 +222,16 @@ class BillingPortalPurchasev2 extends Component
         
     }
 
-    public function updatedLogin()
+
+    public function handleLogin($log)
     {
-                nlog($this->login);
-
+        nlog($log);
     }
-    public function handleLogin()
-    {
-        nlog($this->all());
-
-        nlog($this->login);
-        nlog($this->otp);
-        nlog($this->value);
-    }
-
 
     public function handleEmail()
     {
          $this->validateOnly('email', ['email' => 'required|bail|email:rfc']);
+     
          $rand = rand(100000,999999);
 
          $email_hash = "{$this->email}:" . $rand;
diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php
index 40962a7ced78..9e627d33a90c 100644
--- a/app/Services/Invoice/UpdateReminder.php
+++ b/app/Services/Invoice/UpdateReminder.php
@@ -145,8 +145,6 @@ class UpdateReminder extends AbstractService
             $reminder_date = $this->addTimeInterval($this->invoice->last_sent_date, (int) $this->settings->endless_reminder_frequency_id);
 
             if ($reminder_date) {
-                // $reminder_date->addSeconds($offset);
-
                 if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
                     $date_collection->push($reminder_date);
                 }
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 a4c087ae2dcd..67c5e676d34c 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
@@ -258,46 +258,44 @@
                     </form>
                     @endif
 
+                    @if($email && !$errors->has('email'))
                     <div class="py-6 px-6 w-80 border mx-auto text-center my-6">
-                    <form wire:submit.prevent="handleLogin" action="#" class="" x-data="otpForm()">
-                        <div class="flex justify-between">
-                          <template x-for="(input, index) in length" :key="index">
-                            <input
-                                type="text"
-                                maxlength="1"
-                                class="border border-gray-500 w-10 h-10 text-center text-gray-700"
-                                :x-ref="index"
-                                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>
-                        <input type="hidden" wire:model.defer="login" x-model="value" x-data="value">
-                         <button type="submit" class="btn-primary mx-auto block bg-gray-500 w-full p-2 mt-2 text-white">
-                            {{ ctrans('texts.login') }}
-                        </button>
-                        <p class="absolute bottom-0" x-text="`value: ${value}`"></p>
-
-                    </form>
+                        <form wire:submit.prevent="handleLogin" class="" x-data="otpForm()">
+                            <p class="mb-4">Enter the code we emailed</p>
+                            <div class="flex justify-between">
+                              <template x-for="(input, index) in length" :key="index">
+                                <input
+                                    type="text"
+                                    maxlength="1"
+                                    class="border border-gray-500 w-10 h-10 text-center text-gray-700"
+                                    :x-ref="index"
+                                    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>
+                             <button x-on:click="buttonDisabled = true" x-bind:disabled="buttonDisabled" class="btn-primary mx-auto block bg-gray-500 w-full p-2 mt-2 text-white">
+                                {{ ctrans('texts.verify') }}
+                            </button>
+                        </form>
                     </div>
-
+                    @endif
                 </div>
             </div>
         </div>
     </div>
-</div>
-
 <script>
     function otpForm() {
         return {
             length: 6,
-            value: "",
+            login: "",
+            buttonDisabled: true,
 
             handleInput(e) {
                 const input = e.target;
 
-                this.value = Array.from(Array(this.length), (element, i) => {
+                this.login = Array.from(Array(this.length), (element, i) => {
                 return this.$refs[i].value || "";
                 }).join("");
 
@@ -305,6 +303,15 @@
                     input.nextElementSibling.focus();
                     input.nextElementSibling.select();
                 }
+
+                if(this.login.length == 6){
+                    this.$wire.handleLogin(this.login);
+                    this.buttonDisabled = false;
+                }
+                else{
+                    this.buttonDisabled = true;   
+                }
+
             },
 
             handlePaste(e) {
@@ -324,4 +331,6 @@
             },
       };
     }
-</script>
\ No newline at end of file
+</script>
+</div>
+