close #1444 Fixed: Apps All Categories not working

akaunting · May 17, 2020 · 92288eb · 92288eb
1 parent 2ef5502
commit 92288eb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/Http/ViewComposers/Modules.php b/app/Http/ViewComposers/Modules.php
@@ -22,11 +22,11 @@ public function compose(View $view)
         if (setting('apps.api_key')) {
             $categories = Cache::remember('modules.categories.' . language()->getShortCode(), Date::now()->addHour(6), function () {
                 return collect($this->getCategories())->pluck('name', 'slug')
-                    ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
+                    ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '*');
             });
         } else {
             $categories = collect([
-                '' => trans('general.all_type', ['type' => trans_choice('general.categories', 2)]),
+                '*' => trans('general.all_type', ['type' => trans_choice('general.categories', 2)]),
             ]);
         }
 

diff --git a/resources/assets/js/views/modules/apps.js b/resources/assets/js/views/modules/apps.js
@@ -34,7 +34,7 @@ const app = new Vue({
         onChangeCategory(category) {
             let path =  document.getElementById('category_page').value;
 
-            if (category) {
+            if (category != '*') {
                 path += '/' + encodeURIComponent(category);
             } else {
                 path = app_home;

diff --git a/resources/assets/js/views/modules/item.js b/resources/assets/js/views/modules/item.js
@@ -56,7 +56,7 @@ const app = new Vue({
         onChangeCategory(category) {
             let path =  document.getElementById('category_page').value;
 
-            if (category) {
+            if (category != '*') {
                 path += '/' + encodeURIComponent(category);
             } else {
                 path = app_home;

diff --git a/resources/views/partials/modules/head.blade.php b/resources/views/partials/modules/head.blade.php
@@ -30,7 +30,7 @@
 
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
-        var app_home = '{{ url("apps/categories") }}';
+        var app_home = '{{ route("apps.home") }}';
         var app_url = '{{ config("app.url") }}';
     //--></script>