Merge branch 'master' of https://github.com/openclassify/openclassify into muammertop

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

@@ -130,12 +130,3 @@ $('.set_category').on('click', function () {
     $('#filterModal').find('form').attr("action", '/advs/list');
     $('#filterModal').modal('toggle');
 });
-
-// Move filter on small screen
-$(window).on("load resize", function () {
-    const width = (window.innerWidth > 0) ? window.innerWidth : screen.width;
-    if (width <= 575) {
-        const detach = $('#listFilterForm').detach();
-        $('#modalListFilterForm').append(detach);
-    }
-});

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

@@ -163,7 +163,8 @@ $(document).ready(function () {
 });
 
 function getCities(country) {
-    return crudAjax(`id=${country}`, '/ajax/getCities', 'POST', () => {}, true)
+    return crudAjax(`id=${country}`, '/ajax/getCities', 'POST', () => {
+    }, true)
         .then(function (cities) {
             $('select[name="filter_City"]').html("<option value=''>" + $('select[name=filter_City] option:first-child').text() + "</option>");
             $.each(cities, function (index, value) {
@@ -172,9 +173,10 @@ function getCities(country) {
         })
 }
 
-$("#listFilterForm").submit(function(e) {
+$("#listFilterForm, #listFilterFormMobile").submit(function (e) {
     // Disable unselected inputs
-    const inputs = $('#listFilterForm :input');
+    const inputs = $('#' + $(this).attr('id') + ' :input');
+
     [...inputs].forEach((input) => {
         if (input.type === 'checkbox' || input.type === 'radio') {
             if ($(input).prop("checked") == false) {

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

@@ -36,7 +36,9 @@
                         {% endif %}
                     </a>
                 </div>
-                <div id="modalListFilterForm"></div>
+                <div id="modalListFilterForm">
+                    {% include 'visiosoft.module.advs::list/partials/list-filter' with {"filter_id": 'listFilterFormMobile'} %}
+                </div>
             </div>
         </div>
     </div>

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

@@ -1,5 +1,5 @@
 {% set formHtml %}
-<form action="{{ url_route('visiosoft.module.advs::list') }}" method="get" id="listFilterForm" rel="nofollow">
+<form action="{{ url_route('visiosoft.module.advs::list') }}" method="get" id="{{ (filter_id) ? filter_id : "listFilterForm" }}" rel="nofollow">
     {% endset %}
     {% set catSlug = null %}
     {% set citySlug = null %}
@@ -12,7 +12,7 @@
     {% endif %}
     {% if catSlug %}
     {% set formHtml %}
-    <form action="{{ url_route('adv_list_seo', [catSlug, citySlug]) }}" method="get" id="listFilterForm" rel="nofollow">
+    <form action="{{ url_route('adv_list_seo', [catSlug, citySlug]) }}" method="get" id="{{ (filter_id) ? filter_id : "listFilterForm" }}" rel="nofollow">
         {% endset %}
         {% endif %}
         {{ formHtml }}

addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php

@@ -50,7 +50,10 @@ class OptionConfigurationRepository extends EntryRepository implements OptionCon
         $adv = $this->advRepository->find($ad_id);
         $configurations = array();
 
-		$product_configurations = $this->model->where('stock', '>', '0')->where('parent_adv_id', $ad_id)->get();
+        $product_configurations = $this->model->where('stock', '>', '0')
+            ->where('parent_adv_id', $ad_id)
+            ->orderBy('created_at', 'ASC')
+            ->get();
 
         foreach ($product_configurations as $product_configuration) {
             $configurations_item = json_decode($product_configuration->option_json, true);

addons/default/visiosoft/profile-module/resources/assets/js/create.js

@@ -15,7 +15,7 @@ function Locations(cat, level, name) {
         url: "/class/ajax",
         success: function (msg) {
             $('select[name="' + name + '"]').find('option').remove();
-            $('select[name="' + name + '"]').append('<option>...</option>');
+            $('select[name="' + name + '"]').append('<option value="">...</option>');
             $.each(msg, function (key, value) {
                 $('select[name="' + name + '"]').append('<option value="' + value.id + '">' + value.name + '</option>');
             });

addons/default/visiosoft/profile-module/resources/config/settings/sections.php

@@ -7,6 +7,7 @@ return [
             'general_setting' => [
                 'title' => 'visiosoft.module.profile::section.general_setting',
                 'fields' => [
+                    'required_district',
                     'show_my_ads',
                     'upload_avatar',
                     'show_tax_office',

addons/default/visiosoft/profile-module/resources/config/settings/settings.php

@@ -70,4 +70,10 @@ return [
     "education" => "anomaly.field_type.tags",
     "state_of_education" => "anomaly.field_type.tags",
     "profession" => "anomaly.field_type.tags",
+    'required_district' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+        ]
+    ],
 ];

addons/default/visiosoft/profile-module/resources/lang/en/setting.php

@@ -47,4 +47,7 @@ return [
         'name' => 'Hide Register Type in Profile Page',
         'instructions' => 'Hides the register type field in the profile edit page.',
     ],
+    'required_district' => [
+        'name' => 'Required District'
+    ],
 ];

addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php

@@ -26,7 +26,9 @@ class AdressFormFields
                 'city' => [
                     'required' => true,
                 ],
-                'district',
+                'district' => [
+                    'required' => setting_value( 'visiosoft.module.profile::required_district'),
+                ],
                 'adress_content' => [
                     'required' => true,
                 ],

addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php

@@ -134,8 +134,15 @@ class MyProfileController extends PublicController
     {
         $message = [];
 
+        $error_district = false;
+        if (setting_value('visiosoft.module.profile::required_district') and (!$this->request->district or $this->request->district == "")) {
+            $error_district = true;
+        }
+
         $error = $form->build()->validate()->getFormErrors()->getMessages();
-        if (!empty($error)) {
+
+        if (!empty($error) or $error_district) {
+            $this->messages->flush();
             $message['status'] = "error";
             $message['msg'] = trans('visiosoft.module.profile::message.required_all');
             return $message;