From c31c097e191894d3737307d8bef2da0d233a6e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 10 Nov 2020 19:15:54 +0300
Subject: [PATCH] Change selectAddNewGroup to selectRemoteAddNewGroup

---
 app/Http/Controllers/Auth/Users.php           |  4 +-
 app/Http/Controllers/Banking/Transactions.php |  2 +-
 app/Http/Controllers/Common/Items.php         |  4 +-
 app/Http/Controllers/Modals/Items.php         |  2 +-
 app/Http/Controllers/Purchases/Bills.php      | 16 +--
 app/Http/Controllers/Purchases/Payments.php   | 16 +--
 app/Http/Controllers/Sales/Invoices.php       | 16 +--
 app/Http/Controllers/Sales/Revenues.php       | 16 +--
 app/Http/Controllers/Settings/Defaults.php    |  4 +-
 app/Providers/Form.php                        |  8 ++
 config/setting.php                            |  1 +
 resources/views/common/items/create.blade.php |  2 +-
 resources/views/common/items/edit.blade.php   |  2 +-
 resources/views/modals/items/create.blade.php |  2 +-
 ...ulti_select_remote_add_new_group.blade.php | 98 +++++++++++++++++++
 .../select_remote_add_new_group.blade.php     | 90 +++++++++++++++++
 .../views/purchases/bills/create.blade.php    |  4 +-
 .../views/purchases/bills/edit.blade.php      |  4 +-
 .../views/purchases/bills/index.blade.php     |  2 +-
 .../views/purchases/payments/create.blade.php |  4 +-
 .../views/purchases/payments/edit.blade.php   |  4 +-
 .../views/sales/invoices/create.blade.php     |  4 +-
 resources/views/sales/invoices/edit.blade.php |  4 +-
 .../views/sales/revenues/create.blade.php     |  4 +-
 resources/views/sales/revenues/edit.blade.php |  4 +-
 .../views/settings/default/edit.blade.php     |  4 +-
 26 files changed, 247 insertions(+), 74 deletions(-)
 create mode 100644 resources/views/partials/form/multi_select_remote_add_new_group.blade.php
 create mode 100644 resources/views/partials/form/select_remote_add_new_group.blade.php

diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php
index dfff5b28a..6221d20b1 100644
--- a/app/Http/Controllers/Auth/Users.php
+++ b/app/Http/Controllers/Auth/Users.php
@@ -58,7 +58,7 @@ class Users extends Controller
             return $r->hasPermission('read-client-portal');
         });
 
-        $companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id');
+        $companies = user()->companies()->take(setting('default.select_limit'))->get()->sortBy('name')->pluck('name', 'id');
 
         return view('auth.users.create', compact('roles', 'companies', 'landing_pages'));
     }
@@ -123,7 +123,7 @@ class Users extends Controller
             });
         }
 
-        $companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id');
+        $companies = user()->companies()->take(setting('default.select_limit'))->get()->sortBy('name')->pluck('name', 'id');
 
         return view('auth.users.edit', compact('user', 'companies', 'roles', 'landing_pages'));
     }
diff --git a/app/Http/Controllers/Banking/Transactions.php b/app/Http/Controllers/Banking/Transactions.php
index 9ec181b73..0daceef6a 100644
--- a/app/Http/Controllers/Banking/Transactions.php
+++ b/app/Http/Controllers/Banking/Transactions.php
@@ -22,7 +22,7 @@ class Transactions extends Controller
     {
         $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
 
-        $types = collect(['expense' => 'Expense', 'income' => 'Income'])
+        $types = collect(['expense' => trans_choice('general.expenses', 1), 'income' => trans_choice('general.incomes', 1)])
             ->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), '');
 
         $request_type = !request()->has('type') ? ['income', 'expense'] : request('type');
diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php
index 180a95499..1f99856f9 100644
--- a/app/Http/Controllers/Common/Items.php
+++ b/app/Http/Controllers/Common/Items.php
@@ -50,9 +50,9 @@ class Items extends Controller
      */
     public function create()
     {
-        $categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
-        $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
+        $taxes = Tax::enabled()->orderBy('name')->get()->take(setting('default.select_limit'))->pluck('title', 'id');
 
         return view('common.items.create', compact('categories', 'taxes'));
     }
diff --git a/app/Http/Controllers/Modals/Items.php b/app/Http/Controllers/Modals/Items.php
index 0c5f50f46..23cac8104 100644
--- a/app/Http/Controllers/Modals/Items.php
+++ b/app/Http/Controllers/Modals/Items.php
@@ -30,7 +30,7 @@ class Items extends Controller
      */
     public function create(IRequest $request)
     {
-        $categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 
diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php
index a26f33f28..4fef9896c 100644
--- a/app/Http/Controllers/Purchases/Bills.php
+++ b/app/Http/Controllers/Purchases/Bills.php
@@ -39,13 +39,7 @@ class Bills extends Controller
     {
         $bills = Bill::with('contact', 'transactions')->collect(['billed_at'=> 'desc']);
 
-        $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
-
-        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
-
-        $statuses = $this->getBillStatuses();
-
-        return $this->response('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
+        return $this->response('purchases.bills.index', compact('bills'));
     }
 
     /**
@@ -96,7 +90,7 @@ class Bills extends Controller
      */
     public function create()
     {
-        $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
+        $vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
 
@@ -106,7 +100,7 @@ class Bills extends Controller
 
         $taxes = Tax::enabled()->orderBy('name')->get();
 
-        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $number = $this->getNextBillNumber();
 
@@ -192,7 +186,7 @@ class Bills extends Controller
      */
     public function edit(Bill $bill)
     {
-        $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
+        $vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
 
@@ -202,7 +196,7 @@ class Bills extends Controller
 
         $taxes = Tax::enabled()->orderBy('name')->get();
 
-        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         return view('purchases.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }
diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php
index 21b4cea43..83b10c9e8 100644
--- a/app/Http/Controllers/Purchases/Payments.php
+++ b/app/Http/Controllers/Purchases/Payments.php
@@ -32,13 +32,7 @@ class Payments extends Controller
     {
         $payments = Transaction::with('account', 'bill', 'category', 'contact')->expense()->isNotTransfer()->collect(['paid_at'=> 'desc']);
 
-        $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
-
-        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
-
-        $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
-
-        return $this->response('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
+        return $this->response('purchases.payments.index', compact('payments'));
     }
 
     /**
@@ -66,9 +60,9 @@ class Payments extends Controller
 
         $currency = Currency::where('code', $account_currency_code)->first();
 
-        $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
+        $vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
-        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 
@@ -154,9 +148,9 @@ class Payments extends Controller
 
         $currency = Currency::where('code', $payment->currency_code)->first();
 
-        $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id');
+        $vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
-        $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 
diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php
index d15ff5847..252759165 100644
--- a/app/Http/Controllers/Sales/Invoices.php
+++ b/app/Http/Controllers/Sales/Invoices.php
@@ -40,13 +40,7 @@ class Invoices extends Controller
     {
         $invoices = Invoice::with('contact', 'transactions')->collect(['invoice_number'=> 'desc']);
 
-        $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
-
-        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
-
-        $statuses = $this->getInvoiceStatuses();
-
-        return $this->response('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
+        return $this->response('sales.invoices.index', compact('invoices'));
     }
 
     /**
@@ -99,7 +93,7 @@ class Invoices extends Controller
      */
     public function create()
     {
-        $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
+        $customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
 
@@ -109,7 +103,7 @@ class Invoices extends Controller
 
         $taxes = Tax::enabled()->orderBy('name')->get();
 
-        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $number = $this->getNextInvoiceNumber();
 
@@ -195,7 +189,7 @@ class Invoices extends Controller
      */
     public function edit(Invoice $invoice)
     {
-        $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
+        $customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
 
@@ -205,7 +199,7 @@ class Invoices extends Controller
 
         $taxes = Tax::enabled()->orderBy('name')->get();
 
-        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         return view('sales.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
     }
diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php
index ead04da46..d13d54a9d 100644
--- a/app/Http/Controllers/Sales/Revenues.php
+++ b/app/Http/Controllers/Sales/Revenues.php
@@ -32,13 +32,7 @@ class Revenues extends Controller
     {
         $revenues = Transaction::with('account', 'category', 'contact', 'invoice')->income()->isNotTransfer()->collect(['paid_at'=> 'desc']);
 
-        $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
-
-        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
-
-        $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
-
-        return $this->response('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
+        return $this->response('sales.revenues.index', compact('revenues'));
     }
 
     /**
@@ -66,9 +60,9 @@ class Revenues extends Controller
 
         $currency = Currency::where('code', $account_currency_code)->first();
 
-        $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
+        $customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
-        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 
@@ -154,9 +148,9 @@ class Revenues extends Controller
 
         $currency = Currency::where('code', $revenue->currency_code)->first();
 
-        $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id');
+        $customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
-        $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
+        $categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
 
diff --git a/app/Http/Controllers/Settings/Defaults.php b/app/Http/Controllers/Settings/Defaults.php
index 818cfaf8c..ea1fd0f65 100644
--- a/app/Http/Controllers/Settings/Defaults.php
+++ b/app/Http/Controllers/Settings/Defaults.php
@@ -17,8 +17,8 @@ class Defaults extends Controller
 
         $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
 
-        $sales_categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id');
-        $purchases_categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id');
+        $sales_categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
+        $purchases_categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 
diff --git a/app/Providers/Form.php b/app/Providers/Form.php
index 69395ae74..24d19c34b 100644
--- a/app/Providers/Form.php
+++ b/app/Providers/Form.php
@@ -59,6 +59,10 @@ class Form extends Provider
             'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required'], 'col' => 'col-md-6', 'group_class' => null
         ]);
 
+        Facade::component('multiSelectRemoteAddNewGroup', 'partials.form.multi_select_remote_add_new_group', [
+            'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required', 'path' => ''], 'col' => 'col-md-6', 'group_class' => null
+        ]);
+
         Facade::component('selectGroup', 'partials.form.select_group', [
             'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required'], 'col' => 'col-md-6', 'group_class' => null
         ]);
@@ -79,6 +83,10 @@ class Form extends Provider
             'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required'], 'col' => 'col-md-6', 'group_class' => null
         ]);
 
+        Facade::component('selectRemoteAddNewGroup', 'partials.form.select_remote_add_new_group', [
+            'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required', 'path' => ''], 'col' => 'col-md-6', 'group_class' => null
+        ]);
+
         Facade::component('textareaGroup', 'partials.form.textarea_group', [
             'name', 'text', 'icon', 'value' => null, 'attributes' => ['rows' => '3'], 'col' => 'col-md-12', 'group_class' => null
         ]);
diff --git a/config/setting.php b/config/setting.php
index 8f0ce3c14..eb59a6b44 100644
--- a/config/setting.php
+++ b/config/setting.php
@@ -120,6 +120,7 @@ return [
             'locale'                    => env('SETTING_FALLBACK_DEFAULT_LOCALE', 'en-GB'),
             'list_limit'                => env('SETTING_FALLBACK_DEFAULT_LIST_LIMIT', '25'),
             'payment_method'            => env('SETTING_FALLBACK_DEFAULT_PAYMENT_METHOD', 'offline-payments.cash.1'),
+            'select_limit'              => env('SETTING_FALLBACK_DEFAULT_SELECT_LIMIT', '10'),
         ],
         'email' => [
             'protocol'                  => env('SETTING_FALLBACK_EMAIL_PROTOCOL', 'mail'),
diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php
index 62023f1a7..f3f90ca52 100644
--- a/resources/views/common/items/create.blade.php
+++ b/resources/views/common/items/create.blade.php
@@ -27,7 +27,7 @@
 
                     {{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['path' => route('modals.categories.create') . '?type=item']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['path' => route('modals.categories.create') . '?type=item', 'remote_action' => route('categories.index'). '?type=item', 'remote_type' => 'category']) }}
 
                     {{ Form::fileGroup('picture', trans_choice('general.pictures', 1), 'plus') }}
 
diff --git a/resources/views/common/items/edit.blade.php b/resources/views/common/items/edit.blade.php
index e41c742ae..8e429d902 100644
--- a/resources/views/common/items/edit.blade.php
+++ b/resources/views/common/items/edit.blade.php
@@ -28,7 +28,7 @@
 
                     {{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['path' => route('modals.categories.create') . '?type=item']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['path' => route('modals.categories.create') . '?type=item', 'remote_action' => route('categories.index'). '?type=item', 'remote_type' => 'category']) }}
 
                     {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }}
 
diff --git a/resources/views/modals/items/create.blade.php b/resources/views/modals/items/create.blade.php
index 64f64fa16..ba7250919 100644
--- a/resources/views/modals/items/create.blade.php
+++ b/resources/views/modals/items/create.blade.php
@@ -18,7 +18,7 @@
 
         {{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }}
 
-        {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null) }}
+        {{ Form::selectRemoteGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['remote_action' => route('categories.index'). '?type=item', 'remote_type' => 'category']) }}
 
         {!! Form::hidden('enabled', '1', []) !!}
     </div>
diff --git a/resources/views/partials/form/multi_select_remote_add_new_group.blade.php b/resources/views/partials/form/multi_select_remote_add_new_group.blade.php
new file mode 100644
index 000000000..b00f49516
--- /dev/null
+++ b/resources/views/partials/form/multi_select_remote_add_new_group.blade.php
@@ -0,0 +1,98 @@
+@stack($name . '_input_start')
+
+    <akaunting-select-remote
+        class="{{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
+
+        id="form-select-{{ $name }}"
+
+        @if (!empty($attributes['v-error']))
+        :form-classes="[{'has-error': {{ $attributes['v-error'] }} }]"
+        @else
+        :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
+        @endif
+
+        icon="{{ $icon }}"
+        title="{{ $text }}"
+        placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
+        name="{{ $name }}"
+        :options="{{ json_encode($values) }}"
+
+        @if (!empty($selected) || old($name))
+        :value="{{ json_encode(old($name, $selected)) }}"
+        @endif
+
+        @if (!empty($attributes['model']))
+        :model="{{ $attributes['model'] }}"
+        @endif
+
+        :multiple="true"
+
+        :add-new="{{ json_encode([
+            'status' => true,
+            'text' => trans('general.add_new'),
+            'path' => isset($attributes['path']) ? $attributes['path']: false,
+            'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
+            'field' => [
+                'key' => isset($attributes['field']['key']) ? $attributes['field']['key'] : 'id',
+                'value' => isset($attributes['field']['value']) ? $attributes['field']['value'] : 'name'
+            ],
+            'new_text' => trans('modules.new'),
+            'buttons' => [
+                'cancel' => [
+                    'text' => trans('general.cancel'),
+                    'class' => 'btn-outline-secondary'
+                ],
+                'confirm' => [
+                    'text' => trans('general.save'),
+                    'class' => 'btn-success'
+                ]
+            ]
+        ])}}"
+
+        @if (!empty($attributes['collapse']))
+        :collapse="true"
+        @endif
+
+        @if (!empty($attributes['v-model']))
+        @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
+        @elseif (!empty($attributes['data-field']))
+        @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
+        @else
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
+        @endif
+
+        @if (!empty($attributes['change']))
+        @change="{{ $attributes['change'] }}($event)"
+        @endif
+
+        @if (isset($attributes['readonly']))
+        :readonly="{{ $attributes['readonly'] }}"
+        @endif
+
+        @if (isset($attributes['disabled']))
+        :disabled="{{ $attributes['disabled'] }}"
+        @endif
+
+        @if (isset($attributes['show']))
+        v-if="{{ $attributes['show'] }}"
+        @endif
+
+        @if (isset($attributes['v-error-message']))
+        :form-error="{{ $attributes['v-error-message'] }}"
+        @else
+        :form-error="form.errors.get('{{ $name }}')"
+        @endif
+
+        remote-action="{{ $attributes['remote_action'] }}"
+        remote-type="{{ $attributes['remote_type'] }}"
+
+        @if (!empty($attributes['currecny_code'])) 
+        currency-code="{{ $attributes['currecny_code'] }}"
+        @endif
+
+        loading-text="{{ trans('general.loading') }}"
+        no-data-text="{{ trans('general.no_data') }}"
+        no-matching-data-text="{{ trans('general.no_matching_data') }}"
+    ></akaunting-select-remote>
+
+@stack($name . '_input_end')
diff --git a/resources/views/partials/form/select_remote_add_new_group.blade.php b/resources/views/partials/form/select_remote_add_new_group.blade.php
new file mode 100644
index 000000000..542acef27
--- /dev/null
+++ b/resources/views/partials/form/select_remote_add_new_group.blade.php
@@ -0,0 +1,90 @@
+@stack($name . '_input_start')
+
+    <akaunting-select-remote
+        class="{{ $col }}{{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
+
+        @if (!empty($attributes['v-error']))
+        :form-classes="[{'has-error': {{ $attributes['v-error'] }} }]"
+        @else
+        :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
+        @endif
+
+        icon="{{ $icon }}"
+        title="{{ $text }}"
+        placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
+        name="{{ $name }}"
+        :options="{{ json_encode($values) }}"
+
+        @if (isset($selected) || old($name))
+        value="{{ old($name, $selected) }}"
+        @endif
+
+        @if (!empty($attributes['model']))
+        :model="{{ $attributes['model'] }}"
+        @endif
+
+        :add-new="{{ json_encode([
+            'status' => true,
+            'text' => trans('general.add_new'),
+            'path' => isset($attributes['path']) ? $attributes['path']: false,
+            'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
+            'field' => [
+                'key' => isset($attributes['field']['key']) ? $attributes['field']['key'] : 'id',
+                'value' => isset($attributes['field']['value']) ? $attributes['field']['value'] : 'name'
+            ],
+            'new_text' => trans('modules.new'),
+            'buttons' => [
+                'cancel' => [
+                    'text' => trans('general.cancel'),
+                    'class' => 'btn-outline-secondary'
+                ],
+                'confirm' => [
+                    'text' => trans('general.save'),
+                    'class' => 'btn-success'
+                ]
+            ]
+        ])}}"
+
+        @if (!empty($attributes['v-model']))
+        @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
+        @elseif (!empty($attributes['data-field']))
+        @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
+        @else
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
+        @endif
+
+        @if (!empty($attributes['change']))
+        @change="{{ $attributes['change'] }}($event)"
+        @endif
+
+        @if (isset($attributes['readonly']))
+        :readonly="{{ $attributes['readonly'] }}"
+        @endif
+
+        @if (isset($attributes['disabled']))
+        :disabled="{{ $attributes['disabled'] }}"
+        @endif
+
+        @if (isset($attributes['show']))
+        v-if="{{ $attributes['show'] }}"
+        @endif
+
+        @if (isset($attributes['v-error-message']))
+        :form-error="{{ $attributes['v-error-message'] }}"
+        @else
+        :form-error="form.errors.get('{{ $name }}')"
+        @endif
+
+        remote-action="{{ $attributes['remote_action'] }}"
+        remote-type="'{{ $attributes['remote_type'] }}"
+
+        @if (!empty($attributes['currecny_code'])) 
+        currency-code="{{ $attributes['currecny_code'] }}"
+        @endif
+
+        loading-text="{{ trans('general.loading') }}"
+        no-data-text="{{ trans('general.no_data') }}"
+        no-matching-data-text="{{ trans('general.no_matching_data') }}"
+    ></akaunting-select-remote>
+
+@stack($name . '_input_end')
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index f730ba22c..889c5d671 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -17,7 +17,7 @@
 
             <div class="card-body">
                 <div class="row">
-                    {{ Form::selectAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, config('general.vendors'), ['required' => 'required', 'path' => route('modals.vendors.create'), 'change' => 'onChangeContact']) }}
+                    {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, setting('default.contact'), ['required' => 'required', 'change' => 'onChangeContact', 'path' => route('modals.vendors.create'), 'remote_action' => route('vendors.index'), 'remote_type' => 'vendor']) }}
 
                     {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'model' => 'form.currency_code', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
@@ -194,7 +194,7 @@
 
                     {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.expense_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.expense_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense', 'remote_action' => route('categories.index'). '?type=expense', 'remote_type' => 'category']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 4f0218830..e665d1bd3 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -18,7 +18,7 @@
 
             <div class="card-body">
                 <div class="row">
-                    {{ Form::selectAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, $bill->contact_id, ['required' => 'required', 'path' => route('modals.vendors.create'), 'change' => 'onChangeContact']) }}
+                    {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, $bill->contact_id, ['required' => 'required', 'change' => 'onChangeContact', 'path' => route('modals.vendors.create'), 'remote_action' => route('vendors.index'), 'remote_type' => 'vendor']) }}
 
                     {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $bill->currency_code, ['required' => 'required', 'model' => 'form.currency_code', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
@@ -195,7 +195,7 @@
 
                     {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $bill->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $bill->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense', 'remote_action' => route('categories.index'). '?type=expense', 'remote_type' => 'category']) }}
 
                     {{ Form::recurring('edit', $bill) }}
 
diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php
index 97f715f75..70af59814 100644
--- a/resources/views/purchases/bills/index.blade.php
+++ b/resources/views/purchases/bills/index.blade.php
@@ -67,7 +67,7 @@
 
                                         <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
                                             <a class="dropdown-item" href="{{ route('bills.show', $item->id) }}">{{ trans('general.show') }}</a>
-                                            @if (!$item->reconciled)
+                                            @if (!$item->reconciled)""
                                                 <a class="dropdown-item" href="{{ route('bills.edit', $item->id) }}">{{ trans('general.edit') }}</a>
                                             @endif
                                             <div class="dropdown-divider"></div>
diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php
index 493b857a2..e963a3465 100644
--- a/resources/views/purchases/payments/create.blade.php
+++ b/resources/views/purchases/payments/create.blade.php
@@ -26,11 +26,11 @@
 
                     {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}
 
-                    {{ Form::selectAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, setting('default.vendor'), ['path' => route('modals.vendors.create')]) }}
+                    {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, setting('default.vendor'), ['path' => route('modals.vendors.create'), 'remote_action' => route('vendors.index'), 'remote_type' => 'vendor']) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.expense_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.expense_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense', 'remote_action' => route('categories.index'). '?type=expense', 'remote_type' => 'category']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/purchases/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php
index 9000303b7..31a65e97d 100644
--- a/resources/views/purchases/payments/edit.blade.php
+++ b/resources/views/purchases/payments/edit.blade.php
@@ -45,11 +45,11 @@
 
                     {{ Form::selectAddNewGroup('account_id',  trans_choice('general.accounts', 1), 'university', $accounts, $payment->account_id, ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}
 
-                    {{ Form::selectAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, $payment->contact_id, ['path' => route('modals.vendors.create')]) }}
+                    {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, $payment->contact_id, ['path' => route('modals.vendors.create'), 'remote_action' => route('vendors.index'), 'remote_type' => 'vendor']) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $payment->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $payment->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense', 'remote_action' => route('categories.index'). '?type=expense', 'remote_type' => 'category']) }}
 
                     {{ Form::recurring('edit', $payment) }}
 
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index 25931a413..4bd9e32e4 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -17,7 +17,7 @@
 
             <div class="card-body">
                 <div class="row">
-                    {{ Form::selectAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, config('general.customers'), ['required' => 'required', 'path' => route('modals.customers.create'), 'change' => 'onChangeContact']) }}
+                    {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, setting('default.contact'), ['required' => 'required', 'change' => 'onChangeContact', 'path' => route('modals.customers.create'), 'remote_action' => route('customers.index'), 'remote_type' => 'customer']) }}
 
                     {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'model' => 'form.currency_code', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
@@ -196,7 +196,7 @@
 
                     {{ Form::textareaGroup('footer', trans('general.footer'), '', setting('invoice.footer'), ['rows' => '3'], 'col-md-6') }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.income_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.income_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income', 'remote_action' => route('categories.index'). '?type=income', 'remote_type' => 'category']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index fc363593e..dcca01385 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -18,7 +18,7 @@
 
             <div class="card-body">
                 <div class="row">
-                    {{ Form::selectAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, $invoice->contact_id, ['required' => 'required', 'path' => route('modals.customers.create'), 'change' => 'onChangeContact']) }}
+                    {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, $invoice->contact_id, ['required' => 'required', 'change' => 'onChangeContact', 'path' => route('modals.customers.create'), 'remote_action' => route('customers.index'), 'remote_type' => 'customer']) }}
 
                     {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $invoice->currency_code, ['required' => 'required', 'model' => 'form.currency_code', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
@@ -197,7 +197,7 @@
 
                     {{ Form::textareaGroup('footer', trans('general.footer'), '', null, ['rows' => '3'], 'col-md-6') }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $invoice->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $invoice->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income', 'remote_action' => route('categories.index'). '?type=income', 'remote_type' => 'category']) }}
 
                     {{ Form::recurring('edit', $invoice) }}
 
diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php
index 36308d1b8..e26ead0d7 100644
--- a/resources/views/sales/revenues/create.blade.php
+++ b/resources/views/sales/revenues/create.blade.php
@@ -26,11 +26,11 @@
 
                     {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}
 
-                    {{ Form::selectAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, setting('default.contact'), ['path' => route('modals.customers.create')]) }}
+                    {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, setting('default.contact'), ['path' => route('modals.customers.create'), 'remote_action' => route('customers.index'), 'remote_type' => 'customer']) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.income_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.income_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income', 'remote_action' => route('categories.index'). '?type=income', 'remote_type' => 'category']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/sales/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php
index 9c3bfb2cc..f67bef82f 100644
--- a/resources/views/sales/revenues/edit.blade.php
+++ b/resources/views/sales/revenues/edit.blade.php
@@ -45,11 +45,11 @@
 
                     {{ Form::selectAddNewGroup('account_id',  trans_choice('general.accounts', 1), 'university', $accounts, $revenue->account_id, ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}
 
-                    {{ Form::selectAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, $revenue->contact_id, ['path' => route('modals.customers.create')]) }}
+                    {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, $revenue->contact_id, ['path' => route('modals.customers.create'), 'remote_action' => route('customers.index'), 'remote_type' => 'customer']) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $revenue->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
+                    {{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $revenue->category_id, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income', 'remote_action' => route('categories.index'). '?type=income', 'remote_type' => 'category']) }}
 
                     {{ Form::recurring('edit', $revenue) }}
 
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index 9f22b9e29..84dbc6740 100644
--- a/resources/views/settings/default/edit.blade.php
+++ b/resources/views/settings/default/edit.blade.php
@@ -22,9 +22,9 @@
 
                 {{ Form::selectGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), []) }}
 
-                {{ Form::selectGroup('income_category', trans('settings.default.income_category'), 'folder', $sales_categories, setting('default.income_category'), []) }}
+                {{ Form::selectRemoteGroup('income_category', trans('settings.default.income_category'), 'folder', $sales_categories, setting('default.income_category'), ['remote_action' => route('categories.index'). '?type=income', 'remote_type' => 'category']) }}
 
-                {{ Form::selectGroup('expense_category', trans('settings.default.expense_category'), 'folder', $purchases_categories, setting('default.expense_category'), []) }}
+                {{ Form::selectRemoteGroup('expense_category', trans('settings.default.expense_category'), 'folder', $purchases_categories, setting('default.expense_category'), ['remote_action' => route('categories.index'). '?type=expense', 'remote_type' => 'category']) }}
 
                 {{ Form::selectGroup('tax', trans_choice('general.taxes', 1), 'percent', $taxes, setting('default.tax'), []) }}