From f62583a007e182811b102b9c3574683bf7d04a3a Mon Sep 17 00:00:00 2001
From: WBLKLeipe <ownerdennis8@gmail.com>
Date: Wed, 1 Dec 2021 13:30:40 +0100
Subject: [PATCH] clean UI

---
 .../Controllers/Admin/SettingsController.php  |  38 +++---
 app/Models/InvoiceSettings.php                |   1 +
 .../views/admin/settings/index.blade.php      | 113 +++++++-----------
 3 files changed, 60 insertions(+), 92 deletions(-)

diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index 625a1051..a38dec4f 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -3,12 +3,12 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
+use App\Models\invoiceSettings;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use App\Models\invoiceSettings;
 
 class SettingsController extends Controller
 {
@@ -19,7 +19,15 @@ class SettingsController extends Controller
      */
     public function index()
     {
-        return view('admin.settings.index');
+        return view('admin.settings.index',
+            [
+                'company_name' => invoiceSettings::get()->first()->company_name,
+                'company_adress' => invoiceSettings::get()->first()->company_adress,
+                'company_phone' => invoiceSettings::get()->first()->company_phone,
+                'company_vat' => invoiceSettings::get()->first()->company_vat,
+                'company_mail' => invoiceSettings::get()->first()->company_mail,
+                'company_web' => invoiceSettings::get()->first()->company_web
+            ]);
     }
 
     public function updateIcons(Request $request)
@@ -46,32 +54,18 @@ class SettingsController extends Controller
             'logo' => 'nullable|max:10000|mimes:jpg,png,jpeg',
         ]);
 
+        invoiceSettings::updateOrCreate(['id' => "1"], ['company_name' => $request->get('company-name')]);
+        invoiceSettings::updateOrCreate(['id' => "1",], ['company_adress' => $request->get('company-adress')]);
+        invoiceSettings::updateOrCreate(['id' => "1",], ['company_phone' => $request->get('company-phone')]);
+        invoiceSettings::updateOrCreate(['id' => "1",], ['company_mail' => $request->get('company-email')]);
+        invoiceSettings::updateOrCreate(['id' => "1",], ['company_vat' => $request->get('company-vat')]);
+        invoiceSettings::updateOrCreate(['id' => "1",], ['company_web' => $request->get('company-web')]);
 
-
-        if($request->filled('company-name')) {
-            invoiceSettings::updateOrCreate(['id'   => "1"],['company_name' => $request->get('company-name')]);
-        }
-        if($request->filled('company-adress')) {
-            invoiceSettings::updateOrCreate(['id'   => "1",],['company_adress' => $request->get('company-adress')]);
-        }
-        if($request->filled('company-phone')) {
-            invoiceSettings::updateOrCreate(['id'   => "1",],['company_phone' => $request->get('company-phone')]);
-        }
-        if($request->filled('company-vat')) {
-            invoiceSettings::updateOrCreate(['id'   => "1",],['company_vat' => $request->get('company-vat')]);
-        }
-        if($request->filled('company-mail')) {
-            invoiceSettings::updateOrCreate(['id'   => "1",],['company_mail' => $request->get('company-mail')]);
-        }
-        if($request->filled('company-web')) {
-            invoiceSettings::updateOrCreate(['id'   => "1",],['company_web' => $request->get('company-web')]);
-        }
         if ($request->hasFile('logo')) {
             $request->file('logo')->storeAs('public', 'logo.png');
         }
 
 
-
         return redirect()->route('admin.settings.index')->with('success', 'Invoice settings updated!');
     }
 
diff --git a/app/Models/InvoiceSettings.php b/app/Models/InvoiceSettings.php
index c866c0d7..5bcaf3dc 100644
--- a/app/Models/InvoiceSettings.php
+++ b/app/Models/InvoiceSettings.php
@@ -15,6 +15,7 @@ class invoiceSettings extends Model
         'company_name',
         'company_adress',
         'company_phone',
+        'company_mail',
         'company_vat',
         'company_web'
     ];
diff --git a/resources/views/admin/settings/index.blade.php b/resources/views/admin/settings/index.blade.php
index ce2bbc59..c2414bb3 100644
--- a/resources/views/admin/settings/index.blade.php
+++ b/resources/views/admin/settings/index.blade.php
@@ -92,7 +92,7 @@
 
                         </div>
 
-                            <div class="tab-pane mt-3" id="invoice-settings">
+                        <div class="tab-pane mt-3" id="invoice-settings">
                             <form method="POST" enctype="multipart/form-data" class="mb-3"
                                   action="{{route('admin.settings.update.invoicesettings')}}">
                                 @csrf
@@ -102,89 +102,63 @@
                                     <div class="col-md-6 col-lg-4 col-12">
                                         <!-- Name -->
                                         <div class="form-group">
-                                            <div class="custom-file mb-3 mt-3">
-                                                <input type="text"
-                                                       class="custom-text-input" name="company-name" id="company-name">
-                                                <label class="custom-text-label selected"
-                                                       for="company-phone">{{__('Enter your Company Name')}}</label>
+                                            <div class="custom-control mb-3">
+                                                <label for="company-name">{{__('Enter your companys name' )}}</label>
+                                                <input x-model="company-name" id="company-name" name="company-name"
+                                                       type="text" value="{{$company_name}}"
+                                                       class="form-control @error('company-name') is-invalid @enderror">
                                             </div>
-                                            @error('company-name')
-                                            <span class="text-danger">
-                                                   {{$message}}
-                                               </span>
-                                            @enderror
                                         </div>
                                         <!-- adress -->
                                         <div class="form-group">
-                                            <div class="custom-file mb-3 mt-3">
-                                                <input type="text"
-                                                       class="custom-text-input" name="company-adress" id="company-adress">
-                                                <label class="custom-text-label selected"
-                                                       for="company-phone">{{__('Enter your Company Adress')}}</label>
+                                            <div class="custom-control mb-3">
+                                                <label
+                                                    for="company-adress">{{__('Enter your companys adress' )}}</label>
+                                                <input x-model="company-adress" id="company-adress"
+                                                       name="company-adress" type="text" value="{{$company_adress}}"
+                                                       class="form-control @error('company-adress') is-invalid @enderror">
                                             </div>
-                                            @error('company-adress')
-                                            <span class="text-danger">
-                                                   {{$message}}
-                                               </span>
-                                            @enderror
                                         </div>
                                         <!-- Phone -->
                                         <div class="form-group">
-                                            <div class="custom-file mb-3 mt-3">
-                                                <input type="text"
-                                                       class="custom-text-input" name="company-phone" id="company-phone">
-                                                <label class="custom-text-label selected"
-                                                       for="company-phone">{{__('Enter your Company Phone Number')}}</label>
+                                            <div class="custom-control mb-3">
+                                                <label
+                                                    for="company-phone">{{__('Enter your companys phone number' )}}</label>
+                                                <input x-model="company-phone" id="company-phone" name="company-phone"
+                                                       type="text" value="{{$company_phone}}"
+                                                       class="form-control @error('company-phone') is-invalid @enderror">
                                             </div>
-                                            @error('company-phone')
-                                            <span class="text-danger">
-                                                   {{$message}}
-                                               </span>
-                                            @enderror
                                         </div>
 
                                         <!-- VAT -->
                                         <div class="form-group">
-                                            <div class="custom-file mb-3 mt-3">
-                                                <input type="text"
-                                                       class="custom-text-input" name="company-vat" id="company-vat">
-                                                <label class="custom-text-label selected"
-                                                       for="company-phone">{{__('Enter your Company VAT')}}</label>
+                                            <div class="custom-control mb-3">
+                                                <label for="company-vat">{{__('Enter your companys VAT id' )}}</label>
+                                                <input x-model="company-vat" id="company-vat" name="company-vat"
+                                                       type="text" value="{{$company_vat}}"
+                                                       class="form-control @error('company-vat') is-invalid @enderror">
                                             </div>
-                                            @error('company-vat')
-                                            <span class="text-danger">
-                                                   {{$message}}
-                                               </span>
-                                            @enderror
                                         </div>
 
                                         <!-- email -->
                                         <div class="form-group">
-                                            <div class="custom-file mb-3 mt-3">
-                                                <input type="text"
-                                                       class="custom-text-input" name="company-mail" id="company-mail">
-                                                <label class="custom-text-label selected"
-                                                       for="company-phone">{{__('Enter your Company mail')}}</label>
+                                            <div class="custom-control mb-3">
+                                                <label
+                                                    for="company-mail">{{__('Enter your companys email adress' )}}</label>
+                                                <input x-model="company-mail" id="company-mail" name="company-mail"
+                                                       type="text" value="{{$company_mail}}"
+                                                       class="form-control @error('company-mail') is-invalid @enderror">
                                             </div>
-                                            @error('company-mail')
-                                            <span class="text-danger">
-                                                   {{$message}}
-                                               </span>
-                                            @enderror
                                         </div>
                                         <!-- website -->
                                         <div class="form-group">
-                                            <div class="custom-file mb-3 mt-3">
-                                                <input type="text"
-                                                       class="custom-text-input" name="company-web" id="company-web">
-                                                <label class="custom-text-label selected"
-                                                       for="company-phone">{{__('Enter your Company web')}}</label>
+                                            <div class="custom-control mb-3">
+                                                <label
+                                                    for="company-web">{{__('Enter your companys website' )}}</label>
+                                                <input x-model="company-web" id="company-web" name="company-web"
+                                                       type="text" value="{{$company_web}}"
+                                                       class="form-control @error('company-web') is-invalid @enderror">
                                             </div>
-                                            @error('company-web')
-                                            <span class="text-danger">
-                                                   {{$message}}
-                                               </span>
-                                            @enderror
                                         </div>
 
                                         <!-- logo -->
@@ -204,21 +178,20 @@
                                     </div>
                                 </div>
                                 <button class="btn btn-primary">Submit</button>
-                                        <!-- end -->
-
-                                    </div>
-                                </div>
-
-
-                            </form>
-
+                                <!-- end -->
 
                         </div>
                     </div>
 
+
+                    </form>
+
+
                 </div>
             </div>
 
+        </div>
+        </div>
 
 
         <!-- END CUSTOM CONTENT -->
@@ -228,7 +201,7 @@
 
     <script>
         // Add the following code if you want the name of the file appear on select
-        document.addEventListener('DOMContentLoaded', ()=>{
+        document.addEventListener('DOMContentLoaded', () => {
             $(".custom-file-input").on("change", function () {
                 var fileName = $(this).val().split("\\").pop();
                 $(this).siblings(".custom-file-label").addClass("selected").html(fileName);