diff --git a/addons/default/visiosoft/base-theme/resources/css/custom.css b/addons/default/visiosoft/advs-module/resources/css/custom.css similarity index 100% rename from addons/default/visiosoft/base-theme/resources/css/custom.css rename to addons/default/visiosoft/advs-module/resources/css/custom.css diff --git a/addons/default/visiosoft/base-theme/resources/css/edit_category.css b/addons/default/visiosoft/advs-module/resources/css/edit_category.css similarity index 100% rename from addons/default/visiosoft/base-theme/resources/css/edit_category.css rename to addons/default/visiosoft/advs-module/resources/css/edit_category.css diff --git a/addons/default/visiosoft/advs-module/resources/images/1.png b/addons/default/visiosoft/advs-module/resources/images/1.png new file mode 100644 index 000000000..44ca35dc3 Binary files /dev/null and b/addons/default/visiosoft/advs-module/resources/images/1.png differ diff --git a/addons/default/visiosoft/advs-module/resources/images/main.png b/addons/default/visiosoft/advs-module/resources/images/main.png new file mode 100644 index 000000000..6203ca514 Binary files /dev/null and b/addons/default/visiosoft/advs-module/resources/images/main.png differ diff --git a/addons/default/visiosoft/advs-module/resources/images/no-image.png b/addons/default/visiosoft/advs-module/resources/images/no-image.png new file mode 100644 index 000000000..397d4d55a Binary files /dev/null and b/addons/default/visiosoft/advs-module/resources/images/no-image.png differ diff --git a/addons/default/visiosoft/advs-module/resources/images/plus-categories.png b/addons/default/visiosoft/advs-module/resources/images/plus-categories.png new file mode 100644 index 000000000..6a1f10423 Binary files /dev/null and b/addons/default/visiosoft/advs-module/resources/images/plus-categories.png differ diff --git a/addons/default/visiosoft/base-theme/resources/js/cats.js b/addons/default/visiosoft/advs-module/resources/js/cats.js similarity index 84% rename from addons/default/visiosoft/base-theme/resources/js/cats.js rename to addons/default/visiosoft/advs-module/resources/js/cats.js index 83d5e9eab..579ddc0a4 100644 --- a/addons/default/visiosoft/base-theme/resources/js/cats.js +++ b/addons/default/visiosoft/advs-module/resources/js/cats.js @@ -1,3 +1,11 @@ +function showLoader() { + $('body').append('
'); +} + +function hideLoader() { + $('.loading-cart').remove(); +} + $(document).ready(function () { $('select[name="cat1"], select[name="cat2"], select[name="cat3"], ' + 'select[name="cat4"], select[name="cat5"], select[name="cat6"], select[name="cat7"]').on('change', function () { @@ -7,7 +15,6 @@ $(document).ready(function () { const filter = {}; filter.getCats = (catId, divId) => { - console.log(catId,divId) $.ajax({ type: 'get', url: '/class/getcats/'+ divId, @@ -20,12 +27,12 @@ $(document).ready(function () { btn = ""+response['nextBtn']+""; } $('.cat-item-3').html( - '
' + - '

'+response['title']+'

' + - '

'+response['msg']+'

' + + '
' + + '
'+response['title']+'
' + + '

'+response['msg']+'

' + '
' + btn + - ''+response['cancelBtn']+'
' + ''+response['cancelBtn']+'
' ); $('.cat-item-3').show(); stop(); diff --git a/addons/default/visiosoft/base-theme/resources/js/edit_cats.js b/addons/default/visiosoft/advs-module/resources/js/edit_cats.js similarity index 100% rename from addons/default/visiosoft/base-theme/resources/js/edit_cats.js rename to addons/default/visiosoft/advs-module/resources/js/edit_cats.js diff --git a/addons/default/visiosoft/base-theme/resources/js/list-item.js b/addons/default/visiosoft/advs-module/resources/js/list-item.js similarity index 100% rename from addons/default/visiosoft/base-theme/resources/js/list-item.js rename to addons/default/visiosoft/advs-module/resources/js/list-item.js diff --git a/addons/default/visiosoft/base-theme/resources/js/list-table.js b/addons/default/visiosoft/advs-module/resources/js/list-table.js similarity index 100% rename from addons/default/visiosoft/base-theme/resources/js/list-table.js rename to addons/default/visiosoft/advs-module/resources/js/list-table.js diff --git a/addons/default/visiosoft/base-theme/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js similarity index 100% rename from addons/default/visiosoft/base-theme/resources/js/list.js rename to addons/default/visiosoft/advs-module/resources/js/list.js diff --git a/addons/default/visiosoft/base-theme/resources/js/location.js b/addons/default/visiosoft/advs-module/resources/js/location.js similarity index 100% rename from addons/default/visiosoft/base-theme/resources/js/location.js rename to addons/default/visiosoft/advs-module/resources/js/location.js diff --git a/addons/default/visiosoft/base-theme/resources/js/new-create.js b/addons/default/visiosoft/advs-module/resources/js/new-create.js similarity index 95% rename from addons/default/visiosoft/base-theme/resources/js/new-create.js rename to addons/default/visiosoft/advs-module/resources/js/new-create.js index 24b914491..afdca1b92 100644 --- a/addons/default/visiosoft/base-theme/resources/js/new-create.js +++ b/addons/default/visiosoft/advs-module/resources/js/new-create.js @@ -1,3 +1,12 @@ +function showLoader() { + $('body').append('
'); +} + +function hideLoader() { + $('.loading-cart').remove(); +} + + const filter = {}; // TODO will be unified diff --git a/addons/default/visiosoft/advs-module/resources/js/phoneCounter.js b/addons/default/visiosoft/advs-module/resources/js/phoneCounter.js new file mode 100644 index 000000000..a5967dab9 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/js/phoneCounter.js @@ -0,0 +1,37 @@ +function sendCount() { + var id = $('.show-number').attr('data-id'); + if (id != "") { + $.ajax({ + type: 'POST', + url: '/ajax/countPhone', + data: 'id=' + id, + success: function (data) { + hideLoader() + $('.show-number').removeAttr('data-function'); + }, + beforeSend: function () { + showLoader() + } + }); + } + +} + +// ------------------------------------------------------------- +// Show Mobile Number +// ------------------------------------------------------------- + +(function () { + $('.show-number').on('click', function () { + this.addEventListener('click', sendCount()); + $('.hide-text').fadeIn(500, function () { + $(this).addClass('hide'); + }); + $('.hide-number').fadeIn(500, function () { + $(this).addClass('show'); + }); + }); +}()); + + +// script end \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/js/viewed.js b/addons/default/visiosoft/advs-module/resources/js/viewed.js similarity index 100% rename from addons/default/visiosoft/base-theme/resources/js/viewed.js rename to addons/default/visiosoft/advs-module/resources/js/viewed.js diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php index 6457e99d1..c6ef2c9b9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php @@ -23,4 +23,5 @@ return [ 'link' => "", ], 'update_category_info' => 'Please update category.', + 'filter_by_search_msg' => 'Filter By Search.', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/message.php b/addons/default/visiosoft/advs-module/resources/lang/tr/message.php index 4c0e3feb9..007ed5a7e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/message.php @@ -23,4 +23,5 @@ return [ 'link' => "", ], 'update_category_info' => 'Lütfen kategoriyi güncelleyiniz.', + 'filter_by_search_msg' => 'Aramanızı Daraltın.', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig similarity index 83% rename from addons/default/visiosoft/base-theme/resources/views/ad-detail/detail.twig rename to addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig index 339ba59a2..92365d2ff 100644 --- a/addons/default/visiosoft/base-theme/resources/views/ad-detail/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig @@ -19,7 +19,7 @@
- {% include "visiosoft.theme.base::partials/messages" %} + {% include "theme::partials/messages" %}
@@ -38,10 +38,10 @@
- {% include "visiosoft.theme.base::ad-detail/partials/slider" %} + {% include "visiosoft.module.advs::ad-detail/partials/slider" %}
- {% include "visiosoft.theme.base::ad-detail/partials/detail" %} + {% include "visiosoft.module.advs::ad-detail/partials/detail" %}
@@ -56,7 +56,7 @@ {% if blocks('ad-item-content-block-area') is null %} - {% include "visiosoft.theme.base::ad-detail/partials/content-ad" %} + {% include "visiosoft.module.advs::ad-detail/partials/content-ad" %} {% else %} {{ blocks('ad-item-content-block-area') }} {% endif %} @@ -90,16 +90,14 @@ {% include "visiosoft.module.comparisons::comparison" %} {% endif %} - {% if entries('advs').isEnabled('phoneclickcounter') %} - {{ asset_add("scripts.js", "visiosoft.module.phoneclickcounter::js/phoneCounter.js") }} - {% endif %} {% if entries('advs').isEnabled('carts') %} {{ asset_add("scripts.js", "visiosoft.module.carts::js/quantity.js") }} {% endif %} - {{ asset_add("scripts.js", "visiosoft.theme.base::js/list-item.js") }} - {{ asset_add("scripts.js", "visiosoft.theme.base::js/viewed.js") }} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-item.js") }} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/phoneCounter.js") }} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/viewed.js") }} {% endblock %} diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/author-button.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/author-button.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/author-button.twig rename to addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/author-button.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/content-ad.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content-ad.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/content-ad.twig rename to addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content-ad.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig similarity index 95% rename from addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/detail.twig rename to addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig index ae93a5fd8..e254f6b23 100644 --- a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig @@ -14,7 +14,7 @@

{{ adv.price.format() }} {{ adv.currency }} - {% include "visiosoft.theme.base::ad-detail/partials/author-button" %} + {% include "visiosoft.module.advs::ad-detail/partials/author-button" %}

@@ -99,7 +99,7 @@ diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/slider.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/slider.twig similarity index 85% rename from addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/slider.twig rename to addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/slider.twig index e6299d113..40a68cc7c 100644 --- a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/slider.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/slider.twig @@ -7,8 +7,8 @@ data-thumbheight="48"> {% set advPhoto = '' %} {% if count(adv.files) == 0 %} - {% set advPhoto = img('visiosoft.theme.base::images/no-image.png').url %} - + {% set advPhoto = img('visiosoft.module.advs::images/no-image.png').url %} + {% else %} {% for image in adv.getViewPhotoUrl %} diff --git a/addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/social.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/social.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/social.twig rename to addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/social.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig similarity index 67% rename from addons/default/visiosoft/base-theme/resources/views/list/list.twig rename to addons/default/visiosoft/advs-module/resources/views/list/list.twig index c63e7a523..108a024c1 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -5,10 +5,10 @@
- {% include "visiosoft.theme.base::partials/messages" %} + {% include "theme::partials/messages" %} - {% include "visiosoft.theme.base::list/partials/breadcrumb" %} + {% include "visiosoft.module.advs::list/partials/breadcrumb" %} {% block listContent %} @@ -16,15 +16,15 @@
- {% include "visiosoft.theme.base::list/partials/user-section" %} + {% include "visiosoft.module.advs::list/partials/user-section" %}
- {% include "visiosoft.theme.base::list/partials/list-filter" %} + {% include "visiosoft.module.advs::list/partials/list-filter" %}
- {% include "visiosoft.theme.base::list/partials/list-section" %} + {% include "visiosoft.module.advs::list/partials/list-section" %}
@@ -48,7 +48,7 @@ {% include "visiosoft.module.favs::list/favorites-modal" %} {% endif %} - {{ asset_add("scripts.js", "visiosoft.theme.base::js/list.js") }} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/list.js") }} {% if entries('advs').isEnabled('comparisons') %} {% include "visiosoft.module.comparisons::comparison" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/list/map.twig b/addons/default/visiosoft/advs-module/resources/views/list/map.twig similarity index 96% rename from addons/default/visiosoft/base-theme/resources/views/list/map.twig rename to addons/default/visiosoft/advs-module/resources/views/list/map.twig index 330002ea3..30106d2c6 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/map.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/map.twig @@ -1,11 +1,12 @@ -{% extends "visiosoft.theme.base::list/list" %} +{% extends layout('map') %} +{% extends "visiosoft.module.advs::list/list" %} {% block listContent %}
- {% include "visiosoft.theme.base::list/partials/list-filter" %} + {% include "visiosoft.module.advs::list/partials/list-filter" %}
- {% include "visiosoft.theme.base::list/partials/display-mode" %} + {% include "visiosoft.module.advs::list/partials/display-mode" %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/ads.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/breadcrumb.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/breadcrumb.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/display-mode.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/display-mode.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/featured-ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/featured-ads.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/featured-ads.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/featured-ads.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig similarity index 95% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 76322f159..7a5a493ae 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -22,7 +22,7 @@ href="{% if(type == "list") %}{{ url_route('visiosoft.module.advs::list') }}{% else %}{{ url_route('advs_map_list') }}{% endif %}?cat={{ maincat.id }}"> {% if maincat.files[0].path != "" %} {% else %}{% endif %}{{ maincat.name }} {% for subcat in subCats %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-section.twig similarity index 69% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/list-section.twig index c384dd9e7..ea953fbd2 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-section.twig @@ -3,10 +3,10 @@
- {% include "visiosoft.theme.base::list/partials/list-sort-by" %} + {% include "visiosoft.module.advs::list/partials/list-sort-by" %}
- {% include "visiosoft.theme.base::list/partials/display-mode" %} + {% include "visiosoft.module.advs::list/partials/display-mode" %}
@@ -18,10 +18,10 @@
- {% include "visiosoft.theme.base::list/partials/featured-ads" %} + {% include "visiosoft.module.advs::list/partials/featured-ads" %} - {% include "visiosoft.theme.base::list/partials/ads" %} + {% include "visiosoft.module.advs::list/partials/ads" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-sort-by.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/list-sort-by.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/table-row.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/table-row.twig similarity index 100% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/table-row.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/table-row.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig similarity index 87% rename from addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig rename to addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig index db82ff954..d87ae00ea 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig @@ -9,7 +9,7 @@
{% if userProfile.adv_listing_banner.url == '' %} - + {% else %} {% endif %} diff --git a/addons/default/visiosoft/base-theme/resources/views/list/table.twig b/addons/default/visiosoft/advs-module/resources/views/list/table.twig similarity index 85% rename from addons/default/visiosoft/base-theme/resources/views/list/table.twig rename to addons/default/visiosoft/advs-module/resources/views/list/table.twig index 3024cc316..bf46b44db 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/table.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/table.twig @@ -1,14 +1,15 @@ -{% extends "visiosoft.theme.base::list/list" %} +{% extends layout('table') %} +{% extends "visiosoft.module.advs::list/list" %} {% block listContent %}
- {% include "visiosoft.theme.base::list/partials/user-section" %} + {% include "visiosoft.module.advs::list/partials/user-section" %} - {% include "visiosoft.theme.base::list/partials/list-filter" %} + {% include "visiosoft.module.advs::list/partials/list-filter" %}
@@ -16,10 +17,10 @@
- {% include "visiosoft.theme.base::list/partials/list-sort-by" %} + {% include "visiosoft.module.advs::list/partials/list-sort-by" %}
- {% include "visiosoft.theme.base::list/partials/display-mode" %} + {% include "visiosoft.module.advs::list/partials/display-mode" %}
@@ -52,7 +53,7 @@ - {% include "visiosoft.theme.base::list/partials/table-row" %} + {% include "visiosoft.module.advs::list/partials/table-row" %}
@@ -87,6 +88,6 @@ {% endblock %} {% block customjs %} - {{ asset_add("scripts.js", "visiosoft.theme.base::js/list-table.js") }} - {% include "visiosoft.theme.base::scroll-modal" %} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }} + {% include "theme::scroll-modal" %} {% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/edit-cat.twig similarity index 97% rename from addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig rename to addons/default/visiosoft/advs-module/resources/views/new-ad/edit-cat.twig index 8dab0e5de..2ee15a5e7 100644 --- a/addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/edit-cat.twig @@ -109,6 +109,6 @@
- {{ asset_add("scripts.js", "visiosoft.theme.base::js/edit_cats.js") }} - {{ asset_style("visiosoft.theme.base::css/edit_category.css") }} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/edit_cats.js") }} + {{ asset_style("visiosoft.module.advs::css/edit_category.css") }} {% endblock %} diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig similarity index 84% rename from addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig rename to addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index da270d1d1..0e63dbfd4 100644 --- a/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -1,12 +1,22 @@ -{% extends layout('new-ad') %} +{% extends layout('new-create') %} {% block content %}
- {% include "visiosoft.theme.base::partials/messages" %} - - {% include "visiosoft.theme.base::new-ad/partials/breadcrumb" %} + {% include "theme::partials/messages" %} +
@@ -32,22 +42,8 @@ {{ trans('visiosoft.module.advs::field.sell_item') }} * {{ trans('visiosoft.module.advs::field.mandatory_fields') }} -
- -
-
+
{{ nameField|raw }}
{% if entries('advs').isEnabled('store') %} @@ -98,10 +94,14 @@
- {{ descField|raw }} +
+ {{ descField|raw }} +
- {{ form.fields.files.input |raw }} +
+ {{ form.fields.files.input |raw }} +
{% if entries('advs').isEnabled('customfields') %} {% include "visiosoft.module.customfields::new-ad/fields" %} @@ -148,6 +148,6 @@ - {{ asset_add("scripts.js", "visiosoft.theme.base::js/new-create.js") }} - {{ asset_add("scripts.js", "visiosoft.theme.base::js/location.js") }} + {{ 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/resources/views/new-ad/partials/breadcrumb.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/breadcrumb.twig new file mode 100644 index 000000000..b0944973b --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/breadcrumb.twig @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig similarity index 53% rename from addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig rename to addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig index 51f7fc0fc..1066b132e 100644 --- a/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig @@ -3,87 +3,78 @@ {% block content %}
- {% include "visiosoft.theme.base::new-ad/partials/breadcrumb" %} + {% include "visiosoft.module.advs::new-ad/partials/breadcrumb" %}
-
-
-

{{ trans('visiosoft.module.advs::field.select_a_category') }}

-
    - {% for cat in main_cats %} - + {% endfor %} -
-
-
-

{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}

-
    - -
-
-
-

{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}

-
    - -
-
-
-

{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}

-
    - -
-
-
-

{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}

-
    - -
-
-
-

{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}

-
    - -
-
-
-

{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}

-
    - -
-
+
+
-
+
+
@@ -101,6 +92,10 @@ overflow-y: auto } + .cat-select:focus { + outline: none; + } + .cat-select option { border-top: 1px solid #f2f2f2; padding: 15px 0 20px; @@ -119,7 +114,7 @@ } #main { - background-image: {{ img('visiosoft.theme.base::images/bg/main.png').url }} !important; + background-image: {{ img('visiosoft.module.advs::images/main.png').url }} !important; } .btn-1 { @@ -130,7 +125,7 @@ margin-right: 5px; } - {{ asset_add("scripts.js", "visiosoft.theme.base::js/cats.js") }} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/cats.js") }} {% endblock %} diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index cbcd74a6f..b7ef273b1 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -313,7 +313,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface public function AddAdsDefaultCoverImage($ad) { if ($ad->cover_photo == null) { - $ad->cover_photo = $this->dispatch(new MakeImageInstance('visiosoft.theme.base::images/no-image-ads.jpg', 'img'))->url(); + $ad->cover_photo = $this->dispatch(new MakeImageInstance('visiosoft.module.advs::images/no-image.png', 'img'))->url(); } else { $ad->cover_photo = url($ad->cover_photo); } @@ -324,7 +324,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface { $adv = $this->find($id); if ($adv == null or $adv->cover_photo == null) { - $cover_photo = $this->dispatch(new MakeImageInstance('visiosoft.theme.base::images/no-image-ads.jpg', 'img'))->url(); + $cover_photo = $this->dispatch(new MakeImageInstance('visiosoft.module.advs::images/no-image.png', 'img'))->url(); } else { $cover_photo = url($adv->cover_photo); } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvResponse.php b/addons/default/visiosoft/advs-module/src/Adv/AdvResponse.php index a885abdd3..bbbd50d23 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvResponse.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvResponse.php @@ -21,7 +21,7 @@ class AdvResponse { if (!$adv->getResponse()) { $response = $this->response->view( - 'visiosoft.theme.base::ad-detail/detail', + 'visiosoft.module.advs::ad-detail/detail', [ 'adv' => $adv, ] diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index 0d539110a..d9c9ca9d4 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -40,8 +40,8 @@ class AdvsController extends AdminController */ public function index(AdvTableBuilder $table, \Anomaly\UsersModule\User\UserModel $userModel, CityModel $cityModel, CatsCategoryEntryModel $categoryModel) { - $table->addAsset("theme.css", "visiosoft.theme.base::css/custom.css"); - $table->addAsset('script.js', 'visiosoft.theme.base::js/admin-list.js'); + $table->addAsset("theme.css", "visiosoft.module.advs::css/custom.css"); + $table->addAsset('script.js', 'visiosoft.module.advs::js/list.js'); $table->addButtons([ 'status' => [ diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php index c5c7d28db..3329bb931 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php @@ -14,6 +14,6 @@ class CategoriesController extends PublicController { ->select('advs_advs.*','u1.username as owner', 't1.name as name') ->get(); - return $this->view->make('visiosoft.theme.base::list/list', compact('advs')); + return $this->view->make('visiosoft.module.advs::list/list', compact('advs')); } } 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 8cf4d6ddd..ba76e11fc 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -220,11 +220,11 @@ class AdvsController extends PublicController $viewType = $this->requestHttp->cookie('viewType'); if (isset($viewType) and $viewType == 'table') - return $this->view->make('visiosoft.theme.base::list/table', $compact); + return $this->view->make('visiosoft.module.advs::list/table', $compact); elseif (isset($viewType) and $viewType == 'map') - return $this->view->make('visiosoft.theme.base::list/map', $compact); + return $this->view->make('visiosoft.module.advs::list/map', $compact); - return $this->view->make('visiosoft.theme.base::list/list', $compact); + return $this->view->make('visiosoft.module.advs::list/list', $compact); } public function viewType($type) @@ -305,7 +305,7 @@ class AdvsController extends PublicController if ($adv->created_by_id == isset(auth()->user()->id) OR $adv->status == "approved") { - return $this->view->make('visiosoft.theme.base::ad-detail/detail', compact('adv', 'complaints', 'recommended_advs', 'categories', 'features', 'tags', 'profile', 'comments', 'qrSRC')); + return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints', 'recommended_advs', 'categories', 'features', 'tags', 'profile', 'comments', 'qrSRC')); } else { return back(); } @@ -399,7 +399,7 @@ class AdvsController extends PublicController $custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->create($categories); } //Cloudinary Module - return $this->view->make('visiosoft.theme.base::new-ad/new-create', compact( + return $this->view->make('visiosoft.module.advs::new-ad/new-create', compact( 'request', 'formBuilder', 'cats_d', 'custom_fields')); } @@ -715,7 +715,7 @@ class AdvsController extends PublicController $custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->edit($adv, $categories, $cats); } - return $this->view->make('visiosoft.theme.base::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', 'nameField', 'descField')); } public function destroy($id) @@ -772,7 +772,7 @@ class AdvsController extends PublicController } $main_cats = $this->category_repository->mainCats(); - return $this->view->make('visiosoft.theme.base::new-ad/post-cat', compact('main_cats')); + return $this->view->make('visiosoft.module.advs::new-ad/post-cat', compact('main_cats')); } @@ -809,7 +809,7 @@ class AdvsController extends PublicController $main_cats = $this->category_repository->mainCats(); - return $this->view->make('visiosoft.theme.base::new-ad/edit-cat', compact('main_cats', 'id')); + return $this->view->make('visiosoft.module.advs::new-ad/edit-cat', compact('main_cats', 'id')); } @@ -821,7 +821,7 @@ class AdvsController extends PublicController $urlPrev = str_replace(url('/'), '', url()->previous()); - return $this->view->make('visiosoft.theme.base::login', compact('urlPrev')); + return $this->view->make('theme::login', compact('urlPrev')); } public function register() @@ -831,7 +831,7 @@ class AdvsController extends PublicController return redirect('/'); } - return $this->view->make('visiosoft.theme.base::register'); + return $this->view->make('theme::register'); } public function passwordForgot() @@ -840,7 +840,7 @@ class AdvsController extends PublicController return redirect('/'); } - return $this->view->make('visiosoft.theme.base::passwords/forgot'); + return $this->view->make('theme::passwords/forgot'); } public function passwordReset(Request $request) @@ -849,14 +849,14 @@ class AdvsController extends PublicController return redirect('/'); } $code = $request->email; - return $this->view->make('visiosoft.theme.base::passwords/reset', compact('code')); + return $this->view->make('theme::passwords/reset', compact('code')); } public function homePage(CategoryRepositoryInterface $repository) { $cats = $repository->mainCats(); - return $this->view->make('visiosoft.theme.base::addons/anomaly/pages-module/page', compact('cats')); + return $this->view->make('theme::addons/anomaly/pages-module/page', compact('cats')); } public function map(AdvRepositoryInterface $advRepository, diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig index 1cea819a0..e8325f104 100644 --- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig +++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig index eabaaeb4d..01e7f4332 100644 --- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig +++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig @@ -3,7 +3,7 @@
- Icon
@@ -15,7 +15,7 @@
- Icon
@@ -28,7 +28,7 @@
- Icon
diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig index e8ea4a415..bce963ff7 100644 --- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig +++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig @@ -3,7 +3,7 @@
- Icon
@@ -15,7 +15,7 @@
- Icon
@@ -28,7 +28,7 @@
- Icon
@@ -40,7 +40,7 @@
- Icon
Yardıma mı ihtiyacınız var?
diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig index 15d1af80e..3e24115e7 100644 --- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig +++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig @@ -1,3 +1,3 @@
- Image + Image
\ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig b/addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig index 0d530d900..120413a60 100644 --- a/addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig +++ b/addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/fields.php b/addons/default/visiosoft/base-theme/resources/lang/en/fields.php index f07a8d979..9574ef8a8 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/fields.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/fields.php @@ -30,7 +30,4 @@ return [ 'content' => [ 'name' => 'Content', ], - 'price' => [ - 'name' => 'Price' - ], ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/message.php b/addons/default/visiosoft/base-theme/resources/lang/en/message.php index 71dc80956..c5c23e41e 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/message.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/message.php @@ -1,6 +1,4 @@ 'Filter By Search.', -]; +return []; diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/fields.php b/addons/default/visiosoft/base-theme/resources/lang/tr/fields.php index 6c9433c45..08b08ad87 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/fields.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/fields.php @@ -31,7 +31,4 @@ return [ 'content' => [ 'name' => 'Açıklama', ], - 'price' => [ - 'name' => 'Fiyat' - ], ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/message.php b/addons/default/visiosoft/base-theme/resources/lang/tr/message.php index 01617eb80..0b67a5fe4 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/message.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/message.php @@ -1,5 +1,3 @@ 'Aramanızı Daraltın.', -]; +return []; diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/partials/breadcrumb.twig b/addons/default/visiosoft/base-theme/resources/views/new-ad/partials/breadcrumb.twig deleted file mode 100644 index 7c458e2a9..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/new-ad/partials/breadcrumb.twig +++ /dev/null @@ -1,7 +0,0 @@ -
-
    -
  1. {{ trans('visiosoft.module.advs::field.home') }}
    2. -
  2. {{ trans('visiosoft.module.advs::field.ad_post') }}
    3. -
-

{{ trans('visiosoft.module.advs::field.post_free_ad') }}

-
\ No newline at end of file diff --git a/addons/default/visiosoft/media-field_type/resources/lang/tr/button.php b/addons/default/visiosoft/media-field_type/resources/lang/tr/button.php index 438fea527..e8fb1e78d 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/tr/button.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/tr/button.php @@ -1,5 +1,5 @@ 'Ana', + 'showOn' => 'Vitrin', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/views/input.twig b/addons/default/visiosoft/media-field_type/resources/views/input.twig index f16cc0988..b4cd48d09 100644 --- a/addons/default/visiosoft/media-field_type/resources/views/input.twig +++ b/addons/default/visiosoft/media-field_type/resources/views/input.twig @@ -1,8 +1,3 @@ - - {{ asset_add('scripts.js', 'visiosoft.field_type.media::js/jquery-sortable.js') }} {% if not (field_type.readonly) %} diff --git a/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php b/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php index 614c4c4d8..6c4ff96a8 100644 --- a/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php +++ b/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php @@ -64,7 +64,7 @@ class ValueTableBuilder extends TableBuilder ], 'rotate' => [ 'target' => '_blank', - 'icon' => 'fa fa-repeat', + 'icon' => 'fas fa-redo', 'type' => 'info', 'text' => '', 'attributes' => [ diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/show-my-sale.twig b/addons/default/visiosoft/profile-module/resources/views/profile/show-my-sale.twig index e48901605..ac4371e4d 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/show-my-sale.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/show-my-sale.twig @@ -29,7 +29,7 @@