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

Fixes for documents

Browse Source
This commit is contained in:
David Bomba 2022-03-17 13:20:58 +11:00
parent f3a94904ac
commit ae16eb66e5
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/DocumentController.php
View File

@ -189,12 +189,11 @@ class DocumentController extends BaseController
*/ */
$documents->each(function ($document, $key) use ($action) { $documents->each(function ($document, $key) use ($action) {
if (auth()->user()->can('edit', $document)) { if (auth()->user()->can('edit', $document)) {
$this->{$action}($document); $this->document_repo->{$action}($document);
} }
}); });
/* Need to understand which permission are required for the given bulk action ie. view / edit */ /* Need to understand which permission are required for the given bulk action ie. view / edit */
return $this->listResponse(Document::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()); return $this->listResponse(Document::withTrashed()->whereIn('id', $this->transformKeys($ids))->company());
} }
} }

19
app/Repositories/DocumentRepository.php
View File

@ -19,6 +19,7 @@ use App\Utils\Ninja;
*/ */
class DocumentRepository extends BaseRepository class DocumentRepository extends BaseRepository
{ {
public function delete($document) public function delete($document)
{ {
$document->deleteFile(); $document->deleteFile();
@ -27,14 +28,18 @@ class DocumentRepository extends BaseRepository
public function restore($document) public function restore($document)
{ {
if (! $document->trashed()) { return;
// if (! $document->trashed()) {
// return;
// }
// $document->restore();
}
public function archive($document)
{
return; return;
} }
$document->restore();
// if (class_exists($className)) {
// event(new $className($document, $document->company, Ninja::eventVars()));
// }
}
} }

4
resources/views/portal/ninja2020/components/general/sidebar/main.blade.php
View File

@ -4,7 +4,7 @@
@keydown.window.escape="sidebarOpen = false" @keydown.window.escape="sidebarOpen = false"
id="main-sidebar"> id="main-sidebar">
@if($settings->enable_client_portal) @if($settings && $settings->enable_client_portal)
<!-- Off-canvas menu for mobile --> <!-- Off-canvas menu for mobile -->
@include('portal.ninja2020.components.general.sidebar.mobile') @include('portal.ninja2020.components.general.sidebar.mobile')
@ -15,7 +15,7 @@
@endif @endif
<div class="flex flex-col w-0 flex-1 overflow-hidden"> <div class="flex flex-col w-0 flex-1 overflow-hidden">
@if($settings->enable_client_portal) @if($settings && $settings->enable_client_portal)
@include('portal.ninja2020.components.general.sidebar.header') @include('portal.ninja2020.components.general.sidebar.header')
@endif @endif