From 98566cfa178ed75be5a985dc96bd5b430939321b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 7 Aug 2021 12:45:43 +0300
Subject: [PATCH] Account shoe button add income, expense and transfer set
 default account

---
 app/Http/Controllers/Banking/Accounts.php     | 21 ++++++++++++++++++
 resources/lang/en-GB/general.php              |  1 +
 .../views/banking/accounts/show.blade.php     | 22 +++++++++----------
 routes/admin.php                              |  3 +++
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Banking/Accounts.php b/app/Http/Controllers/Banking/Accounts.php
index 3ed5689c8..559bf379c 100644
--- a/app/Http/Controllers/Banking/Accounts.php
+++ b/app/Http/Controllers/Banking/Accounts.php
@@ -222,6 +222,27 @@ class Accounts extends Controller
         return response()->json($response);
     }
 
+    public function createRevenue(Account $account)
+    {
+        $data['account_id'] = $account->id;
+
+        return redirect()->route('revenues.create')->withInput($data);
+    }
+
+    public function createPayment(Account $account)
+    {
+        $data['account_id'] = $account->id;
+
+        return redirect()->route('payments.create')->withInput($data);
+    }
+
+    public function createTransfer(Account $account)
+    {
+        $data['from_account_id'] = $account->id;
+
+        return redirect()->route('transfers.create')->withInput($data);
+    }
+
     public function currency()
     {
         $account_id = (int) request('account_id');
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 08e9778d7..6696852f6 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -73,6 +73,7 @@ return [
     'add_new'               => 'Add New',
     'add_income'            => 'Add Income',
     'add_expense'           => 'Add Expense',
+    'add_transfer'          => 'Add Transfer',
     'show'                  => 'Show',
     'edit'                  => 'Edit',
     'delete'                => 'Delete',
diff --git a/resources/views/banking/accounts/show.blade.php b/resources/views/banking/accounts/show.blade.php
index c1c4e73dc..e12529263 100644
--- a/resources/views/banking/accounts/show.blade.php
+++ b/resources/views/banking/accounts/show.blade.php
@@ -23,24 +23,24 @@
 
             @stack('revenue_button_start')
             @can('create-sales-revenues')
-                <a class="dropdown-item" href="{{ route('revenues.create') . '?account_id=' . $account->id }}">
+                <a class="dropdown-item" href="{{ route('accounts.create-revenue', $account->id) }}">
                     {{ trans('general.add_income')}}
                 </a>
             @endcan
             @stack('revenue_button_end')
 
-            @stack('revenue_button_start')
-            @can('create-sales-revenues')
-                <a class="dropdown-item" href="{{ route('payments.create') . '?account_id=' . $account->id }}">
-                    {{ trans('general.add_expense') }}           
+            @stack('payment_button_start')
+            @can('create-purchases-payments')
+                <a class="dropdown-item" href="{{ route('accounts.create-payment', $account->id) }}">
+                    {{ trans('general.add_expense') }}
                 </a>
             @endcan
-            @stack('revenue_button_end')
+            @stack('payment_button_end')
 
             @stack('transfer_button_start')
             @can('create-banking-transfers')
-                <a class="dropdown-item" href="{{ route('transfers.create') . '?from_account_id=' . $account->id }}">
-                    Add Transfer
+                <a class="dropdown-item" href="{{ route('accounts.create-transfer', $account->id) }}">
+                    {{ trans('general.add_transfer') }}
                 </a>
             @endcan
             @stack('transfer_button_end')
@@ -129,7 +129,7 @@
             <div class="row mb--3">
                 @stack('account_incoming_card_start')
                 <div class="col-md-4">
-                    <div class="card bg-gradient-success border-0">
+                    <div class="card bg-gradient-info border-0">
                         <div class="card-body">
                             <div class="row">
                                 <div class="col">
@@ -145,7 +145,7 @@
 
                 @stack('account_outgoing_card_start')
                 <div class="col-md-4">
-                    <div class="card bg-gradient-warning border-0">
+                    <div class="card bg-gradient-danger border-0">
                         <div class="card-body">
                             <div class="row">
                                 <div class="col">
@@ -161,7 +161,7 @@
 
                 @stack('account_balance_card_start')
                 <div class="col-md-4">
-                    <div class="card bg-gradient-danger border-0">
+                    <div class="card bg-gradient-success border-0">
                         <div class="card-body">
                             <div class="row">
                                 <div class="col">
diff --git a/routes/admin.php b/routes/admin.php
index 971f9f90a..86afc89df 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -128,6 +128,9 @@ Route::group(['prefix' => 'purchases'], function () {
 
 Route::group(['prefix' => 'banking'], function () {
     Route::get('accounts/currency', 'Banking\Accounts@currency')->name('accounts.currency');
+    Route::get('accounts/{account}/create-revenue', 'Banking\Accounts@createRevenue')->name('accounts.create-revenue');
+    Route::get('accounts/{account}/create-payment', 'Banking\Accounts@createPayment')->name('accounts.create-payment');
+    Route::get('accounts/{account}/create-transfer', 'Banking\Accounts@createTransfer')->name('accounts.create-transfer');
     Route::get('accounts/{account}/enable', 'Banking\Accounts@enable')->name('accounts.enable');
     Route::get('accounts/{account}/disable', 'Banking\Accounts@disable')->name('accounts.disable');
     Route::get('accounts/{account}/duplicate', 'Banking\Accounts@duplicate')->name('accounts.duplicate');