From 49b753d3fdff964ef5e9c45fea9364ae3d44423f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 27 Mar 2024 17:36:35 +0100
Subject: [PATCH] Combine forms

---
 .../register-or-login.blade.php               | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/resources/views/billing-portal/v3/authentication/register-or-login.blade.php b/resources/views/billing-portal/v3/authentication/register-or-login.blade.php
index 3ae7e47bc6e0..0d4a4bca1d06 100644
--- a/resources/views/billing-portal/v3/authentication/register-or-login.blade.php
+++ b/resources/views/billing-portal/v3/authentication/register-or-login.blade.php
@@ -198,6 +198,44 @@
             @endif
         </div>
 
+        <div class="mt-6">
+            <h1 class="text-2xl font-medium">{{ ctrans('texts.details') }}</h1>
+        </div>
+
+        <div class="grid grid-cols-12 gap-4 mt-10">
+        @foreach($fields as $field)
+            @if(!array_key_exists('filled', $field))
+                <div class="col-span-12 md:col-span-6">
+                    <section class="flex items-center">
+                        <label
+                            for="password_confirmation"
+                            class="input-label">
+                            {{ $field['label'] }}
+                        </label>
+                    </section>
+
+                    @if($field['name'] == 'client_country_id' || $field['name'] == 'client_shipping_country_id')
+                    <select id="client_country" class="input w-full form-select bg-white" name="{{ $field['name'] }}" wire:model="{{ $field['name'] }}">
+                        <option value="none"></option>
+
+                        @foreach($countries as $country)
+                            <option value="{{ $country->id }}">
+                                {{ $country->iso_3166_2 }} ({{ $country->name }})
+                            </option>
+                        @endforeach
+                    </select>
+                    @else
+                        <input class="input w-full" type="{{ $field['type'] ?? 'text' }}" name="{{ $field['name'] }}" wire:model="{{ $field['name'] }}">
+                    @endif
+
+                    @if(session()->has('validation_errors') && array_key_exists($field['name'], session('validation_errors')))
+                        <p class="mt-2 text-gray-900 border-red-300 px-2 py-1 bg-gray-100">{{ session('validation_errors')[$field['name']][0] }}</p>
+                    @endif
+                </div>
+            @endif
+        @endforeach
+        </div>
+
         <button 
             type="submit"
             class="button button-block bg-primary text-white mt-4">