From 54f14a5e6577ed1971a3436070b3102278e1eac9 Mon Sep 17 00:00:00 2001
From: alp <alp@visiosoft.com.tr>
Date: Sun, 12 Jan 2020 19:54:10 +0300
Subject: [PATCH] Design and language fixes

---
 .../visiosoft/advs-module/resources/lang/en/field.php        | 1 +
 .../visiosoft/advs-module/resources/lang/tr/field.php        | 5 ++---
 .../resources/views/ad-detail/partials/content.twig          | 4 ++--
 .../resources/views/ad-detail/partials/detail.twig           | 4 ++--
 .../default/visiosoft/advs-module/src/Adv/AdvRepository.php  | 2 +-
 .../default/visiosoft/base-theme/resources/lang/ar/field.php | 4 +---
 .../default/visiosoft/base-theme/resources/lang/en/field.php | 4 +---
 .../default/visiosoft/base-theme/resources/lang/tr/field.php | 4 +---
 .../visiosoft/base-theme/resources/views/index/default.twig  | 2 +-
 9 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
index a69126a71..4cdb91172 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
@@ -106,6 +106,7 @@ return [
     'description' => [
         'name' => 'Description'
     ],
+    'explanation' =>  'Explanation',
     'type' => [
         'name' => 'Type'
     ],
diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
index a6ca314ff..067fddb25 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
@@ -103,9 +103,8 @@ return [
     'my_adv' => [
         'name' => 'İlan'
     ],
-    'description' => [
-        'name' => 'Açıklama'
-    ],
+    'description' =>  'Detaylar',
+    'explanation' =>  'Açıklama',
     'type' => [
         'name' => 'Tip'
     ],
diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig
index 5a5310c3b..3044719df 100644
--- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig
@@ -8,7 +8,7 @@
                     <a class="nav-item nav-link active bg-secondary text-white" id="nav-description-tab"
                        data-toggle="tab" href="#nav-description" role="tab"
                        aria-controls="nav-description"
-                       aria-selected="true">{{ trans('visiosoft.module.advs::field.description.name') }}</a>
+                       aria-selected="true">{{ trans('visiosoft.module.advs::field.description') }}</a>
 
                     <!-- Content Tab With Block -->
                     {{ addBlock('ad-detail/content-tab',{'features':features})|raw }}
@@ -21,7 +21,7 @@
 
                 <div class="tab-pane fade show active" id="nav-description" role="tabpanel"
                      aria-labelledby="nav-description-tab">
-                    <h4>{{ trans('visiosoft.module.advs::field.description.name') }}</h4>
+                    <h4>{{ trans('visiosoft.module.advs::field.description') }}</h4>
                     <p>{{ adv.advs_desc|raw }}</p>
                 </div>
 
diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig
index b64caf196..90d6410ab 100644
--- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig
@@ -22,7 +22,7 @@
                         {{ trans('visiosoft.module.advs::field.offered_by') }}:
                         <a id="owner"
                            href="{{ url_route('visiosoft.module.advs::list_user_ad', [adv.created_by_id]) }}"
-                           data-content="{{ adv.owner_id }}">{{ adv.owner }}
+                           data-content="{{ adv.owner_id }}"> {{ adv.first_name }} {{ adv.last_name }}
                         </a>
                         {{ addBlock('ad-detail/seller/action',{'seller_id':adv.owner_id})|raw }}
                     </div>
@@ -43,7 +43,7 @@
                         <div class="col-md-12 m-2">
                             <i class="fa fa-suitcase"></i>
                             <a href="{{ url_route('visiosoft.module.advs::list_user_ad',
-                                [adv.created_by_id]) }}">{{ adv.owner }}</a>
+                                [adv.created_by_id]) }}"> {{ adv.first_name }} {{ adv.last_name }}</a>
                         </div>
                     {% endif %}
                 </div>
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index d059b7659..572f15dc0 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -292,7 +292,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
         $adv = $this->model
             ->where('advs_advs.id', $id)
             ->leftJoin('users_users as u1', 'advs_advs.created_by_id', '=', 'u1.id')
-            ->select('advs_advs.*', 'u1.display_name as owner', 'u1.first_name as firstname', 'u1.last_name as lastname', 'u1.id as owner_id')
+            ->select('advs_advs.*','u1.first_name as first_name', 'u1.last_name as last_name', 'u1.id as owner_id')
             ->inRandomOrder()
             ->first();
 
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/field.php b/addons/default/visiosoft/base-theme/resources/lang/ar/field.php
index f4f0f0ea9..af8021364 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ar/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ar/field.php
@@ -1,9 +1,7 @@
 <?php
 
 return [
-    'latest_ads' => [
-        'name' => 'أحدث الإعلانات',
-    ],
+    'latest_ads' =>  'أحدث الإعلانات',
     'show_all' => [
         'name' => 'عرض الكل',
     ],
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
index c95e51246..db04bc683 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
@@ -1,9 +1,7 @@
 <?php
 
 return [
-    'latest_ads' => [
-        'name' => 'Latest Ads',
-    ],
+    'latest_ads' => 'Latest Ads',
     'show_all' => [
         'name' => 'Show All',
     ],
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
index 9eb5380a0..ad12a66df 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
@@ -1,9 +1,7 @@
 <?php
 
 return [
-    'latest_ads' => [
-        'name' => 'Son Eklenenler',
-    ],
+    'latest_ads' =>  'Son Eklenenler',
     'show_all' => [
         'name' => 'Tümünü Göster',
     ],
diff --git a/addons/default/visiosoft/base-theme/resources/views/index/default.twig b/addons/default/visiosoft/base-theme/resources/views/index/default.twig
index 69c42b915..3c5b1bce8 100644
--- a/addons/default/visiosoft/base-theme/resources/views/index/default.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/index/default.twig
@@ -2,7 +2,7 @@
     <div class="row p-2">
         {% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %}
             <div class="col-md-6">
-                <h4 class="p-2">{{ trans('theme::field.latest_ads.name') }}</h4>
+                <h4 class="p-2">{{ trans('theme::field.latest_ads') }}</h4>
             </div>
             <div class="col-md-6 text-right">
                 <a class="btn btn-outline-secondary"