diff --git a/public/installer/MigrationRun.php b/public/installer/MigrationRun.php index 835f7cca9..3d611769a 100755 --- a/public/installer/MigrationRun.php +++ b/public/installer/MigrationRun.php @@ -3,12 +3,12 @@ ini_set('max_execution_time', 300); // array to pass back data -$data = array(); +$data = []; -// run command on terminal -$command = 'cd ../.. && php artisan migrate --force'; -$last_line = exec($command, $data['migrate'], $data['results']); +// run command on terminal and asumming that this is as fresh installation +$command = 'cd ../.. && php artisan config:cache && php artisan migrate:fresh --force'; +$data['last_line'] = exec($command, $data['migrate'], $data['results']); // return a response -//return all our data to an AJAX call +// return all our data to an AJAX call echo json_encode($data); diff --git a/public/installer/Views/migration.blade.php b/public/installer/Views/migration.blade.php index a58d13078..4fbec5b1f 100644 --- a/public/installer/Views/migration.blade.php +++ b/public/installer/Views/migration.blade.php @@ -65,26 +65,26 @@ - +

Click the button below to run following :

- +
Create the database tables
- +
Populate the database tables
- +
Publishing Vendor
- - + +

Checking Composer Dependency

@@ -100,7 +100,7 @@
- +
back
@@ -164,7 +164,7 @@ }) // using the done promise callback .done(function(data) { - if(data) { + if (data) { $('#composer-migrate').hide(); if (data['results'] == 0) { @@ -205,8 +205,10 @@ $('#loader').hide(); $('#migrate-seed').hide(); $('#migration-back').hide(); + if (data['migrate']) { $('#install-details').append(data['migrate']); + $('#install-log').show(); } } }