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

Recurring child issue solved..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-06-07 11:29:11 +03:00
parent b33009c7cd
commit 7359e246c3
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Abstracts/View/Components/Documents/Show.php
View File

@ -41,6 +41,9 @@ abstract class Show extends Component
/* -- Main End -- */
/* -- Buttons Start -- */
/** @var string */
public $textPage;
/** @var bool */
public $hideCreate;
@ -59,6 +62,9 @@ abstract class Show extends Component
/** @var string */
public $editRoute;
/** @var string */
public $showRoute;
/** @var bool */
public $hideMoreActions;
@ -318,8 +324,8 @@ abstract class Show extends Component
*/
public function __construct(
$type, $document, $transactions = [],
string $permissionCreate = '', string $permissionUpdate = '', string $permissionDelete = '',
bool $hideCreate = false, string $createRoute = '', string $textCreate = '', bool $hideButtonStatuses = false, bool $hideEdit = false, string $editRoute = '',
string $permissionCreate = '', string $permissionUpdate = '', string $permissionDelete = '', string $textPage = '',
bool $hideCreate = false, string $createRoute = '', string $textCreate = '', bool $hideButtonStatuses = false, bool $hideEdit = false, string $editRoute = '', string $showRoute = '',
bool $hideMoreActions = false, bool $hideDuplicate = false, string $duplicateRoute = '', bool $hidePrint = false, bool $checkCancelled = true, string $printRoute = '',
bool $hideShare = false, string $shareRoute = '', string $signedUrl = '', bool $hideEmail = false, string $emailRoute = '', string $textEmail = '', bool $hidePdf = false, string $pdfRoute = '',
bool $hideCancel = false, string $cancelledRoute = '', bool $hideCustomize = false, string $permissionCustomize = '', string $customizeRoute = '',
@ -356,6 +362,7 @@ abstract class Show extends Component
/* -- Main End -- */
/* -- Buttons Start -- */
$this->textPage = $this->getTextPage($type, $textPage);
$this->hideCreate = $hideCreate;
$this->createRoute = $this->getCreateRoute($type, $createRoute);
$this->textCreate = $this->getTextCreate($type, $textCreate);
@ -363,6 +370,7 @@ abstract class Show extends Component
$this->hideButtonStatuses = $this->getHideButtonStatuses($type, $hideButtonStatuses);
$this->hideEdit = $hideEdit;
$this->editRoute = $this->getEditRoute($type, $editRoute);
$this->showRoute = $this->getShowRoute($type, $showRoute);
$this->hideMoreActions = $hideMoreActions;
$this->hideDuplicate = $hideDuplicate;

2
resources/views/components/documents/show/buttons.blade.php
View File

@ -3,7 +3,7 @@
@if (! $hideCreate)
@can($permissionCreate)
<x-link href="{{ route($createRoute) }}" kind="primary">
{{ trans($textCreate) }}
{{ trans('general.title.new', ['type' => trans_choice($textPage, 1)]) }}
</x-link>
@endcan
@endif

24
resources/views/components/documents/show/children.blade.php
View File

@ -7,18 +7,18 @@
</x-slot>
<x-slot name="body" class="block" override="class">
<div class="flex my-3 space-x-2 rtl:space-x-reverse">
@if ($document->children()->count())
@foreach ($document->children() as $child)
@php $url = '<a href="' . route('transactions.show', $child->id) . '" class="text-purple" @click="e => e.target.classList.add(\'disabled\')">' . $child->number . '</a>' @endphp
@if ($document->children()->count())
@foreach ($document->children()->get() as $child)
@php
$url = '<a href="' . route(Str::replace('recurring-', '', $showRoute), $child->id) . '" class="text-purple">' . $child->document_number . '</a>';
@endphp
<div class="my-2">
{{ trans('recurring.child', ['url' => $url, 'date' => company_date($child->due_at)]) }}
</div>
@endforeach
@else
{{ trans('general.none') }}
@endif
</div>
<div class="my-2">
{!! trans('recurring.child', ['url' => $url, 'date' => company_date($child->due_at)]) !!}
</div>
@endforeach
@else
{{ trans('general.none') }}
@endif
</x-slot>
</x-show.accordion>

4
resources/views/components/transactions/show/children.blade.php
View File

@ -20,11 +20,11 @@
x-bind:class="children == 1 ? 'h-auto ' : 'scale-y-0 h-0'"
>
@if ($transaction->children()->count())
@foreach ($transaction->children() as $child)
@foreach ($transaction->children()->get() as $child)
@php $url = '<a href="' . route('transactions.show', $child->id) . '" class="text-purple">' . $child->number . '</a>' @endphp
<div class="my-2">
{{ trans('recurring.child', ['url' => $url, 'date' => company_date($child->paid_at)]) }}
{!! trans('recurring.child', ['url' => $url, 'date' => company_date($child->paid_at)]) !!}
</div>
@endforeach
@else