diff --git a/resources/lang/en-GB/transfers.php b/resources/lang/en-GB/transfers.php index 93be947e6..becce0773 100644 --- a/resources/lang/en-GB/transfers.php +++ b/resources/lang/en-GB/transfers.php @@ -28,6 +28,7 @@ return [ 'create' => ':user created this transfer on :date', 'transactions' => 'List of transactions related to this transfer', 'transactions_desc' => ':number transaction for :account', + 'attachments' => 'Download the files attached to this transfer', ], ]; diff --git a/resources/views/components/transactions/show/attachment.blade.php b/resources/views/components/transactions/show/attachment.blade.php index c65ba98c0..aefeb8dd7 100644 --- a/resources/views/components/transactions/show/attachment.blade.php +++ b/resources/views/components/transactions/show/attachment.blade.php @@ -1,30 +1,16 @@ @if ($attachment) -
-
- - - {{ trans_choice('general.attachments', 2) }} - - + + + + -
- {{ trans('transactions.slider.attachments') }} -
- - expand_more -
- -
+ @foreach ($attachment as $file) @endforeach -
-
+ + @endif diff --git a/resources/views/components/transactions/show/children.blade.php b/resources/views/components/transactions/show/children.blade.php index 61593abdf..4d30a2c35 100644 --- a/resources/views/components/transactions/show/children.blade.php +++ b/resources/views/components/transactions/show/children.blade.php @@ -1,26 +1,12 @@ -
- - -
+ @if ($transaction->children()->count()) @foreach ($transaction->children()->get() as $child) @php $url = '' . $child->number . '' @endphp @@ -32,5 +18,5 @@ @else {{ trans('general.none') }} @endif -
-
+ + diff --git a/resources/views/components/transactions/show/create.blade.php b/resources/views/components/transactions/show/create.blade.php index bfdaa558f..7700873eb 100644 --- a/resources/views/components/transactions/show/create.blade.php +++ b/resources/views/components/transactions/show/create.blade.php @@ -1,14 +1,10 @@ @php $created_date = '' . company_date($transaction->created_at) . '' @endphp -
- - -
+ @if ($transaction->isNotTransferTransaction())
@endif -
-
+ + \ No newline at end of file diff --git a/resources/views/components/transactions/show/schedule.blade.php b/resources/views/components/transactions/show/schedule.blade.php index c5f8587a2..92baa9c94 100644 --- a/resources/views/components/transactions/show/schedule.blade.php +++ b/resources/views/components/transactions/show/schedule.blade.php @@ -3,27 +3,15 @@ $frequency = Str::lower(trans('recurring.' . str_replace('ly', 's', $transaction->recurring->frequency))); @endphp -
- - -
+
@if ($next = $transaction->recurring->getNextRecurring()) {{ trans('recurring.next_date', ['date' => $next->format(company_date_format())]) }} @@ -41,5 +29,5 @@ {{ trans('documents.statuses.ended') }} @endif
-
-
+ + diff --git a/resources/views/components/transactions/show/transfer.blade.php b/resources/views/components/transactions/show/transfer.blade.php index 0baa7c669..3b3b42212 100644 --- a/resources/views/components/transactions/show/transfer.blade.php +++ b/resources/views/components/transactions/show/transfer.blade.php @@ -9,42 +9,33 @@ @endphp @endif -
- - -
+ @if ($transfer) -
- {!! trans('transactions.slider.transfer_desc', ['date' => $date]) !!} -
- @else -
-
- - {{ trans('messages.warning.missing_transfer') }} - +
+ {!! trans('transactions.slider.transfer_desc', ['date' => $date]) !!} +
+ @else +
+
+ + {{ trans('messages.warning.missing_transfer') }} + +
-
@endif -
-
+ + @endif diff --git a/resources/views/components/transfers/show/attachment.blade.php b/resources/views/components/transfers/show/attachment.blade.php index e2a118a26..a2462b240 100644 --- a/resources/views/components/transfers/show/attachment.blade.php +++ b/resources/views/components/transfers/show/attachment.blade.php @@ -1,26 +1,16 @@ @if ($transfer->attachment) -
-
- - - {{ trans_choice('general.attachments', 2) }} - - + + + + -
- {{ trans('transers.slider.attachments') }} -
- - expand_more -
- -
+ @foreach ($transfer->attachment as $file) @endforeach -
-
+ + @endif diff --git a/resources/views/components/transfers/show/create.blade.php b/resources/views/components/transfers/show/create.blade.php index f1b3f1417..6ed1f922d 100644 --- a/resources/views/components/transfers/show/create.blade.php +++ b/resources/views/components/transfers/show/create.blade.php @@ -1,25 +1,14 @@ @php $created_date = '' . company_date($transfer->created_at) . '' @endphp -
- - -
+
-
-
+ + diff --git a/resources/views/components/transfers/show/transactions.blade.php b/resources/views/components/transfers/show/transactions.blade.php index b427412ff..d9ce26435 100644 --- a/resources/views/components/transfers/show/transactions.blade.php +++ b/resources/views/components/transfers/show/transactions.blade.php @@ -1,27 +1,18 @@ @php $link_class = 'to-black-400 hover:bg-full-2 bg-no-repeat bg-0-2 bg-0-full bg-gradient-to-b from-transparent transition-backgroundSize'; - $expense_number = '' . $transfer->expense_transaction->number . ''; - $income_number = '' . $transfer->income_transaction->number . ''; + $expense_number = '' . $transfer->expense_transaction->number . ''; + $income_number = '' . $transfer->income_transaction->number . ''; @endphp -
- - -
+
{!! trans('transfers.slider.transactions_desc', ['number' => $expense_number, 'account' => $transfer->expense_account->title]) !!}
@@ -29,5 +20,5 @@
{!! trans('transfers.slider.transactions_desc', ['number' => $income_number, 'account' => $transfer->income_account->title]) !!}
-
-
+ + \ No newline at end of file