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 afe2db15d..eb2e98add 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -18,6 +18,8 @@ return [ 'title' => 'visiosoft.module.advs::section.ads', 'fields' => [ 'latest-limit', + 'default_view_type', + 'hide_zero_price', 'auto_approve', 'estimated_pending_time', 'default_published_time', 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 c63c27f0d..4b56fe2db 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -14,6 +14,19 @@ return [ 'default_value' => 5, ], ], + 'default_view_type' => [ + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'options' => ['list' => 'List', 'table' => 'Table', 'map' => 'Map', 'gallery' => 'Gallery'], + 'default_value' => 'list', + ] + ], + 'hide_zero_price' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ], + ], 'auto_approve' => [ 'type' => 'anomaly.field_type.boolean', 'bind' => 'adv.auto_approve', diff --git a/addons/default/visiosoft/advs-module/resources/js/new-create.js b/addons/default/visiosoft/advs-module/resources/js/new-create.js index 74801a25a..c75f3693a 100644 --- a/addons/default/visiosoft/advs-module/resources/js/new-create.js +++ b/addons/default/visiosoft/advs-module/resources/js/new-create.js @@ -211,8 +211,9 @@ $(document).ready(function () { }); $(".priceField, .priceDecimalField").on('change', function () { - var price = parseInt($(".priceField").val().replace(/\./g, '')); - var decimal = parseInt($(".priceDecimalField").val()); + let price = $(".priceField").val() === "" ? '0' : $(".priceField").val(); + price = parseInt(price.replace(/\./g, '')); + let decimal = parseInt($(".priceDecimalField").val()); $('.priceHidden').find('input').val(parseFloat(price + "." + decimal)); }) }); diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index 7f476577c..bad7dd0ab 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -278,4 +278,7 @@ return [ 'part_2' => 'If not, click the "Edit" button.', ], 'views' => 'Views', + + // Detail page + "no_street_view" => "No street view image in this location" ]; 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 0ae1ae9a5..3e8095be3 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -4,6 +4,13 @@ return [ 'auto_approve' => [ 'name' => 'Auto Approve', ], + 'default_view_type' => [ + 'name' => 'Default View Type', + ], + 'hide_zero_price' => [ + 'name' => 'Hide Price if Zero', + 'instructions' => 'Hide the price if the ad price is 0', + ], 'estimated_pending_time' => [ 'name' => 'Estimated Pending Time', 'instructions' => 'In Hours', diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/field.php b/addons/default/visiosoft/advs-module/resources/lang/sq/field.php index b27d16f55..5e10f445a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/field.php @@ -173,7 +173,7 @@ return [ 'create_adv' => 'Krijoni shpalljen', 'edit_adv' => 'Ndrysho shpalljen', 'mandatory_fields' => 'Të dhëna të detyrueshme', - 'ad_post' => 'Postimi i reklamave', + 'ad_post' => 'Postimi i Njoftime', 'sell_item' => 'Shitet nje artikull ose sherbim', 'search_save' => 'Kërkimi i preferuar u ruajt me sukses', 'address' => 'Adresë', @@ -185,8 +185,8 @@ return [ 'extended' => 'Zgjatur me sukses', 'declined' => 'Ka rënë me sukses', 'search_on_map' => 'Kërkimi në hartë', - 'post_free_ad' => 'Posto reklamën falas', - 'select_a_category' => 'Zgjidh nje kategori', + 'post_free_ad' => 'Posto Njoftime Falas', + 'select_a_category' => 'Zgjidh nje Kategori', 'select_a_sub_category' => 'Zgjidhni një Nën Kategori', 'all_dopings_added' => 'Të gjitha llojet e vitamina janë shtuar për këtë shpallje.', 'is_get_adv' => [ diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/message.php b/addons/default/visiosoft/advs-module/resources/lang/sq/message.php index 967e3788c..4cd42fbb8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/message.php @@ -16,7 +16,7 @@ return [ ], 'create_ad_with_post_cat' => [ 'title' => "Posto një shpallje në vetëm 30 sekonda", - 'msg' => "Ju lutemi NUK postoni reklama të shumta për të njëjtat artikuj ose shërbim. Të gjitha reklamat e kopjuara, spam dhe të kategorizuara gabimisht do të fshihen.", + 'msg' => "Ju lutemi NUK postoni reklama të shumta për të njëjtat artikuj ose shërbim. Të gjitha njoftime e kopjuara, spam dhe të kategorizuara gabimisht do të fshihen.", 'nextBtn' => "tjetër", 'cancelBtn' => "ose Anuloni", 'link' => "", 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 24b09a976..d3aa2e518 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php @@ -76,7 +76,7 @@ return [ 'name' => 'Reklama e paracaktuar GET', ], 'twitter' => [ - 'name' => 'Cicëroj', + 'name' => 'Twitter', ], 'facebook' => [ 'name' => 'Facebook', diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/map.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/map.twig index b36a93e25..5df7ac7b8 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/map.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/map.twig @@ -3,27 +3,33 @@ {{ trans('visiosoft.module.advs::field.no_location') }} {% else %} {% set map_arr = adv.map_Val|split(',') %} -
+
+ + {{ asset_add("scripts.js", "visiosoft.module.advs::js/list.js") }} + {{ asset_add("styles.css", "visiosoft.module.advs::css/list.css") }} + {{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/list.css") }} +{% endblock %} +{% block customjs %} + {{ addBlock('ads-list/list',{'adv':adv})|raw }} +{% endblock %} diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/ads.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/ads.twig new file mode 100644 index 000000000..4ca79aa12 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/ads.twig @@ -0,0 +1,41 @@ +{{ addBlock('ad-list/partials/ads',{'featured_advs':featured_advs})|raw }} +{% for adv in advs %} +
+ +
+
+ {{ adv.name }} +
+
+
+
+

{{ adv.name }}

+
+
+ {{ adv.cat1_name }}, {{ adv.cat2_name }} +
+
+
+
+
+
+ {{ adv.price.currency(null,'currency') }} +
+ {% if setting_value('visiosoft.module.location::list_page_location') %} +
+ {{ adv.city_name }} {{ adv.country_name }} +
+ {% endif %} +
+
+
+
+
+
+
+ {{ addBlock('list/extra-actions', {'ad': adv})|raw }} +
+
+
+{% endfor %} diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/breadcrumb.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/breadcrumb.twig new file mode 100644 index 000000000..dd628087e --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/breadcrumb.twig @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/main.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/main.twig new file mode 100644 index 000000000..9ccb280fa --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/main.twig @@ -0,0 +1,36 @@ + +
+
+ + {% include "visiosoft.module.advs::list/partials/user-section" %} + +
+
+ {% include "visiosoft.module.advs::list/partials/list-filter" %} +
+
+ +
+
+
+
\ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/price-filter.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/price-filter.twig new file mode 100644 index 000000000..c21f9131f --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/price-filter.twig @@ -0,0 +1,55 @@ +
+
+
+
+
+ {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} + {% set active_currencies2 = setting_value('visiosoft.module.advs::enabled_currencies') %} + {% set selected_currency = setting_value('streams::currency') %} + {% if app.request.get('currency') %} + {% set selected_currency = app.request.get('currency') %} + {% endif %} + + {% for currency in active_currencies %} + + {% endfor %} + + +
+
+ +
+
+ + +
+
-
+
+ +
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/new-ad/preview/partials/preview-window.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/new-ad/preview/partials/preview-window.twig new file mode 100644 index 000000000..8ce32ccaa --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/new-ad/preview/partials/preview-window.twig @@ -0,0 +1,8 @@ + +{% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/breadcrumb" %} + + +{% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/main" %} + +{{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/sahibinden.css") }} +{{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/detail.css") }} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig index b1026d923..7faa77ccc 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig @@ -20,7 +20,6 @@ {% include "theme::partials/header" %} {{ addBlock('layouts/default/section')|raw }} -
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig index ee463306d..2833942f0 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig @@ -18,7 +18,7 @@ {{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }} {# Theme Scripts #} -{#{{ asset_add("theme.js", "theme::js/plugins/*") }}#} +{#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#} {{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }} {{ asset_script("theme.js") }} diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig new file mode 100644 index 000000000..5a323512a --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig @@ -0,0 +1,23 @@ +{% set sub_categories_limit = setting_value('visiosoft.theme.base::home_page_sub_categories_limit') %} + + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig new file mode 100644 index 000000000..9e47154ed --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig @@ -0,0 +1,40 @@ +{% set sub_categories_limit = setting_value('visiosoft.theme.base::home_page_sub_categories_limit') %} + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories.twig new file mode 100644 index 000000000..a1b2a426c --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories.twig @@ -0,0 +1,50 @@ +
+ + + + {{ addBlock('base/categoriesRow')|raw }} + +
+ {% set main_categories = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('sort_order').get() %} + {% for main_category in main_categories %} + {% include "visiosoft.theme.base::partials/categories-web" %} + {% include "visiosoft.theme.base::partials/categories-mobile" %} + {% endfor %} +
+
+ {{ setting_value('visiosoft.theme.base::home_bottom_left_categories')|raw }} +
+
\ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig index ab18b79dd..0c9932310 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -13,6 +13,7 @@ {#{{ favicons("theme::img/favicon.png") }}#} {# Base Theme Components #} +{{ asset_add("theme.css", "visiosoft.theme.base::css/base.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/bootstrap.min.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/theme.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/select2.css") }} diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig b/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig index 5ce8773c0..168d5248c 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig @@ -26,19 +26,15 @@ {% if setting_value('visiosoft.theme.base::navigation_action') %}