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

Merge pull request #1730 from pavel-mironchik/timeline

Browse Source 
Allow to hide the "paid" section in a document's timeline.
This commit is contained in:
Cüneyt Şentürk 2021-01-05 10:15:20 +03:00 committed by GitHub
commit 8ff95f9ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,9 @@ abstract class DocumentShow extends Component
/** @var bool */
public $hideTimelineSent;
/** @var bool */
public $hideTimelinePaid;
/** @var bool */
public $hideButtonSent;
@ -357,7 +360,7 @@ abstract class DocumentShow extends Component
bool $hideButtonGroupDivider1 = false, bool $hideButtonGroupDivider2 = false, bool $hideButtonGroupDivider3 = false,
bool $hideButtonMoreActions = false, bool $hideButtonAddNew = false, bool $hideButtonEdit = false, bool $hideButtonDuplicate = false, bool $hideButtonPrint = false, bool $hideButtonPdf = false, bool $hideButtonCancel = false, bool $hideButtonCustomize = false, bool $hideButtonDelete = false,
bool $hideHeader = false,bool $hideRecurringMessage = false, bool $hideStatusMessage = false, bool $hideTimeline = false, bool $hideFooter = false, bool $hideFooterHistories = false, bool $hideFooterTransactions = false,
array $hideTimelineStatuses = [], bool $hideTimelineSent = false, bool $hideButtonSent = false, bool $hideButtonReceived = false, bool $hideButtonEmail = false, bool $hideButtonShare = false, bool $hideButtonPaid = false,
array $hideTimelineStatuses = [], bool $hideTimelineSent = false, bool $hideTimelinePaid = false, bool $hideButtonSent = false, bool $hideButtonReceived = false, bool $hideButtonEmail = false, bool $hideButtonShare = false, bool $hideButtonPaid = false,
string $textHeaderContact = '', string $textHeaderAmount = '', string $textHeaderDueAt = '',
string $classHeaderStatus = '', string $classHeaderContact = '', string $classHeaderAmount = '', string $classHeaderDueAt = '',
bool $hideHeaderStatus = false, bool $hideHeaderContact = false, bool $hideHeaderAmount = false, bool $hideHeaderDueAt = false,
@ -447,6 +450,7 @@ abstract class DocumentShow extends Component
$this->hideTimelineCreate = $hideTimelineCreate;
$this->hideTimelineSent = $hideTimelineSent;
$this->hideTimelinePaid = $hideTimelinePaid;
$this->hideButtonSent = $hideButtonSent;
$this->hideButtonReceived = $hideButtonReceived;
$this->hideButtonEmail = $hideButtonEmail;

5
resources/views/components/documents/show/content.blade.php
View File

@ -46,7 +46,7 @@
:document="$document"
:hide-timeline-statuses="$hideTimelineStatuses"
hide-timeline-create="{{ $hideTimelineCreate }}"
hide-timeline-create-title="{{ $textTimelineCreateTitle }}"
text-timeline-create-title="{{ $textTimelineCreateTitle }}"
text-timeline-create-message="{{ $textTimelineCreateMessage }}"
hide-button-edit="{{ $hideButtonEdit }}"
permission-document-update="{{ $permissionDocumentUpdate }}"
@ -55,7 +55,6 @@
text-timeline-sent-title="{{ $textTimelineSentTitle }}"
text-timeline-sent-status-draft="{{ $textTimelineSentStatusDraft }}"
hide-button-sent="{{ $hideButtonSent }}"
permission-document-update="{{ $permissionDocumentUpdate }}"
route-button-sent="{{ $routeButtonSent }}"
text-timeline-sent-status-mark-sent="{{ $textTimelineSentStatusMarkSent }}"
hide-button-received="{{ $hideButtonReceived }}"
@ -66,7 +65,7 @@
text-timeline-send-status-mail="{{ $textTimelineSendStatusMail }}"
hide-button-share="{{ $hideButtonShare }}"
signed-url="{{ $signedUrl }}"
hide-timeline-sent="{{ $hideTimelineSent }}"
hide-timeline-paid="{{ $hideTimelinePaid }}"
text-timeline-get-paid-title="{{ $textTimelineGetPaidTitle }}"
text-timeline-get-paid-status-await="{{ $textTimelineGetPaidStatusAwait }}"
text-timeline-get-paid-status-partially-paid="{{ $textTimelineGetPaidStatusPartiallyPaid }}"

10
resources/views/components/documents/show/timeline.blade.php
View File

@ -106,11 +106,11 @@
<small>{{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($document->sent_at)->format($date_format)]) }}</small>
@stack('timeline_sent_body_message_end')
@endif
@if (!($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed'))
<div class="mt-3">
@endif
@stack('timeline_sent_body_button_email_start')
@if (!$hideButtonEmail)
@if($document->contact_email)
@ -134,7 +134,7 @@
@endif
@endif
@stack('timeline_sent_body_button_share_end')
</div>
@stack('timeline_sent_body_end')
@ -144,7 +144,7 @@
@stack('timeline_sent_end')
@stack('timeline_get_paid_start')
@if (!$hideTimelineSent)
@if (!$hideTimelinePaid)
<div class="timeline-block">
<span class="timeline-step badge-success">
<i class="far fa-money-bill-alt"></i>
@ -206,4 +206,4 @@
</div>
</div>
@stack('timeline_get_paid_end')
@endif
@endif