diff --git a/app/Abstracts/View/Components/TransferShow.php b/app/Abstracts/View/Components/TransferShow.php index 071db76f5..ba62cd890 100644 --- a/app/Abstracts/View/Components/TransferShow.php +++ b/app/Abstracts/View/Components/TransferShow.php @@ -420,9 +420,7 @@ abstract class TransferShow extends Component return $transferTemplate; } - $transferTemplate = setting('transfer.template') ?: 'default'; - - return $transferTemplate; + return setting('transfer.template'); } protected function getRouteButtonAddNew($routeButtonAddNew) diff --git a/app/View/Components/Transfers/Template/Second.php b/app/View/Components/Transfers/Template/Second.php new file mode 100644 index 000000000..82bd333be --- /dev/null +++ b/app/View/Components/Transfers/Template/Second.php @@ -0,0 +1,18 @@ + @endsection diff --git a/resources/views/components/transfers/template/default.blade.php b/resources/views/components/transfers/template/default.blade.php index 33e63768b..70cf32add 100644 --- a/resources/views/components/transfers/template/default.blade.php +++ b/resources/views/components/transfers/template/default.blade.php @@ -167,7 +167,7 @@

- @money($transfer->expense_transaction->amount, $transfer->from_currency_code, true) + @money($transfer->expense_transaction->amount, $transfer->expense_transaction->currency_code, true)

diff --git a/resources/views/components/transfers/template/second.blade.php b/resources/views/components/transfers/template/second.blade.php index 75c2cb7ac..a77ebb69a 100644 --- a/resources/views/components/transfers/template/second.blade.php +++ b/resources/views/components/transfers/template/second.blade.php @@ -22,7 +22,7 @@ - @date($transfer->transferred_at) + @date($transfer->expense_transaction->paid_at) @endif @@ -34,7 +34,7 @@ - {{ $payment_methods[$transfer->payment_method] }} + {{ $payment_methods[$transfer->expense_transaction->payment_method] }} @endif @@ -46,7 +46,7 @@ - {{ $transfer->reference }} + {{ $transfer->expense_transaction->reference }} @endif @@ -58,7 +58,7 @@ - {{ $transfer->description }} + {{ $transfer->expense_transaction->description }} @endif @@ -75,7 +75,7 @@

- @money($transfer->amount, $transfer->from_currency_code, true) + @money($transfer->expense_transaction->amount, $transfer->expense_transaction->currency_code, true)

diff --git a/resources/views/components/transfers/template/third.blade.php b/resources/views/components/transfers/template/third.blade.php index f1799294a..3426a5a34 100644 --- a/resources/views/components/transfers/template/third.blade.php +++ b/resources/views/components/transfers/template/third.blade.php @@ -126,7 +126,7 @@ - @date($transfer->transferred_at) + @date($transfer->expense_transaction->paid_at) @endif @@ -138,7 +138,7 @@ - {{ $payment_methods[$transfer->payment_method] }} + {{ $payment_methods[$transfer->expense_transaction->payment_method] }} @endif @@ -150,7 +150,7 @@ - {{ $transfer->reference }} + {{ $transfer->expense_transaction->reference }} @endif @@ -162,7 +162,7 @@ - {{ $transfer->description }} + {{ $transfer->expense_transaction->description }} @endif @@ -179,7 +179,7 @@

- @money($transfer->amount, $transfer->from_currency_code, true) + @money($transfer->expense_transaction->amount, $transfer->expense_transaction->currency_code, true)