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

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

Browse Source
This commit is contained in:
Burak Civan
2022-06-02 16:35:18 +03:00
parent faa661fd8e a05737e0b5
commit 4f87e09674
8 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/banking/recurring_transactions/index.blade.php
+3
View File
@@ -39,6 +39,9 @@
<x-table>
<x-table.thead>
<x-table.tr class="flex items-center px-1">
<x-table.th class="ltr:pr-6 rtl:pl-6 hidden sm:table-cell" override="class">
<x-index.bulkaction.all />
</x-table.th>
<x-table.th class="w-4/12 sm:w-3/12">
<x-slot name="first">
resources/views/components/documents/show/content.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
@php
$recurring_message = trans('recurring.message_parent', [
'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
'link' => '<a href="' . route(config('type.document.' . $document->paten->type . '.route.prefix', 'invoices') . '.show', $parent->id) . '"><u>' . $parent->id . '</u></a>'
'link' => '<a href="' . route(config('type.document.' . $document->parent->type . '.route.prefix', 'invoices') . '.show', $parent->id) . '"><u>' . $parent->id . '</u></a>'
]);
@endphp
resources/views/components/documents/template/default.blade.php
+1 -1
View File
@@ -296,7 +296,7 @@
<div class="row mt-4">
<div class="col-100 text-left">
<div class="text">
<strong>{!! nl2br($document->footer) !!}<strong>
<strong>{!! nl2br($document->footer) !!}</strong>
</div>
</div>
</div>
resources/views/components/transactions/show/schedule.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@
@if ($next = $transaction->recurring->getNextRecurring())
{{ trans('recurring.next_date', ['date' => $next->format(company_date_format())]) }}
<br>
@if (($transaction->recurring->limit_by == 'count'))
@if ($transaction->recurring->limit_by == 'count')
@if ($transaction->recurring->limit_count == 0)
{{ trans('recurring.ends_never') }}
@else