Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 03:04:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove html_backup column from backups tables

Browse Source
This commit is contained in:
David Bomba 2022-11-07 08:52:06 +11:00
parent 18ce82ceed
commit 9c16c12ee9
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ActivityController.php
View File

@ -182,9 +182,7 @@ class ActivityController extends BaseController
} else { } else {
$html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->path($backup->filename)); $html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->path($backup->filename));
} }
} elseif ($backup && $backup->html_backup) { //db } else { //failed
$html_backup = $backup->html_backup;
} elseif (! $backup || ! $backup->html_backup) { //failed
return response()->json(['message'=> ctrans('texts.no_backup_exists'), 'errors' => new stdClass], 404); return response()->json(['message'=> ctrans('texts.no_backup_exists'), 'errors' => new stdClass], 404);
} }

6
app/Models/Backup.php
View File

@ -36,15 +36,11 @@ class Backup extends BaseModel
$filename = now()->format('Y_m_d').'_'.md5(time()).'.html'; $filename = now()->format('Y_m_d').'_'.md5(time()).'.html';
$file_path = $path.$filename; $file_path = $path.$filename;
// Storage::disk(config('filesystems.default'))->makeDirectory($path, 0775);
Storage::disk(config('filesystems.default'))->put($file_path, $html); Storage::disk(config('filesystems.default'))->put($file_path, $html);
// if (Storage::disk(config('filesystems.default'))->exists($file_path)) {
$this->html_backup = '';
$this->filename = $file_path; $this->filename = $file_path;
$this->save(); $this->save();
// }
} }
public function deleteFile() public function deleteFile()

3
app/Repositories/ActivityRepository.php
View File

@ -60,7 +60,7 @@ class ActivityRepository extends BaseRepository
$activity->save(); $activity->save();
//rate limiter //rate limiter
$this->createBackup($entity, $activity); // $this->createBackup($entity, $activity);
} }
/** /**
@ -83,7 +83,6 @@ class ActivityRepository extends BaseRepository
$backup = new Backup(); $backup = new Backup();
$entity->load('client'); $entity->load('client');
$contact = $entity->client->primary_contact()->first(); $contact = $entity->client->primary_contact()->first();
$backup->html_backup = '';
$backup->amount = $entity->amount; $backup->amount = $entity->amount;
$backup->activity_id = $activity->id; $backup->activity_id = $activity->id;
$backup->json_backup = ''; $backup->json_backup = '';

4
app/Transformers/InvoiceHistoryTransformer.php
View File

@ -34,7 +34,7 @@ class InvoiceHistoryTransformer extends EntityTransformer
'id' => '', 'id' => '',
'activity_id' => '', 'activity_id' => '',
'json_backup' => (string) '', 'json_backup' => (string) '',
'html_backup' => (string) '', 'html_backup' => (string) '', //deprecated
'amount' => (float) 0, 'amount' => (float) 0,
'created_at' => (int) 0, 'created_at' => (int) 0,
'updated_at' => (int) 0, 'updated_at' => (int) 0,
@ -45,7 +45,7 @@ class InvoiceHistoryTransformer extends EntityTransformer
'id' => $this->encodePrimaryKey($backup->id), 'id' => $this->encodePrimaryKey($backup->id),
'activity_id' => $this->encodePrimaryKey($backup->activity_id), 'activity_id' => $this->encodePrimaryKey($backup->activity_id),
'json_backup' => (string) '', 'json_backup' => (string) '',
'html_backup' => (string) '', 'html_backup' => (string) '', //deprecated
'amount' => (float) $backup->amount, 'amount' => (float) $backup->amount,
'created_at' => (int) $backup->created_at, 'created_at' => (int) $backup->created_at,
'updated_at' => (int) $backup->updated_at, 'updated_at' => (int) $backup->updated_at,