From 0bca0ccdf98e1702cc839df64a11c323463adc91 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Mon, 24 Feb 2020 15:35:33 +0300
Subject: [PATCH] fixed update routes

---
 app/Http/Controllers/Install/Updates.php        | 7 +++----
 resources/views/install/updates/index.blade.php | 4 ++--
 routes/admin.php                                | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Install/Updates.php b/app/Http/Controllers/Install/Updates.php
index 6438e1179..841a16da6 100644
--- a/app/Http/Controllers/Install/Updates.php
+++ b/app/Http/Controllers/Install/Updates.php
@@ -9,9 +9,8 @@ use Illuminate\Http\Request;
 
 class Updates extends Controller
 {
-
     /**
-     * Show the form for creating a new resource.
+     * Display a listing of the resource.
      *
      * @return Response
      */
@@ -70,13 +69,13 @@ class Updates extends Controller
     }
 
     /**
-     * Update the core or modules.
+     * Run the update.
      *
      * @param  $alias
      * @param  $version
      * @return Response
      */
-    public function update($alias, $version)
+    public function run($alias, $version)
     {
         if ($alias == 'core') {
             $name = 'Akaunting ' . $version;
diff --git a/resources/views/install/updates/index.blade.php b/resources/views/install/updates/index.blade.php
index 8537d8d1d..1c08c7872 100644
--- a/resources/views/install/updates/index.blade.php
+++ b/resources/views/install/updates/index.blade.php
@@ -23,7 +23,7 @@
                         {{ trans('updates.new_core') }}
                     </div>
                     <div class="col-sm-10 col-md-6 text-right">
-                        <a href="{{ route('updates.update', ['alias' => 'core', 'version' => $core]) }}"
+                        <a href="{{ route('updates.run', ['alias' => 'core', 'version' => $core]) }}"
                             class="btn btn-info btn-sm header-button-top long-texts">
                             <i class="fa fa-refresh"></i> &nbsp;{{ trans('updates.update', ['version' => $core]) }}
                         </a>
@@ -61,7 +61,7 @@
                                 <td class="col-sm-3 col-md-2 d-none d-sm-block">{{ $module->installed }}</td>
                                 <td class="col-xs-4 col-md-2 col-sm-3">{{ $module->latest }}</td>
                                 <td class="col-xs-4 col-sm-2 col-md-2 text-center">
-                                    <a href="{{ route('updates.update', ['alias' => $module->alias, 'version' => $module->latest]) }}" class="btn btn-warning btn-sm">
+                                    <a href="{{ route('updates.run', ['alias' => $module->alias, 'version' => $module->latest]) }}" class="btn btn-warning btn-sm">
                                         <i class="fa fa-refresh" aria-hidden="true"></i> {{ trans_choice('general.updates', 1) }}
                                     </a>
                                 </td>
diff --git a/routes/admin.php b/routes/admin.php
index 55ec8076a..5c7b4fd83 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -199,9 +199,10 @@ Route::group(['as' => 'apps.', 'prefix' => 'apps'], function () {
 });
 
 Route::group(['prefix' => 'install'], function () {
+    Route::get('updates', 'Install\Updates@index')->name('updates.index');
     Route::get('updates/changelog', 'Install\Updates@changelog')->name('updates.changelog');
     Route::get('updates/check', 'Install\Updates@check')->name('updates.check');
-    Route::get('updates/update/{alias}/{version}', 'Install\Updates@update')->name('updates.update');
+    Route::get('updates/run/{alias}/{version}', 'Install\Updates@run')->name('updates.run');
     Route::post('updates/steps', 'Install\Updates@steps')->name('updates.steps');
     Route::post('updates/download', 'Install\Updates@download')->middleware('api.key')->name('updates.download');
     Route::post('updates/unzip', 'Install\Updates@unzip')->middleware('api.key')->name('updates.unzip');
@@ -209,7 +210,6 @@ Route::group(['prefix' => 'install'], function () {
     Route::post('updates/migrate', 'Install\Updates@migrate')->name('updates.migrate');
     Route::post('updates/finish', 'Install\Updates@finish')->name('updates.finish');
     Route::post('updates/redirect', 'Install\Updates@redirect')->name('updates.redirect');
-    Route::resource('updates', 'Install\Updates');
 });
 
 Route::group(['as' => 'modals.', 'prefix' => 'modals'], function () {