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

addons/default/visiosoft/base-theme/resources/views/home/carsearch.twig

@@ -24,7 +24,7 @@
                             <div class="dropdown category-dropdown">
                                 <a data-toggle="dropdown" href="#" aria-expanded="false"><span class="change-text">{{ trans('visiosoft.theme.base::addon.all') }}</span> <i class="fa fa-angle-down"></i></a>
                                 <ul class="dropdown-menu category-change">
-                                    {% set cats = entries('advs','categories').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}                                    {% for cat in cats %}
+                                    {% set cats = entries('advs','categories').where('parent_category_id', null).where('deleted_at', null).orderBy('sort_order').get() %}                                    {% for cat in cats %}
                                         <li><a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ cat.id }}">{{ cat.name }}</a></li>
                                     {% endfor %}
 

addons/default/visiosoft/base-theme/resources/views/home/featured.twig

@@ -34,7 +34,7 @@
                                                     </h4>
                                                     <div class="item-cat">
                                                                 <span><a href="#">
-{% set cats = entries('advs','categories').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}                                                                        {% for cat in cats %}
+{% set cats = entries('advs','categories').where('parent_category_id', null).where('deleted_at', null).orderBy('sort_order').get() %}                                                                        {% for cat in cats %}
                                                                             {% if cat.id == adv.cat1[0].value %}
                                                                                 {{ cat.title }}
                                                                             {% endif %}

addons/default/visiosoft/base-theme/resources/views/indexes/index.twig

@@ -28,7 +28,7 @@
                                 <div class="form-group ">
                                     <ul>
                                         <li class="dropdown home-search-category-field">
-                                            {% set cats = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}
+                                            {% set cats = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('sort_order').get() %}
                                             <a href="#" class="btn btn-default" data-toggle="dropdown" role="button"
                                                aria-haspopup="true" aria-expanded="false">
                                             <span class="selected-category-item"

addons/default/visiosoft/base-theme/resources/views/partials/categories-s.twig

@@ -1,5 +1,5 @@
 <div class="col-sm-3 hidden-xs">
-    {% set main_categories = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}
+    {% set main_categories = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('sort_order').get() %}
     {% for main_category in main_categories %}
         <div class="list-group s-list-group">
             {% if main_category.files[0].path != "" %}
@@ -10,7 +10,7 @@
                class="list-group-item">
                 <b>{{ main_category.name }}</b>
             </a>
-            {% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('order').get() %}
+            {% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('sort_order').get() %}
             {% for sub_category in sub_categories|slice(0,8) %}
                 <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ sub_category.id }}"
                    class="list-group-item">{{ sub_category.name }}</a>

addons/default/visiosoft/base-theme/resources/views/partials/nav.twig

@@ -32,7 +32,7 @@
                         <form action="{{ url('advs/list') }}" method="get">
                             <ul class="nav navbar-nav center-navigation">
                                 <li class="dropdown navigation-select-category-field">
-                                    {% set cats = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}
+                                    {% set cats = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('sort_order').get() %}
                                     <a href="#" class="dropdown-toggle selected-category-item-field"
                                        data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
                                         <span class="selected-category-item" style="">{{ cats[0].name }}</span> <span

addons/default/visiosoft/base-theme/resources/views/partials/s-mobile-categories.twig

@@ -1,6 +1,6 @@
 <div class="col-xs-12 visible-xs s-mobile-categories">
     <ul class="list-group">
-        {% set main_categories = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}
+        {% set main_categories = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('sort_order').get() %}
         {% for main_category in main_categories %}
             <li class="list-group-item">
                 <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ main_category.id }}">

addons/default/visiosoft/cats-module/migrations/2019_04_01_160927_visiosoft.module.cats__create_cats_fields.php

@@ -27,7 +27,6 @@ class VisiosoftModuleCatsCreateCatsFields extends Migration
                 "default_value" => 0,
             ]
         ],
-        'order' => 'anomaly.field_type.integer',
         'deleted_at' => "anomaly.field_type.datetime",
         'icon' => [
             'type' => 'anomaly.field_type.file',

addons/default/visiosoft/cats-module/migrations/2019_04_01_161009_visiosoft.module.cats__create_category_stream.php

@@ -35,7 +35,6 @@ class VisiosoftModuleCatsCreateCategoryStream extends Migration
             'required' => true,
         ],
         'parent_category',
-        'order',
         'deleted_at',
         'icon',
         'seo_keyword',

addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php

@@ -31,7 +31,7 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn
 
     public function mainCats()
     {
-        return $this->model->where('parent_category_id', null)->where('deleted_at', null)->get();
+        return $this->model->where('parent_category_id', null)->where('deleted_at', null)->orderBy('sort_order')->get();
     }
 
     public function getItem($cat)
@@ -41,12 +41,12 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn
 
     public function getCatById($id)
     {
-        return $this->model->where('cats_category.id', $id)->where('deleted_at', null)->get();
+        return $this->model->where('cats_category.id', $id)->where('deleted_at', null)->orderBy('sort_order')->get();
     }
 
     public function getSubCatById($id)
     {
-        return $this->model->where('parent_category_id', $id)->where('deleted_at', null)->get();
+        return $this->model->where('parent_category_id', $id)->where('deleted_at', null)->orderBy('sort_order')->get();
     }
 
     public function getSingleCat($id)
@@ -61,7 +61,7 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn
 
     public function getCategories()
     {
-        return $this->model->get();
+        return $this->model->orderBy('sort_order')->get();
     }
 
     public function DeleteCategories($id)