Merge pull request #339 from openclassify/dia

#847 fuardayim problems

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

@@ -8,7 +8,7 @@
         </a>
 
 
-        <ul class="dropdown-menu" x-placement="bottom-start">
+        <ul class="dropdown-menu px-2 mt-0" x-placement="bottom-start">
             <li>
                 <a href="#" data-value="sort_price_up"
                    class="sort-by-item text-dark">{{ trans("visiosoft.module.advs::field.price_high") }}</a>

addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php

@@ -27,7 +27,6 @@ class AdvCriteria extends EntryCriteria
         return $ads;
     }
 
-
     public function advsofDay()
     {
         $advModel = new AdvModel();
@@ -69,6 +68,24 @@ class AdvCriteria extends EntryCriteria
         return $ads;
     }
 
+    public function findAdsByCategoryId($catId)
+    {
+        $advModel = new AdvModel();
+        $advs = AdvModel::query()
+            ->whereDate('finish_at', '>=', date("Y-m-d H:i:s"))
+            ->where('status', '=', 'approved')
+            ->where('slug', '!=', '')
+            ->where('cat1', $catId)
+            ->get();
+
+        $ads = $advModel->getLocationNames($advs);
+        foreach ($ads as $index => $ad) {
+            $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list');
+            $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad);
+        }
+        return $ads;
+    }
+
     public function getCurrentLocale()
     {
         return locale_get_display_name(config('app.locale'));

addons/default/visiosoft/base-theme/resources/config/settings/sections.php

@@ -8,7 +8,8 @@ return [
                 'title' => 'visiosoft.theme.base::section.catalog_mode.name',
                 'fields' => [
                     'navigation_title', 'navigation_action', 'date_fields', 'price_fields',
-                    'breadcrumbs', 'ad_details', 'ad_details_tab','latest_and_view_all_btn'
+                    'breadcrumbs', 'ad_details', 'ad_details_tab','latest_and_view_all_btn',
+                    'register_page_instruction_logo'
                 ],
             ],
         ],

addons/default/visiosoft/base-theme/resources/config/settings/settings.php

@@ -49,5 +49,11 @@ return [
             "default_value" => 1,
         ]
     ],
-
+    'register_page_instruction_logo' => [
+        'type' => 'anomaly.field_type.file',
+        "config" => [
+            "folders" => ['images'],
+            "mode" => "upload",
+        ]
+    ],
 ];

addons/default/visiosoft/base-theme/resources/css/register.css

@@ -6,4 +6,9 @@
     font-size: 18px;
     position: relative;
     top: 4px;
+}
+
+.personal-advantages img {
+    max-height: 60px;
+    max-width: 60px;
 }

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

@@ -28,4 +28,7 @@ return [
     'latest_and_view_all_btn' => [
         'name' => 'Latest and View All Btn',
     ],
+    'register_page_instruction_logo' => [
+        'name' => 'Register Page Instruction Logo',
+    ],
 ];

addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig

@@ -40,8 +40,11 @@
             <div class="col-12 col-md-6 py-3 pr-0 instructions d-none d-md-block">
                 <div class="border personal-advantages py-5 px-5">
                     <div class="d-flex align-items-center mb-4">
-                        <img src="{{ img('visiosoft.theme.base::images/register-instruction.png').url }}">
-                        <h4 class="ml-3">
+                        {% if setting_value('visiosoft.theme.base::register_page_instruction_logo') %}
+                            <img class="mr-3"
+                                 src="{{ file(setting_value('visiosoft.theme.base::register_page_instruction_logo')).url }}">
+                        {% endif %}
+                        <h4 class="mb-0">
                             {{ trans('visiosoft.theme.base::field.personal_registration_header') }}
                         </h4>
                     </div>