shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #1444 Fixed: Apps All Categories not working

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-05-17 03:15:26 +03:00
parent 2ef5502172
commit 92288eb60f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/ViewComposers/Modules.php
View File

@ -22,11 +22,11 @@ class Modules
if (setting('apps.api_key')) { if (setting('apps.api_key')) {
$categories = Cache::remember('modules.categories.' . language()->getShortCode(), Date::now()->addHour(6), function () { $categories = Cache::remember('modules.categories.' . language()->getShortCode(), Date::now()->addHour(6), function () {
return collect($this->getCategories())->pluck('name', 'slug') 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 { } else {
$categories = collect([ $categories = collect([
'' => trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '*' => trans('general.all_type', ['type' => trans_choice('general.categories', 2)]),
]); ]);
} }

2
resources/assets/js/views/modules/apps.js vendored
View File

@ -34,7 +34,7 @@ const app = new Vue({
onChangeCategory(category) { onChangeCategory(category) {
let path = document.getElementById('category_page').value; let path = document.getElementById('category_page').value;
if (category) { if (category != '*') {
path += '/' + encodeURIComponent(category); path += '/' + encodeURIComponent(category);
} else { } else {
path = app_home; path = app_home;

2
resources/assets/js/views/modules/item.js vendored
View File

@ -56,7 +56,7 @@ const app = new Vue({
onChangeCategory(category) { onChangeCategory(category) {
let path = document.getElementById('category_page').value; let path = document.getElementById('category_page').value;
if (category) { if (category != '*') {
path += '/' + encodeURIComponent(category); path += '/' + encodeURIComponent(category);
} else { } else {
path = app_home; path = app_home;

2
resources/views/partials/modules/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var url = '{{ url("/") }}'; var url = '{{ url("/") }}';
var app_home = '{{ url("apps/categories") }}'; var app_home = '{{ route("apps.home") }}';
var app_url = '{{ config("app.url") }}'; var app_url = '{{ config("app.url") }}';
//--></script> //--></script>