diff --git a/addons/default/visiosoft/base-theme/resources/images/no-image.png b/addons/default/visiosoft/base-theme/resources/images/no-image.png index 397d4d55a..4e15f2d7e 100644 Binary files a/addons/default/visiosoft/base-theme/resources/images/no-image.png and b/addons/default/visiosoft/base-theme/resources/images/no-image.png differ diff --git a/addons/default/visiosoft/base-theme/resources/js/phonefield.js b/addons/default/visiosoft/base-theme/resources/js/phonefield.js index b1e0a81b6..52c392655 100644 --- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js +++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js @@ -27,12 +27,10 @@ function phoneMask(fields) { function maskPhone(name) { var currentMask = $("input[name='" + name + "']").attr('placeholder'); - if (currentMask) { - $("input[name='" + name + "']").mask(currentMask.replace(/[0-9+]/ig, '9'), { - autoclear: true, - clearIncomplete: true - }); - } + $("input[name='" + name + "']").mask(currentMask.replace(/[0-9+]/ig, '9'), { + autoclear: true, + clearIncomplete: true + }); } } diff --git a/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js b/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js index 89838e6d4..be480dac4 100644 --- a/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js +++ b/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js @@ -3,15 +3,3 @@ // Go! })(window, document); - -function crud(params, url, type, callback) { - $.ajax({ - type: type, - async: false, - data: params, - url: url, - success: function (response) { - callback(response); - }, - }); -} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/button.php b/addons/default/visiosoft/base-theme/resources/lang/ar/button.php index ee7518063..6f07733a8 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ar/button.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ar/button.php @@ -2,41 +2,10 @@ return [ 'post_ad' => [ - 'name' => 'Post Free Ad*', - 'footer' => 'Post Ad', + 'name' => 'نشر الإعلان', ], - 'register' => [ - 'name' => 'Sign Up', - ], - 'login' => [ - 'name' => 'Sign In', - ], - 'my_ads' => [ - 'name' => 'My Ads', - ], - 'my_account' => [ - 'name' => 'My Account', - ], - 'logout' => [ - 'name' => 'Logout', - ], - 'show_all' => 'Show All', - - 'close' => 'Close', - - 'hidden' => [ - 'name' => 'Hide', - ], - 'search' => [ - 'name' => 'Search', - ], - 'showcase' => [ - 'name' => 'Showcase', - ], - 'categories' => [ - 'name' => 'Categories', - ], - 'save_category' => 'Save Category', - 'edit' => 'Edit', - 'update_profile' => 'Update Profile', + 'login' => 'تسجيل الدخول', + 'register' => 'تسجيل', + 'continue' => 'استمر', + 'reset_password' => 'إعادة تعيين كلمة المرور', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/field.php b/addons/default/visiosoft/base-theme/resources/lang/ar/field.php index f1860ba01..7d9270817 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ar/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ar/field.php @@ -38,11 +38,5 @@ return [ 'create_new_password' => 'إنشاء كلمة مرور جديدة', // Login page - 'or' => 'أو', - - // Side menu links - 'company_directory' => 'Company directory', - 'popular_ads' => 'Popular Ads', - 'last_48_hours' => 'Last 48 Hours', - 'secure_e-commerce_ads' => 'Secure e-Commerce Ads', + 'or' => 'أو' ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/de/button.php b/addons/default/visiosoft/base-theme/resources/lang/de/button.php index ee7518063..8d660ae4e 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/de/button.php +++ b/addons/default/visiosoft/base-theme/resources/lang/de/button.php @@ -2,41 +2,10 @@ return [ 'post_ad' => [ - 'name' => 'Post Free Ad*', - 'footer' => 'Post Ad', + 'name' => 'Postanzeige', ], - 'register' => [ - 'name' => 'Sign Up', - ], - 'login' => [ - 'name' => 'Sign In', - ], - 'my_ads' => [ - 'name' => 'My Ads', - ], - 'my_account' => [ - 'name' => 'My Account', - ], - 'logout' => [ - 'name' => 'Logout', - ], - 'show_all' => 'Show All', - - 'close' => 'Close', - - 'hidden' => [ - 'name' => 'Hide', - ], - 'search' => [ - 'name' => 'Search', - ], - 'showcase' => [ - 'name' => 'Showcase', - ], - 'categories' => [ - 'name' => 'Categories', - ], - 'save_category' => 'Save Category', - 'edit' => 'Edit', - 'update_profile' => 'Update Profile', + 'login' => 'Einloggen', + 'register' => 'Registrieren', + 'continue' => 'Fortsetzen', + 'reset_password' => 'Passwort zurücksetzen', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/de/field.php b/addons/default/visiosoft/base-theme/resources/lang/de/field.php index 185dc6d32..bb554675f 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/de/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/de/field.php @@ -38,11 +38,5 @@ return [ 'create_new_password' => 'Neues Passwort erstellen', // Login page - 'or' => 'oder', - - // Side menu links - 'company_directory' => 'Company directory', - 'popular_ads' => 'Popular Ads', - 'last_48_hours' => 'Last 48 Hours', - 'secure_e-commerce_ads' => 'Secure e-Commerce Ads', + 'or' => 'oder' ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/button.php b/addons/default/visiosoft/base-theme/resources/lang/en/button.php index ee7518063..1337b4c22 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/button.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/button.php @@ -2,41 +2,10 @@ return [ 'post_ad' => [ - 'name' => 'Post Free Ad*', - 'footer' => 'Post Ad', + 'name' => 'Post Ad', ], - 'register' => [ - 'name' => 'Sign Up', - ], - 'login' => [ - 'name' => 'Sign In', - ], - 'my_ads' => [ - 'name' => 'My Ads', - ], - 'my_account' => [ - 'name' => 'My Account', - ], - 'logout' => [ - 'name' => 'Logout', - ], - 'show_all' => 'Show All', - - 'close' => 'Close', - - 'hidden' => [ - 'name' => 'Hide', - ], - 'search' => [ - 'name' => 'Search', - ], - 'showcase' => [ - 'name' => 'Showcase', - ], - 'categories' => [ - 'name' => 'Categories', - ], - 'save_category' => 'Save Category', - 'edit' => 'Edit', - 'update_profile' => 'Update Profile', + 'login' => 'Login', + 'register' => 'Register', + 'continue' => 'Continue', + 'reset_password' => 'Reset Password', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ru/button.php b/addons/default/visiosoft/base-theme/resources/lang/ru/button.php index ee7518063..a803bf138 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ru/button.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ru/button.php @@ -2,41 +2,10 @@ return [ 'post_ad' => [ - 'name' => 'Post Free Ad*', - 'footer' => 'Post Ad', + 'name' => 'Разместить объявление', ], - 'register' => [ - 'name' => 'Sign Up', - ], - 'login' => [ - 'name' => 'Sign In', - ], - 'my_ads' => [ - 'name' => 'My Ads', - ], - 'my_account' => [ - 'name' => 'My Account', - ], - 'logout' => [ - 'name' => 'Logout', - ], - 'show_all' => 'Show All', - - 'close' => 'Close', - - 'hidden' => [ - 'name' => 'Hide', - ], - 'search' => [ - 'name' => 'Search', - ], - 'showcase' => [ - 'name' => 'Showcase', - ], - 'categories' => [ - 'name' => 'Categories', - ], - 'save_category' => 'Save Category', - 'edit' => 'Edit', - 'update_profile' => 'Update Profile', + 'login' => 'Авторизоваться', + 'register' => 'регистр', + 'continue' => 'Продолжить', + 'reset_password' => 'Сброс пароля', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ru/field.php b/addons/default/visiosoft/base-theme/resources/lang/ru/field.php index 2a69cede7..7ecfa4021 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ru/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ru/field.php @@ -38,11 +38,5 @@ return [ 'create_new_password' => 'Создать новый пароль', // Login page - 'or' => 'или', - - // Side menu links - 'company_directory' => 'Company directory', - 'popular_ads' => 'Popular Ads', - 'last_48_hours' => 'Last 48 Hours', - 'secure_e-commerce_ads' => 'Secure e-Commerce Ads', + 'or' => 'или' ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/button.php b/addons/default/visiosoft/base-theme/resources/lang/sq/button.php index ee7518063..6143f1bd9 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/sq/button.php +++ b/addons/default/visiosoft/base-theme/resources/lang/sq/button.php @@ -2,41 +2,10 @@ return [ 'post_ad' => [ - 'name' => 'Post Free Ad*', - 'footer' => 'Post Ad', + 'name' => 'Posto reklamën', ], - 'register' => [ - 'name' => 'Sign Up', - ], - 'login' => [ - 'name' => 'Sign In', - ], - 'my_ads' => [ - 'name' => 'My Ads', - ], - 'my_account' => [ - 'name' => 'My Account', - ], - 'logout' => [ - 'name' => 'Logout', - ], - 'show_all' => 'Show All', - - 'close' => 'Close', - - 'hidden' => [ - 'name' => 'Hide', - ], - 'search' => [ - 'name' => 'Search', - ], - 'showcase' => [ - 'name' => 'Showcase', - ], - 'categories' => [ - 'name' => 'Categories', - ], - 'save_category' => 'Save Category', - 'edit' => 'Edit', - 'update_profile' => 'Update Profile', + 'login' => 'hyrje', + 'register' => 'Regjistrohu', + 'continue' => 'vazhdoj', + 'reset_password' => 'Rivendosni fjalëkalimin', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/field.php b/addons/default/visiosoft/base-theme/resources/lang/sq/field.php index 640248bbb..ec42ac9f4 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/sq/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/sq/field.php @@ -1,48 +1,42 @@ 'Njoftimet e Fundit', + 'latest_ads' => 'Reklamat më të fundit', 'show_all' => 'Trego të Gjithë', 'login' => [ - 'name' => 'Hyrje', + 'name' => 'hyrje', ], 'logout' => [ - 'name' => 'Dalje', + 'name' => 'Shkyç', ], - 'profile' => 'Profil', - 'email' => 'Adresa e-mail', - 'reset_code' => 'Rivendosni Kodin', - 'password_confirmation' => 'Konfirmimi i Fjalëkalimit', - 'password' => 'Fjalëkalimi', + 'profile' => 'Profile', + 'email' => 'Adresa e postës elektronike', + 'reset_code' => 'Rivendosni kodin', + 'password_confirmation' => 'Konfirmimi i fjalëkalimit', + 'password' => 'fjalëkalim', 'first_name' => 'Emri', 'last_name' => 'Mbiemri', 'remember_me' => 'Më kujto', - 'not_a_member_yet' => 'I pa Regjistruar', - 'not_a_member_yet_message' => 'Regjistrohu si anëtar dhe përfito nga shërbimi ynë special', - 'forgot_password' => 'Keni harruar Fjalekalimin', + 'not_a_member_yet' => 'Jo Anëtar ende', + 'not_a_member_yet_message' => 'Regjistrohuni që anëtarët tanë të përfitojnë nga shërbimi ynë special', + 'forgot_password' => 'Kam harruar fjalëkalimin tim', 'email_or_phone_number' => 'Adresa e emailit ose numri i telefonit', - 'phone_number' => 'Numri i Telefonit', + 'phone_number' => 'Numri i telefonit', // Registration instructions 'personal_registration_header' => 'Cilat janë avantazhet e anëtarësisë individuale?', - 'personal_registration_body' => 'Shit dhe merr me qera Shtëpinë, Makinën tënde, shit sendet e tua të përdorura, merr të reja.', + 'personal_registration_body' => 'Shes dhe marr me qira shtëpinë, makinën tënde, shes sendet e tua të papërdorura, merr të reja.', 'personal_registration_list_1' => 'Posto një reklamë falas,', - 'personal_registration_list_2' => 'Shtoni njoftimet që ju interesojnë, ndiqni ndryshimet e çmimeve pasi t\'i shtoni ato në të preferuarat tuaja, krijoni kërkime të preferuara që plotësojnë kriteret tuaja,', - 'personal_registration_list_3' => 'Dërgoni mesazhe pronarëve të njoftimet në faqe.', - 'register_information_note' => 'Informacioni në këtë faqe merret për ' . env('APPLICATION_DOMAIN') . ' Anëtarësimi. Mund të gjeni informacione të hollësishme në lidhje me mbrojtjen e të dhënave personale këtu.', + 'personal_registration_list_2' => 'Shtoni reklamat që ju interesojnë, ndiqni ndryshimet e çmimeve pasi t\'i shtoni ato në të preferuarat tuaja, krijoni kërkime të preferuara që plotësojnë kriteret tuaja,', + 'personal_registration_list_3' => 'Dërgoni mesazhe pronarëve të reklamave në faqe.', + 'register_information_note' => 'Informacioni në këtë faqe merret për ' . env('APPLICATION_DOMAIN') . ' anëtarësimi. Mund të gjeni informacione të hollësishme në lidhje me mbrojtjen e të dhënave personale këtu.', // Register page 'phone_validation_error' => 'Ky numër telefoni është në përdorim nga një anëtar tjetër.', // Forgot Password - 'create_new_password' => 'Krijoni Fjalëkalimin e ri', + 'create_new_password' => 'Krijoni fjalëkalimin e ri', // Login page - 'or' => 'ose', - - // Side menu links - 'company_directory' => 'Company directory', - 'popular_ads' => 'Popular Ads', - 'last_48_hours' => 'Last 48 Hours', - 'secure_e-commerce_ads' => 'Secure e-Commerce Ads', + 'or' => 'ose' ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/section.php b/addons/default/visiosoft/base-theme/resources/lang/sq/section.php index a9043167b..777181b86 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/sq/section.php +++ b/addons/default/visiosoft/base-theme/resources/lang/sq/section.php @@ -2,7 +2,7 @@ return [ 'catalog_mode' => [ - 'name' => 'Mënyra e Katalogut', + 'name' => 'Mënyra e katalogut', ], - 'template' => 'Shabllon', + 'template' => 'shabllon', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php b/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php index 1c19f9747..be80eb245 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php @@ -2,13 +2,13 @@ return [ 'navigation_title' => [ - 'name' => 'Titulli i Lundrimit', + 'name' => 'Titulli i lundrimit', ], 'navigation_action' => [ - 'name' => 'Veprimi i Lundrimit', + 'name' => 'Veprimi i lundrimit', ], 'country_fields' => [ - 'name' => 'Fushat e Shteti', + 'name' => 'Fushat e vendit', ], 'date_fields' => [ 'name' => 'Fushat e datës', @@ -20,13 +20,13 @@ return [ 'name' => 'Breadcrumb', ], 'ad_details' => [ - 'name' => 'Detajet e Njoftimet', + 'name' => 'Detajet e reklamës', ], 'ad_details_tab' => [ - 'name' => 'Tab Detajet e Njoftime', + 'name' => 'Tab Detajet e Ad', ], 'latest_and_view_all_btn' => [ - 'name' => 'Butoni i fundit dhe Shikoni të gjithë', + 'name' => 'Më të fundit dhe Shiko të gjitha Btn', ], 'register_page_instruction_logo' => [ 'name' => 'Regjistrohu Logo udhëzuese', diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/button.php b/addons/default/visiosoft/base-theme/resources/lang/tr/button.php index ee7518063..8c74b4a91 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/button.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/button.php @@ -2,41 +2,10 @@ return [ 'post_ad' => [ - 'name' => 'Post Free Ad*', - 'footer' => 'Post Ad', + 'name' => 'Ücretsiz İlan Ver', ], - 'register' => [ - 'name' => 'Sign Up', - ], - 'login' => [ - 'name' => 'Sign In', - ], - 'my_ads' => [ - 'name' => 'My Ads', - ], - 'my_account' => [ - 'name' => 'My Account', - ], - 'logout' => [ - 'name' => 'Logout', - ], - 'show_all' => 'Show All', - - 'close' => 'Close', - - 'hidden' => [ - 'name' => 'Hide', - ], - 'search' => [ - 'name' => 'Search', - ], - 'showcase' => [ - 'name' => 'Showcase', - ], - 'categories' => [ - 'name' => 'Categories', - ], - 'save_category' => 'Save Category', - 'edit' => 'Edit', - 'update_profile' => 'Update Profile', + 'login' => 'Giriş Yap', + 'register' => 'Üye Ol', + 'continue' => 'Devam', + 'reset_password' => 'Şifremi Güncelle', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php index b717e092a..dd5820d84 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php @@ -41,8 +41,9 @@ return [ 'or' => 'veya', // Side menu links - 'company_directory' => 'Company directory', - 'popular_ads' => 'Popular Ads', - 'last_48_hours' => 'Last 48 Hours', - 'secure_e-commerce_ads' => 'Secure e-Commerce Ads', + 'company_directory' => 'şirket bilgisi', + 'popular_ads' => 'popüler reklamlar', + 'last_48_hours' => 'son 48 saat', + 'secure_e-commerce_ads' => 'güvenli e-ticaret', + ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/detail.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/detail.twig new file mode 100644 index 000000000..c4d9469f7 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/detail.twig @@ -0,0 +1,20 @@ +{% extends "theme::layouts/default" %} +{% block ogdata %} + + {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/ogdata" %} + +{% endblock %} + +{% block content %} + + {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/breadcrumb" %} + + {% include "visiosoft.module.advs::ad-detail/partials/ad-status" %} + + {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/main" %} + + {{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/sahibinden.css") }} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/viewed.js") }} + {{ asset_add("styles.css", "visiosoft.module.advs::css/detail.css") }} + {{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/detail.css") }} +{% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/main.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/main.twig new file mode 100644 index 000000000..ddbd03b1a --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/main.twig @@ -0,0 +1,165 @@ +
+
+
+
+
+
+

+ {{ adv.title }} +

+
+ +
+ {{ addBlock('ad-detail/title/action', {'adv_id':adv.id, 'sahibinden':true})|raw }} + + + + + + + + + +
+ +
+ +
+
+ {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/slider" %} + +
+ {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/detail" %} +
+ +
+
+
+
+ {{ addBlock('ad-details/user-image', {'userId': adv.created_by_id})|raw }} +
{{ adv.first_name }} {{ adv.last_name }}
+
+
+

{{ trans('visiosoft.theme.sahibinden::field.member_since.name') }} {{ user(adv.create_by_id).created_at|date('F Y') }}

+ {% if profile.file.url is not null %} + + {% endif %} +
+
    +
  • + {% include 'visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/list-link' %} +
    • + {{ addBlock('ad-detail/seller/action',{'seller_id':adv.created_by_id, 'sahibinden':true})|raw }} +
+
+
+ {% set user = adv.created_by %} +
    + {% if user.gsm_phone is not null %} +
  • +
    + + {{ trans('visiosoft.theme.sahibinden::field.mobile.name') }} + +
    +
    {{ user.gsm_phone }}
    +
    • + {% endif %} + + {% if user.office_phone is not empty %} +
  • +
    + + {{ trans('visiosoft.theme.sahibinden::field.office_phone.name') }} + +
    +
    {{ user.office_phone }}
    +
    • + {% endif %} + + {% if user.land_phone is not empty %} +
  • +
    + + {{ trans('visiosoft.theme.sahibinden::field.land_phone.name') }} + +
    +
    {{ user.land_phone }}
    +
    • + {% endif %} +
+ {% if user.gsm_phone is not null %} +
+ + {{ asset_add('scripts.js','visiosoft.theme.sahibinden::js/phoneCheck.js') }} +
+ + + {% endif %} + {{ addBlock('ad-detail/contact-with', {'adv': adv, 'showTheme': false})|raw }} +
+
+ {{ addBlock('ad-detail/widget', {'ad': adv, 'price': adv.price, 'id': adv.id, 'cat1': categories['cat1']})|raw }} + {{ addBlock('ad-detail/widget-details', {'adv': adv})|raw }} + {% if setting_value('visiosoft.theme.sahibinden::show_security_tips') %} +
+
+ {{ trans('visiosoft.theme.sahibinden::field.security_tips.name') }} +
+

+ {{ setting_value('visiosoft.theme.sahibinden::security_tips_msg') }} +

+
+ {% endif %} +
+
+
+ + {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/content" %} +
+
+
+
+{% if user.gsm_phone is not null %} + +{% endif %} + +{% include "visiosoft.module.advs::ad-detail/partials/dropleft-edit" %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/breadcrumb.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/breadcrumb.twig new file mode 100644 index 000000000..dc2086a8f --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/breadcrumb.twig @@ -0,0 +1,12 @@ + diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/content.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/content.twig new file mode 100644 index 000000000..df54baa69 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/content.twig @@ -0,0 +1,76 @@ +
+
+
+ +
+ + + + + + + {{ addBlock('ad-detail/content',{'features':features,'adv':adv, 'profile': profile, 'show':true})|raw }} + +
+
+
+
+{{ addBlock('ad-detail/section',{'adv':adv})|raw }} +
+ {{ setting_value('visiosoft.theme.sahibinden::detail_bottom')|raw }} +
+
+ {{ setting_value('visiosoft.theme.sahibinden::detail_bottom_mobile')|raw }} +
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/detail.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/detail.twig new file mode 100644 index 000000000..72e0d6ff4 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/detail.twig @@ -0,0 +1,58 @@ +{% set district = getDistrict(adv.district.getObject().value) %} +{% set neighborhood = getNeighborhood(adv.neighborhood.getObject().value) %} +
+
+

+ {{ adv.price.currency(null,'currency') }} + + {{ addBlock('ad-detail/details',{'adv':adv,'theme':'sahibinden'})|raw }} + + + {{ addBlock('ad-detail/priceField',{'adv':adv})|raw }} + + +

+

+ {% set lastCatId = categories|last['id'] %} + {% if setting_value('visiosoft.theme.sahibinden::show_country') %} + {{ adv.country_name }} + / + {% endif %} + + {{ adv.city_name }} + + {% if district %} + / + + {{ district.name }} + + {% endif %} + {% if neighborhood %} + / + + {{ neighborhood.name }} + + {% endif %} +

+
+
+ +
+
\ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/list-link.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/list-link.twig new file mode 100644 index 000000000..e3ece0d62 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/list-link.twig @@ -0,0 +1,7 @@ +{% if addBlock('store/link') is null %} + + {{ trans('visiosoft.theme.sahibinden::field.other_ads.name') }} + +{% else %} + {{ addBlock('store/link', {'userId': adv.created_by_id})|raw }} +{% endif %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/ogdata.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/ogdata.twig new file mode 100644 index 000000000..37079c10f --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/ogdata.twig @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/slider.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/slider.twig new file mode 100644 index 000000000..b4183c4c0 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/slider.twig @@ -0,0 +1,69 @@ +
+ {% if blocks('ad-item-picture-block-area') is null %} +
+ + {% set advPhoto = '' %} + {% if count(adv.files) == 0 %} + {% set advPhoto = img('visiosoft.module.advs::images/no-image.png').url %} + + {% else %} + {% for image in adv.getViewPhotoUrl %} + + {% if loop.index == 1 %} + {% set advPhoto = image %} + {% endif %} + {% endfor %} + + {% endif %} +
+
+
+
+ + + {{ trans('visiosoft.theme.sahibinden::field.mega_photo.name') }} + +
+
+ +
+
+
+ {% else %} + {{ blocks('ad-item-picture-block-area') }} + {% endif %} + {{ asset_add("styles.css", "visiosoft.module.advs::css/fotorama.css") }} +
+{% if adv.video_url %} + + {{ asset_add("scripts.js", "visiosoft.module.cloudinary::js/close-btn.js") }} +{% endif %} +{{ asset_add("scripts.js", "visiosoft.module.advs::js/fotorama.js") }} +{{ asset_add("scripts.js", "visiosoft.theme.sahibinden::js/slider.js") }} diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/list.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/list.twig new file mode 100644 index 000000000..2f2aef362 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/list.twig @@ -0,0 +1,67 @@ +{% extends "theme::layouts/default" %} + +{% block content %} + + + {% include "visiosoft.module.advs::list/partials/breadcrumb" %} + + +
+
+ + {{ addBlock('ads-list/user-section', {'store': store})|raw }} + +
+
+ {% include "visiosoft.module.advs::list/partials/list-filter" %} +
+
+
+
+
+ {% include "visiosoft.module.advs::list/partials/list-sort-by" %} +
+
+ {% include "visiosoft.module.advs::list/partials/display-mode" %} +
+
+
+ + + {{ addBlock('ads-list/row-bottom',{'show_favorite_search':true})|raw }} +
+ {{ addBlock('ads-list/row',{'topfields':topfields,'advs':advs})|raw }} +
+ {% block listContent %} + {% include "visiosoft.module.advs::list/partials/ads" %} + {% endblock %} +
+ {% include "visiosoft.module.advs::list/partials/pagination" %} + + {{ addBlock('ads-list/row-bottom')|raw }} + + {#
#} +
+
+
+
+
+ {% include "visiosoft.module.advs::list/partials/filter-modal" %} + {% include "visiosoft.module.advs::list/partials/sort-modal" %} + + + {{ 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" %} +
+
+
+ +
+ +
+ {% include "visiosoft.module.advs::list/partials/list-sort-by" %} +
+
+ {% include "visiosoft.module.advs::list/partials/display-mode" %} +
+
+ {{ addBlock('ads-list/row',{'topfields':topfields})|raw }} +
+ {% block listContent %} + {% include "visiosoft.module.advs::list/partials/ads" %} + {% endblock %} +
+ {% include "visiosoft.module.advs::list/partials/pagination" %} + + {#
#} +
+
+
+
+
\ 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/index/default.twig b/addons/default/visiosoft/base-theme/resources/views/index/default.twig index 2ef0a709c..01fc2a7b1 100644 --- a/addons/default/visiosoft/base-theme/resources/views/index/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/index/default.twig @@ -1,78 +1,65 @@ - - -
- - {{ addBlock('index_top')|raw }} -
-
{% include "visiosoft.theme.base::partials/categories" %}
-
-
- {% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %} -
-

{{ trans('theme::field.latest_ads') }}

-
-
- {{ trans('theme::field.show_all') }} -
- {% endif %} - -
- - -
- {% for latestAd in latestAds() %} -
-
-
- -
- -
- -
- -
- {% if setting_value('visiosoft.theme.base::price_fields') %} -
- {{ latestAd.price }} {{ latestAd.currency }} -
- {% endif %} -
- -

{{ latestAd.name }}

- -
- {% if setting_value('visiosoft.module.location::home_page_location') %} -
- - - {{ latestAd.city_name }}, {{ latestAd.country_name }} - -
- {% endif %} - {% if setting_value('visiosoft.theme.base::date_fields') %} -
- - - {{ latestAd.created_at|date('d/m/Y') }} - -
- {% endif %} -
-
-
- {% endfor %} -
-
+
+
+ {% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %} +
+

{{ trans('theme::field.latest_ads') }}

+
+
+ {{ trans('theme::field.show_all') }} +
+ {% endif %}
+
+
+ {% for latestAd in latestAds() %} +
+
+
+ +
+ +
+ +
+
+ {% if setting_value('visiosoft.theme.base::price_fields') %} +
+ {{ latestAd.price }} {{ latestAd.currency }} +
+ {% endif %} +
+ +

{{ latestAd.name }}

+ +
+ {% if setting_value('visiosoft.module.location::home_page_location') %} +
+ + + {{ latestAd.city_name }}, {{ latestAd.country_name }} + +
+ {% endif %} + {% if setting_value('visiosoft.theme.base::date_fields') %} +
+ + + {{ latestAd.created_at|date('d/m/Y') }} + +
+ {% endif %} +
+
+
+ {% endfor %} +
+
+
{{ addBlock('index')|raw }} - - -
\ 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..b52ab4017 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig @@ -19,8 +19,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..f37fa311c 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig @@ -2,34 +2,24 @@ Main CSS can be found in metadata.twig #} - - - {# Core Theme Components #} -{{ asset_add("theme.js", "visiosoft.theme.base::js/popper.min.js") }} -{{ asset_add("theme.js", "visiosoft.theme.base::js/bootstrap.min.js") }} -{{ asset_add("theme.js", "visiosoft.theme.base::js/modal_include.js") }} -{{ asset_add("theme.js", "visiosoft.theme.base::js/select2.js") }} -{{ asset_add("theme.js", "visiosoft.theme.base::js/params.js") }} -{{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.maskedinput.js") }} +{{ asset_add("theme.js", "theme::js/popper.min.js") }} +{{ asset_add("theme.js", "theme::js/bootstrap.min.js") }} +{{ asset_add("theme.js", "theme::js/modal_include.js") }} +{{ asset_add("theme.js", "theme::js/select2.js") }} +{{ asset_add("theme.js", "theme::js/params.js") }} +{{ asset_add("theme.js", "theme::js/jquery.maskedinput.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/intlTelInput.min.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }} -{{ asset_add("theme.js", "visiosoft.theme.base::js/phoneField.js") }} -{{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }} +{{ asset_add("theme.js", "theme::js/phoneField.js") }} + {# Theme Scripts #} {#{{ asset_add("theme.js", "theme::js/plugins/*") }}#} -{{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }} +{{ asset_add("theme.js", "theme::js/theme/initialize.js") }} {{ asset_script("theme.js") }} -{# Include Styles Loaded From Outside #} - - {# Include Scripts Loaded From Outside #} + +{# Include Styles Loaded From Outside #} + 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 0c9932310..3120cef97 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -1,9 +1,6 @@ - - - @@ -13,25 +10,19 @@ {#{{ 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") }} -{{ asset_add("theme.css", "visiosoft.theme.base::css/font-awesome.min.css") }} +{{ asset_add("theme.css", "theme::css/bootstrap.min.css") }} +{{ asset_add("theme.css", "theme::css/theme.css") }} +{{ asset_add("theme.css", "theme::css/select2.css") }} +{{ asset_add("theme.css", "theme::css/font-awesome.min.css") }} {{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }} - + {{ asset_style("theme.css") }} {% include "visiosoft.theme.base::partials/styles" %} -{# Custom Theme Components #} - + {# Important!! #} {{ constants() }} 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 cecd917c0..168d5248c 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig @@ -28,9 +28,9 @@
  • {% if auth_check() %} - {{ trans('visiosoft.theme.users::field.logout.name') }} + {{ trans('visiosoft.theme.base::field.logout.name') }} {% else %} - {{ trans('visiosoft.theme.users::field.login.name') }} + {{ trans('visiosoft.theme.base::field.login.name') }} {% endif %}
  • diff --git a/addons/default/visiosoft/base-theme/src/BaseThemeServiceProvider.php b/addons/default/visiosoft/base-theme/src/BaseThemeServiceProvider.php index 364670981..bd906ef5c 100644 --- a/addons/default/visiosoft/base-theme/src/BaseThemeServiceProvider.php +++ b/addons/default/visiosoft/base-theme/src/BaseThemeServiceProvider.php @@ -119,10 +119,6 @@ class BaseThemeServiceProvider extends AddonServiceProvider protected $overrides = [ //'streams::errors/404' => 'module::errors/404', //'streams::errors/500' => 'module::errors/500', - 'anomaly.module.users::login' => 'visiosoft.theme.base::addons/anomaly/users-module/login', - 'anomaly.module.users::register' => 'visiosoft.theme.base::addons/anomaly/users-module/register', - 'anomaly.module.users::password/forgot' => 'visiosoft.theme.base::addons/anomaly/users-module/password/forgot', - 'anomaly.module.users::password/reset' => 'visiosoft.theme.base::addons/anomaly/users-module/password/reset', ]; /**