From 554e5952111350307324bcc83f88f71add2771a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 24 Sep 2020 14:23:05 +0200
Subject: [PATCH] Profile settings: Shipping address

---
 .../Profile/Settings/PersonalAddress.php      | 62 ++++++++++++
 .../portal/ninja2020/profile/index.blade.php  | 98 +------------------
 .../settings/name-website-logo.blade.php      |  1 -
 .../settings/personal-address.blade.php       | 84 ++++++++++++++++
 4 files changed, 147 insertions(+), 98 deletions(-)
 create mode 100644 app/Http/Livewire/Profile/Settings/PersonalAddress.php
 create mode 100644 resources/views/portal/ninja2020/profile/settings/personal-address.blade.php

diff --git a/app/Http/Livewire/Profile/Settings/PersonalAddress.php b/app/Http/Livewire/Profile/Settings/PersonalAddress.php
new file mode 100644
index 0000000000..6a1488a249
--- /dev/null
+++ b/app/Http/Livewire/Profile/Settings/PersonalAddress.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Http\Livewire\Profile\Settings;
+
+use Livewire\Component;
+
+class PersonalAddress extends Component
+{
+    public $profile;
+
+    public $address1;
+    public $address2;
+    public $city;
+    public $state;
+    public $postal_code;
+    public $country_id;
+
+    public $countries;
+
+    public $saved;
+
+    protected $rules = [
+        'address1' => ['required'],
+        'address2' => ['required'],
+        'city' => ['required'],
+        'state' => ['required'],
+        'postal_code' => ['required'],
+        'country_id' => ['required'],
+    ];
+
+    public function mount($countries)
+    {
+        $this->fill([
+            'profile' => auth()->user('contact')->client,
+            'address1' => auth()->user('contact')->client->address1,
+            'address2' => auth()->user('contact')->client->address2,
+            'city' => auth()->user('contact')->client->city,
+            'state' => auth()->user('contact')->client->state,
+            'postal_code' => auth()->user('contact')->client->postal_code,
+            'country_id' => optional(auth()->user('contact')->client->country)->id,
+
+            'countries' => $countries,
+            'saved' => ctrans('texts.save'),
+        ]);
+    }
+
+    public function render()
+    {
+        return render('profile.settings.personal-address');
+    }
+
+    public function submit()
+    {
+        $data = $this->validate($this->rules);
+
+        $this->profile
+            ->fill($data)
+            ->save();
+
+        $this->saved = ctrans('texts.saved_at', ['time' => now()->toTimeString()]);
+    }
+}
diff --git a/resources/views/portal/ninja2020/profile/index.blade.php b/resources/views/portal/ninja2020/profile/index.blade.php
index 6cb2d546ae..4197ac83f7 100644
--- a/resources/views/portal/ninja2020/profile/index.blade.php
+++ b/resources/views/portal/ninja2020/profile/index.blade.php
@@ -14,103 +14,7 @@
     @livewire('profile.settings.name-website-logo')
 
     <!-- Client personal address -->
-    <div class="mt-10 sm:mt-6">
-        <div class="md:grid md:grid-cols-3 md:gap-6">
-            <div class="md:col-span-1">
-                <div class="sm:px-0">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">{{ ctrans('texts.personal_address') }}</h3>
-                    <p class="mt-1 text-sm leading-5 text-gray-500">
-                        {{ ctrans('texts.enter_your_personal_address') }}
-                    </p>
-                </div>
-            </div>
-            <div class="mt-5 md:mt-0 md:col-span-2">
-                <form action="{{ route('client.profile.edit_client', auth()->user()->hashed_id) }}" method="POST"
-                      id="update_contact">
-                    @csrf
-                    @method('PUT')
-                    <div class="shadow overflow-hidden rounded">
-                        <div class="px-4 py-5 bg-white sm:p-6">
-                            <div class="grid grid-cols-6 gap-6">
-                                <div class="col-span-6 sm:col-span-4">
-                                    <label for="address1" class="input-label">@lang('texts.address1')</label>
-                                    <input id="address1" class="input w-full" name="address1"
-                                           value="{{ auth()->user()->client->address1 }}"/>
-                                    @error('address1')
-                                    <div class="validation validation-fail">
-                                        {{ $message }}
-                                    </div>
-                                    @enderror
-                                </div>
-                                <div class="col-span-6 sm:col-span-3">
-                                    <label for="address2" class="input-label">@lang('texts.address2')</label>
-                                    <input id="address2" class="input w-full" name="address2"
-                                           value="{{ auth()->user()->client->address2 }}"/>
-                                    @error('address2')
-                                    <div class="validation validation-fail">
-                                        {{ $message }}
-                                    </div>
-                                    @enderror
-                                </div>
-                                <div class="col-span-6 sm:col-span-3">
-                                    <label for="city" class="input-label">@lang('texts.city')</label>
-                                    <input id="city" class="input w-full" name="city"
-                                           value="{{ auth()->user()->client->city }}"/>
-                                    @error('city')
-                                    <div class="validation validation-fail">
-                                        {{ $message }}
-                                    </div>
-                                    @enderror
-                                </div>
-                                <div class="col-span-6 sm:col-span-2">
-                                    <label for="state" class="input-label">@lang('texts.state')</label>
-                                    <input id="state" class="input w-full" name="state"
-                                           value="{{ auth()->user()->client->state }}"/>
-                                    @error('state')
-                                    <div class="validation validation-fail">
-                                        {{ $message }}
-                                    </div>
-                                    @enderror
-                                </div>
-                                <div class="col-span-6 sm:col-span-2">
-                                    <label for="postal_code" class="input-label">@lang('texts.postal_code')</label>
-                                    <input id="postal_code" class="input w-full" name="postal_code"
-                                           value="{{ auth()->user()->client->postal_code }}"/>
-                                    @error('postal_code')
-                                    <div class="validation validation-fail">
-                                        {{ $message }}
-                                    </div>
-                                    @enderror
-                                </div>
-                                <div class="col-span-6 sm:col-span-2">
-                                    <label for="country" class="input-label">@lang('texts.country')</label>
-                                    <select id="country" class="input w-full form-select" name="country">
-                                        @foreach($countries as $country)
-                                            <option
-                                                {{ $country == isset(auth()->user()->client->country->id) ? 'selected' : null }} value="{{ $country->id }}">
-                                                {{ $country->iso_3166_2 }}
-                                                ({{ $country->name }})
-                                            </option>
-                                        @endforeach
-                                    </select>
-                                    @error('country')
-                                    <div class="validation validation-fail">
-                                        {{ $message }}
-                                    </div>
-                                    @enderror
-                                </div>
-                            </div>
-                        </div>
-                        <div class="px-4 py-3 bg-gray-50 text-right sm:px-6">
-                            <button class="button button-primary">
-                                @lang('texts.save')
-                            </button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
+    @livewire('profile.settings.personal-address', ['countries' => $countries])
 
     <!-- Client shipping address -->
     <div class="mt-10 sm:mt-6">
diff --git a/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php b/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php
index 4e731dc9f8..177319bafe 100644
--- a/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php
+++ b/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php
@@ -12,7 +12,6 @@
         <div class="mt-5 md:mt-0 md:col-span-2">
             <form wire:submit.prevent="submit" method="POST" id="update_contact">
                 @csrf
-                @method('PUT')
                 <div class="shadow overflow-hidden rounded">
                     <div class="px-4 py-5 bg-white sm:p-6">
                         <div class="grid grid-cols-6 gap-6">
diff --git a/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php b/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php
new file mode 100644
index 0000000000..e651266777
--- /dev/null
+++ b/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php
@@ -0,0 +1,84 @@
+<div class="mt-10 sm:mt-6">
+    <div class="md:grid md:grid-cols-3 md:gap-6">
+        <div class="md:col-span-1">
+            <div class="sm:px-0">
+                <h3 class="text-lg font-medium leading-6 text-gray-900">{{ ctrans('texts.personal_address') }}</h3>
+                <p class="mt-1 text-sm leading-5 text-gray-500">
+                    {{ ctrans('texts.enter_your_personal_address') }}
+                </p>
+            </div>
+        </div>
+        <div class="mt-5 md:mt-0 md:col-span-2">
+            <form wire:submit.prevent="submit" method="POST" id="update_contact">
+                @csrf
+                <div class="px-4 py-5 bg-white sm:p-6">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-4">
+                            <label for="address1" class="input-label">{{ ctrans('texts.address1') }}</label>
+                            <input id="address1" class="input w-full" name="address1" wire:model.defer="address1" />
+                            @error('address1')
+                            <div class="validation validation-fail">
+                                {{ $message }}
+                            </div>
+                            @enderror
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="address2" class="input-label">{{ ctrans('texts.address2') }}</label>
+                            <input id="address2" class="input w-full" name="address2" wire:model.defer="address2" />
+                            @error('address2')
+                            <div class="validation validation-fail">
+                                {{ $message }}
+                            </div>
+                            @enderror
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="city" class="input-label">{{ ctrans('texts.city') }}</label>
+                            <input id="city" class="input w-full" name="city" wire:model.defer="city" />
+                            @error('city')
+                            <div class="validation validation-fail">
+                                {{ $message }}
+                            </div>
+                            @enderror
+                        </div>
+                        <div class="col-span-6 sm:col-span-2">
+                            <label for="state" class="input-label">{{ ctrans('texts.state') }}</label>
+                            <input id="state" class="input w-full" name="state" wire:model.defer="state" />
+                            @error('state')
+                            <div class="validation validation-fail">
+                                {{ $message }}
+                            </div>
+                            @enderror
+                        </div>
+                        <div class="col-span-6 sm:col-span-2">
+                            <label for="postal_code" class="input-label">{{ ctrans('texts.postal_code') }}</label>
+                            <input id="postal_code" class="input w-full" name="postal_code" wire:model.defer="postal_code" />
+                            @error('postal_code')
+                            <div class="validation validation-fail">
+                                {{ $message }}
+                            </div>
+                            @enderror
+                        </div>
+                        <div class="col-span-6 sm:col-span-2">
+                            <label for="country" class="input-label">@lang('texts.country')</label>
+                            <select id="country" class="input w-full form-select" wire:model.defer="country_id">
+                                @foreach($countries as $country)
+                                    <option value="{{ $country->id }}">
+                                        {{ $country->iso_3166_2 }} ({{ $country->name }})
+                                    </option>
+                                @endforeach
+                            </select>
+                            @error('country')
+                            <div class="validation validation-fail">
+                                {{ $message }}
+                            </div>
+                            @enderror
+                        </div>
+                    </div>
+                </div>
+                <div class="px-4 py-3 bg-gray-50 text-right sm:px-6">
+                    <button class="button button-primary">{{ $saved }}</button>
+                </div>
+        </div>
+        </form>
+    </div>
+</div>