Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for activity backups"

Browse Source 
git push
This commit is contained in:
David Bomba 2020-08-12 10:13:34 +10:00
parent 928a9d46af
commit ee0aa891bb
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,8 +87,12 @@ class ActivityController extends BaseController
public function downloadHistoricalInvoice(DownloadHistoricalInvoiceRequest $request, Activity $activity) public function downloadHistoricalInvoice(DownloadHistoricalInvoiceRequest $request, Activity $activity)
{ {
$backup = $activity->backup;
$pdf = $this->makePdf(null, null, $activity->backup->html_backup); if(!$backup || !$backup->html_backup)
return response()->json(['message'=> 'No backup exists for this activity', 'errors' => new \stdClass], 404);
$pdf = $this->makePdf(null, null, $backup->html_backup);
if(isset($activity->invoice_id)) if(isset($activity->invoice_id))
$filename = $activity->invoice->number . ".pdf"; $filename = $activity->invoice->number . ".pdf";

16
tests/Integration/DownloadHistoricalInvoiceTest.php
View File

@ -56,7 +56,6 @@ class DownloadHistoricalInvoiceTest extends TestCase
$this->assertNotNull($this->invoice->activities->first()->backup->html_backup); $this->assertNotNull($this->invoice->activities->first()->backup->html_backup);
} }
public function testBackupDownload() public function testBackupDownload()
{ {
$this->mockActivity(); $this->mockActivity();
@ -68,4 +67,19 @@ class DownloadHistoricalInvoiceTest extends TestCase
$response->assertStatus(200); $response->assertStatus(200);
} }
public function testBackupCheckPriorToDownloadWorks()
{
$this->mockActivity();
$backup = $this->invoice->activities->first()->backup;
$backup->forceDelete();
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token
])->get('/api/v1/activities/download_invoice/'.$this->encodePrimaryKey($this->invoice->activities->first()->id));
$response->assertStatus(404);
}
} }