Merge pull request #142 from openclassify/vedat

Vedat

addons/default/visiosoft/advs-module/resources/js/cats.js

@@ -1,3 +1,11 @@
+function showLoader() {
+    $('body').append('<div class="loading-cart"><div class="lds-ripple"><div></div><div></div></div></div>');
+}
+
+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 = "<a class='btn btn-primary' href='"+response['link']+"' role='button'>"+response['nextBtn']+"</a>";
                     }
                     $('.cat-item-3').html(
-                        '<div class="section next-stap post-option">' +
-                        '<h2>'+response['title']+'</h2>' +
-                        '<p>'+response['msg']+'</p>' +
+                        '<div class="section next-stap post-option p-2">' +
+                        '<h5>'+response['title']+'</h5>' +
+                        '<p class="p-2">'+response['msg']+'</p>' +
                         '<div class="btn-section btn-next">' +
                         btn +
-                        '<a href="/" class="btn-info">'+response['cancelBtn']+'</a></div></div>'
+                        '<a href="/">'+response['cancelBtn']+'</a></div></div>'
                     );
                     $('.cat-item-3').show();
                     stop();

addons/default/visiosoft/advs-module/resources/js/new-create.js

@@ -1,3 +1,12 @@
+function showLoader() {
+    $('body').append('<div class="loading-cart"><div class="lds-ripple"><div></div><div></div></div></div>');
+}
+
+function hideLoader() {
+    $('.loading-cart').remove();
+}
+
+
 const filter = {};
 
 // TODO will be unified

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

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.',
 ];

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.',
 ];

addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig

@@ -19,7 +19,7 @@
     <section id="main" class="clearfix details-page">
         <div class="container">
 
-            {% include "visiosoft.theme.base::partials/messages" %}
+            {% include "theme::partials/messages" %}
 
             <!-- breadcrumb -->
             <div class="breadcrumb-section">
@@ -38,10 +38,10 @@
             <div class="section slider">
                 <div class="row">
 
-                    {% include "visiosoft.theme.base::ad-detail/partials/slider" %}
+                    {% include "visiosoft.module.advs::ad-detail/partials/slider" %}
 
                     <div class="col-md-5">
-                        {% include "visiosoft.theme.base::ad-detail/partials/detail" %}
+                        {% include "visiosoft.module.advs::ad-detail/partials/detail" %}
                     </div>
                 </div>
 
@@ -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 %}
 

addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig

@@ -14,7 +14,7 @@
         <h2 class="ad-price">
             <b>{{ adv.price.format() }}</b> {{ adv.currency }}
 
-            {% include "visiosoft.theme.base::ad-detail/partials/author-button" %}
+            {% include "visiosoft.module.advs::ad-detail/partials/author-button" %}
 
         </h2>
 
@@ -99,7 +99,7 @@
 
             <!-- social-links -->
             <div class="social-links">
-                {% include "visiosoft.theme.base::ad-detail/partials/social" %}
+                {% include "visiosoft.module.advs::ad-detail/partials/social" %}
             </div>
             <!-- social-links -->
 

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 %}
-                <a href="{{ image }}"><img src="{{ img('visiosoft.theme.base::images/no-image.png').url }}"></a>
+                {% set advPhoto = img('visiosoft.module.advs::images/no-image.png').url %}
+                <a href="{{ image }}"><img src="{{ img('visiosoft.module.advs::images/no-image.png').url }}"></a>
             {% else %}
                 {% for image in adv.getViewPhotoUrl %}
                     <a href="{{ image }}"><img src="{{ image }}"></a>

addons/default/visiosoft/advs-module/resources/views/list/list.twig

@@ -5,10 +5,10 @@
 
         <div class="container">
 
-            {% include "visiosoft.theme.base::partials/messages" %}
+            {% include "theme::partials/messages" %}
 
             <!-- breadcrumb -->
-            {% include "visiosoft.theme.base::list/partials/breadcrumb" %}
+            {% include "visiosoft.module.advs::list/partials/breadcrumb" %}
             <!-- breadcrumb -->
 
             {% block listContent %}
@@ -16,15 +16,15 @@
 
                     <div class="row">
 
-                        {% include "visiosoft.theme.base::list/partials/user-section" %}
+                        {% include "visiosoft.module.advs::list/partials/user-section" %}
 
                         <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get">
 
-                            {% include "visiosoft.theme.base::list/partials/list-filter" %}
+                            {% include "visiosoft.module.advs::list/partials/list-filter" %}
 
                             <div class="col-sm-8 col-md-9">
 
-                                {% include "visiosoft.theme.base::list/partials/list-section" %}
+                                {% include "visiosoft.module.advs::list/partials/list-section" %}
 
 
                             </div>
@@ -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" %}

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 %}
     <div class="category-info">
         <div class="row">
-            {% include "visiosoft.theme.base::list/partials/list-filter" %}
+            {% include "visiosoft.module.advs::list/partials/list-filter" %}
             <div class="col-sm-8 col-md-9">
                 <div class="section recommended-ads ">
-                    {% include "visiosoft.theme.base::list/partials/display-mode" %}
+                    {% include "visiosoft.module.advs::list/partials/display-mode" %}
                     <div class="listMap">
                         <div id="map"></div>
                     </div>

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 != "" %}
                                     <img class="catIcon" src="{{ url('files/' ~ maincat.files[0].path) }}"
                                          alt="">{% else %}<img class="catIcon"
-                                                               src="{{ img('visiosoft.theme.base::images/plus-categories.png').url }}"
+                                                               src="{{ img('visiosoft.module.advs::images/plus-categories.png').url }}"
                                                                alt="">{% endif %}{{ maincat.name }}</a>
                             {% for subcat in subCats %}
                                 <ul>
@@ -49,7 +49,7 @@
                 <div class="panel-heading">
                     <a data-toggle="collapse" data-parent="#accordion" href="#accordion-three">
                         <h4 class="panel-title">
-                            {{ trans('visiosoft.theme.base::fields.price.name') }}
+                            {{ trans('visiosoft.module.advs::fields.price.name') }}
                             <span class="pull-right"><i class="fa fa-minus"></i></span>
                         </h4>
                     </a>
@@ -94,7 +94,7 @@
                         <button type="submit" class="btn btn-primary search-filter-button">
                             {{ trans("visiosoft.module.advs::field.search") }}
                         </button>
-                        <h5><font color="#333">{{ trans('visiosoft.theme.base::message.filter_by_search_msg') }}</font></h5>
+                        <h5><font color="#333">{{ trans('visiosoft.module.advs::message.filter_by_search_msg') }}</font></h5>
                     </div>
                 </div>
             </div>

addons/default/visiosoft/advs-module/resources/views/list/partials/list-section.twig

@@ -3,10 +3,10 @@
     <div class="row list-header">
 
         <div class="col-md-6">
-            {% include "visiosoft.theme.base::list/partials/list-sort-by" %}
+            {% include "visiosoft.module.advs::list/partials/list-sort-by" %}
         </div>
         <div class="col-md-6">
-            {% include "visiosoft.theme.base::list/partials/display-mode" %}
+            {% include "visiosoft.module.advs::list/partials/display-mode" %}
 
         </div>
     </div>
@@ -18,10 +18,10 @@
 
     <div class="category-tabs"></div>
 
-    {% 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" %}
 
 
     <!-- pagination  -->

addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig

@@ -9,7 +9,7 @@
             </div>
         </div>
         {% if userProfile.adv_listing_banner.url == '' %}
-            <img src="{{ img('visiosoft.theme.base::images/bg/1.png').url }}">
+            <img src="{{ img('visiosoft.module.advs::images/1.png').url }}">
         {% else %}
             <img src="{{ userProfile.adv_listing_banner.url }}">
         {% endif %}

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 %}
 
     <div class="category-info">
         <div class="row">
 
-            {% include "visiosoft.theme.base::list/partials/user-section" %}
+            {% include "visiosoft.module.advs::list/partials/user-section" %}
 
             <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get">
 
-                {% include "visiosoft.theme.base::list/partials/list-filter" %}
+                {% include "visiosoft.module.advs::list/partials/list-filter" %}
 
                 <div class="col-sm-8 col-md-9">
                     <div class="section recommended-ads">
@@ -16,10 +17,10 @@
                         <div class="row">
 
                             <div class="col-md-6">
-                                    {% include "visiosoft.theme.base::list/partials/list-sort-by" %}
+                                    {% include "visiosoft.module.advs::list/partials/list-sort-by" %}
                             </div>
                             <div class="col-md-6">
-                                {% include "visiosoft.theme.base::list/partials/display-mode" %}
+                                {% include "visiosoft.module.advs::list/partials/display-mode" %}
 
                             </div>
                         </div>
@@ -52,7 +53,7 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                {% include "visiosoft.theme.base::list/partials/table-row" %}
+                                {% include "visiosoft.module.advs::list/partials/table-row" %}
                                 </tbody>
                             </table>
                         </div>
@@ -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 %}

addons/default/visiosoft/advs-module/resources/views/new-ad/edit-cat.twig

@@ -109,6 +109,6 @@
             </div>
         </div>
     </section>
-    {{ 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 %}

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 %}
     <section id="main" class="clearfix home-default">
         <div class="container">
-            {% include "visiosoft.theme.base::partials/messages" %}
-
-            {% include "visiosoft.theme.base::new-ad/partials/breadcrumb" %}
+            {% include "theme::partials/messages" %}
 
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb">
+                    {% for cat in cats_d %}
+                        <li class="breadcrumb-item"><a href="#">{{ cat }}</a></li>
+                    {% endfor %}
+                    <li class="breadcrumb-item">
+                        <a href="{{ url_route('adv::edit_category',[id]) }}">
+                            <i class="fas fa-pencil-alt"></i> {{ trans('visiosoft.module.advs::field.edit_category') }}
+                        </a>
+                    </li>
+                </ol>
+            </nav>
             <div class="adpost-details">
                 <div class="row">
                     <div class="col-md-12">
@@ -32,22 +42,8 @@
                                     {{ trans('visiosoft.module.advs::field.sell_item') }}
                                     <span class="pull-right">* {{ trans('visiosoft.module.advs::field.mandatory_fields') }}</span>
                                 </h4>
-                                <div class="form-group selected-product">
-                                    <ul class="select-category list-inline">
-                                        {% for cat in cats_d %}
-                                            <li>
-                                                <a>
-                                                    {{ cat }}
-                                                </a>
-                                            </li>
-                                        {% endfor %}
-                                        <a href="{{ url_route('adv::edit_category',[id]) }}"><i
-                                                    class="fas fa-pencil-alt"></i> {{ trans('visiosoft.module.advs::field.edit_category') }}
-                                        </a>
-                                    </ul>
-                                </div>
                                 <div class="row form-group add-title">
-                                    <div class="col-md-9">
+                                    <div class="col-md-12">
                                         {{ nameField|raw }}
                                     </div>
                                     {% if entries('advs').isEnabled('store') %}
@@ -98,10 +94,14 @@
                                     </div>
                                 </div>
                                 <div class="row form-group brand-name">
-                                    {{ descField|raw }}
+                                    <div class="col-md-12">
+                                        {{ descField|raw }}
+                                    </div>
                                 </div>
                                 <div class="row form-group images">
-                                    {{ form.fields.files.input |raw }}
+                                    <div class="col-md-12">
+                                        {{ form.fields.files.input |raw }}
+                                    </div>
                                 </div>
                                 {% if entries('advs').isEnabled('customfields') %}
                                     {% include "visiosoft.module.customfields::new-ad/fields" %}
@@ -148,6 +148,6 @@
     </script>
     <script src="https://maps.googleapis.com/maps/api/js?key={{ setting_value('visiosoft.module.advs::google_map_key') }}&callback="
             type="text/javascript"></script>
-    {{ 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 %}

addons/default/visiosoft/advs-module/resources/views/new-ad/partials/breadcrumb.twig

@@ -0,0 +1,7 @@
+<nav aria-label="breadcrumb">
+    <ol class="breadcrumb">
+        <li class="breadcrumb-item"><a href="{{ url("/") }}">{{ trans('visiosoft.module.advs::field.home') }}</a></li>
+        <li class="breadcrumb-item active" aria-current="page">{{ trans('visiosoft.module.advs::field.ad_post') }}</li>
+    </ol>
+    <h2 class="title">{{ trans('visiosoft.module.advs::field.post_free_ad') }}</h2>
+</nav>

addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig

@@ -3,87 +3,78 @@
 {% block content %}
     <section id="main" class="clearfix ad-post-page">
         <div class="container">
-            {% include "visiosoft.theme.base::new-ad/partials/breadcrumb" %}
+            {% include "visiosoft.module.advs::new-ad/partials/breadcrumb" %}
             <div id="ad-cat-section">
                 <form action="{{ url_route('visiosoft.module.advs::post_cat') }}" method="post">
                     <div class="row category-tab">
-                        <div class="col-md-3 col-sm-6 cat-item">
-                            <div class="section cat-option select-category post-option">
-                                <h4>{{ trans('visiosoft.module.advs::field.select_a_category') }}</h4>
-                                <ul role="tablist">
-                                    <select class="cat-select" name="cat1" id="cat1" multiple id="">
+
+                        <div class="col-lg-3 col-md-4 col-sm-6 cat-item mb-2">
+                            <div class="section cat-option select-category post-option card p-2">
+                                <h5>{{ trans('visiosoft.module.advs::field.select_a_category') }}</h5>
+                                    <select class="cat-select" name="cat1" id="cat1" multiple >
                                         {% for cat in main_cats %}
-                                            <option value="{{ cat.id }}"><span
-                                                        style="font-size: 20px">{{ cat.name }}</span></option>
+                                            <option value="{{ cat.id }}">
+                                                {{ cat.name }}
+                                            </option>
                                         {% endfor %}
                                     </select>
-                                </ul>
                             </div>
                         </div>
-                        <div class="col-md-3 col-sm-6 cat-item cat-item-2">
-                            <div class="section cat-option select-category post-option">
-                                <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
-                                <ul role="tablist">
-                                    <select class="cat-select" name="cat2" id="cat2" multiple id="">
+
+                        <div class="col-lg-3 col-md-4 col-sm-6 cat-item mb-2 cat-item-2">
+                            <div class="section cat-option select-category post-option card p-2">
+                                <h5>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h5>
+                                    <select class="cat-select" name="cat2" id="cat2" multiple>
 
                                     </select>
-                                </ul>
                             </div>
                         </div>
-                        <div class="col-md-3 col-sm-6 cat-item cat-item-2">
-                            <div class="section cat-option select-category post-option">
-                                <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
-                                <ul role="tablist">
-                                    <select class="cat-select" name="cat3" id="cat3" multiple id="">
+                        <div class="col-lg-3 col-md-4 col-sm-6 cat-item mb-2 cat-item-2">
+                            <div class="section cat-option select-category post-option card p-2">
+                                <h5>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h5>
+                                    <select class="cat-select" name="cat3" id="cat3" multiple>
 
                                     </select>
-                                </ul>
                             </div>
                         </div>
-                        <div class="col-md-3 col-sm-6 cat-item cat-item-2">
-                            <div class="section cat-option select-category post-option">
-                                <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
-                                <ul role="tablist">
-                                    <select class="cat-select" name="cat4" id="cat4" multiple id="">
+                        <div class="col-lg-3 col-md-4 col-sm-6 cat-item mb-2 cat-item-2">
+                            <div class="section cat-option select-category post-option card p-2">
+                                <h5>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h5>
+                                    <select class="cat-select" name="cat4" id="cat4" multiple>
 
                                     </select>
-                                </ul>
                             </div>
                         </div>
-                        <div class="col-md-3 col-sm-6 cat-item cat-item-2">
-                            <div class="section cat-option select-category post-option">
-                                <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
-                                <ul role="tablist">
-                                    <select class="cat-select" name="cat5" id="cat5" multiple id="">
+                        <div class="col-lg-3 col-md-4 col-sm-6 cat-item mb-2 cat-item-2">
+                            <div class="section cat-option select-category post-option card p-2">
+                                <h5>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h5>
+                                    <select class="cat-select" name="cat5" id="cat5" multiple>
 
                                     </select>
-                                </ul>
                             </div>
                         </div>
-                        <div class="col-md-3 col-sm-6 cat-item cat-item-2">
-                            <div class="section cat-option select-category post-option">
-                                <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
-                                <ul role="tablist">
-                                    <select class="cat-select" name="cat6" id="cat6" multiple id="">
+                        <div class="col-lg-3 col-md-4 col-sm-6 cat-item mb-2 cat-item-2">
+                            <div class="section cat-option select-category post-option card p-2">
+                                <h5>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h5>
+                                    <select class="cat-select" name="cat6" id="cat6" multiple >
 
                                     </select>
-                                </ul>
                             </div>
                         </div>
-                        <div class="col-md-3 col-sm-6 cat-item cat-item-2">
-                            <div class="section cat-option select-category post-option">
-                                <h4>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h4>
-                                <ul role="tablist">
-                                    <select class="cat-select" name="cat7" id="cat7" multiple id="">
+                        <div class="col-lg-3 col-md-4 col-sm-6 cat-item mb-2 cat-item-2">
+                            <div class="section cat-option select-category post-option card p-2">
+                                <h5>{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}</h5>
+                                    <select class="cat-select" name="cat7" id="cat7" multiple >
 
                                     </select>
-                                </ul>
                             </div>
                         </div>
 
-                        <div class="col-md-4 col-sm-6 cat-item cat-item-3">
+                        <div class="col-lg-4 col-md-12 cat-item mb-2">
+                            <div class="card cat-item-3 p-2">
 
-                        </div><!-- next-stap -->
+                            </div>
+                        </div>
                     </div>
                     <div class="row">
                         <div class="col-sm-8 col-sm-offset-2 text-center">
@@ -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;
         }
     </style>
-    {{ asset_add("scripts.js", "visiosoft.theme.base::js/cats.js") }}
+    {{ asset_add("scripts.js", "visiosoft.module.advs::js/cats.js") }}
 
 
 {% endblock %}

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);
         }

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,
                 ]

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' => [

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'));
     }
 }

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,

addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig

@@ -1,3 +1,3 @@
 <div class="advertisement">
-    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/2.jpg').url }}" alt="Images" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('theme::images/ads/2.jpg').url }}" alt="Images" class="img-responsive"></a>
 </div>

addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig

@@ -3,7 +3,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-secure">
-            <img src="{{ img('visiosoft.theme.base::images/icon/13.png').url }}" alt="Icon"
+            <img src="{{ img('theme::images/icon/13.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -15,7 +15,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-support">
-            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -28,7 +28,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('visiosoft.theme.base::images/icon/15.png').url }}" alt="Icon"
+            <img src="{{ img('theme::images/icon/15.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 

addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig

@@ -3,7 +3,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-secure">
-            <img src="{{ img('visiosoft.theme.base::images/icon/13.png').url }}" alt="Icon"
+            <img src="{{ img('theme::images/icon/13.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -15,7 +15,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-support">
-            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -28,7 +28,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('visiosoft.theme.base::images/icon/15.png').url }}" alt="Icon"
+            <img src="{{ img('theme::images/icon/15.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -40,7 +40,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
         <h5>Yardıma mı ihtiyacınız var?</h5>

addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig

@@ -1,3 +1,3 @@
 <div class="ad-section text-center">
-    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/3.jpg').url }}" alt="Image" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('theme::images/ads/3.jpg').url }}" alt="Image" class="img-responsive"></a>
 </div>

addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig

@@ -1,3 +1,3 @@
 <div class="advertisement text-center">
-    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('theme::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>
 </div>

addons/default/visiosoft/base-theme/resources/lang/en/fields.php

@@ -30,7 +30,4 @@ return [
     'content' => [
         'name' => 'Content',
     ],
-    'price' => [
-        'name' => 'Price'
-    ],
 ];

addons/default/visiosoft/base-theme/resources/lang/en/message.php

@@ -1,6 +1,4 @@
 <?php
 
-return [
-    'filter_by_search_msg' => 'Filter By Search.',
-];
+return [];
 

addons/default/visiosoft/base-theme/resources/lang/tr/fields.php

@@ -31,7 +31,4 @@ return [
     'content' => [
         'name' => 'Açıklama',
     ],
-    'price' => [
-        'name' => 'Fiyat'
-    ],
 ];

addons/default/visiosoft/base-theme/resources/lang/tr/message.php

@@ -1,5 +1,3 @@
 <?php
 
-return [
-    'filter_by_search_msg' => 'Aramanızı Daraltın.',
-];
+return [];

addons/default/visiosoft/base-theme/resources/views/new-ad/partials/breadcrumb.twig

@@ -1,7 +0,0 @@
-<div class="breadcrumb-section">
-    <ol class="breadcrumb">
-        <li><a href="/">{{ trans('visiosoft.module.advs::field.home') }}</a></li>
-        <li>{{ trans('visiosoft.module.advs::field.ad_post') }}</li>
-    </ol>
-    <h2 class="title">{{ trans('visiosoft.module.advs::field.post_free_ad') }}</h2>
-</div>

addons/default/visiosoft/media-field_type/resources/lang/tr/button.php

@@ -1,5 +1,5 @@
 <?php
 
 return [
-    'showOn' => 'Ana',
+    'showOn' => 'Vitrin',
 ];

addons/default/visiosoft/media-field_type/resources/views/input.twig

@@ -1,8 +1,3 @@
-<script
-        src="https://code.jquery.com/jquery-1.11.3.js"
-        integrity="sha256-IGWuzKD7mwVnNY01LtXxq3L84Tm/RJtNCYBfXZw3Je0="
-        crossorigin="anonymous"></script>
-
 {{ asset_add('scripts.js', 'visiosoft.field_type.media::js/jquery-sortable.js') }}
 
 {% if not (field_type.readonly) %}

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' => [

addons/default/visiosoft/profile-module/resources/views/profile/show-my-sale.twig

@@ -29,7 +29,7 @@
                                         <div class="col-md-2 text-center">
                                             <img src="
                                             {% if(details.getPhoto == null) %}
-                                                 {{ img('theme::images/no-image.png').url }}
+                                                 {{ img('visiosoft.module.advs::images/no-image.png').url }}
                                             {% else %}
                                                  {{ details.getPhoto }}
                                             {% endif %}

addons/default/visiosoft/profile-module/resources/views/profile/show-order.twig

@@ -76,7 +76,7 @@
                                             <div class="col-md-2 text-center">
                                                 <img src="
                                             {% if(detail.getPhoto is null) %}
-                                                 {{ img('theme::images/no-image.png').url }}
+                                                 {{ img('visiosoft.module.advs::images/no-image.png').url }}
                                             {% else %}
                                                  {{ detail.getPhoto }}
                                             {% endif %}