Minor backups fixes

app/Console/Commands/SystemBackup.php

@@ -38,28 +38,7 @@ class SystemBackup extends Command {
 	public function fire()
 	{
 		//
-		$files['avatars'] = glob(public_path().'/uploads/avatars/*');
-		$files['models'] = glob(public_path().'/uploads/models/*');
-		$files['suppliers'] = glob(public_path().'/uploads/suppliers/*');
-		$files['private_uploads'] = glob(config('app.private_uploads').'/*');
-		$base_filename = date('Ymdgis');
-		$zip_file = config('app.private_uploads').'/backups/zips/'.$base_filename.'-backup.zip';
-		$db_dump = config('app.private_uploads').'/backups/sql/'.$base_filename.'-db.sql';
-		$this->call('db:backup', array('filename' => $db_dump));
-        echo $zip_file."\n";
-        echo $db_dump."\n";
-
-
-		Zipper::make($zip_file)
-			->folder('avatars')->add($files['avatars'])
-			->folder('models')->add($files['models'])
-			->folder('suppliers')->add($files['suppliers'])
-			->folder('private_uploads')->add($files['private_uploads'])
-			->folder('database')->add($db_dump)->close();
-
-		$this->info('Backup file created at '.$zip_file);
-		$this->info('Removing SQL dump at '.$db_dump);
-		unlink($db_dump);
+		$this->call('backup:run');
 
 	}
 

app/Http/Controllers/SettingsController.php

@@ -416,7 +416,7 @@ class SettingsController extends Controller
     public function getBackups()
     {
 
-        $path = config('app.private_uploads').'/backups';
+        $path = storage_path().'/app/'.config('laravel-backup.destination.path');
 
         $files = array();
 
@@ -475,7 +475,7 @@ class SettingsController extends Controller
     public function downloadFile($filename = null)
     {
         if (!config('app.lock_passwords')) {
-            $path = config('app.private_uploads').'/backups';
+            $path = storage_path().'/app/'.config('laravel-backup.destination.path');
             $file = $path.'/'.$filename;
             if (file_exists($file)) {
                 return Response::download($file);
@@ -504,7 +504,8 @@ class SettingsController extends Controller
 
         if (!config('app.lock_passwords')) {
 
-            $file = config('backup::path').'/'.$filename;
+            $path = storage_path().'/app/'.config('laravel-backup.destination.path');
+            $file = $path.'/'.$filename;
             if (file_exists($file)) {
                 unlink($file);
                 return redirect()->route('settings/backups')->with('success', trans('admin/settings/message.backup.file_deleted'));

composer.json

@@ -19,9 +19,9 @@
       "watson/validating": "^2.0",
       "doctrine/cache": "v1.5.4",
       "doctrine/common": "v2.5.3",
-		  "doctrine/dbal": "v2.4.2",
+      "doctrine/dbal": "v2.4.2",
       "barryvdh/laravel-debugbar": "^2.1",
-      "spatie/laravel-backup": "^2.9"
+      "spatie/laravel-backup": "3.0"
     },
     "require-dev": {
       "fzaninotto/faker": "~1.4",

resources/views/settings/backups.blade.php

@@ -59,7 +59,7 @@
 
 
       </form>
-      <p>Backup files are located in: app/storage/dumps</p>
+      <p>Backup files are located in: {{ $path  }}</p>