From 763bc57eac6db1b768d77908be43328478ccbadd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <53110792+CihanSenturk@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:00:48 +0300 Subject: [PATCH] added recurring transaction tax --- app/Http/Controllers/Banking/RecurringTransactions.php | 9 ++++++++- .../banking/recurring_transactions/create.blade.php | 4 ++++ .../views/banking/recurring_transactions/edit.blade.php | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Banking/RecurringTransactions.php b/app/Http/Controllers/Banking/RecurringTransactions.php index 038ea7581..d3f173641 100644 --- a/app/Http/Controllers/Banking/RecurringTransactions.php +++ b/app/Http/Controllers/Banking/RecurringTransactions.php @@ -13,6 +13,7 @@ use App\Models\Banking\Account; use App\Models\Banking\Transaction; use App\Models\Common\Recurring; use App\Models\Setting\Currency; +use App\Models\Setting\Tax; use App\Traits\Currencies; use App\Traits\DateTime; use App\Traits\Transactions as TransactionsTrait; @@ -76,13 +77,16 @@ class RecurringTransactions extends Controller $currency = Currency::where('code', $account_currency_code)->first(); + $taxes = Tax::enabled()->orderBy('name')->get(); + return view('banking.recurring_transactions.create', compact( 'type', 'real_type', 'number', 'contact_type', 'account_currency_code', - 'currency' + 'currency', + 'taxes' )); } @@ -173,6 +177,8 @@ class RecurringTransactions extends Controller $currency = Currency::where('code', $recurring_transaction->currency_code)->first(); + $taxes = Tax::enabled()->orderBy('name')->get(); + $date_format = $this->getCompanyDateFormat(); return view('banking.recurring_transactions.edit', compact( @@ -182,6 +188,7 @@ class RecurringTransactions extends Controller 'contact_type', 'recurring_transaction', 'currency', + 'taxes', 'date_format' )); } diff --git a/resources/views/banking/recurring_transactions/create.blade.php b/resources/views/banking/recurring_transactions/create.blade.php index 8e05645ec..318909518 100644 --- a/resources/views/banking/recurring_transactions/create.blade.php +++ b/resources/views/banking/recurring_transactions/create.blade.php @@ -55,6 +55,8 @@ + + @@ -108,6 +110,8 @@ @push('scripts_start')