From 0e3eafe60f0edaf72399299c5c2cdf57eb6d9058 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 3 Dec 2019 19:13:31 +0300
Subject: [PATCH 1/4] navigation and left menu for home completed

---
 addons/default/visiosoft/sahibinden-theme | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 addons/default/visiosoft/sahibinden-theme

diff --git a/addons/default/visiosoft/sahibinden-theme b/addons/default/visiosoft/sahibinden-theme
new file mode 160000
index 000000000..f1dd08972
--- /dev/null
+++ b/addons/default/visiosoft/sahibinden-theme
@@ -0,0 +1 @@
+Subproject commit f1dd0897214d61108811add6edc06d6ed391c9bc

From d1218c1c8bec90232001a069637e9f9b760d5615 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 9 Jan 2020 18:01:05 +0300
Subject: [PATCH 2/4] remove sahibinden folder

---
 addons/default/visiosoft/sahibinden-theme | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 addons/default/visiosoft/sahibinden-theme

diff --git a/addons/default/visiosoft/sahibinden-theme b/addons/default/visiosoft/sahibinden-theme
deleted file mode 160000
index f1dd08972..000000000
--- a/addons/default/visiosoft/sahibinden-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f1dd0897214d61108811add6edc06d6ed391c9bc

From 398cbb090825a4468aa782fc576a52852e18794e Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 9 Jan 2020 19:15:38 +0300
Subject: [PATCH 3/4] #681 fixed create ad translation problem

---
 .../resources/views/new-ad/new-create.twig    | 81 ++++++++++++++++++-
 .../src/Http/Controller/advsController.php    | 16 +---
 2 files changed, 79 insertions(+), 18 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index c67b768ee..a1547c709 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -37,9 +37,15 @@
                         <fieldset>
                             <div class="section postdetails">
                                 <div class="row form-group add-title">
+                                    {% set fields = form.fields.base().pluck('field_name').all() %}
                                     <div class="col-md-12">
-                                        {{ nameField|raw }}
+                                        <div class="field-group name">
+                                            {% for field in form.fields.translations('name') %}
+                                                {{ field.render({'form': form})|raw }}
+                                            {% endfor %}
+                                        </div>
                                     </div>
+
                                     <div style="display: none">
                                         {{ form.fields.slug|raw }}
                                     </div>
@@ -62,7 +68,11 @@
 
                                 <div class="row form-group brand-name">
                                     <div class="col-md-12">
-                                        {{ descField|raw }}
+                                        <div class="field-group advs_desc">
+                                            {% for field in form.fields.translations('advs_desc') %}
+                                                {{ field.render({'form': form})|raw }}
+                                            {% endfor %}
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="row form-group images">
@@ -113,4 +123,69 @@
             type="text/javascript"></script>
     {{ asset_add("scripts.js", "visiosoft.module.advs::js/new-create.js") }}
     {{ asset_add("scripts.js", "visiosoft.module.advs::js/location.js") }}
-{% endblock %}
\ No newline at end of file
+    {{ asset_add("scripts.js", "streams::js/form/form.js") }}
+    {{ asset_add("scripts.js", "streams::js/form/translations.js") }}
+
+{% endblock %}
+
+
+{#{% extends layout('new-create') %}#}
+
+{#{% block content %}#}
+{#    <section id="main" class="clearfix home-default">#}
+{#        <div class="container">#}
+{#            <nav aria-label="breadcrumb">#}
+{#                <ol class="breadcrumb">#}
+{#                    {% for cat in cats_d %}#}
+{#                        <li class="breadcrumb-item text-primary">{{ cat }}</li>#}
+{#                    {% endfor %}#}
+{#                    <li class="breadcrumb-item">#}
+{#                        <a href="{{ url_route('adv::edit_category',[id]) }}">#}
+{#                            <i class="fas fa-pencil-alt"></i> {{ trans('visiosoft.module.advs::field.edit_category') }}#}
+{#                        </a>#}
+{#                    </li>#}
+{#                </ol>#}
+{#            </nav>#}
+{#            <div class="adpost-details">#}
+{#                <div class="row">#}
+{#                    <div class="col-md-12">#}
+{#                        {% set form = form('advs', 'advs').entry(id).get() %}#}
+{#                        {{ asset_add("scripts.js", "streams::js/form/form.js") }}#}
+{#                        {{ asset_add("scripts.js", "streams::js/form/translations.js") }}#}
+
+{#                        {{ form.open({#}
+{#                            'class': 'form ' ~ form.options.class,#}
+{#                        })|raw }}#}
+
+{#                        {% set fields = form.fields.base().pluck('field_name').all() %}#}
+
+{#                        <div class="field-group name">#}
+{#                            {% for field in form.fields.translations('name') %}#}
+{#                                {{ field.render({'form': form})|raw }}#}
+{#                            {% endfor %}#}
+{#                        </div>#}
+
+
+{#                        {{ form.close()|raw }}#}
+{#                    </div>#}
+{#                </div><!-- photos-ad -->#}
+
+{#            </div>#}
+{#        </div>#}
+{#        </div>#}
+{#    </section>#}
+{#    <script>#}
+{#        var default_country = "{{ setting_value('visiosoft.module.advs::default_country') }}";#}
+{#        var default_city = "{{ setting_value('visiosoft.module.advs::default_city') }}";#}
+{#        var default_district = "{{ setting_value('visiosoft.module.advs::default_district') }}";#}
+{#        var default_neighborhood = "{{ setting_value('visiosoft.module.advs::default_neighborhood') }}";#}
+{#        var default_currency = "{{ setting_value('visiosoft.module.advs::default_currency') }}";#}
+{#        var default_GET = "{{ setting_value('visiosoft.module.advs::default_GET') }}";#}
+{#        var adv_id = "{{ id }}";#}
+{#    </script>#}
+
+{#    <script src="https://maps.googleapis.com/maps/api/js?key={{ setting_value('visiosoft.module.advs::google_map_key') }}&callback="#}
+{#            type="text/javascript"></script>#}
+{#    {{ asset_add("scripts.js", "visiosoft.module.advs::js/new-create.js") }}#}
+{#    {{ asset_add("scripts.js", "visiosoft.module.advs::js/location.js") }}#}
+{#{% endblock %}#}
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
index 1df9b5859..2f0de1df8 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -652,20 +652,6 @@ class AdvsController extends PublicController
         AdvModel $advModel
     )
     {
-        $Field = HTMLDomParser::str_get_html($advFormBuilder->render($id)->getContent());
-        $nameField = $Field->find('.name', 0);
-        if ($nameField !== null) {
-            $nameField = $nameField->innertext();
-        } else {
-            $nameField = "";
-        }
-
-        $descField = $Field->find('.advs_desc', 0);
-        if ($descField !== null) {
-            $descField = $descField->innertext();
-        } else {
-            $nameField = "";
-        }
         if (!Auth::user()) {
             redirect('/login?redirect=' . url()->current())->send();
         }
@@ -714,7 +700,7 @@ class AdvsController extends PublicController
             $custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->edit($adv, $categories, $cats);
         }
 
-        return $this->view->make('visiosoft.module.advs::new-ad/new-create', compact('id', 'cats_d', 'request', 'Cloudinary', 'cities', 'adv', 'custom_fields', 'nameField', 'descField'));
+        return $this->view->make('visiosoft.module.advs::new-ad/new-create', compact('id', 'cats_d', 'request', 'Cloudinary', 'cities', 'adv', 'custom_fields'));
     }
 
     public function destroy($id)

From 6943b01dde181f4734030f0b6c291789eaf14dc8 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 9 Jan 2020 19:17:51 +0300
Subject: [PATCH 4/4] remove comment out code

---
 .../resources/views/new-ad/new-create.twig    | 64 +------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index a1547c709..8cfff0fcf 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -126,66 +126,4 @@
     {{ asset_add("scripts.js", "streams::js/form/form.js") }}
     {{ asset_add("scripts.js", "streams::js/form/translations.js") }}
 
-{% endblock %}
-
-
-{#{% extends layout('new-create') %}#}
-
-{#{% block content %}#}
-{#    <section id="main" class="clearfix home-default">#}
-{#        <div class="container">#}
-{#            <nav aria-label="breadcrumb">#}
-{#                <ol class="breadcrumb">#}
-{#                    {% for cat in cats_d %}#}
-{#                        <li class="breadcrumb-item text-primary">{{ cat }}</li>#}
-{#                    {% endfor %}#}
-{#                    <li class="breadcrumb-item">#}
-{#                        <a href="{{ url_route('adv::edit_category',[id]) }}">#}
-{#                            <i class="fas fa-pencil-alt"></i> {{ trans('visiosoft.module.advs::field.edit_category') }}#}
-{#                        </a>#}
-{#                    </li>#}
-{#                </ol>#}
-{#            </nav>#}
-{#            <div class="adpost-details">#}
-{#                <div class="row">#}
-{#                    <div class="col-md-12">#}
-{#                        {% set form = form('advs', 'advs').entry(id).get() %}#}
-{#                        {{ asset_add("scripts.js", "streams::js/form/form.js") }}#}
-{#                        {{ asset_add("scripts.js", "streams::js/form/translations.js") }}#}
-
-{#                        {{ form.open({#}
-{#                            'class': 'form ' ~ form.options.class,#}
-{#                        })|raw }}#}
-
-{#                        {% set fields = form.fields.base().pluck('field_name').all() %}#}
-
-{#                        <div class="field-group name">#}
-{#                            {% for field in form.fields.translations('name') %}#}
-{#                                {{ field.render({'form': form})|raw }}#}
-{#                            {% endfor %}#}
-{#                        </div>#}
-
-
-{#                        {{ form.close()|raw }}#}
-{#                    </div>#}
-{#                </div><!-- photos-ad -->#}
-
-{#            </div>#}
-{#        </div>#}
-{#        </div>#}
-{#    </section>#}
-{#    <script>#}
-{#        var default_country = "{{ setting_value('visiosoft.module.advs::default_country') }}";#}
-{#        var default_city = "{{ setting_value('visiosoft.module.advs::default_city') }}";#}
-{#        var default_district = "{{ setting_value('visiosoft.module.advs::default_district') }}";#}
-{#        var default_neighborhood = "{{ setting_value('visiosoft.module.advs::default_neighborhood') }}";#}
-{#        var default_currency = "{{ setting_value('visiosoft.module.advs::default_currency') }}";#}
-{#        var default_GET = "{{ setting_value('visiosoft.module.advs::default_GET') }}";#}
-{#        var adv_id = "{{ id }}";#}
-{#    </script>#}
-
-{#    <script src="https://maps.googleapis.com/maps/api/js?key={{ setting_value('visiosoft.module.advs::google_map_key') }}&callback="#}
-{#            type="text/javascript"></script>#}
-{#    {{ asset_add("scripts.js", "visiosoft.module.advs::js/new-create.js") }}#}
-{#    {{ asset_add("scripts.js", "visiosoft.module.advs::js/location.js") }}#}
-{#{% endblock %}#}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file