From 083ea42aa6594e9435770836cc2ec660fb53ce00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 31 Oct 2022 00:43:30 +0300
Subject: [PATCH] Fixed transfer and split transaction show/create pages
 real_type issue ( #3qec0xc )

---
 app/Http/Controllers/Banking/Transactions.php    |  5 ++++-
 app/Traits/Transactions.php                      |  9 +++++++++
 .../views/banking/transactions/create.blade.php  | 16 ++++++++--------
 .../views/banking/transactions/show.blade.php    |  8 ++++----
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Banking/Transactions.php b/app/Http/Controllers/Banking/Transactions.php
index b74a2fe8a..4a8f72829 100644
--- a/app/Http/Controllers/Banking/Transactions.php
+++ b/app/Http/Controllers/Banking/Transactions.php
@@ -86,8 +86,9 @@ class Transactions extends Controller
     public function show(Transaction $transaction)
     {
         $title = $transaction->isIncome() ? trans_choice('general.receipts', 1) : trans('transactions.payment_made');
+        $real_type = $this->getRealTypeTransaction($transaction->type);
 
-        return view('banking.transactions.show', compact('transaction', 'title'));
+        return view('banking.transactions.show', compact('transaction', 'title', 'real_type'));
     }
 
     /**
@@ -98,6 +99,7 @@ class Transactions extends Controller
     public function create()
     {
         $type = request()->get('type', 'income');
+        $real_type = $this->getRealTypeTransaction($type);
 
         $number = $this->getNextTransactionNumber();
 
@@ -109,6 +111,7 @@ class Transactions extends Controller
 
         return view('banking.transactions.create', compact(
             'type',
+            'real_type',
             'number',
             'contact_type',
             'account_currency_code',
diff --git a/app/Traits/Transactions.php b/app/Traits/Transactions.php
index 7e51aa466..d36e23802 100644
--- a/app/Traits/Transactions.php
+++ b/app/Traits/Transactions.php
@@ -204,6 +204,15 @@ trait Transactions
         ];
     }
 
+    public function getRealTypeTransaction(string $type): string
+    {
+        $type = $this->getRealTypeOfRecurringTransaction($type);
+        $type = $this->getRealTypeOfTransferTransaction($type);
+        $type = $this->getRealTypeOfSplitTransaction($type);
+
+        return $type;
+    }
+
     public function getRealTypeOfRecurringTransaction(string $recurring_type): string
     {
         return Str::replace('-recurring', '', $recurring_type);
diff --git a/resources/views/banking/transactions/create.blade.php b/resources/views/banking/transactions/create.blade.php
index fcc3cb514..8f9798056 100644
--- a/resources/views/banking/transactions/create.blade.php
+++ b/resources/views/banking/transactions/create.blade.php
@@ -1,13 +1,13 @@
 <x-layouts.admin>
     <x-slot name="title">
-        {{ trans('general.title.new', ['type' => trans_choice('general.' . Str::plural($type), 1)]) }}
+        {{ trans('general.title.new', ['type' => trans_choice('general.' . Str::plural($real_type), 1)]) }}
     </x-slot>
 
-    @php $fav_icon = ($type == 'income') ? 'request_quote' : 'paid'; @endphp
+    @php $fav_icon = ($real_type == 'income') ? 'request_quote' : 'paid'; @endphp
     <x-slot name="favorite"
-        title="{{ trans('general.title.new', ['type' => trans_choice('general.' . Str::plural($type), 1)]) }}"
+        title="{{ trans('general.title.new', ['type' => trans_choice('general.' . Str::plural($real_type), 1)]) }}"
         icon="{{ $fav_icon }}"
-        url="{{ route('transactions.create', ['type' => $type]) }}"
+        url="{{ route('transactions.create', ['type' => $real_type]) }}"
     ></x-slot>
 
     <x-slot name="content">
@@ -36,13 +36,13 @@
 
                 <x-form.section>
                     <x-slot name="head">
-                        <x-form.section.head title="{{ trans('general.assign') }}" description="{{ trans('transactions.form_description.assign_' . $type) }}" />
+                        <x-form.section.head title="{{ trans('general.assign') }}" description="{{ trans('transactions.form_description.assign_' . $real_type) }}" />
                     </x-slot>
 
                     <x-slot name="body">
-                        <x-form.group.category type="{{ $type }}" :selected="setting('default.' . $type . '_category')" />
+                        <x-form.group.category type="{{ $real_type }}" :selected="setting('default.' . $real_type . '_category')" />
 
-                        <x-form.group.contact type="{{ config('type.transaction.' . $type . '.contact_type') }}" not-required />
+                        <x-form.group.contact type="{{ config('type.transaction.' . $real_type . '.contact_type') }}" not-required />
                     </x-slot>
                 </x-form.section>
 
@@ -66,7 +66,7 @@
                     </x-slot>
                 </x-form.section>
 
-                <x-form.input.hidden name="type" :value="$type" />
+                <x-form.input.hidden name="type" :value="$real_type" />
             </x-form>
         </x-form.container>
     </x-slot>
diff --git a/resources/views/banking/transactions/show.blade.php b/resources/views/banking/transactions/show.blade.php
index 2548eba06..6b404a54f 100644
--- a/resources/views/banking/transactions/show.blade.php
+++ b/resources/views/banking/transactions/show.blade.php
@@ -4,20 +4,20 @@
     </x-slot>
 
     <x-slot name="buttons">
-        <x-transactions.show.buttons type="{{ $transaction->type }}" :transaction="$transaction" />
+        <x-transactions.show.buttons type="{{ $real_type }}" :transaction="$transaction" />
     </x-slot>
 
     <x-slot name="moreButtons">
-        <x-transactions.show.more-buttons type="{{ $transaction->type }}" :transaction="$transaction" hide-divider-3 hide-button-end />
+        <x-transactions.show.more-buttons type="{{ $real_type }}" :transaction="$transaction" hide-divider-3 hide-button-end />
     </x-slot>
 
     <x-slot name="content">
-        <x-transactions.show.content type="{{ $transaction->type }}" :transaction="$transaction" hide-schedule hide-children />
+        <x-transactions.show.content type="{{ $real_type }}" :transaction="$transaction" hide-schedule hide-children />
     </x-slot>
 
     @push('stylesheet')
         <link rel="stylesheet" href="{{ asset('public/css/print.css?v=' . version('short')) }}" type="text/css">
     @endpush
 
-    <x-transactions.script type="{{ $transaction->type }}" />
+    <x-transactions.script type="{{ $real_type }}" />
 </x-layouts.admin>