diff --git a/README.md b/README.md index fc2c5389b..7e33e4fa8 100644 --- a/README.md +++ b/README.md @@ -118,10 +118,12 @@ Onur Üre @onurure Fatih Alp @fatihalp -Emek Sancar +Emek Sancar @emeksancar Ozcan Durak @ozcandurak +Dia @Diatrex + ## Thanks to Ryan and it's stream platform and pyrocms it makes OpenClassify more powerfull. diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index c17e61fe5..fe5ceee54 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -26,7 +26,6 @@ return [ 'watermark_text', 'watermark_image', 'watermark_position', - 'watermark_opacity', 'listing_page_image', ], ], diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index 1f8d6f748..06ea54889 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -126,14 +126,6 @@ return [ 'default_value' => 'top-right', ] ], - 'watermark_opacity' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.watermark_opacity', - 'env' => 'ADV_WATERMARK_OPACITY', - 'config' => [ - 'default_value' => '80', - ], - ], 'listing_page_image' => [ 'type' => 'anomaly.field_type.file', diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index 5874b8f47..c0d926667 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -31,20 +31,20 @@ $('.sort-by-item').on('click', function () { } else if (searchParams.has('sort_by')) { var parameters = ""; if (value != 'all') { - parameters = "&sort_by=" + value; + parameters = "sort_by=" + value; } - goURL = location.href.replace("&sort_by=" + sort_by, parameters); + goURL = location.href.replace("sort_by=" + sort_by, parameters); } else { goURL = url + "&sort_by=" + value; } window.location.replace(goURL); -}) +}); $('.ad-info-right-bar-video').on('click', function () { $(".video-ad-tooltip-" + $(this).attr('data-id'))[0].play(); $(".video-ad-tooltip-" + $(this).attr('data-id'))[0].controls = false; -}) +}); $(document).ready(function () { diff --git a/addons/default/visiosoft/advs-module/resources/js/location.js b/addons/default/visiosoft/advs-module/resources/js/location.js index 81c45f9fb..9be0a73d3 100644 --- a/addons/default/visiosoft/advs-module/resources/js/location.js +++ b/addons/default/visiosoft/advs-module/resources/js/location.js @@ -1,109 +1,126 @@ /* Location Data */ +var boundsAction = false; + var getCountry = $('.country-data').data('content'); -if(getCountry == ""){getCountry = default_country;} +if (getCountry == "") { + getCountry = default_country; +} var getCity = $('.city-data').data('content'); -if(getCity == ""){getCity = default_city;} +if (getCity == "") { + getCity = default_city; +} var getDistrict = $('.district-data').data('content'); -if(getDistrict == ""){getDistrict = default_district;} +if (getDistrict == "") { + getDistrict = default_district; +} var getNeighborhood = $('.neighborhood-data').data('content'); -if(getNeighborhood == ""){getNeighborhood = default_neighborhood;} +if (getNeighborhood == "") { + getNeighborhood = default_neighborhood; +} var getVillage = $('.village-data').data('content'); var citySelectName = "city"; var districtSelectName = "district"; var neighborhoodSelectName = "neighborhood"; var villageSelectName = "village"; var countrySelectName = "country"; -jQuery( document ).ready(function( $ ) { +jQuery(document).ready(function ($) { -}).promise().done(function() { +}).promise().done(function () { $('select[name="country"]').val(getCountry); -}).promise().done(function() { +}).promise().done(function () { var cat = getCountry; var level = 1; var name = citySelectName; Locations(cat, level, name); -}).promise().done(function() { +}).promise().done(function () { var cat = getCity; var level = 2; var name = districtSelectName; Locations(cat, level, name); -}).promise().done(function() { +}).promise().done(function () { var cat = getDistrict; var level = 3; var name = neighborhoodSelectName; Locations(cat, level, name); -}).promise().done(function() { +}).promise().done(function () { var cat = getNeighborhood; var level = 4; var name = villageSelectName; Locations(cat, level, name); }); -$(document).on('change', 'select[name="'+countrySelectName+'"]', function(){ +$(document).on('change', 'select[name="' + countrySelectName + '"]', function () { var cat = $(this).val(); var level = 1; var name = citySelectName; + boundsAction = true; Locations(cat, level, name); }); -$(document).on('change', 'select[name="'+citySelectName+'"]', function(){ +$(document).on('change', 'select[name="' + citySelectName + '"]', function () { var cat = $(this).val(); var level = 2; var name = districtSelectName; + boundsAction = true; Locations(cat, level, name) }); -$(document).on('change', 'select[name="'+districtSelectName+'"]', function(){ +$(document).on('change', 'select[name="' + districtSelectName + '"]', function () { var cat = $(this).val(); var level = 3; var name = neighborhoodSelectName; + boundsAction = true; Locations(cat, level, name) }); -$(document).on('change', 'select[name="'+neighborhoodSelectName+'"]', function(){ +$(document).on('change', 'select[name="' + neighborhoodSelectName + '"]', function () { var cat = $(this).val(); var level = 4; var name = villageSelectName; + boundsAction = true; Locations(cat, level, name) }); -function Locations(cat, level, name){ + +function Locations(cat, level, name) { $.ajax({ type: "GET", - data: "cat=" + cat + "&level=" + level, + data: "cat=" + cat + "&level=" + level, url: "/class/ajax", - success: function(msg){ - $('select[name="'+name+'"]').find('option').remove(); - $('select[name="'+name+'"]').append(''); - $.each(msg, function(key, value){ - $('select[name="'+name+'"]').append(''); + success: function (msg) { + $('select[name="' + name + '"]').find('option').remove(); + $('select[name="' + name + '"]').append(''); + $.each(msg, function (key, value) { + $('select[name="' + name + '"]').append(''); }); } - }).promise().done(function() { + }).promise().done(function () { setLocation(level); haritaIslem(0); }); } -function setLocation(level){ - if(level == 1){ - $('select[name="'+citySelectName+'"]').val(getCity); - }else if(level == 2){ - $('select[name="'+districtSelectName+'"]').val(getDistrict); - }else if(level == 3){ - $('select[name="'+neighborhoodSelectName+'"]').val(getNeighborhood); - }else if(level == 4){ - $('select[name="'+villageSelectName+'"]').val(getVillage); +function setLocation(level) { + if (level == 1) { + $('select[name="' + citySelectName + '"]').val(getCity); + } else if (level == 2) { + $('select[name="' + districtSelectName + '"]').val(getDistrict); + } else if (level == 3) { + $('select[name="' + neighborhoodSelectName + '"]').val(getNeighborhood); + } else if (level == 4) { + $('select[name="' + villageSelectName + '"]').val(getVillage); } } var locationedit = $('input[name="map_Val"]').val(); -if(locationedit){ - var coordcenter = new google.maps.LatLng(locationedit); -}else{ +if (locationedit) { + var lat = locationedit.split(",")[0]; + var lng = locationedit.split(",")[1]; + var coordcenter = new google.maps.LatLng(lat, lng); +} else { var coordcenter = new google.maps.LatLng(38.9573415, 35.2415759); } var mapOptions = { - + center: coordcenter, - zoom: 6, + zoom: 20, mapTypeId: google.maps.MapTypeId.STREET }; var secildi = 0; @@ -112,19 +129,19 @@ 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').text() + ' '; } - if ($('select[name="'+citySelectName+'"]').val() != "") { - str += $('select[name="'+citySelectName+'"] :selected').text() + ' '; + if ($('select[name="' + citySelectName + '"]').val() != "") { + str += $('select[name="' + citySelectName + '"] :selected').text() + ' '; } - if ($('select[name="'+districtSelectName+'"]').val() != "") { - str += $('select[name="'+districtSelectName+'"] :selected').text() + ' '; + if ($('select[name="' + districtSelectName + '"]').val() != "") { + str += $('select[name="' + districtSelectName + '"] :selected').text() + ' '; } - if ($('select[name="'+neighborhoodSelectName+'"]').val() != "") { - str += $('select[name="'+neighborhoodSelectName+'"] :selected').text() + ' '; + if ($('select[name="' + neighborhoodSelectName + '"]').val() != "") { + str += $('select[name="' + neighborhoodSelectName + '"] :selected').text() + ' '; } - + if (!str) { return true; } @@ -140,12 +157,11 @@ function haritaIslem() { var lng = results[0].geometry.location.lng(); var latlng = new google.maps.LatLng(lat, lng); var bounds = results[0].geometry.bounds; - - if (bounds != undefined) { + if (boundsAction) { map.fitBounds(bounds); } } - if ($('select[name="'+neighborhoodSelectName+'"]').val() != "" && $('select[name="'+neighborhoodSelectName+'"]').val() != 0 && secildi == 0) { + if ($('select[name="' + neighborhoodSelectName + '"]').val() != "" && $('select[name="' + neighborhoodSelectName + '"]').val() != 0 && secildi == 0) { secildi = 1; } @@ -153,13 +169,12 @@ function haritaIslem() { } function placeMarker(location) { - console.log(location); var lat = location.lat(); var lng = location.lng(); $(".mapVal").val(lat + "," + lng); if (marker) { marker.setPosition(location); - $("#map").data(lat+","+lng); + $("#map").data(lat + "," + lng); } else { marker = new google.maps.Marker({ position: location, @@ -170,19 +185,22 @@ function placeMarker(location) { } editMarket(); + function editMarket() { var locationedit = $('input[name="map_Val"]').val(); - if(locationedit){ + if (locationedit) { + var lat = locationedit.split(",")[0]; var lng = locationedit.split(",")[1]; - var location = new google.maps.LatLng(lat, lng); - $(".mapVal").val($('input[name="map_Val"]')); + + var locationMap = new google.maps.LatLng(lat, lng); + $(".mapVal").val($('input[name="map_Val"]').val()); if (marker) { - marker.setPosition(location); - $("#map").data(lat+","+lng); + marker.setPosition(locationMap); + $("#map").data(lat + "," + lng); } else { marker = new google.maps.Marker({ - position: location, + position: locationMap, map: map }); } diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php index d5389800a..2251ad9e1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php @@ -98,9 +98,6 @@ return [ 'watermark_position' => [ 'name' => 'موقف العلامة المائية', ], - 'watermark_opacity' => [ - 'name' => 'عتامة العلامة المائية', - ], 'listing_page_image' => [ 'name' => 'سرد صورة الصفحة', ], diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php index b35c974e2..c00c03205 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php @@ -115,10 +115,6 @@ "watermark_position" => [ "name" =>"Wasserzeichen Position", - ], - "watermark_opacity" => [ - "name" =>"Wasserzeichen Deckkraft", - ], "listing_page_image" => [ "name" =>"Listing Page Image", diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php index 35ea00eb8..e3fa5d466 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php @@ -115,10 +115,6 @@ "watermark_position" => [ "name" =>"Θέση υδατοσήματος", - ], - "watermark_opacity" => [ - "name" =>"Αδιαφάνεια του υδατογραφήματος", - ], "listing_page_image" => [ "name" =>"Λίστα εικόνων σελίδας", diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/button.php b/addons/default/visiosoft/advs-module/resources/lang/en/button.php index 87812eaee..e0b9fc5b2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php @@ -11,6 +11,7 @@ return [ 'approve' => "Approve", 'decline' => 'Decline', 'extend' => 'Extend', + 'extend_all' => 'Extend All', 'sub_category' => 'Sub Categories', 'add_sub_category' => 'Add Sub Category', 'sub_cities' => 'Sub Cities', diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 18a089366..2fff9dccd 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Watermark Position', ], - 'watermark_opacity' => [ - 'name' => 'Watermark Opacity', - ], 'listing_page_image' => [ 'name' => 'Listing Page Image', ], diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php index 3ecdbbd73..1024c72d8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Pozicioni i Filigranit', ], - 'watermark_opacity' => [ - 'name' => 'Hapësira e Filigranit', - ], 'listing_page_image' => [ 'name' => 'Lista e figurës së faqes', ], diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php index 580453def..f7232ec89 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php @@ -10,7 +10,8 @@ return [ 'new_village' => 'Yeni köy', 'approve' => "Onayla", 'decline' => 'Reddet', - 'extend' => 'Uzat', + 'extend' => 'Tarihi Güncelle', + 'extend_all' => 'Tümünün Tarihini Güncelle', 'sub_category' => 'Alt Kategoriler', 'add_sub_category' => 'Alt Kategori Ekle', 'sub_cities' => 'Alt Şehirler', diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 2dec0752a..5450ac6ce 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Filigran Konumu', ], - 'watermark_opacity' => [ - 'name' => 'Filigran Opaklığı', - ], 'listing_page_image' => [ 'name' => 'Sayfa Resmi Listeleme', ], diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 4bf5abd23..4b3b36139 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -27,7 +27,7 @@ {% include "visiosoft.module.advs::list/partials/display-mode" %} - {{ addBlock('ads-list/row',{'topfields':topfields})|raw }} + {{ addBlock('ads-list/row',{'topfields':topfields,'advs':advs})|raw }}
{% block listContent %} {% include "visiosoft.module.advs::list/partials/ads" %} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 72a6defd1..9dd474609 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -1,200 +1,212 @@ {% set formHtml %} -
-{% endset %} -{% if 'cat' in param|keys %} + + {% endset %} + {% if 'cat' in param|keys %} {% if not param['cat'] is empty %} - {% set catId = entries('cats', 'category').find(param['cat']) %} - {% set cityId = null %} - {% if 'city' in param|keys %} - {% set citiesArray = param['city'][0]|split(',') %} - {% if count(citiesArray) is same as(1) %} - {% set cityId = entries('location', 'cities').find(param['city'][0]) %} - {% endif %} + {% set catId = entries('cats', 'category').find(param['cat']) %} + {% set cityId = null %} + {% if 'city' in param|keys %} + {% set citiesArray = param['city'][0]|split(',') %} + {% if count(citiesArray) is same as(1) %} + {% set cityId = entries('location', 'cities').find(param['city'][0]) %} {% endif %} - {% set formHtml %} - - {% endset %} {% endif %} -{% endif %} -{{ formHtml }} -
- - -
-
-
+ {% set formHtml %} + + {% endset %} + {% endif %} + {% endif %} + {{ formHtml }} +
+ + +
+
+
- {{ addBlock('ads-list/partials/list-filter',{ - 'mainCats':mainCats, - 'subCats':subCats, - 'ranges':ranges, - 'checkboxes':checkboxes, - 'radio':radio, - 'countries':countries, - 'cities':cities, - 'districts':districts, - 'neighborhoods':neighborhoods, - 'villages':villages, - 'param':param - })|raw }} + {{ addBlock('ads-list/partials/list-filter',{ + 'mainCats':mainCats, + 'subCats':subCats, + 'ranges':ranges, + 'checkboxes':checkboxes, + 'topfields' : topfields, + 'radio':radio, + 'countries':countries, + 'cities':cities, + 'districts':districts, + 'neighborhoods':neighborhoods, + 'villages':villages, + 'param':param + })|raw }} - -
- -
-
-
- - -
-
- - -
-
- - + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
-
- + - -
- -
-
-
- - -
-
- - + +
+ +
+
+
+ + +
+
+ + +
-
- + - -
- -
-
-
- - + +
+ +
+
+
+ + +
-
- + - -
- -
-
- {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} -
- -
-
- + +
+ +
+
+ {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} +
+ +
+
+ + +
+
+ +
-
- -
-
-
- + -
-
-
- -
+
+
+
+ +
+
-
- \ No newline at end of file + \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig index c7dbd2516..0ade2fc8f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig @@ -8,7 +8,7 @@ -