From c7b1a9af7b25be5b454ce209cb43adb49ab7cde4 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 21 Dec 2020 14:01:15 +0300
Subject: [PATCH 1/2] #2957 General Bugs

---
 .../advs-module/resources/js/location.js         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/js/location.js b/addons/default/visiosoft/advs-module/resources/js/location.js
index d53f3abd0..3c8af3e39 100644
--- a/addons/default/visiosoft/advs-module/resources/js/location.js
+++ b/addons/default/visiosoft/advs-module/resources/js/location.js
@@ -131,17 +131,17 @@ var map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions)
 
 function haritaIslem() {
     var str = '';
-    if ($('select[name="' + countrySelectName + '"]').val() != "") {
-        str += $('select[name="' + countrySelectName + '"] :selected').text() + ' ';
+    if ($('select[name="' + countrySelectName + '"]').val()) {
+        str += $('select[name="' + countrySelectName + '"] :selected').first().text() + ' ';
     }
-    if ($('select[name="' + citySelectName + '"]').val() != "") {
-        str += $('select[name="' + citySelectName + '"] :selected').text() + ' ';
+    if ($('select[name="' + citySelectName + '"]').val()) {
+        str += $('select[name="' + citySelectName + '"] :selected').first().text() + ' ';
     }
-    if ($('select[name="' + districtSelectName + '"]').val() != "") {
-        str += $('select[name="' + districtSelectName + '"] :selected').text() + ' ';
+    if ($('select[name="' + districtSelectName + '"]').val()) {
+        str += $('select[name="' + districtSelectName + '"] :selected').first().text() + ' ';
     }
-    if ($('select[name="' + neighborhoodSelectName + '"]').val() != "") {
-        str += $('select[name="' + neighborhoodSelectName + '"] :selected').text() + ' ';
+    if ($('select[name="' + neighborhoodSelectName + '"]').val()) {
+        str += $('select[name="' + neighborhoodSelectName + '"] :selected').first().text() + ' ';
     }
 
     if (!str) {

From 7f21b02fd0ed7d922da979f433d1b95a0a38bbd9 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 21 Dec 2020 14:50:46 +0300
Subject: [PATCH 2/2] #2945 Fast create edit category error

---
 .../default/visiosoft/advs-module/resources/views/blank.twig   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/blank.twig b/addons/default/visiosoft/advs-module/resources/views/blank.twig
index 79333af1d..97aac471f 100644
--- a/addons/default/visiosoft/advs-module/resources/views/blank.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/blank.twig
@@ -4,8 +4,9 @@
     {{ content|raw }}
 
     {% if form.mode == 'edit' %}
+        {% set entry = form.entry.setAttribute('cf_json', null) %}
         <script>
-            const ad = JSON.parse(`{{ form.entry|json_encode|raw }}`)
+            const ad = JSON.parse(`{{ entry|json_encode|raw }}`)
         </script>
     {% endif %}
 {% endblock %}