close #352 Fixed: Not running migrations on module install

akaunting · May 22, 2018 · 8242da8 · 8242da8
1 parent b894daf
commit 8242da8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php
@@ -7,6 +7,7 @@
 use App\Models\Module\ModuleHistory;
 use App\Traits\Modules;
 use Artisan;
+use Module as LModule;
 use Illuminate\Http\Request;
 
 class Item extends Controller
@@ -147,8 +148,6 @@ public function install(Request $request)
         $json = $this->installModule($path);
 
         if ($json['success']) {
-            Artisan::call('module:install', ['alias' => $json['data']['alias'], 'company_id' => session('company_id')]);
-
             $message = trans('modules.installed', ['module' => $json['data']['name']]);
 
             flash($message)->success();
@@ -266,4 +265,25 @@ public function disable($alias)
 
         return redirect('apps/' . $alias)->send();
     }
+
+    /**
+     * Final actions post update.
+     *
+     * @param  $alias
+     * @param  $old
+     * @param  $new
+     * @return Response
+     */
+    public function post($alias)
+    {
+        Artisan::call('module:install', ['alias' => $alias, 'company_id' => session('company_id')]);
+
+        $module = LModule::findByAlias($alias);
+
+        $message = trans('modules.installed', ['module' => $module->get('name')]);
+
+        flash($message)->success();
+
+        return redirect('apps/' . $alias);
+    }
 }
diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php
@@ -241,7 +241,7 @@ public function installModule($path)
 
         return [
             'success' => true,
-            'installed' => true,
+            'installed' => url("apps/post/" . $module->alias),
             'errors' => false,
             'data' => $data,
         ];

diff --git a/app/Utilities/Updater.php b/app/Utilities/Updater.php
@@ -137,7 +137,7 @@ public static function all()
                     $data['core'] = $version;
                 }
             } else {
-                $module = Module::get($alias);
+                $module = Module::findByAlias($alias);
 
                 // Up-to-date
                 if (version_compare($module->get('version'), $version) == 0) {

diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
@@ -231,7 +231,7 @@ function next() {
                             }
 
                             if (json['installed']) {
-                                window.location = '{{ url("apps/" . $module->slug) }}';
+                                window.location = json['installed'];
                             }
                         },
                         error: function(xhr, ajaxOptions, thrownError) {

diff --git a/routes/web.php b/routes/web.php
@@ -125,6 +125,7 @@
                 Route::post('download', 'Modules\Item@download');
                 Route::post('unzip', 'Modules\Item@unzip');
                 Route::post('install', 'Modules\Item@install');
+                Route::get('post/{alias}', 'Modules\Item@post');
                 Route::get('{alias}/uninstall', 'Modules\Item@uninstall');
                 Route::get('{alias}/enable', 'Modules\Item@enable');
                 Route::get('{alias}/disable', 'Modules\Item@disable');