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

This commit is contained in:
Cüneyt Şentürk 2021-01-11 23:52:04 +03:00
commit 5a38063ddf
4 changed files with 6 additions and 6 deletions

View File

@ -205,5 +205,5 @@
</div> </div>
</div> </div>
</div> </div>
@stack('timeline_get_paid_end') @stack('timeline_body_end')
@endif @endif

View File

@ -135,12 +135,12 @@
@endif @endif
@stack('order_number_input_end') @stack('order_number_input_end')
@stack('invoiced_at_input_start') @stack('issued_at_input_start')
@if (!$hideIssuedAt) @if (!$hideIssuedAt)
<strong>{{ trans($textIssuedAt) }}:</strong> <strong>{{ trans($textIssuedAt) }}:</strong>
<span class="float-right">@date($document->issued_at)</span><br><br> <span class="float-right">@date($document->issued_at)</span><br><br>
@endif @endif
@stack('invoiced_at_input_end') @stack('issued_at_input_end')
@stack('due_at_input_start') @stack('due_at_input_start')
@if (!$hideDueAt) @if (!$hideDueAt)

View File

@ -130,7 +130,7 @@
</strong> </strong>
<span class="float-right">@date($document->issued_at)</span><br><br> <span class="float-right">@date($document->issued_at)</span><br><br>
@endif @endif
@stack('issueed_at_input_end') @stack('issued_at_input_end')
@stack('due_at_input_start') @stack('due_at_input_start')
@if (!$hideDueAt) @if (!$hideDueAt)

View File

@ -117,12 +117,12 @@
@endif @endif
@stack('invoice_number_input_end') @stack('invoice_number_input_end')
@stack('invoiced_at_input_start') @stack('issued_at_input_start')
@if (!$hideIssuedAt) @if (!$hideIssuedAt)
<strong>{{ trans($textIssuedAt) }}:</strong> <strong>{{ trans($textIssuedAt) }}:</strong>
<span class="float-right">@date($document->issued_at)</span><br><br> <span class="float-right">@date($document->issued_at)</span><br><br>
@endif @endif
@stack('invoiced_at_input_end') @stack('issued_at_input_end')
@stack('due_at_input_start') @stack('due_at_input_start')
@if (!$hideDueAt) @if (!$hideDueAt)