From bef35fd08ae27df2ef8a5920cd503fb1a6d21ef5 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Wed, 1 Nov 2017 22:26:34 +0300
Subject: [PATCH] wrong changes

---
 app/Http/Middleware/AdminMenu.php | 11 +++++++----
 composer.json                     |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Http/Middleware/AdminMenu.php b/app/Http/Middleware/AdminMenu.php
index fa49dc7a3..296df0be7 100644
--- a/app/Http/Middleware/AdminMenu.php
+++ b/app/Http/Middleware/AdminMenu.php
@@ -2,11 +2,12 @@
 
 namespace App\Http\Middleware;
 
+use App\Models\Module\Module;
 use App\Events\AdminMenuCreated;
 use Auth;
 use Closure;
 use Menu;
-use Module;
+use Module as LaravelModule;
 
 class AdminMenu
 {
@@ -152,12 +153,14 @@ class AdminMenu
                     $modules = Module::all();
                     $position = 5;
                     foreach ($modules as $module) {
+                        $m = LaravelModule::findByAlias($module->alias);
+
                         // Check if the module has settings
-                        if (empty($module->get('settings'))) {
+                        if (empty($m->get('settings'))) {
                             continue;
                         }
 
-                        $sub->url('settings/apps/' . $module->getAlias(), $module->getName(), $position, $attr);
+                        $sub->url('settings/apps' . $m->getAlias(), $m->getName(), $position, $attr);
 
                         $position++;
                     }
@@ -183,4 +186,4 @@ class AdminMenu
 
         return $next($request);
     }
-}
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 8032cb475..eaf3d2a20 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "akaunting/akaunting",
     "description": "Free accounting software, based on Laravel framework.",
+    "homepage": "https://akaunting.com",
     "keywords": ["laravel", "accounting", "software", "online"],
     "license": "GPL-3.0+",
     "type": "project",
@@ -21,11 +22,11 @@
         "intervention/image": "2.3.*",
         "jackiedo/dotenv-editor": "1.*",
         "jenssegers/date": "3.2.*",
+        "kyslik/column-sortable": "5.4.*",
         "laracasts/flash": "3.0.*",
         "laravel/framework": "5.4.*",
         "laravel/tinker": "~1.0",
         "LaravelCollective/html": "5.4.*",
-        "kyslik/column-sortable": "5.4.*",
         "nwidart/laravel-menus": "0.5.*",
         "nwidart/laravel-modules": "1.*",
         "santigarcor/laratrust": "4.0.*",