shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-01-04 10:38:24 +03:00
commit b86dadb278
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Abstracts/View/Components/DocumentShow.php
View File

@ -339,6 +339,9 @@ abstract class DocumentShow extends Component
public $attachment;
/** @var string */
public $textDeleteModal;
/**
* Create a new component instance.
*
@ -366,7 +369,8 @@ abstract class DocumentShow extends Component
bool $hideOrderNumber = false, bool $hideDocumentNumber = false, bool $hideIssuedAt = false, bool $hideDueAt = false,
string $textContactInfo = '', string $textDocumentNumber = '', string $textOrderNumber = '', string $textIssuedAt = '', string $textDueAt = '',
bool $hideItems = false, bool $hideName = false, bool $hideDescription = false, bool $hideQuantity = false, bool $hidePrice = false, bool $hideDiscount = false, bool $hideAmount = false, bool $hideNote = false, bool $hideAttachment = false,
string $textItems = '', string $textQuantity = '', string $textPrice = '', string $textAmount = '', $attachment = []
string $textItems = '', string $textQuantity = '', string $textPrice = '', string $textAmount = '', $attachment = [],
string $textDeleteModal = ''
) {
$this->type = $type;
$this->document = $document;
@ -503,6 +507,8 @@ abstract class DocumentShow extends Component
$this->textQuantity = $textQuantity;
$this->textPrice = $textPrice;
$this->textAmount = $textAmount;
$this->textDeleteModal = $textDeleteModal;
}
protected function getTextRecurringType($type, $textRecurringType)

4
resources/views/components/documents/show/top-buttons.blade.php
View File

@ -96,10 +96,10 @@
@can($permissionDocumentDelete)
@if ($checkButtonReconciled)
@if (!$document->reconciled)
{!! Form::deleteLink($document, $routeButtonDelete) !!}
{!! Form::deleteLink($document, $routeButtonDelete, $textDeleteModal, 'document_number') !!}
@endif
@else
{!! Form::deleteLink($document, $routeButtonDelete) !!}
{!! Form::deleteLink($document, $routeButtonDelete, $textDeleteModal, 'document_number') !!}
@endif
@endcan
@endif