From 1c1bf22188f33a0301b5c386f01b2e96381933b4 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 3 Nov 2020 14:51:26 +0300
Subject: [PATCH 1/5] #2502 removed code because packages error

---
 .../default/visiosoft/advs-module/resources/js/cats.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/js/cats.js b/addons/default/visiosoft/advs-module/resources/js/cats.js
index d6d3d2921..93dc4d2dc 100644
--- a/addons/default/visiosoft/advs-module/resources/js/cats.js
+++ b/addons/default/visiosoft/advs-module/resources/js/cats.js
@@ -5,16 +5,6 @@ function showLoader() {
 function hideLoader() {
     $('.loading-cart').remove();
 }
-$("#catSelectionStepForm").submit(function(e) {
-    var val = $("input[type=submit][clicked=true]").data('pack-id');
-
-    $("<input />").attr("type", "hidden")
-        .attr("name", "pack_id")
-        .attr("value", val)
-        .appendTo(this);
-
-    return true;
-});
 $("#catSelectionStepForm").on('click', 'input[type=submit]', function() {
     $("input[type=submit]", $(this).parents("form")).removeAttr("clicked");
     $(this).attr("clicked", "true");

From 5b4e22dbdc5926a1d61fe824d91545c684595aba Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 3 Nov 2020 15:08:30 +0300
Subject: [PATCH 2/5] advs post as the default map has been set as Turkey

---
 addons/default/visiosoft/advs-module/resources/js/location.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/resources/js/location.js b/addons/default/visiosoft/advs-module/resources/js/location.js
index 9be0a73d3..e82653051 100644
--- a/addons/default/visiosoft/advs-module/resources/js/location.js
+++ b/addons/default/visiosoft/advs-module/resources/js/location.js
@@ -120,7 +120,7 @@ if (locationedit) {
 var mapOptions = {
 
     center: coordcenter,
-    zoom: 20,
+    zoom: 6,
     mapTypeId: google.maps.MapTypeId.STREET
 };
 var secildi = 0;

From e40b10fd43462aeee81b2e38325ea33ed5feda0c Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 3 Nov 2020 15:50:49 +0300
Subject: [PATCH 3/5] #2383 social share home image settings added

---
 .../visiosoft/base-theme/resources/views/partials/ogdata.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
index 5915bd553..ae7cc1b20 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
@@ -4,7 +4,7 @@
     <meta property="og:description" content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}"/>
     <meta property="og:title" content="{{ (setting_value('streams::name', config_get('streams::distribution.name'))~" | "~trans(template.meta_title))|slice(0,60) }}"/>
     <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
-    <meta property="og:image" content="{{ template.get('og_image', trans(template.meta_image)) }}"/>
+    <meta property="og:image" content="{{ template.get('og_image', file(setting_value('visiosoft.module.advs::ogImage')).url) }}"/>
     <meta property="og:type" content="website"/>
 
     <!-- Meta for twitter sharing -->
@@ -12,5 +12,5 @@
     <meta name="twitter:site" content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}">
     <meta name="twitter:title" content="{{ (setting_value('streams::name', config_get('streams::distribution.name'))~" | "~trans(template.meta_title))|slice(0,60) }}">
     <meta name="twitter:description" content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}">
-    <meta name="twitter:image" content="{{ template.get('og_image', trans(template.meta_image)) }}">
+    <meta name="twitter:image" content="{{ template.get('og_image', file(setting_value('visiosoft.module.advs::ogImage')).url) }}">
 {% endblock %}
\ No newline at end of file

From 6db834b9a1529d3794071dbfdb54fc08cffe3bdc Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 3 Nov 2020 15:56:30 +0300
Subject: [PATCH 4/5] Revert "#2383 social share home image settings added"

This reverts commit e40b10fd
---
 .../visiosoft/base-theme/resources/views/partials/ogdata.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
index ae7cc1b20..5915bd553 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
@@ -4,7 +4,7 @@
     <meta property="og:description" content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}"/>
     <meta property="og:title" content="{{ (setting_value('streams::name', config_get('streams::distribution.name'))~" | "~trans(template.meta_title))|slice(0,60) }}"/>
     <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
-    <meta property="og:image" content="{{ template.get('og_image', file(setting_value('visiosoft.module.advs::ogImage')).url) }}"/>
+    <meta property="og:image" content="{{ template.get('og_image', trans(template.meta_image)) }}"/>
     <meta property="og:type" content="website"/>
 
     <!-- Meta for twitter sharing -->
@@ -12,5 +12,5 @@
     <meta name="twitter:site" content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}">
     <meta name="twitter:title" content="{{ (setting_value('streams::name', config_get('streams::distribution.name'))~" | "~trans(template.meta_title))|slice(0,60) }}">
     <meta name="twitter:description" content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}">
-    <meta name="twitter:image" content="{{ template.get('og_image', file(setting_value('visiosoft.module.advs::ogImage')).url) }}">
+    <meta name="twitter:image" content="{{ template.get('og_image', trans(template.meta_image)) }}">
 {% endblock %}
\ No newline at end of file

From 8551130c0f8e21ad338fac3da3b53db2c0f7ddc7 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 3 Nov 2020 15:56:55 +0300
Subject: [PATCH 5/5] #2383 social share home image settings added

---
 .../visiosoft/base-theme/resources/views/partials/ogdata.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
index 5915bd553..ae7cc1b20 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
@@ -4,7 +4,7 @@
     <meta property="og:description" content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}"/>
     <meta property="og:title" content="{{ (setting_value('streams::name', config_get('streams::distribution.name'))~" | "~trans(template.meta_title))|slice(0,60) }}"/>
     <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
-    <meta property="og:image" content="{{ template.get('og_image', trans(template.meta_image)) }}"/>
+    <meta property="og:image" content="{{ template.get('og_image', file(setting_value('visiosoft.module.advs::ogImage')).url) }}"/>
     <meta property="og:type" content="website"/>
 
     <!-- Meta for twitter sharing -->
@@ -12,5 +12,5 @@
     <meta name="twitter:site" content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}">
     <meta name="twitter:title" content="{{ (setting_value('streams::name', config_get('streams::distribution.name'))~" | "~trans(template.meta_title))|slice(0,60) }}">
     <meta name="twitter:description" content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}">
-    <meta name="twitter:image" content="{{ template.get('og_image', trans(template.meta_image)) }}">
+    <meta name="twitter:image" content="{{ template.get('og_image', file(setting_value('visiosoft.module.advs::ogImage')).url) }}">
 {% endblock %}
\ No newline at end of file