From e5a7f5b15edb2c05a16a22268989f0fe85e1bf32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Fri, 6 Nov 2020 00:43:46 +0300
Subject: [PATCH 01/19] added responsable class to index

---
 app/Abstracts/Http/Controller.php             | 22 ++++++++
 app/Abstracts/Http/Response.php               | 55 +++++++++++++++++++
 app/Abstracts/Model.php                       |  9 ++-
 app/Console/Stubs/Modules/controller.stub     | 10 +++-
 app/Http/Controllers/Auth/Permissions.php     |  2 +-
 app/Http/Controllers/Auth/Roles.php           |  2 +-
 app/Http/Controllers/Auth/Users.php           |  2 +-
 app/Http/Controllers/Banking/Accounts.php     |  2 +-
 .../Controllers/Banking/Reconciliations.php   |  2 +-
 app/Http/Controllers/Banking/Transactions.php |  2 +-
 app/Http/Controllers/Banking/Transfers.php    |  8 +--
 app/Http/Controllers/Common/Companies.php     |  2 +-
 app/Http/Controllers/Common/Dashboards.php    |  2 +-
 app/Http/Controllers/Common/Items.php         |  2 +-
 app/Http/Controllers/Common/Reports.php       |  2 +-
 app/Http/Controllers/Modules/Home.php         |  2 +-
 app/Http/Controllers/Modules/My.php           |  2 +-
 app/Http/Controllers/Portal/Invoices.php      |  2 +-
 app/Http/Controllers/Portal/Payments.php      |  2 +-
 app/Http/Controllers/Purchases/Bills.php      |  2 +-
 app/Http/Controllers/Purchases/Payments.php   |  2 +-
 app/Http/Controllers/Purchases/Vendors.php    |  2 +-
 app/Http/Controllers/Sales/Customers.php      |  2 +-
 app/Http/Controllers/Sales/Invoices.php       |  2 +-
 app/Http/Controllers/Sales/Revenues.php       |  2 +-
 app/Http/Controllers/Settings/Categories.php  |  2 +-
 app/Http/Controllers/Settings/Currencies.php  |  2 +-
 app/Http/Controllers/Settings/Settings.php    |  2 +-
 app/Http/Controllers/Settings/Taxes.php       |  2 +-
 app/Http/Responses/Common/Items.php           | 10 ++++
 app/Models/Common/Company.php                 |  9 ++-
 31 files changed, 139 insertions(+), 32 deletions(-)
 create mode 100644 app/Abstracts/Http/Response.php
 create mode 100644 app/Http/Responses/Common/Items.php

diff --git a/app/Abstracts/Http/Controller.php b/app/Abstracts/Http/Controller.php
index f366929d5..d1f7dce54 100644
--- a/app/Abstracts/Http/Controller.php
+++ b/app/Abstracts/Http/Controller.php
@@ -2,6 +2,7 @@
 
 namespace App\Abstracts\Http;
 
+use App\Abstracts\Http\Response;
 use App\Traits\Jobs;
 use App\Traits\Relationships;
 use Illuminate\Database\Eloquent\Collection;
@@ -99,4 +100,25 @@ abstract class Controller extends BaseController
 
         return new LengthAwarePaginator($items->forPage($page, $perPage), $items->count(), $perPage, $page, $options);
     }
+
+    /**
+     * Generate a response based on request type like HTML, JSON, or anything else.
+     *
+     * @param string $view
+     * @param array $data
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function response($view, $data = [])
+    {
+        $class_name = str_replace('Controllers', 'Responses', (new \ReflectionClass($this))->getName());
+
+        if (class_exists($class_name)) {
+            $response = new $class_name($view, $data);
+        } else {
+            $response = new class($view, $data) extends Response {};
+        }
+
+        return $response;
+    }
 }
diff --git a/app/Abstracts/Http/Response.php b/app/Abstracts/Http/Response.php
new file mode 100644
index 000000000..75a3dac50
--- /dev/null
+++ b/app/Abstracts/Http/Response.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Abstracts\Http;
+
+use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+
+abstract class Response implements Responsable
+{
+    protected $accepts = ['json', 'rss'];
+
+    protected $view;
+
+    protected $data;
+
+    public function __construct($view, $data)
+    {
+        $this->view = $view;
+        $this->data = $data;
+    }
+
+    public function toJson()
+    {
+        return response()->json([
+            'success'   => true,
+            'error'     => false,
+            'data'      => Arr::first($this->data),
+            'message'   => '',
+        ]);
+    }
+
+    public function toHtml()
+    {
+        return view($this->view, $this->data);
+    }
+
+    public function toResponse($request)
+    {
+        foreach ($this->accepts as $accept) {
+            $request_method = 'expects' . Str::studly($accept);
+            $response_method = 'to' . Str::studly($accept);
+
+            if (!method_exists($request, $request_method) || !method_exists($this, $response_method)) {
+                continue;
+            }
+
+            if ($request->{$request_method}()) {
+                return $this->{$response_method}();
+            }
+        }
+
+        return $this->toHtml();
+    }
+}
diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php
index f2fd309ea..460de969c 100644
--- a/app/Abstracts/Model.php
+++ b/app/Abstracts/Model.php
@@ -70,9 +70,16 @@ abstract class Model extends Eloquent
         $request = request();
 
         $search = $request->get('search');
+
+        $query->usingSearchString($search)->sortable($sort);
+
+        if ($request->expectsJson()) {
+            return $query->get();
+        }
+
         $limit = $request->get('limit', setting('default.list_limit', '25'));
 
-        return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
+        return $query->paginate($limit);
     }
 
     /**
diff --git a/app/Console/Stubs/Modules/controller.stub b/app/Console/Stubs/Modules/controller.stub
index 4a62c49dd..1dcac0c56 100644
--- a/app/Console/Stubs/Modules/controller.stub
+++ b/app/Console/Stubs/Modules/controller.stub
@@ -3,7 +3,6 @@
 namespace $CLASS_NAMESPACE$;
 
 use App\Abstracts\Http\Controller;
-use App\Abstracts\Http\FormRequest;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -11,15 +10,17 @@ class $CLASS$ extends Controller
 {
     /**
      * Display a listing of the resource.
+     *
      * @return Response
      */
     public function index()
     {
-        return view('$ALIAS$::index');
+        return $this->response('$ALIAS$::index');
     }
 
     /**
      * Show the form for creating a new resource.
+     *
      * @return Response
      */
     public function create()
@@ -29,6 +30,7 @@ class $CLASS$ extends Controller
 
     /**
      * Store a newly created resource in storage.
+     *
      * @param Request $request
      * @return Response
      */
@@ -39,6 +41,7 @@ class $CLASS$ extends Controller
 
     /**
      * Show the specified resource.
+     *
      * @param int $id
      * @return Response
      */
@@ -49,6 +52,7 @@ class $CLASS$ extends Controller
 
     /**
      * Show the form for editing the specified resource.
+     *
      * @param int $id
      * @return Response
      */
@@ -59,6 +63,7 @@ class $CLASS$ extends Controller
 
     /**
      * Update the specified resource in storage.
+     *
      * @param Request $request
      * @param int $id
      * @return Response
@@ -70,6 +75,7 @@ class $CLASS$ extends Controller
 
     /**
      * Remove the specified resource from storage.
+     *
      * @param int $id
      * @return Response
      */
diff --git a/app/Http/Controllers/Auth/Permissions.php b/app/Http/Controllers/Auth/Permissions.php
index 5fadd7f0a..555435dbb 100644
--- a/app/Http/Controllers/Auth/Permissions.php
+++ b/app/Http/Controllers/Auth/Permissions.php
@@ -20,7 +20,7 @@ class Permissions extends Controller
     {
         $permissions = Permission::collect();
 
-        return view('auth.permissions.index', compact('permissions'));
+        return $this->response('auth.permissions.index', compact('permissions'));
     }
 
     /**
diff --git a/app/Http/Controllers/Auth/Roles.php b/app/Http/Controllers/Auth/Roles.php
index 53a74b561..ab4e042f5 100644
--- a/app/Http/Controllers/Auth/Roles.php
+++ b/app/Http/Controllers/Auth/Roles.php
@@ -21,7 +21,7 @@ class Roles extends Controller
     {
         $roles = Role::collect();
 
-        return view('auth.roles.index', compact('roles'));
+        return $this->response('auth.roles.index', compact('roles'));
     }
 
     /**
diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php
index c43aac6e7..dfff5b28a 100644
--- a/app/Http/Controllers/Auth/Users.php
+++ b/app/Http/Controllers/Auth/Users.php
@@ -37,7 +37,7 @@ class Users extends Controller
     {
         $users = User::with('media', 'roles')->collect();
 
-        return view('auth.users.index', compact('users'));
+        return $this->response('auth.users.index', compact('users'));
     }
 
     /**
diff --git a/app/Http/Controllers/Banking/Accounts.php b/app/Http/Controllers/Banking/Accounts.php
index 08e9f89e4..0683c4e59 100644
--- a/app/Http/Controllers/Banking/Accounts.php
+++ b/app/Http/Controllers/Banking/Accounts.php
@@ -21,7 +21,7 @@ class Accounts extends Controller
     {
         $accounts = Account::collect();
 
-        return view('banking.accounts.index', compact('accounts'));
+        return $this->response('banking.accounts.index', compact('accounts'));
     }
 
     /**
diff --git a/app/Http/Controllers/Banking/Reconciliations.php b/app/Http/Controllers/Banking/Reconciliations.php
index 81f0f8229..fe040cfdd 100644
--- a/app/Http/Controllers/Banking/Reconciliations.php
+++ b/app/Http/Controllers/Banking/Reconciliations.php
@@ -26,7 +26,7 @@ class Reconciliations extends Controller
 
         $accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'));
 
-        return view('banking.reconciliations.index', compact('reconciliations', 'accounts'));
+        return $this->response('banking.reconciliations.index', compact('reconciliations', 'accounts'));
     }
 
     /**
diff --git a/app/Http/Controllers/Banking/Transactions.php b/app/Http/Controllers/Banking/Transactions.php
index 7cfeded9c..9ec181b73 100644
--- a/app/Http/Controllers/Banking/Transactions.php
+++ b/app/Http/Controllers/Banking/Transactions.php
@@ -30,7 +30,7 @@ class Transactions extends Controller
 
         $transactions = Transaction::with('account', 'category', 'contact')->collect(['paid_at'=> 'desc']);
 
-        return view('banking.transactions.index', compact('transactions', 'accounts', 'types', 'categories'));
+        return $this->response('banking.transactions.index', compact('transactions', 'accounts', 'types', 'categories'));
     }
 
     /**
diff --git a/app/Http/Controllers/Banking/Transfers.php b/app/Http/Controllers/Banking/Transfers.php
index 64e7b7a71..b9febd0fd 100644
--- a/app/Http/Controllers/Banking/Transfers.php
+++ b/app/Http/Controllers/Banking/Transfers.php
@@ -52,10 +52,10 @@ class Transfers extends Controller
             ];
         }
 
-        $special_key = array(
+        $special_key = [
             'expense_transaction.name' => 'from_account',
             'income_transaction.name' => 'to_account',
-        );
+        ];
 
         $request = request();
 
@@ -77,12 +77,12 @@ class Transfers extends Controller
             array_multisort($sort_order, $sort_type, $data);
         }
 
-        $transfers = $this->paginate($data);
+        $transfers = $request->expectsJson() ? $data : $this->paginate($data);
 
         $accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'))
             ->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
 
-        return view('banking.transfers.index', compact('transfers', 'accounts'));
+        return $this->response('banking.transfers.index', compact('transfers', 'accounts'));
     }
 
     /**
diff --git a/app/Http/Controllers/Common/Companies.php b/app/Http/Controllers/Common/Companies.php
index 2cd575a18..3876b7574 100644
--- a/app/Http/Controllers/Common/Companies.php
+++ b/app/Http/Controllers/Common/Companies.php
@@ -26,7 +26,7 @@ class Companies extends Controller
     {
         $companies = Company::collect();
 
-        return view('common.companies.index', compact('companies'));
+        return $this->response('common.companies.index', compact('companies'));
     }
 
     /**
diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php
index 53afd6784..99a77c24a 100644
--- a/app/Http/Controllers/Common/Dashboards.php
+++ b/app/Http/Controllers/Common/Dashboards.php
@@ -39,7 +39,7 @@ class Dashboards extends Controller
     {
         $dashboards = user()->dashboards()->collect();
 
-        return view('common.dashboards.index', compact('dashboards'));
+        return $this->response('common.dashboards.index', compact('dashboards'));
     }
 
     /**
diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php
index 58214e3ea..180a95499 100644
--- a/app/Http/Controllers/Common/Items.php
+++ b/app/Http/Controllers/Common/Items.php
@@ -30,7 +30,7 @@ class Items extends Controller
     {
         $items = Item::with('category', 'media')->collect();
 
-        return view('common.items.index', compact('items'));
+        return $this->response('common.items.index', compact('items'));
     }
 
     /**
diff --git a/app/Http/Controllers/Common/Reports.php b/app/Http/Controllers/Common/Reports.php
index 93a5fcbf5..d846e96a8 100644
--- a/app/Http/Controllers/Common/Reports.php
+++ b/app/Http/Controllers/Common/Reports.php
@@ -45,7 +45,7 @@ class Reports extends Controller
             $categories[$class->getCategory()][] = $report;
         }
 
-        return view('common.reports.index', compact('categories', 'totals', 'icons'));
+        return $this->response('common.reports.index', compact('categories', 'totals', 'icons'));
     }
 
     /**
diff --git a/app/Http/Controllers/Modules/Home.php b/app/Http/Controllers/Modules/Home.php
index 4465cf47f..358f0c4ca 100644
--- a/app/Http/Controllers/Modules/Home.php
+++ b/app/Http/Controllers/Modules/Home.php
@@ -29,6 +29,6 @@ class Home extends Controller
         $free = $this->getFreeModules($data);
         $installed = Module::all()->pluck('enabled', 'alias')->toArray();
 
-        return view('modules.home.index', compact('pre_sale', 'paid', 'new', 'free', 'installed'));
+        return $this->response('modules.home.index', compact('pre_sale', 'paid', 'new', 'free', 'installed'));
     }
 }
diff --git a/app/Http/Controllers/Modules/My.php b/app/Http/Controllers/Modules/My.php
index cf043fb6b..ded71f548 100644
--- a/app/Http/Controllers/Modules/My.php
+++ b/app/Http/Controllers/Modules/My.php
@@ -21,6 +21,6 @@ class My extends Controller
         $modules = $this->getInstalledModules();
         $installed = Module::where('company_id', '=', session('company_id'))->pluck('enabled', 'alias')->toArray();
 
-        return view('modules.my.index', compact('purchased', 'modules', 'installed'));
+        return $this->response('modules.my.index', compact('purchased', 'modules', 'installed'));
     }
 }
diff --git a/app/Http/Controllers/Portal/Invoices.php b/app/Http/Controllers/Portal/Invoices.php
index dc10e2a0f..e25e8c862 100644
--- a/app/Http/Controllers/Portal/Invoices.php
+++ b/app/Http/Controllers/Portal/Invoices.php
@@ -32,7 +32,7 @@ class Invoices extends Controller
 
         $statuses = $this->getInvoiceStatuses();
 
-        return view('portal.invoices.index', compact('invoices', 'categories', 'statuses'));
+        return $this->response('portal.invoices.index', compact('invoices', 'categories', 'statuses'));
     }
 
     /**
diff --git a/app/Http/Controllers/Portal/Payments.php b/app/Http/Controllers/Portal/Payments.php
index 5357a2e74..82eefc662 100644
--- a/app/Http/Controllers/Portal/Payments.php
+++ b/app/Http/Controllers/Portal/Payments.php
@@ -20,7 +20,7 @@ class Payments extends Controller
 
         $payment_methods = Modules::getPaymentMethods('all');
 
-        return view('portal.payments.index', compact('payments', 'payment_methods'));
+        return $this->response('portal.payments.index', compact('payments', 'payment_methods'));
     }
 
     /**
diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php
index 0f2f8120b..a26f33f28 100644
--- a/app/Http/Controllers/Purchases/Bills.php
+++ b/app/Http/Controllers/Purchases/Bills.php
@@ -45,7 +45,7 @@ class Bills extends Controller
 
         $statuses = $this->getBillStatuses();
 
-        return view('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
+        return $this->response('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
     }
 
     /**
diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php
index e49d77f85..21b4cea43 100644
--- a/app/Http/Controllers/Purchases/Payments.php
+++ b/app/Http/Controllers/Purchases/Payments.php
@@ -38,7 +38,7 @@ class Payments extends Controller
 
         $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
+        return $this->response('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
     }
 
     /**
diff --git a/app/Http/Controllers/Purchases/Vendors.php b/app/Http/Controllers/Purchases/Vendors.php
index 39aaf9df4..766c315ce 100644
--- a/app/Http/Controllers/Purchases/Vendors.php
+++ b/app/Http/Controllers/Purchases/Vendors.php
@@ -30,7 +30,7 @@ class Vendors extends Controller
     {
         $vendors = Contact::with('bills.transactions')->vendor()->collect();
 
-        return view('purchases.vendors.index', compact('vendors'));
+        return $this->response('purchases.vendors.index', compact('vendors'));
     }
 
     /**
diff --git a/app/Http/Controllers/Sales/Customers.php b/app/Http/Controllers/Sales/Customers.php
index af77ce983..179ac68e1 100644
--- a/app/Http/Controllers/Sales/Customers.php
+++ b/app/Http/Controllers/Sales/Customers.php
@@ -28,7 +28,7 @@ class Customers extends Controller
     {
         $customers = Contact::with('invoices.transactions')->customer()->collect();
 
-        return view('sales.customers.index', compact('customers'));
+        return $this->response('sales.customers.index', compact('customers'));
     }
 
     /**
diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php
index 059f3e16e..d15ff5847 100644
--- a/app/Http/Controllers/Sales/Invoices.php
+++ b/app/Http/Controllers/Sales/Invoices.php
@@ -46,7 +46,7 @@ class Invoices extends Controller
 
         $statuses = $this->getInvoiceStatuses();
 
-        return view('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
+        return $this->response('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
     }
 
     /**
diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php
index 14212e8f2..ead04da46 100644
--- a/app/Http/Controllers/Sales/Revenues.php
+++ b/app/Http/Controllers/Sales/Revenues.php
@@ -38,7 +38,7 @@ class Revenues extends Controller
 
         $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
+        return $this->response('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
     }
 
     /**
diff --git a/app/Http/Controllers/Settings/Categories.php b/app/Http/Controllers/Settings/Categories.php
index 9a37b0298..b37a1132c 100644
--- a/app/Http/Controllers/Settings/Categories.php
+++ b/app/Http/Controllers/Settings/Categories.php
@@ -30,7 +30,7 @@ class Categories extends Controller
             'other' => trans_choice('general.others', 1),
         ]);
 
-        return view('settings.categories.index', compact('categories', 'types', 'transfer_id'));
+        return $this->response('settings.categories.index', compact('categories', 'types', 'transfer_id'));
     }
 
     /**
diff --git a/app/Http/Controllers/Settings/Currencies.php b/app/Http/Controllers/Settings/Currencies.php
index 080d11e3f..de310271e 100644
--- a/app/Http/Controllers/Settings/Currencies.php
+++ b/app/Http/Controllers/Settings/Currencies.php
@@ -21,7 +21,7 @@ class Currencies extends Controller
     {
         $currencies = Currency::collect();
 
-        return view('settings.currencies.index', compact('currencies'));
+        return $this->response('settings.currencies.index', compact('currencies'));
     }
 
     /**
diff --git a/app/Http/Controllers/Settings/Settings.php b/app/Http/Controllers/Settings/Settings.php
index 75b4e6c5e..90364505e 100644
--- a/app/Http/Controllers/Settings/Settings.php
+++ b/app/Http/Controllers/Settings/Settings.php
@@ -63,7 +63,7 @@ class Settings extends Controller
             $settings[$alias] = $setting;
         }
 
-        return view('settings.settings.index', ['modules' => $settings]);
+        return $this->response('settings.settings.index', ['modules' => $settings]);
     }
 
     /**
diff --git a/app/Http/Controllers/Settings/Taxes.php b/app/Http/Controllers/Settings/Taxes.php
index d7b75c974..500e32587 100644
--- a/app/Http/Controllers/Settings/Taxes.php
+++ b/app/Http/Controllers/Settings/Taxes.php
@@ -29,7 +29,7 @@ class Taxes extends Controller
             'compound' => trans('taxes.compound'),
         ];
 
-        return view('settings.taxes.index', compact('taxes', 'types'));
+        return $this->response('settings.taxes.index', compact('taxes', 'types'));
     }
 
     /**
diff --git a/app/Http/Responses/Common/Items.php b/app/Http/Responses/Common/Items.php
new file mode 100644
index 000000000..6437e644b
--- /dev/null
+++ b/app/Http/Responses/Common/Items.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Responses\Common;
+
+use App\Abstracts\Http\Response;
+
+class Items extends Response
+{
+    //
+}
diff --git a/app/Models/Common/Company.php b/app/Models/Common/Company.php
index e8cff5716..b4c061d20 100644
--- a/app/Models/Common/Company.php
+++ b/app/Models/Common/Company.php
@@ -275,9 +275,16 @@ class Company extends Eloquent
         $request = request();
 
         $search = $request->get('search');
+
+        $query = user()->companies()->usingSearchString($search)->sortable($sort);
+
+        if ($request->expectsJson()) {
+            return $query->get();
+        }
+
         $limit = $request->get('limit', setting('default.list_limit', '25'));
 
-        return user()->companies()->usingSearchString($search)->sortable($sort)->paginate($limit);
+        return $query->paginate($limit);
     }
 
     /**

From ff843840241db9676272771616fb5087a85a4f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 6 Nov 2020 01:48:49 +0300
Subject: [PATCH 02/19] Search and filter first commit

---
 app/Http/Controllers/Common/BulkActions.php   |   4 +-
 app/View/Components/SearchString.php          |  82 +++
 config/search-string.php                      |   6 +-
 .../assets/js/components/AkauntingSearch.vue  | 587 +++++++++++++-----
 resources/lang/en-GB/general.php              |   2 +-
 .../views/auth/permissions/index.blade.php    |   5 +-
 resources/views/auth/roles/index.blade.php    |   5 +-
 resources/views/auth/users/index.blade.php    |   5 +-
 .../views/banking/accounts/index.blade.php    |   5 +-
 .../banking/reconciliations/index.blade.php   |   5 +-
 .../banking/transactions/index.blade.php      |   5 +-
 .../views/banking/transfers/index.blade.php   |   5 +-
 .../views/common/companies/index.blade.php    |   5 +-
 .../views/common/dashboards/index.blade.php   |   5 +-
 resources/views/common/items/index.blade.php  |   5 +-
 .../views/components/search-string.blade.php  |   7 +
 .../views/purchases/bills/index.blade.php     |   5 +-
 .../views/purchases/payments/index.blade.php  |   5 +-
 .../views/purchases/vendors/index.blade.php   |   5 +-
 .../views/sales/customers/index.blade.php     |   5 +-
 .../views/sales/invoices/index.blade.php      |   5 +-
 .../views/sales/revenues/index.blade.php      |   5 +-
 .../views/settings/categories/index.blade.php |   5 +-
 .../views/settings/currencies/index.blade.php |   5 +-
 .../views/settings/taxes/index.blade.php      |   5 +-
 25 files changed, 552 insertions(+), 231 deletions(-)
 create mode 100644 app/View/Components/SearchString.php
 create mode 100644 resources/views/components/search-string.blade.php

diff --git a/app/Http/Controllers/Common/BulkActions.php b/app/Http/Controllers/Common/BulkActions.php
index e84694553..ef43531a8 100644
--- a/app/Http/Controllers/Common/BulkActions.php
+++ b/app/Http/Controllers/Common/BulkActions.php
@@ -6,9 +6,7 @@ use App\Abstracts\Http\Controller;
 use App\Http\Requests\Common\BulkAction as Request;
 use Illuminate\Support\Str;
 
-class
-
-BulkActions extends Controller
+class BulkActions extends Controller
 {
 
     /**
diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
new file mode 100644
index 000000000..d7969ad06
--- /dev/null
+++ b/app/View/Components/SearchString.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\View\Components;
+
+use Illuminate\View\Component;
+use Illuminate\Support\Str;
+
+class SearchString extends Component
+{
+    public $filters;
+
+    public $model;
+
+    /**
+     * Create a new component instance.
+     *
+     * @return void
+     */
+    public function __construct($model)
+    {
+        $this->model = $model;
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     *
+     * @return \Illuminate\Contracts\View\View|string
+     */
+    public function render()
+    {
+        $searc_string = config('search-string');
+
+        $this->filters = false;
+
+        if (!empty($searc_string[$this->model])) {
+            $columns = $searc_string[$this->model]['columns'];
+
+            foreach ($columns as $column => $options) {
+                if (!empty($options['searchable'])) {
+                    continue;
+                }
+    
+                if (!is_array($options)) {
+                    $column = $options;
+                }
+
+                $name = $this->getFilterName($column);
+    
+                $this->filters[] = [
+                    'key' => $column,
+                    'value' => $name,
+                    'url' => !empty($options['route']) ? route($options['route'][0], $options['route'][1]) : ''
+                ];
+            }
+        }
+
+        return view('components.search-string');
+    }
+
+    protected function getFilterName($column)
+    {
+        if (strpos($column, '_id') !== false) {
+            $column = str_replace('_id', '', $column);
+        }
+
+        $plural = Str::plural($column, 2);
+
+        if (trans_choice('general.' . $plural, 1) !== 'general.' . $plural) {
+            return trans_choice('general.' . $plural, 1);
+        } elseif (trans_choice('search_string.colmuns.' . $plural, 1) !== 'search_string.colmuns.' . $plural) {
+            return trans_choice('search_string.colmuns.' . $plural, 1);
+        }
+
+        $name = trans('general.' . $column);
+    
+        if ($name == 'general.' . $column) {
+            $name = trans('search_string.colmuns.' . $column);
+        }
+
+        return $name;
+    }
+}
diff --git a/config/search-string.php b/config/search-string.php
index 355e1a988..cf316c474 100644
--- a/config/search-string.php
+++ b/config/search-string.php
@@ -120,9 +120,9 @@ return [
             'name' => ['searchable' => true],
             'description' => ['searchable' => true],
             'enabled' => ['boolean' => true],
-            'category_id' => ['key' => 'category_id'],
-            'sale_price',
-            'purchase_price',
+            'category_id' => [
+                'route' => ['categories.index', 'search=type:item']
+            ],
         ],
     ],
 
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index 639849c4a..238c34490 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -1,175 +1,466 @@
 <template>
+  <div :id="'search-field-' + _uid" class="searh-field tags-input__wrapper">
+    <div class="tags-group" v-for="(filter, index) in filtered" :index="index">
+      <span v-if="filter.option" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-option">
+        {{ filter.option }}
+      </span>
 
-    <el-select
-        :class="'pl-20 mr-40'"
-        v-model="real_model"
-        @input="change"
-        filterable
-        remote
-        reserve-keyword
+      <span v-if="filter.operator" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-operator">
+        {{ filter.operator }}
+      </span>
+
+      <span v-if="filter.value" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-value">
+        {{ filter.value }}
+        <i class="el-tag__close el-icon-close" @click="onFilterDelete(index)"></i>
+      </span>
+    </div>
+
+    <div class="dropdown input-full">
+      <input
+        type="text"
+        class="form-control"
         :placeholder="placeholder"
-        :remote-method="remoteMethod"
-        :loading="loading">
-        <div v-if="loading" class="el-select-dropdown__wrap" slot="empty">
-            <p class="el-select-dropdown__empty loading">
-                {{ loadingText }}
-            </p>
-        </div>
+        :ref="'input-search-field-' + _uid"
+        v-model="search"
+        @focus="onInputFocus"
+        @input="onInput"
+        @keyup.enter="onInputConfirm"
+      />
 
-        <div v-else-if="options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-            <p class="el-select-dropdown__empty">
-                {{ noMatchingDataText }}
-            </p>
-        </div>
+      <button type="button" class="btn btn-link clear" @click="onSearchAndFilterClear">
+        <i class="el-tag__close el-icon-close"></i>
+      </button>
 
-        <div v-else-if="options.length == 0" slot="empty">
-            <p class="el-select-dropdown__empty">
-                {{ noDataText }}
-            </p>
-        </div>
+      <div class="dropdown-menu" :class="[{'show': visible.options}]">
+        <li ref="" class="dropdown-item" v-for="option in filteredOptions" :data-value="option.key">
+          <button type="button" class="btn btn-link" @click="onOptionSelected(option.key)">{{ option.value }}</button>
+        </li>
+        <li ref="" v-if="search" class="dropdown-item">
+          <button type="button" class="btn btn-link" @click="onInputConfirm">{{ textSearch }}</button>
+        </li>
+      </div>
 
-        <template v-if="icon" slot="prefix">
-            <span class="el-input__suffix-inner el-select-icon">
-                <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-            </span>
-        </template>
-
-        <el-option v-if="!group" v-for="option in selectOptions"
-            :key="option.id"
-            :label="option.name"
-            :value="option.id">
-        </el-option>
-
-        <el-option-group
-            v-if="group"
-            v-for="(options, name) in selectOptions"
-            :key="name"
-            :label="name">
-            <el-option
-                v-for="(label, value) in options"
-                :key="value"
-                :label="label"
-                :value="value">
-            </el-option>
-        </el-option-group>
-    </el-select>
+      <div class="dropdown-menu" :class="[{'show': visible.operator}]">
+        <li ref="" class="dropdown-item">
+          <button type="button" class="btn btn-link" @click="onOperatorSelected('=')">=<span class="btn-helptext">is</span></button>
+        </li>
+        <li ref="" class="dropdown-item">
+          <button type="button" class="btn btn-link" @click="onOperatorSelected('!=')">!=<span class="btn-helptext">is not</span></button>
+        </li>
+      </div>
 
+      <div class="dropdown-menu" :class="[{'show': visible.values}]">
+        <li ref="" class="dropdown-item" v-for="(value) in filteredValues" :data-value="value.key">
+          <button type="button" class="btn btn-link" @click="onValueSelected(value.key)">{{ value.value }}</button>
+        </li>
+      </div>
+    </div>
+  </div>
 </template>
 
-<style>
-    .el-select {
-        display: inline;
-    }
-</style>
-
 <script>
-    import { Select, Option, OptionGroup } from 'element-ui';
+export default {
+  name: 'akaunting-search',
 
-    export default {
-        name: 'akaunting-select',
+  props: {
+    placeholder: {
+      type: String,
+      default: 'Search or filter results...',
+      description: 'Input placeholder'
+    },
+    textSearch: {
+      type: String,
+      default: 'Search for this text',
+      description: 'Input placeholder'
+    },
+    value: {
+      type: String,
+      default: null,
+      description: 'Search attribute value'
+    },
+    filters: {
+      type: Array,
+      default: () => [],
+      description: 'List of filters'
+    },
+  },
 
-        components: {
-            [Select.name]: Select,
-            [Option.name]: Option,
-            [OptionGroup.name]: OptionGroup,
-        },
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
 
-        props: {
-            name: {
-                type: String,
-                default: null,
-                description: "Selectbox attribute name"
-            },
-            placeholder: {
-                type: String,
-                default: '',
-                description: "Selectbox input placeholder text"
-            },
-            options: null,
-            value: {
-                type: String,
-                default: null,
-                description: "Selectbox selected value"
-            },
+  data() {
+    return {
+      filter_list: this.filters, // set filters prop assing it.
+      search: '', // search cloumn model
+      filtered:[], // Show selected filters
+      filter_index: 0, // added filter count
+      filter_last_step: 'options', // last fitler step
+      visible: { // Which visible dropdown
+        options: false,
+        operator: false,
+        values: false,
+      },
 
-            icon: {
-                type: String,
-                description: "Prepend icon (left)"
-            },
+      option_values: [],
+      selected_options: [],
+      selected_values: [],
+      values: [],
+      current_value: null,
+    };
+  },
 
-            group:  {
-                type: Boolean,
-                default: false,
-                description: "Selectbox option group status"
-            },
+  methods: {
+    onInputFocus() {
+      this.visible[this.filter_last_step] = true;
 
-            loadingText: {
-                type: String,
-                default: 'Loading...',
-                description: "Selectbox loading message"
-            },
-            noDataText: {
-                type: String,
-                default: 'No Data',
-                description: "Selectbox empty options message"
-            },
-            noMatchingDataText: {
-                type: String,
-                default: 'No Matchign Data',
-                description: "Selectbox search option not found item message"
-            },
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+    },
 
-            remoteAction: {
-                type: String,
-                default: null,
-                description: "Selectbox remote action path"
-            },
-            remoteType: {
-                type: String,
-                default: 'invoice',
-                description: "Ger remote item type."
-            },
-        },
+    onInput(evt) {
+      this.search = evt.target.value;
 
-        data() {
-            return {
-                list: [],
-                selectOptions: this.options,
-                real_model: this.model,
-                loading: false,
-            }
-        },
+      this.$emit('input', evt.target.value);
+    },
 
-        mounted() {
-            this.real_model = this.value;
+    onInputConfirm() {
+      let args = '';
 
-            this.$emit('interface', this.real_model);
-        },
+      if (this.search) {
+        args += '?search=' + this.search;
+      }
 
-        methods: {
-            change() {
-                this.$emit('change', this.real_model);
-                this.$emit('interface', this.real_model);
+      this.filtered.forEach(function (filter, index) {
+        if (!args) {
+          args += '?search=';
+        }
 
-                this.selectOptions.forEach(item => {
-                    if (item.id == this.real_model) {
-                        this.$emit('label', item.name);
-                        this.$emit('option', item);
+        args += this.selected_options[index].key + ':' + this.selected_values[index].key;
+      }, this);
 
-                        return;
-                    }
-                });
-            },
-            remoteMethod() {
+      window.location = url + '/common/items' + args;
+    },
 
-            },
-        },
+    onOptionSelected(value) {
+      this.current_value = value;
 
-        watch: {
-            options: function (options) {
-                // update options
-                //this.selectOptions = options;
-            }
-        },
+      let option = false;
+      let option_url = url + '';
+
+      for (let i = 0; i < this.filter_list.length; i++) {
+        if (this.filter_list[i].key == value) {
+          option = this.filter_list[i].value;
+
+          if (typeof this.filter_list[i].url !== 'undefined' && this.filter_list[i].url) {
+            option_url = this.filter_list[i].url;
+          }
+
+          this.selected_options.push(this.filter_list[i]);
+          this.filter_list.splice(i, 1);
+          break;
+        }
+      }
+
+      // Set filtered select option
+      this.filtered.push({
+        option: option,
+        operator: false,
+        value: false
+      });
+
+      this.$emit('change', this.filtered);
+
+      this.search = '';
+
+      if (!this.option_values[value]) {
+        window.axios.get(option_url)
+        .then(response => {
+            let data = response.data.data;
+
+            data.forEach(function (item) {
+              this.values.push({
+                key: item.id,
+                value: item.name
+              });
+            }, this);
+
+            this.option_values[value] = this.values;
+        })
+        .catch(error => {
+            this.form.loading = false;
+
+            this.form.onFail(error);
+
+            this.method_show_html = error.message;
+        });
+      } else {
+        this.values = this.option_values[value];
+      }
+
+      this.visible = {
+        options: false,
+        operator: true,
+        values: false,
+      };
+
+      this.filter_last_step = 'operator';
+
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+    },
+
+    onOperatorSelected(value) {
+      this.filtered[this.filter_index].operator = value;
+
+      this.$emit('change', this.filtered);
+
+      this.operatorValue = '';
+
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+
+      this.visible = {
+        options: false,
+        operator: false,
+        values: true,
+      };
+
+      this.filter_last_step = 'values';
+    },
+ 
+    onValueSelected(value) {
+      let select_value = false;
+
+      for (let i = 0; i < this.values.length; i++) {
+        if (this.values[i].key == value) {
+          select_value = this.values[i].value;
+
+          this.selected_values.push(this.values[i]);
+          this.option_values[this.current_value].splice(i, 1);
+          break;
+        }
+      }
+
+      this.filtered[this.filter_index].value = select_value;
+
+      this.$emit('change', this.filtered);
+
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+
+      this.filter_index++;
+
+      this.visible = {
+        options: true,
+        operator: false,
+        values: false,
+      };
+
+      this.filter_last_step = 'options';
+    },
+
+    onFilterDelete(index) {
+      this.filter_list.push(this.selected_options[index]);
+
+      this.filter_index--;
+
+      this.filtered.splice(index, 1);
+      this.selected_options.splice(index, 1);
+    },
+
+    onSearchAndFilterClear() {
+      this.filtered = [];
+      this.search = '';
+    },
+
+    closeIfClickedOutside(event) {
+      if (!document.getElementById('search-field-' + this._uid).contains(event.target)) {
+          this.visible.options = false;
+          this.visible.operator = false;
+          this.visible.values = false;
+
+          document.removeEventListener('click', this.closeIfClickedOutside);
+      }
+    },
+  },
+
+  created() {
+    if (this.value) {
+      let serach_string = this.value.split(' ');
+
+      serach_string.forEach(function (string) {
+        if (string.search(':') === -1) {
+          this.search = string;
+        } else {
+          let filter = string.split(':');
+
+          this.filtered.push({
+            option: filter[0],
+            operator: '=',
+            value: filter[1]
+          })
+        }
+      }, this);
     }
+  },
+
+  computed: {
+    filteredOptions() {
+      this.filter_list.sort(function (a, b) {
+          var nameA = a.value.toUpperCase(); // ignore upper and lowercase
+          var nameB = b.value.toUpperCase(); // ignore upper and lowercase
+
+          if (nameA < nameB) {
+            return -1;
+          }
+
+          if (nameA > nameB) {
+            return 1;
+          }
+
+          // names must be equal
+          return 0;
+      });
+
+      return this.filter_list.filter(option => {
+        return option.value.toLowerCase().includes(this.search.toLowerCase())
+      }); 
+    },
+
+    filteredValues() {
+      this.values.sort(function (a, b) {
+          var nameA = a.value.toUpperCase(); // ignore upper and lowercase
+          var nameB = b.value.toUpperCase(); // ignore upper and lowercase
+
+          if (nameA < nameB) {
+            return -1;
+          }
+
+          if (nameA > nameB) {
+            return 1;
+          }
+
+          // names must be equal
+          return 0;
+      });
+
+      return this.values.filter(value => {
+        return value.value.toLowerCase().includes(this.search.toLowerCase())
+      })
+    }
+  },
+
+   watch: {
+      visible: {
+        handler: function(newValue) {
+            if (newValue) {
+                document.addEventListener('click', this.closeIfClickedOutside);
+            }
+        },
+        deep: true
+      }
+    },
+};
 </script>
+
+<style>
+.searh-field {
+    border: 1px solid #dee2e6;
+    border-radius: 0.25rem;
+}
+
+.searh-field .tags-group {
+  display: contents;
+}
+
+.searh-field .el-tag.el-tag--primary {
+  background: #f6f9fc;
+  background-color: #f6f9fc;
+  border-color: #f6f9fc;
+  color: #8898aa;
+  margin-top: 7px;
+}
+
+.searh-field .tags-group:hover > span {
+  background:#cbd4de;
+  background-color: #cbd4de;
+  border-color: #cbd4de;
+}
+
+.searh-field .el-tag.el-tag--primary .el-tag__close.el-icon-close {
+  color: #8898aa;
+}
+
+.searh-field .el-tag-option {
+  border-radius: 0.25rem 0 0 0.25rem;
+  margin-left: 10px;
+}
+
+.searh-field .el-tag-operator {
+  border-radius: 0;
+  margin-left: -1px;
+  margin-right: -1px;
+}
+
+.searh-field .el-tag-value {
+  border-radius: 0 0.25rem 0.25rem 0;
+  margin-right: 10px;
+}
+
+.searh-field .el-select.input-new-tag {
+    width: 100%;
+}
+
+.searh-field .input-full {
+  width: 100%;
+}
+
+.searh-field .btn.btn-link {
+  width: inherit;
+  text-align: left;
+  display: flex;
+  margin: 0;
+  text-overflow: inherit;
+  text-align: left;
+  text-overflow: ellipsis;
+  padding: unset;
+  color: #212529;
+}
+
+.searh-field .btn.btn-link.clear {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 45px;
+  height: 45px;
+  -webkit-box-pack: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  color: #adb5bd;
+  opacity: 1;
+}
+
+.searh-field .btn.btn-link.clear:hover {
+  color: #8898aa;
+}
+
+.searh-field .btn-helptext {
+  margin-left: auto;
+  color: var(--gray);
+}
+
+.searh-field .btn:not(:disabled):not(.disabled):active:focus,
+.searh-field .btn:not(:disabled):not(.disabled).active:focus {
+  -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 7c3426789..86eb36c0e 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -105,7 +105,7 @@ return [
     'to'                    => 'To',
     'print'                 => 'Print',
     'search'                => 'Search',
-    'search_placeholder'    => 'Type to search..',
+    'search_placeholder'    => 'Search or filter results..',
     'filter'                => 'Filter',
     'help'                  => 'Help',
     'all'                   => 'All',
diff --git a/resources/views/auth/permissions/index.blade.php b/resources/views/auth/permissions/index.blade.php
index 54d53b2e0..381594d41 100644
--- a/resources/views/auth/permissions/index.blade.php
+++ b/resources/views/auth/permissions/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Auth\Permission" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.permissions', $bulk_actions, ['group' => 'auth', 'type' => 'permissions']) }}
diff --git a/resources/views/auth/roles/index.blade.php b/resources/views/auth/roles/index.blade.php
index a24fcabd3..992b7ff9e 100644
--- a/resources/views/auth/roles/index.blade.php
+++ b/resources/views/auth/roles/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Auth\Role" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.roles', $bulk_actions, ['group' => 'auth', 'type' => 'roles']) }}
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php
index 69e5cd50f..a5d283672 100644
--- a/resources/views/auth/users/index.blade.php
+++ b/resources/views/auth/users/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Auth\User" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.users', $bulk_actions, ['group' => 'auth', 'type' => 'users']) }}
diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php
index 888ff8cc7..24df6f215 100644
--- a/resources/views/banking/accounts/index.blade.php
+++ b/resources/views/banking/accounts/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Banking\Account" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.accounts', $bulk_actions, ['group' => 'banking', 'type' => 'accounts']) }}
diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php
index 2c0a9b255..d5ceabef9 100644
--- a/resources/views/banking/reconciliations/index.blade.php
+++ b/resources/views/banking/reconciliations/index.blade.php
@@ -19,10 +19,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Banking\Reconciliation" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.reconciliations', $bulk_actions, ['group' => 'banking', 'type' => 'reconciliations']) }}
diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php
index 58d9a3a95..6b16ba24a 100644
--- a/resources/views/banking/transactions/index.blade.php
+++ b/resources/views/banking/transactions/index.blade.php
@@ -22,10 +22,7 @@
                 'role' => 'form',
                 'class' => 'mb-0'
             ]) !!}
-                <akaunting-search
-                    :placeholder="'{{ trans('general.search_placeholder') }}'"
-                    :options="{{ json_encode([]) }}"
-                ></akaunting-search>
+                <x-search-string model="App\Models\Banking\Transaction" />
             {!! Form::close() !!}
         </div>
 
diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php
index f2f3b08f0..3b13700ec 100644
--- a/resources/views/banking/transfers/index.blade.php
+++ b/resources/views/banking/transfers/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Banking\Transfer" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.transfers', $bulk_actions, ['group' => 'banking', 'type' => 'transfers']) }}
diff --git a/resources/views/common/companies/index.blade.php b/resources/views/common/companies/index.blade.php
index b4de518d9..40049bbe9 100644
--- a/resources/views/common/companies/index.blade.php
+++ b/resources/views/common/companies/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Common\Company" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.companies', $bulk_actions, ['group' => 'common', 'type' => 'companies']) }}
diff --git a/resources/views/common/dashboards/index.blade.php b/resources/views/common/dashboards/index.blade.php
index 06cc6964a..a7536c528 100644
--- a/resources/views/common/dashboards/index.blade.php
+++ b/resources/views/common/dashboards/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Common\Dashboard" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.dashboards', $bulk_actions, ['group' => 'common', 'type' => 'dashboards']) }}
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php
index 6a7170a7f..9e6b48018 100644
--- a/resources/views/common/items/index.blade.php
+++ b/resources/views/common/items/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Common\Item" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.items', $bulk_actions, ['group' => 'common', 'type' => 'items']) }}
diff --git a/resources/views/components/search-string.blade.php b/resources/views/components/search-string.blade.php
new file mode 100644
index 000000000..d655b6dc8
--- /dev/null
+++ b/resources/views/components/search-string.blade.php
@@ -0,0 +1,7 @@
+
+<akaunting-search
+    placeholder="{{ trans('general.search_placeholder') }}"
+    text-search="{{ trans('Search for this text') }}"
+    value="{{ request()->get('search', null) }}"
+    :filters="{{ json_encode($filters) }}"
+></akaunting-search>
diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php
index 97f715f75..540b72cc7 100644
--- a/resources/views/purchases/bills/index.blade.php
+++ b/resources/views/purchases/bills/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Purchase\Bill" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.bills', $bulk_actions, ['group' => 'purchases', 'type' => 'bills']) }}
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index 3c24e4cb6..7aa451d26 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Banking\Transaction" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.payments', $bulk_actions, ['group' => 'purchases', 'type' => 'payments']) }}
diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
index 8d2f4501a..c1045e75b 100644
--- a/resources/views/purchases/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Common\Contact" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, ['group' => 'purchases', 'type' => 'vendors']) }}
diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php
index 0b067419d..824341b7a 100644
--- a/resources/views/sales/customers/index.blade.php
+++ b/resources/views/sales/customers/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Common\Contact" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.customers', $bulk_actions, ['group' => 'sales', 'type' => 'customers']) }}
diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php
index ec9deea37..03649eb26 100644
--- a/resources/views/sales/invoices/index.blade.php
+++ b/resources/views/sales/invoices/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Sale\Invoice" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.invoices', $bulk_actions, ['group' => 'sales', 'type' => 'invoices']) }}
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 75930749e..42f6cab05 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Banking\Transaction" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, ['group' => 'sales', 'type' => 'revenues']) }}
diff --git a/resources/views/settings/categories/index.blade.php b/resources/views/settings/categories/index.blade.php
index 50d1a1ade..ac5b2a67f 100644
--- a/resources/views/settings/categories/index.blade.php
+++ b/resources/views/settings/categories/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Setting\Category" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.categories', $bulk_actions, ['group' => 'settings', 'type' => 'categories']) }}
diff --git a/resources/views/settings/currencies/index.blade.php b/resources/views/settings/currencies/index.blade.php
index 3a22a21ba..259cbfd45 100644
--- a/resources/views/settings/currencies/index.blade.php
+++ b/resources/views/settings/currencies/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Setting\Currency" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.currencies', $bulk_actions, ['group' => 'settings', 'type' => 'currencies']) }}
diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php
index fd22cde08..cbea11413 100644
--- a/resources/views/settings/taxes/index.blade.php
+++ b/resources/views/settings/taxes/index.blade.php
@@ -19,10 +19,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Setting\Tax" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.taxes', $bulk_actions, ['group' => 'settings', 'type' => 'taxes']) }}

From a9ab2e61a0f6a6a86ac001cc5bde8265e380c492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 6 Nov 2020 22:34:53 +0300
Subject: [PATCH 03/19] refs search filter files..

---
 app/View/Components/SearchString.php          |  86 ++++++++++++-
 .../assets/js/components/AkauntingSearch.vue  | 117 +++++++++++++++---
 resources/lang/en-GB/general.php              |  10 +-
 .../views/components/search-string.blade.php  |   9 +-
 4 files changed, 195 insertions(+), 27 deletions(-)

diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
index d7969ad06..cfedd9190 100644
--- a/app/View/Components/SearchString.php
+++ b/app/View/Components/SearchString.php
@@ -30,12 +30,13 @@ class SearchString extends Component
     {
         $searc_string = config('search-string');
 
-        $this->filters = false;
+        $this->filters = [];
 
         if (!empty($searc_string[$this->model])) {
             $columns = $searc_string[$this->model]['columns'];
 
             foreach ($columns as $column => $options) {
+                // This column skip for filter
                 if (!empty($options['searchable'])) {
                     continue;
                 }
@@ -43,13 +44,13 @@ class SearchString extends Component
                 if (!is_array($options)) {
                     $column = $options;
                 }
-
-                $name = $this->getFilterName($column);
     
                 $this->filters[] = [
-                    'key' => $column,
-                    'value' => $name,
-                    'url' => !empty($options['route']) ? route($options['route'][0], $options['route'][1]) : ''
+                    'key' => $this->getFilterKey($column, $options),
+                    'value' => $this->getFilterName($column),
+                    'type' => $this->getFilterType($options),
+                    'url' => $this->getFilterUrl($column, $options),
+                    'values' => $this->getFilterValues($options),
                 ];
             }
         }
@@ -57,6 +58,15 @@ class SearchString extends Component
         return view('components.search-string');
     }
 
+    protected function getFilterKey($column, $options)
+    {
+        if (isset($options['relationship'])) {
+            $column .= '.id';
+        }
+
+        return $column;
+    }
+
     protected function getFilterName($column)
     {
         if (strpos($column, '_id') !== false) {
@@ -79,4 +89,68 @@ class SearchString extends Component
 
         return $name;
     }
+
+    protected function getFilterType($options) 
+    {
+        $type = 'select';
+
+        if (isset($options['boolean'])) {
+            $type = 'boolean';
+        }
+
+        return $type;
+    }
+
+    protected function getFilterUrl($column, $options) 
+    {
+        $url = '';
+
+        if (isset($options['boolean'])) {
+            return $url;
+        }
+
+        if (!empty($options['route'])) {
+            if (is_array($options['route'])) {
+                $url = route($options['route'][0], $options['route'][1]);
+            } else {
+                $url = route($options['route']);
+            }
+        } else {
+            if (strpos($this->model, 'Modules') !== false) {
+                $module_class = explode('\\', $this->model);
+
+                $url .= Str::slug($module_class[1], '-') . '::';
+            }
+            
+            if (strpos($column, '_id') !== false) {
+                $column = str_replace('_id', '', $column);
+            }
+    
+            $plural = Str::plural($column, 2);
+
+            $url = route($url . $plural . '.index');
+        }
+
+        return $url;
+    }
+
+    protected function getFilterValues($options) 
+    {
+        $values = [];
+
+        if (isset($options['boolean'])) {
+            $values = [
+                [
+                    'key' => 0,
+                    'value' => trans('general.no'),
+                ],
+                [
+                    'key' => 1,
+                    'value' => trans('general.yes'),
+                ],
+            ];
+        }
+
+        return $values;
+    }
 }
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index 238c34490..ed3f893d6 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -36,16 +36,16 @@
           <button type="button" class="btn btn-link" @click="onOptionSelected(option.key)">{{ option.value }}</button>
         </li>
         <li ref="" v-if="search" class="dropdown-item">
-          <button type="button" class="btn btn-link" @click="onInputConfirm">{{ textSearch }}</button>
+          <button type="button" class="btn btn-link" @click="onInputConfirm">{{ searchText }}</button>
         </li>
       </div>
 
       <div class="dropdown-menu" :class="[{'show': visible.operator}]">
         <li ref="" class="dropdown-item">
-          <button type="button" class="btn btn-link" @click="onOperatorSelected('=')">=<span class="btn-helptext">is</span></button>
+          <button type="button" class="btn btn-link" @click="onOperatorSelected('=')">{{ operatorIsText }}<span class="btn-helptext d-none">is</span></button>
         </li>
         <li ref="" class="dropdown-item">
-          <button type="button" class="btn btn-link" @click="onOperatorSelected('!=')">!=<span class="btn-helptext">is not</span></button>
+          <button type="button" class="btn btn-link" @click="onOperatorSelected('!=')">{{ operatorIsNotText }}<span class="btn-helptext d-none">is not</span></button>
         </li>
       </div>
 
@@ -53,6 +53,9 @@
         <li ref="" class="dropdown-item" v-for="(value) in filteredValues" :data-value="value.key">
           <button type="button" class="btn btn-link" @click="onValueSelected(value.key)">{{ value.value }}</button>
         </li>
+        <li ref="" class="dropdown-item" v-if="!filteredValues.length">
+          <button type="button" class="btn btn-link">{{ noMatchingDataText }}</button>
+        </li>
       </div>
     </div>
   </div>
@@ -68,11 +71,31 @@ export default {
       default: 'Search or filter results...',
       description: 'Input placeholder'
     },
-    textSearch: {
+    searchText: {
       type: String,
       default: 'Search for this text',
       description: 'Input placeholder'
     },
+    operatorIsText: {
+      type: String,
+      default: 'is',
+      description: 'Operator is "="'
+    },
+    operatorIsNotText: {
+      type: String,
+      default: 'is not',
+      description: 'Operator is not "!="'
+    },
+    noDataText: {
+        type: String,
+        default: 'No Data',
+        description: "Selectbox empty options message"
+    },
+    noMatchingDataText: {
+        type: String,
+        default: 'No Matchign Data',
+        description: "Selectbox search option not found item message"
+    },
     value: {
       type: String,
       default: null,
@@ -113,6 +136,10 @@ export default {
 
   methods: {
     onInputFocus() {
+      if (!this.filters.length) {
+        return;
+      }
+
       this.visible[this.filter_last_step] = true;
 
       this.$nextTick(() => {
@@ -122,6 +149,31 @@ export default {
 
     onInput(evt) {
       this.search = evt.target.value;
+  
+      let option_url = this.selected_options[this.filter_index].url;
+
+      if (this.search) {
+        option_url += '?search=' + this.search;
+      }
+
+      window.axios.get(option_url)
+      .then(response => {
+          this.values = [];
+
+          let data = response.data.data;
+
+          data.forEach(function (item) {
+            this.values.push({
+              key: item.id,
+              value: item.name
+            });
+          }, this);
+
+          this.option_values[value] = this.values;
+      })
+      .catch(error => {
+
+      });
 
       this.$emit('input', evt.target.value);
     },
@@ -138,17 +190,17 @@ export default {
           args += '?search=';
         }
 
-        args += this.selected_options[index].key + ':' + this.selected_values[index].key;
+        args += this.selected_options[index].key + ':' + this.selected_values[index].key + ' ';
       }, this);
 
-      window.location = url + '/common/items' + args;
+      window.location = window.location.href.replace(window.location.search, '') + args;
     },
 
     onOptionSelected(value) {
       this.current_value = value;
 
       let option = false;
-      let option_url = url + '';
+      let option_url = url;
 
       for (let i = 0; i < this.filter_list.length; i++) {
         if (this.filter_list[i].key == value) {
@@ -158,6 +210,10 @@ export default {
             option_url = this.filter_list[i].url;
           }
 
+          if (typeof this.filter_list[i].type !== 'undefined' && this.filter_list[i].type == 'boolean') {
+            this.option_values[value] = this.filter_list[i].values;
+          }
+
           this.selected_options.push(this.filter_list[i]);
           this.filter_list.splice(i, 1);
           break;
@@ -190,11 +246,7 @@ export default {
             this.option_values[value] = this.values;
         })
         .catch(error => {
-            this.form.loading = false;
 
-            this.form.onFail(error);
-
-            this.method_show_html = error.message;
         });
       } else {
         this.values = this.option_values[value];
@@ -277,13 +329,15 @@ export default {
     onSearchAndFilterClear() {
       this.filtered = [];
       this.search = '';
+
+      this.onInputConfirm();
     },
 
     closeIfClickedOutside(event) {
       if (!document.getElementById('search-field-' + this._uid).contains(event.target)) {
-          this.visible.options = false;
-          this.visible.operator = false;
-          this.visible.values = false;
+          //this.visible.options = false;
+          //this.visible.operator = false;
+          //this.visible.values = false;
 
           document.removeEventListener('click', this.closeIfClickedOutside);
       }
@@ -299,12 +353,41 @@ export default {
           this.search = string;
         } else {
           let filter = string.split(':');
+          let option = '';
+          let value = '';
+
+          this.filter_list.forEach(function (_filter, i) {
+            if (_filter.key == filter[0]) {
+              option = _filter.value;
+
+              _filter.values.forEach(function (_value) {
+                if (_value.key == filter[1]) {
+                  value = _value.value;
+                }
+              }, this);
+
+              this.selected_options.push(this.filter_list[i]);
+              this.filter_list.splice(i, 1);
+
+              this.option_values[_filter.key] = _filter.values;
+
+              _filter.values.forEach(function (value, j) {
+                if (value.key == filter[1]) {
+                  this.selected_values.push(value);
+
+                  this.option_values[_filter.key].splice(j, 1);
+                }
+              }, this);
+            }
+          }, this);
 
           this.filtered.push({
-            option: filter[0],
+            option: option,
             operator: '=',
-            value: filter[1]
-          })
+            value: value
+          });
+
+          this.filter_index++;
         }
       }, this);
     }
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 86eb36c0e..6d6a1a153 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -105,7 +105,8 @@ return [
     'to'                    => 'To',
     'print'                 => 'Print',
     'search'                => 'Search',
-    'search_placeholder'    => 'Search or filter results..',
+    'search_text'           => 'Search for this text',
+    'search_placeholder'    => 'Type to search..',
     'filter'                => 'Filter',
     'help'                  => 'Help',
     'all'                   => 'All',
@@ -152,6 +153,8 @@ return [
     'no_matching_data'      => 'No matching data',
     'clear_cache'           => 'Clear Cache',
     'go_to_dashboard'       => 'Go to dashboard',
+    'is'                    => 'is',
+    'isnot'                 => 'is not', 
 
     'card' => [
         'name'                  => 'Name on Card',
@@ -181,6 +184,11 @@ return [
         'no_file_selected'  => 'No file selected...',
     ],
 
+    'placeholder' => [
+        'search'            => 'Type to search..',
+        'search_and_filter' => 'Search or filter results..',
+    ],
+
     'date_range' => [
         'today' => 'Today',
         'yesterday' => 'Yesterday',
diff --git a/resources/views/components/search-string.blade.php b/resources/views/components/search-string.blade.php
index d655b6dc8..fe89a5f41 100644
--- a/resources/views/components/search-string.blade.php
+++ b/resources/views/components/search-string.blade.php
@@ -1,7 +1,10 @@
-
 <akaunting-search
-    placeholder="{{ trans('general.search_placeholder') }}"
-    text-search="{{ trans('Search for this text') }}"
+    placeholder="{{ (!empty($filters)) ? trans('general.placeholder.search_and_filter') : trans('general.search_placeholder')}}"
+    search-text="{{ trans('general.search_text') }}"
+    operator-is-text="{{ trans('general.is') }}"
+    operator-is-not-text="{{ trans('general.isnot') }}" 
+    no-data-text="{{ trans('general.no_data') }}"
+    no-matching-data-text="{{ trans('general.no_matching_data') }}"
     value="{{ request()->get('search', null) }}"
     :filters="{{ json_encode($filters) }}"
 ></akaunting-search>

From e638b7860c5696e5af544c6890d5fc44604b5950 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 Nov 2020 16:18:44 +0300
Subject: [PATCH 04/19] Added Sales & Purchases default category

---
 app/Http/Controllers/Settings/Defaults.php    |  6 +++
 app/Listeners/Update/V21/Version210.php       | 39 +++++++++++++++++++
 database/seeds/Categories.php                 | 20 +++++++++-
 resources/lang/en-GB/settings.php             |  2 +
 .../views/purchases/bills/create.blade.php    |  2 +-
 .../views/purchases/payments/create.blade.php |  2 +-
 .../views/sales/invoices/create.blade.php     |  2 +-
 .../views/sales/revenues/create.blade.php     |  2 +-
 .../views/settings/default/edit.blade.php     |  4 ++
 9 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Settings/Defaults.php b/app/Http/Controllers/Settings/Defaults.php
index 6be3afb9e..818cfaf8c 100644
--- a/app/Http/Controllers/Settings/Defaults.php
+++ b/app/Http/Controllers/Settings/Defaults.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Settings;
 
 use App\Abstracts\Http\Controller;
 use App\Models\Banking\Account;
+use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Tax;
 use App\Utilities\Modules;
@@ -16,6 +17,9 @@ 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');
+
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 
         $payment_methods = Modules::getPaymentMethods();
@@ -23,6 +27,8 @@ class Defaults extends Controller
         return view('settings.default.edit', compact(
             'accounts',
             'currencies',
+            'sales_categories',
+            'purchases_categories',
             'taxes',
             'payment_methods'
         ));
diff --git a/app/Listeners/Update/V21/Version210.php b/app/Listeners/Update/V21/Version210.php
index eb5bd4107..cacf6257e 100644
--- a/app/Listeners/Update/V21/Version210.php
+++ b/app/Listeners/Update/V21/Version210.php
@@ -4,6 +4,9 @@ namespace App\Listeners\Update\V21;
 
 use App\Abstracts\Listeners\Update as Listener;
 use App\Events\Install\UpdateFinished as Event;
+use App\Models\Setting\Category;
+use App\Models\Common\Company;
+use App\Utilities\Overrider;
 use Illuminate\Support\Facades\Artisan;
 
 class Version210 extends Listener
@@ -24,6 +27,42 @@ class Version210 extends Listener
             return;
         }
 
+        $this->updateCompanies();
+
         Artisan::call('migrate', ['--force' => true]);
     }
+    protected function updateCompanies()
+    {
+        $company_id = session('company_id');
+
+        $companies = Company::cursor();
+
+        foreach ($companies as $company) {
+            session(['company_id' => $company->id]);
+
+            $this->updateSettings($company);
+        }
+
+        setting()->forgetAll();
+
+        session(['company_id' => $company_id]);
+
+        Overrider::load('settings');
+    }
+
+    public function updateSettings($company)
+    {
+        $sales_category = Category::income()->enabled()->first();
+        $purchases_category = Category::expense()->enabled()->first();
+
+        // Set the active company settings
+        setting()->setExtraColumns(['company_id' => $company->id]);
+        setting()->forgetAll();
+        setting()->load(true);
+
+        setting()->set(['default.sales_category' => setting('default.sales_category', $sales_category->id)]);
+        setting()->set(['default.purchases_category' => setting('default.purchases_category', $purchases_category->id)]);
+
+        setting()->save();
+    }
 }
diff --git a/database/seeds/Categories.php b/database/seeds/Categories.php
index c74833575..463f84f85 100644
--- a/database/seeds/Categories.php
+++ b/database/seeds/Categories.php
@@ -64,8 +64,26 @@ class Categories extends Seeder
             ],
         ];
 
+        $sales_category = $purchases_category = false;
+
         foreach ($rows as $row) {
-            Category::create($row);
+            $category = Category::create($row);
+
+            switch ($category->type) {
+                case 'income':
+                    if (empty($sales_category)) {
+                        $sales_category = $category;
+                    }
+                    break;
+                case 'expense':
+                    if (empty($purchases_category)) {
+                        $purchases_category = $category;
+                    }
+                    break;
+            }
         }
+
+        setting()->set('default.sales_category', $sales_category->id);
+        setting()->set('default.purchases_category', $purchases_category->id);
     }
 }
diff --git a/resources/lang/en-GB/settings.php b/resources/lang/en-GB/settings.php
index 394c2910d..3a6f8335a 100644
--- a/resources/lang/en-GB/settings.php
+++ b/resources/lang/en-GB/settings.php
@@ -68,6 +68,8 @@ return [
         'description'       => 'Default account, currency, language of your company',
         'list_limit'        => 'Records Per Page',
         'use_gravatar'      => 'Use Gravatar',
+        'sales_category'    => 'Sales Category',
+        'purchases_category'=> 'Purchases Category',
     ],
 
     'email' => [
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index b0fe97801..19ebd4c6d 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -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.category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
+                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.purchases_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php
index 57fc19ec6..46844b047 100644
--- a/resources/views/purchases/payments/create.blade.php
+++ b/resources/views/purchases/payments/create.blade.php
@@ -30,7 +30,7 @@
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
+                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.purchases_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index defccec38..68de6d3ec 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -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('defaults.category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
+                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.sales_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php
index c1c23ab06..dbbb3495d 100644
--- a/resources/views/sales/revenues/create.blade.php
+++ b/resources/views/sales/revenues/create.blade.php
@@ -30,7 +30,7 @@
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
+                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.sales_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index e18c01914..b5c8bbc46 100644
--- a/resources/views/settings/default/edit.blade.php
+++ b/resources/views/settings/default/edit.blade.php
@@ -22,6 +22,10 @@
 
                 {{ Form::selectGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), []) }}
 
+                {{ Form::selectGroup('sales_category', trans('settings.default.sales_category'), 'folder', $sales_categories, setting('default.sales_category'), []) }}
+
+                {{ Form::selectGroup('purchases_category', trans('settings.default.purchases_category'), 'folder', $purchases_categories, setting('default.purchases_category'), []) }}
+
                 {{ Form::selectGroup('tax', trans_choice('general.taxes', 1), 'percent', $taxes, setting('default.tax'), []) }}
 
                 {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('default.payment_method'), []) }}

From 4694e3bfaff1a7008b7427dc7baf978b1fd950cb 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 Nov 2020 22:48:25 +0300
Subject: [PATCH 05/19] Change default category prefix sales to income,
 purchases to expense

---
 app/Listeners/Update/V21/Version210.php            |  8 ++++----
 database/seeds/Categories.php                      | 14 +++++++-------
 resources/lang/en-GB/settings.php                  |  4 ++--
 resources/views/purchases/bills/create.blade.php   |  2 +-
 .../views/purchases/payments/create.blade.php      |  2 +-
 resources/views/sales/invoices/create.blade.php    |  2 +-
 resources/views/sales/revenues/create.blade.php    |  2 +-
 resources/views/settings/default/edit.blade.php    |  4 ++--
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/Listeners/Update/V21/Version210.php b/app/Listeners/Update/V21/Version210.php
index cacf6257e..81fd01bf7 100644
--- a/app/Listeners/Update/V21/Version210.php
+++ b/app/Listeners/Update/V21/Version210.php
@@ -52,16 +52,16 @@ class Version210 extends Listener
 
     public function updateSettings($company)
     {
-        $sales_category = Category::income()->enabled()->first();
-        $purchases_category = Category::expense()->enabled()->first();
+        $income_category = Category::income()->enabled()->first();
+        $expense_category = Category::expense()->enabled()->first();
 
         // Set the active company settings
         setting()->setExtraColumns(['company_id' => $company->id]);
         setting()->forgetAll();
         setting()->load(true);
 
-        setting()->set(['default.sales_category' => setting('default.sales_category', $sales_category->id)]);
-        setting()->set(['default.purchases_category' => setting('default.purchases_category', $purchases_category->id)]);
+        setting()->set(['default.income_category' => setting('default.income_category', $income_category->id)]);
+        setting()->set(['default.expense_category' => setting('default.expense_category', $expense_category->id)]);
 
         setting()->save();
     }
diff --git a/database/seeds/Categories.php b/database/seeds/Categories.php
index 463f84f85..a46874f73 100644
--- a/database/seeds/Categories.php
+++ b/database/seeds/Categories.php
@@ -64,26 +64,26 @@ class Categories extends Seeder
             ],
         ];
 
-        $sales_category = $purchases_category = false;
+        $income_category = $expense_category = false;
 
         foreach ($rows as $row) {
             $category = Category::create($row);
 
             switch ($category->type) {
                 case 'income':
-                    if (empty($sales_category)) {
-                        $sales_category = $category;
+                    if (empty($income_category)) {
+                        $income_category = $category;
                     }
                     break;
                 case 'expense':
-                    if (empty($purchases_category)) {
-                        $purchases_category = $category;
+                    if (empty($expense_category)) {
+                        $expense_category = $category;
                     }
                     break;
             }
         }
 
-        setting()->set('default.sales_category', $sales_category->id);
-        setting()->set('default.purchases_category', $purchases_category->id);
+        setting()->set('default.income_category', $income_category->id);
+        setting()->set('default.expense_category', $expense_category->id);
     }
 }
diff --git a/resources/lang/en-GB/settings.php b/resources/lang/en-GB/settings.php
index 3a6f8335a..3e47ce44d 100644
--- a/resources/lang/en-GB/settings.php
+++ b/resources/lang/en-GB/settings.php
@@ -68,8 +68,8 @@ return [
         'description'       => 'Default account, currency, language of your company',
         'list_limit'        => 'Records Per Page',
         'use_gravatar'      => 'Use Gravatar',
-        'sales_category'    => 'Sales Category',
-        'purchases_category'=> 'Purchases Category',
+        'income_category'   => 'Income Category',
+        'expense_category'  => 'Expense Category',
     ],
 
     'email' => [
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 19ebd4c6d..f730ba22c 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -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.purchases_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
+                    {{ 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::recurring('create') }}
 
diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php
index 46844b047..493b857a2 100644
--- a/resources/views/purchases/payments/create.blade.php
+++ b/resources/views/purchases/payments/create.blade.php
@@ -30,7 +30,7 @@
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.purchases_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=expense']) }}
+                    {{ 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::recurring('create') }}
 
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index 68de6d3ec..25931a413 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -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.sales_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
+                    {{ 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::recurring('create') }}
 
diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php
index dbbb3495d..36308d1b8 100644
--- a/resources/views/sales/revenues/create.blade.php
+++ b/resources/views/sales/revenues/create.blade.php
@@ -30,7 +30,7 @@
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.sales_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=income']) }}
+                    {{ 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::recurring('create') }}
 
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index b5c8bbc46..9f22b9e29 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('sales_category', trans('settings.default.sales_category'), 'folder', $sales_categories, setting('default.sales_category'), []) }}
+                {{ Form::selectGroup('income_category', trans('settings.default.income_category'), 'folder', $sales_categories, setting('default.income_category'), []) }}
 
-                {{ Form::selectGroup('purchases_category', trans('settings.default.purchases_category'), 'folder', $purchases_categories, setting('default.purchases_category'), []) }}
+                {{ Form::selectGroup('expense_category', trans('settings.default.expense_category'), 'folder', $purchases_categories, setting('default.expense_category'), []) }}
 
                 {{ Form::selectGroup('tax', trans_choice('general.taxes', 1), 'percent', $taxes, setting('default.tax'), []) }}
 

From 4f8a1661fcb741ce6dc09f5c1bf760d915f293a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 9 Nov 2020 20:30:05 +0300
Subject: [PATCH 06/19] index blade fixes..

---
 app/View/Components/SearchString.php          | 18 +++-
 public/css/custom.css                         |  6 ++
 public/vendor/js-cookie/js.cookie.js          | 24 +++++-
 .../assets/js/components/AkauntingSearch.vue  | 84 ++++++++++++++-----
 resources/assets/js/views/auth/roles.js       |  2 +-
 .../banking/reconciliations/index.blade.php   |  2 +-
 .../views/banking/transfers/index.blade.php   |  2 +-
 resources/views/common/items/index.blade.php  |  2 +-
 .../views/purchases/bills/index.blade.php     |  2 +-
 .../views/purchases/payments/index.blade.php  |  2 +-
 .../views/purchases/vendors/index.blade.php   |  2 +-
 .../views/sales/customers/index.blade.php     |  2 +-
 .../views/sales/invoices/index.blade.php      |  2 +-
 .../views/sales/revenues/index.blade.php      |  2 +-
 .../views/settings/taxes/index.blade.php      |  2 +-
 15 files changed, 117 insertions(+), 37 deletions(-)

diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
index cfedd9190..51ef8500c 100644
--- a/app/View/Components/SearchString.php
+++ b/app/View/Components/SearchString.php
@@ -50,7 +50,7 @@ class SearchString extends Component
                     'value' => $this->getFilterName($column),
                     'type' => $this->getFilterType($options),
                     'url' => $this->getFilterUrl($column, $options),
-                    'values' => $this->getFilterValues($options),
+                    'values' => $this->getFilterValues($column, $options),
                 ];
             }
         }
@@ -134,7 +134,7 @@ class SearchString extends Component
         return $url;
     }
 
-    protected function getFilterValues($options) 
+    protected function getFilterValues($column, $options) 
     {
         $values = [];
 
@@ -149,6 +149,20 @@ class SearchString extends Component
                     'value' => trans('general.yes'),
                 ],
             ];
+        } else if ($search = request()->get('search', false)) {
+            $fields = explode(' ', $search);
+
+            foreach ($fields as $field) {
+                if (strpos($field, ':') === false) {
+                    continue;
+                }
+
+                $filters = explode(':', $field);
+
+                if ($filters[0] != $column) {
+                    continue;
+                }
+            }
         }
 
         return $values;
diff --git a/public/css/custom.css b/public/css/custom.css
index daf4d6f16..8feca3952 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -846,3 +846,9 @@ table .align-items-center td span.badge {
     border: 1px solid #3c3f72;
 }
 /*--lightbox Finish--*/
+
+/*-- Search string & BulkAction Start --*/
+#app .card .card-header {
+    min-height: 88px;
+}
+/*-- Search string & BulkAction Finish --*/
\ No newline at end of file
diff --git a/public/vendor/js-cookie/js.cookie.js b/public/vendor/js-cookie/js.cookie.js
index 9a0945ed8..98f13c735 100644
--- a/public/vendor/js-cookie/js.cookie.js
+++ b/public/vendor/js-cookie/js.cookie.js
@@ -7,19 +7,26 @@
  */
 ;(function (factory) {
 	var registeredInModuleLoader = false;
+
 	if (typeof define === 'function' && define.amd) {
 		define(factory);
+
 		registeredInModuleLoader = true;
 	}
+
 	if (typeof exports === 'object') {
 		module.exports = factory();
+
 		registeredInModuleLoader = true;
 	}
+
 	if (!registeredInModuleLoader) {
 		var OldCookies = window.Cookies;
 		var api = window.Cookies = factory();
+
 		api.noConflict = function () {
 			window.Cookies = OldCookies;
+
 			return api;
 		};
 	}
@@ -27,24 +34,27 @@
 	function extend () {
 		var i = 0;
 		var result = {};
+
 		for (; i < arguments.length; i++) {
 			var attributes = arguments[ i ];
+
 			for (var key in attributes) {
 				result[key] = attributes[key];
 			}
 		}
+
 		return result;
 	}
 
 	function init (converter) {
 		function api (key, value, attributes) {
 			var result;
+
 			if (typeof document === 'undefined') {
 				return;
 			}
 
 			// Write
-
 			if (arguments.length > 1) {
 				attributes = extend({
 					path: '/'
@@ -52,7 +62,9 @@
 
 				if (typeof attributes.expires === 'number') {
 					var expires = new Date();
+
 					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
+
 					attributes.expires = expires;
 				}
 
@@ -61,6 +73,7 @@
 
 				try {
 					result = JSON.stringify(value);
+
 					if (/^[\{\[]/.test(result)) {
 						value = result;
 					}
@@ -83,17 +96,20 @@
 					if (!attributes[attributeName]) {
 						continue;
 					}
+
 					stringifiedAttributes += '; ' + attributeName;
+
 					if (attributes[attributeName] === true) {
 						continue;
 					}
+
 					stringifiedAttributes += '=' + attributes[attributeName];
 				}
+
 				return (document.cookie = key + '=' + value + stringifiedAttributes);
 			}
 
 			// Read
-
 			if (!key) {
 				result = {};
 			}
@@ -115,6 +131,7 @@
 
 				try {
 					var name = parts[0].replace(rdecode, decodeURIComponent);
+
 					cookie = converter.read ?
 						converter.read(cookie, name) : converter(cookie, name) ||
 						cookie.replace(rdecode, decodeURIComponent);
@@ -140,14 +157,17 @@
 		}
 
 		api.set = api;
+
 		api.get = function (key) {
 			return api.call(api, key);
 		};
+
 		api.getJSON = function () {
 			return api.apply({
 				json: true
 			}, [].slice.call(arguments));
 		};
+
 		api.defaults = {};
 
 		api.remove = function (key, attributes) {
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index ed3f893d6..932cfc777 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -6,7 +6,7 @@
       </span>
 
       <span v-if="filter.operator" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-operator">
-        {{ filter.operator }}
+        {{ (filter.operator == '=') ? operatorIsText : operatorIsNotText }}
       </span>
 
       <span v-if="filter.value" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-value">
@@ -31,7 +31,7 @@
         <i class="el-tag__close el-icon-close"></i>
       </button>
 
-      <div class="dropdown-menu" :class="[{'show': visible.options}]">
+      <div :id="'search-field-option-' + _uid" class="dropdown-menu" :class="[{'show': visible.options}]">
         <li ref="" class="dropdown-item" v-for="option in filteredOptions" :data-value="option.key">
           <button type="button" class="btn btn-link" @click="onOptionSelected(option.key)">{{ option.value }}</button>
         </li>
@@ -40,7 +40,7 @@
         </li>
       </div>
 
-      <div class="dropdown-menu" :class="[{'show': visible.operator}]">
+      <div :id="'search-field-operator-' + _uid" class="dropdown-menu" :class="[{'show': visible.operator}]">
         <li ref="" class="dropdown-item">
           <button type="button" class="btn btn-link" @click="onOperatorSelected('=')">{{ operatorIsText }}<span class="btn-helptext d-none">is</span></button>
         </li>
@@ -49,7 +49,7 @@
         </li>
       </div>
 
-      <div class="dropdown-menu" :class="[{'show': visible.values}]">
+      <div :id="'search-field-value-' + _uid" class="dropdown-menu" :class="[{'show': visible.values}]">
         <li ref="" class="dropdown-item" v-for="(value) in filteredValues" :data-value="value.key">
           <button type="button" class="btn btn-link" @click="onValueSelected(value.key)">{{ value.value }}</button>
         </li>
@@ -136,7 +136,7 @@ export default {
 
   methods: {
     onInputFocus() {
-      if (!this.filters.length) {
+      if (!this.filter_list.length) {
         return;
       }
 
@@ -145,6 +145,8 @@ export default {
       this.$nextTick(() => {
         this.$refs['input-search-field-' + this._uid].focus();
       });
+
+      console.log('Focus :' + this.filter_last_step);
     },
 
     onInput(evt) {
@@ -179,21 +181,37 @@ export default {
     },
 
     onInputConfirm() {
+      let path = window.location.href.replace(window.location.search, '');
       let args = '';
 
       if (this.search) {
-        args += '?search=' + this.search;
+        args += '?search=' + this.search + ' ';
       }
 
+      let now = new Date();
+      now.setTime(now.getTime() + 1 * 3600 * 1000);
+      let expires = now.toUTCString();
+
+      let serach_string = {};
+      serach_string[path] = {};
+
       this.filtered.forEach(function (filter, index) {
         if (!args) {
           args += '?search=';
         }
 
         args += this.selected_options[index].key + ':' + this.selected_values[index].key + ' ';
+
+        
+        serach_string[path][this.selected_options[index].key] = {
+          'key': this.selected_values[index].key,
+          'value': this.selected_values[index].value
+        };
       }, this);
 
-      window.location = window.location.href.replace(window.location.search, '') + args;
+      Cookies.set('search-string', serach_string, expires);
+
+      window.location = path + args;
     },
 
     onOptionSelected(value) {
@@ -252,6 +270,10 @@ export default {
         this.values = this.option_values[value];
       }
 
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+
       this.visible = {
         options: false,
         operator: true,
@@ -259,10 +281,6 @@ export default {
       };
 
       this.filter_last_step = 'operator';
-
-      this.$nextTick(() => {
-        this.$refs['input-search-field-' + this._uid].focus();
-      });
     },
 
     onOperatorSelected(value) {
@@ -270,8 +288,6 @@ export default {
 
       this.$emit('change', this.filtered);
 
-      this.operatorValue = '';
-
       this.$nextTick(() => {
         this.$refs['input-search-field-' + this._uid].focus();
       });
@@ -308,11 +324,19 @@ export default {
 
       this.filter_index++;
 
-      this.visible = {
-        options: true,
-        operator: false,
-        values: false,
-      };
+      if (this.filter_list.length) {
+        this.visible = {
+          options: true,
+          operator: false,
+          values: false,
+        };
+      } else {
+        this.visible = {
+          options: false,
+          operator: false,
+          values: false,
+        };
+      }
 
       this.filter_last_step = 'options';
     },
@@ -330,14 +354,16 @@ export default {
       this.filtered = [];
       this.search = '';
 
+      Cookies.remove('search-string');
+
       this.onInputConfirm();
     },
 
     closeIfClickedOutside(event) {
-      if (!document.getElementById('search-field-' + this._uid).contains(event.target)) {
-          //this.visible.options = false;
-          //this.visible.operator = false;
-          //this.visible.values = false;
+      if (!document.getElementById('search-field-' + this._uid).contains(event.target) && event.target.className != 'btn btn-link') {
+          this.visible.options = false;
+          this.visible.operator = false;
+          this.visible.values = false;
 
           document.removeEventListener('click', this.closeIfClickedOutside);
       }
@@ -345,6 +371,12 @@ export default {
   },
 
   created() {
+    let path = window.location.href.replace(window.location.search, '');
+
+    let cookie = Cookies.get('search-string');
+
+    cookie = JSON.parse(cookie)[path];
+
     if (this.value) {
       let serach_string = this.value.split(' ');
 
@@ -366,6 +398,10 @@ export default {
                 }
               }, this);
 
+              if (!value && cookie[_filter.key]) {
+                value = cookie[_filter.key].value;
+              }
+
               this.selected_options.push(this.filter_list[i]);
               this.filter_list.splice(i, 1);
 
@@ -378,6 +414,10 @@ export default {
                   this.option_values[_filter.key].splice(j, 1);
                 }
               }, this);
+
+              if (cookie[_filter.key]) {
+                  this.selected_values.push(cookie[_filter.key]);
+              }
             }
           }, this);
 
diff --git a/resources/assets/js/views/auth/roles.js b/resources/assets/js/views/auth/roles.js
index 41bd92bd8..09da7f69a 100644
--- a/resources/assets/js/views/auth/roles.js
+++ b/resources/assets/js/views/auth/roles.js
@@ -26,7 +26,7 @@ const app = new Vue({
     ],
 
     mounted() {
-        if (!this.form.permissions.length) {
+        if (typeof this.form.permissions !== 'undefined' && !this.form.permissions.length) {
             this.form.permissions = [];
         }
     },
diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php
index d5ceabef9..237fbaf17 100644
--- a/resources/views/banking/reconciliations/index.blade.php
+++ b/resources/views/banking/reconciliations/index.blade.php
@@ -9,7 +9,7 @@
 @endsection
 
 @section('content')
-    @if ($reconciliations->count())
+    @if ($reconciliations->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php
index 3b13700ec..6c4a63031 100644
--- a/resources/views/banking/transfers/index.blade.php
+++ b/resources/views/banking/transfers/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($transfers->count())
+    @if ($transfers->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php
index 9e6b48018..edd35a1ff 100644
--- a/resources/views/common/items/index.blade.php
+++ b/resources/views/common/items/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($items->count())
+    @if ($items->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php
index 540b72cc7..a7edb7aa1 100644
--- a/resources/views/purchases/bills/index.blade.php
+++ b/resources/views/purchases/bills/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($bills->count())
+    @if ($bills->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index 7aa451d26..a4257c373 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($payments->count())
+    @if ($payments->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
index c1045e75b..55edcfa57 100644
--- a/resources/views/purchases/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($vendors->count())
+    @if ($vendors->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php
index 824341b7a..ccf02c789 100644
--- a/resources/views/sales/customers/index.blade.php
+++ b/resources/views/sales/customers/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($customers->count())
+    @if ($customers->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php
index 03649eb26..91e790e10 100644
--- a/resources/views/sales/invoices/index.blade.php
+++ b/resources/views/sales/invoices/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($invoices->count())
+    @if ($invoices->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 42f6cab05..99e3dea97 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($revenues->count())
+    @if ($revenues->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php
index cbea11413..13739ec12 100644
--- a/resources/views/settings/taxes/index.blade.php
+++ b/resources/views/settings/taxes/index.blade.php
@@ -9,7 +9,7 @@
 @endcan
 
 @section('content')
-    @if ($taxes->count())
+    @if ($taxes->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([

From 86939055cd58a0217f1001b08a526769b20f526c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 9 Nov 2020 20:31:55 +0300
Subject: [PATCH 07/19] change data name

---
 resources/assets/js/components/AkauntingSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index 932cfc777..d355d9579 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -257,7 +257,7 @@ export default {
             data.forEach(function (item) {
               this.values.push({
                 key: item.id,
-                value: item.name
+                value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name
               });
             }, this);
 

From 93a62fed4a10ab61e2c6fc2e701304d82b2fe84a 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 12:28:24 +0300
Subject: [PATCH 08/19] card header fixed.

---
 public/css/custom.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index 8feca3952..6421a2500 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -848,7 +848,7 @@ table .align-items-center td span.badge {
 /*--lightbox Finish--*/
 
 /*-- Search string & BulkAction Start --*/
-#app .card .card-header {
+#app > .card > .card-header {
     min-height: 88px;
 }
 /*-- Search string & BulkAction Finish --*/
\ No newline at end of file

From 683b2a372dc009497c5f8a3a82c94e301ea869a9 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 12:31:17 +0300
Subject: [PATCH 09/19] Fixed: Drop-downs not sorted alphabetically

---
 .../assets/js/components/AkauntingSelect.vue  | 1031 +++--------------
 1 file changed, 161 insertions(+), 870 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 2fc2bdd26..ea0142b77 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -1,7 +1,5 @@
 <template>
-    <base-input
-        :label="title"
-        :name="name"
+    <base-input :label="title" :name="name"
         :readonly="readonly"
         :disabled="disabled"
         :class="[
@@ -10,763 +8,96 @@
             formClasses
         ]"
         :error="formError">
-        <span v-if="Array.isArray(selectOptions)">
-            <el-select v-model="real_model" @input="change" :disabled="disabled" filterable v-if="(disabled) && !multiple && !collapse"
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
 
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
+        <el-select v-model="selected" :placeholder="placeholder" filterable
+            @change="change" @visible-change="visibleChange" @remove-tag="removeTag" @clear="clear" @blur="blur" @focus="focus"
+            :disabled="disabled"
+            :multiple="multiple"
+            :readonly="readonly"
+            :collapse-tags="collapse"
+        >
 
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
+            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                <p class="el-select-dropdown__empty">
+                    {{ noMatchingDataText }}
+                </p>
 
-                <el-option v-if="!group" v-for="(option, key) in selectOptions"
-                :key="key"
+                <ul class="el-scrollbar__view el-select-dropdown__list">
+                    <li class="el-select-dropdown__item el-select__footer">
+                        <div @click="onAddItem">
+                            <i class="fas fa-plus"></i>
+                            <span>
+                                {{ addNew.text }}
+                            </span>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+
+            <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                <p class="el-select-dropdown__empty">
+                    {{ noDataText }}
+                </p>
+                <ul class="el-scrollbar__view el-select-dropdown__list">
+                    <li class="el-select-dropdown__item el-select__footer">
+                        <div @click="onAddItem">
+                            <i class="fas fa-plus"></i>
+                            <span>
+                                {{ addNew.text }}
+                            </span>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+
+            <template slot="prefix">
+                <span class="el-input__suffix-inner el-select-icon">
+                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                </span>
+            </template>
+
+            <el-option v-if="!group" v-for="(option, index) in sortOptions"
+                :key="index"
                 :label="option.value"
                 :value="option.key">
-                    <span class="float-left">{{ option.value }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
-                </el-option>
+                <span class="float-left">{{ option.value }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span>
+            </el-option>
 
-                <!-- Todo sortable -->
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true"  :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <el-select v-model="real_model" @input="change" :disabled="disabled" filterable v-if="!disabled && !multiple"
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
-
-                <el-option v-if="!group" v-for="(option, key) in selectOptions"
-                :key="key"
-                :label="option.value"
-                :value="option.key">
-                    <span class="float-left">{{ option.value }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
-                </el-option>
-
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && !collapse" multiple
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
-
-                <el-option v-if="!group" v-for="(option, key) in selectOptions"
-                :key="key"
-                :label="option.value"
-                :value="option.key">
-                    <span class="float-left">{{ option.value }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
-                </el-option>
-
-                <!-- Todo sortable -->
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <el-select v-model="real_model" @input="change" filterable disabled v-if="disabled && multiple && !collapse" multiple
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
-
-                <el-option v-if="!group" v-for="(option, key) in selectOptions"
-                :key="key"
-                :label="option.value"
-                :value="option.key">
-                    <span class="float-left">{{ option.value }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
-                </el-option>
-
-                <!-- Todo sortable -->
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && collapse" multiple collapse-tags
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
-
-                <el-option v-if="!group" v-for="(option, key) in selectOptions"
-                :key="key"
-                :label="option.value"
-                :value="option.key">
-                    <span class="float-left">{{ option.value }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
-                </el-option>
-
-                <!-- Todo sortable -->
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
-
-            <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
-
-            <select :name="name" v-model="real_model" class="d-none">
-                <option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
-            </select>
-        </span>
-
-        <span v-else>
-            <el-select v-model="real_model" @input="change" :disabled="disabled" filterable v-if="(disabled) && !multiple && !collapse"
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
-
-                <el-option v-if="!group" v-for="(label, value) in selectOptions"
+            <el-option-group
+                v-if="group"
+                v-for="(group_options, name) in sortOptions"
+                :key="name"
+                :label="name">
+                <el-option
+                    v-for="(label, value) in group_options"
                     :key="value"
                     :label="label"
                     :value="value">
                     <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ addNew.new_text }}</span>
                 </el-option>
+            </el-option-group>
 
-                <!-- Todo sortable -->
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true"  :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <el-select v-model="real_model" @input="change" filterable v-if="!Array.isArray(selectOptions) && !disabled && !multiple"
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+            <el-option class="el-select__footer" :disabled="true"  :value="add_new">
+                <div @click="onAddItem">
+                    <i class="fas fa-plus"></i>
+                    <span>
+                        {{ addNew.text }}
                     </span>
-                </template>
-
-                <el-option v-if="!group" v-for="(label, value) in selectOptions"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
-
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && !collapse" multiple
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
                 </div>
+            </el-option>
 
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
+        </el-select>
 
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
+        <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
 
-                <el-option v-if="!group" v-for="(label, value) in selectOptions"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
+        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[selected]">{{ addNew.new_text }}</span>
 
-                <!-- Todo sortable -->
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
+        <select :name="name"  :id="name" v-model="selected" class="d-none">
+            <option v-for="option in sortOptions" :key="option.key" :value="option.key">{{ option.value }}</option>
+        </select>
 
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <el-select v-model="real_model" @input="change" filterable disabled v-if="disabled && multiple && !collapse" multiple
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
-
-                <el-option v-if="!group" v-for="(label, value) in selectOptions"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
-
-                <!-- Todo sortable -->
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && collapse" multiple collapse-tags
-                :placeholder="placeholder">
-                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                    </span>
-                </template>
-
-                <el-option v-if="!group" v-for="(label, value) in selectOptions"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
-
-                <!-- Todo sortable -->
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
-            </el-select>
-
-            <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
-
-            <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
-
-            <select :name="name"  :id="name" v-model="real_model" class="d-none">
-                <option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
-            </select>
-        </span>
     </base-input>
 </template>
 
@@ -808,31 +139,42 @@ export default {
             default: '',
             description: "Selectbox label text"
         },
+
         placeholder: {
             type: String,
             default: '',
             description: "Selectbox input placeholder text"
         },
+
         formClasses: {
             type: Array,
             default: null,
             description: "Selectbox input class name"
         },
+
         formError: {
             type: String,
             default: null,
             description: "Selectbox input error message"
         },
+
+        icon: {
+            type: String,
+            description: "Prepend icon (left)"
+        },
+
         name: {
             type: String,
             default: null,
             description: "Selectbox attribute name"
         },
+
         value: {
             type: [String, Number, Array, Object],
             default: '',
             description: "Selectbox selected value"
         },
+
         options: null,
 
         option_sortable: {
@@ -847,11 +189,6 @@ export default {
             description: "Selectbox selected model"
         },
 
-        icon: {
-            type: String,
-            description: "Prepend icon (left)"
-        },
-
         addNew: {
             type: Object,
             default: function () {
@@ -873,21 +210,25 @@ export default {
             default: false,
             description: "Selectbox option group status"
         },
+
         multiple: {
             type: Boolean,
             default: false,
             description: "Multible feature status"
         },
+
         readonly: {
             type: Boolean,
             default: false,
             description: "Selectbox disabled status"
         },
+
         disabled: {
             type: Boolean,
             default: false,
             description: "Selectbox disabled status"
         },
+
         collapse:  {
             type: Boolean,
             default: false,
@@ -899,6 +240,7 @@ export default {
             default: 'No Data',
             description: "Selectbox empty options message"
         },
+
         noMatchingDataText: {
             type: String,
             default: 'No Matchign Data',
@@ -914,72 +256,75 @@ export default {
                 path: this.addNew.path,
                 type: this.addNew.type, // modal, inline
                 field: this.addNew.field,
-                buttons: this.addNew.buttons
+                buttons: this.addNew.buttons,
             },
-            add_new_text: this.addNew.text,
-            new_text: this.addNew.new_text,
-            selectOptions: this.options,
-            real_model: this.model,
             add_new_html: '',
-            form: {},
-            new_options: false,
-            couunt: 1,
+
+            selected: this.model,
+
+            sort_options: [],
+            new_options: {},
         }
     },
 
     created() {
-        /*
-        if (this.group != true && Object.keys(this.options).length) {
-            let sortable = [];
-            let option_sortable = this.option_sortable;
-
-            for (var option_key in this.options) {
-                sortable.push({
-                    'key' : option_key,
-                    'value': this.options[option_key]
+        // Option set sort_option data
+        if (Object.keys(this.options).length) {
+            for (const [key, value] of Object.entries(this.options)) {
+                this.sort_options.push({
+                    key: key,
+                    value: value
                 });
             }
-
-            if (option_sortable == 'value') {
-                sortable.sort(function(a, b) {
-                    var sortableA = a[option_sortable].toUpperCase();
-                    var sortableB = b[option_sortable].toUpperCase();
-
-                    let comparison = 0;
-
-                    if (sortableA > sortableB) {
-                        comparison = 1;
-                    } else if (sortableA < sortableB) {
-                        comparison = -1;
-                    }
-
-                    return comparison;
+        } else {
+            this.options.forEach(function (option, index) {
+                this.sort_options.push({
+                    key: option,
+                    value: index
                 });
-            }
-
-            this.options = sortable;
+            }, this);
         }
-        */
+    },
 
-        this.new_options = {};
+    computed: {
+        sortOptions() {
+            this.sort_options.sort(function (a, b) {
+                var nameA = a.value.toUpperCase(); // ignore upper and lowercase
+                var nameB = b.value.toUpperCase(); // ignore upper and lowercase
+
+                if (nameA < nameB) {
+                    return -1;
+                }
+
+                if (nameA > nameB) {
+                    return 1;
+                }
+
+                // names must be equal
+                return 0;
+            });
+
+            return this.sort_options;
+        },
     },
 
     mounted() {
-        this.real_model = this.value;
+        // Check Here..
+        this.selected = this.value;
 
         if (this.model.length) {
             if (eval(this.model) !== undefined) {
-                this.real_model = eval(this.model);
+                this.selected = eval(this.model);
             } else {
-                this.real_model = this.model;
+                this.selected = this.model;
             }
         }
 
-        if (this.multiple && !this.real_model.length) {
-            this.real_model = [];
+        if (this.multiple && !this.selected.length) {
+            this.selected = [];
         }
 
-        this.$emit('interface', this.real_model);
+        this.$emit('interface', this.selected);
 
         setTimeout(function() {
             this.change();
@@ -988,30 +333,29 @@ export default {
 
     methods: {
         change() {
-            if (typeof(this.real_model) === 'object' && typeof(this.real_model.type) !== 'undefined') {
-                return false;
-            }
+            this.$emit('interface', this.selected);
 
-            this.$emit('interface', this.real_model);
-            this.$emit('change', this.real_model);
+            this.$emit('change', this.selected);
+        },
 
-            //this.$children[0].$children[0].$emit('keydown.native.tab');
-            //this.$children[0].$children[0].handleMenuEnter();
+        visibleChange(event) {
+            this.$emit('visible-change', event);
+        },
 
-            this.$children[0].$children[0].visible = false;
+        removeTag(event) {
+            this.$emit('remove-tag', event);
+        },
 
-            /*
-            this.$children[0].$children[0].setSoftFocus();
-            if (this.$children[0].$children[0].visible) return;
+        clear(event) {
+            this.$emit('clear', event);
+        },
 
-            let option = {};
+        blur(event) {
+            this.$emit('blur', event);
+        },
 
-            option.value = this.real_model;
-
-            this.$children[0].$children[0].$nextTick(() => {
-                this.$children[0].$children[0].scrollToOption(option);
-            });
-            */
+        focus(event) {
+            this.$emit('focus', event);
         },
 
         async onAddItem() {
@@ -1129,17 +473,17 @@ export default {
                 this.form.loading = false;
 
                 if (response.data.success) {
-                    if (!Object.keys(this.options).length) {
-                        this.selectOptions =  {};
-                    }
+                    this.sort_options.push({
+                        key: response.data.data[this.add_new.field.key].toString(),
+                        value: response.data.data[this.add_new.field.value],
+                    });
 
-                    this.selectOptions[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
                     this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
 
                     if (this.multiple) {
-                        this.real_model.push(response.data.data[this.add_new.field.key].toString());
+                        this.selected.push(response.data.data[this.add_new.field.key].toString());
                     } else {
-                        this.real_model = response.data.data[this.add_new.field.key].toString();
+                        this.selected = response.data.data[this.add_new.field.key].toString();
                     }
 
                     this.add_new.show = false;
@@ -1179,63 +523,6 @@ export default {
 
         },
     },
-
-    watch: {
-        options: function (options) {
-            // update options
-            this.selectOptions = options;
-
-            if (Object.keys(this.new_options).length) {
-                if (!Object.keys(this.options).length) {
-                    this.selectOptions =  {};
-                }
-
-                for (let [key, value] of Object.entries(this.new_options)) {
-                    if (!this.selectOptions[key]) {
-                        this.selectOptions[key] = value;
-                    }
-                }
-            }
-        },
-
-        real_model: function (value) {
-            if (this.multiple) {
-                return;
-            }
-
-            if (this.real_model != value) {
-                this.change();
-            }
-
-            let e = $.Event('keyup');
-            e.keyCode= 9; // tab
-            $('#' + this.name).trigger(e);
-
-            let event = new window.KeyboardEvent('keydown', { keyCode: 9 }); // Tab key
-
-            window.dispatchEvent(event);
-        },
-
-        value: function (value) {
-            if (this.multiple) {
-                this.real_model = value;
-            } else {
-                this.real_model = value.toString();
-            }
-
-            this.change();
-        },
-
-        model: function (value) {
-            if (this.multiple) {
-                this.real_model = value;
-            } else {
-                this.real_model = value.toString();
-            }
-
-            this.change();
-        }
-    },
 }
 </script>
 
@@ -1283,4 +570,8 @@ export default {
         margin-right: 35px;
         position: relative;
     }
+
+    .badge.badge-pill.badge-success {
+        border-radius: 0.375rem;
+    }
 </style>

From 57759aa718294e2966384fd131df473168e63ac1 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 16:55:21 +0300
Subject: [PATCH 10/19] refs select and select remote re-factoring

---
 .../assets/js/components/AkauntingSelect.vue  |  19 +-
 .../js/components/AkauntingSelectRemote.vue   | 797 ++++++------------
 2 files changed, 254 insertions(+), 562 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index ea0142b77..3ce97ac95 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -269,7 +269,7 @@ export default {
 
     created() {
         // Option set sort_option data
-        if (Object.keys(this.options).length) {
+        if (!Array.isArray(this.options)) {
             for (const [key, value] of Object.entries(this.options)) {
                 this.sort_options.push({
                     key: key,
@@ -279,8 +279,9 @@ export default {
         } else {
             this.options.forEach(function (option, index) {
                 this.sort_options.push({
-                    key: option,
-                    value: index
+                    index: index,
+                    key: option.id,
+                    value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name
                 });
             }, this);
         }
@@ -366,11 +367,11 @@ export default {
                 var value = this.$children[0].$children[0].$refs.input.value;
             }
 
-            if (this.add_new.type == 'inline') {
-                if (value === '') {
-                    return false;
-                }
+            if (value === '') {
+                return false;
+            }
 
+            if (this.add_new.type == 'inline') {
                 await this.addInline(value);
             } else {
                 await this.onModal(value);
@@ -535,6 +536,10 @@ export default {
         padding: 10px 0 0 !important;
     }
 
+    .el-select-dropdown__empty.loading {
+        padding: 10px 0 !important;
+    }
+
     .el-select__footer {
         text-align: center;
         border-top: 1px solid #dee2e6;
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index e600a6b6c..cf365b2c4 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -1,8 +1,5 @@
 <template>
-    <base-input
-        v-if="title"
-        :label="title"
-        :name="name"
+    <base-input v-if="title" :label="title" :name="name"
         :readonly="readonly"
         :disabled="disabled"
         :class="[
@@ -11,22 +8,28 @@
             formClasses
         ]"
         :error="formError">
-        <el-select v-model="real_model" @input="change" disabled filterable v-if="disabled && !multiple"
-            remote
-            reserve-keyword
-            :placeholder="placeholder"
+
+        <el-select v-model="selected" :placeholder="placeholder" filterable remote reserve-keyword
+            @change="change" @visible-change="visibleChange" @remove-tag="removeTag" @clear="clear" @blur="blur" @focus="focus"
+            :disabled="disabled"
+            :multiple="multiple"
+            :readonly="readonly"
+            :collapse-tags="collapse"
             :remote-method="remoteMethod"
-            :loading="loading">
+            :loading="loading"
+        >
+
             <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
                 <p class="el-select-dropdown__empty">
                     {{ noMatchingDataText }}
                 </p>
+
                 <ul class="el-scrollbar__view el-select-dropdown__list">
                     <li class="el-select-dropdown__item el-select__footer">
                         <div @click="onAddItem">
                             <i class="fas fa-plus"></i>
                             <span>
-                                {{ add_new_text }}
+                                {{ addNew.text }}
                             </span>
                         </div>
                     </li>
@@ -42,7 +45,7 @@
                         <div @click="onAddItem">
                             <i class="fas fa-plus"></i>
                             <span>
-                                {{ add_new_text }}
+                                {{ addNew.text }}
                             </span>
                         </div>
                     </li>
@@ -55,445 +58,141 @@
                 </span>
             </template>
 
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+            <el-option v-if="!group" v-for="(option, index) in sortOptions"
+                :key="index"
+                :label="option.value"
+                :value="option.key">
+                <span class="float-left">{{ option.value }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span>
             </el-option>
 
             <el-option-group
                 v-if="group"
-                v-for="(options, name) in selectOptions"
+                v-for="(group_options, name) in sortOptions"
                 :key="name"
                 :label="name">
                 <el-option
-                    v-for="(label, value) in options"
+                    v-for="(label, value) in group_options"
                     :key="value"
                     :label="label"
                     :value="value">
                     <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ addNew.new_text }}</span>
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+            <el-option class="el-select__footer" :disabled="true"  :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
-                        {{ add_new_text }}
+                        {{ addNew.text }}
                     </span>
                 </div>
             </el-option>
+
         </el-select>
 
-        <el-select v-model="real_model" @input="change" filterable v-if="!disabled && !multiple"
-            remote
-            reserve-keyword
-            :placeholder="placeholder"
-            :remote-method="remoteMethod"
-            :loading="loading">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+        <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
 
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[selected]">{{ addNew.new_text }}</span>
 
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
-            </el-option-group>
-
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
-                </div>
-            </el-option>
-        </el-select>
-
-        <el-select v-model="real_model" @input="change" filterable v-if="disabled && multiple && !collapse" multiple disabled
-            remote
-            reserve-keyword
-            :placeholder="placeholder"
-            :remote-method="remoteMethod"
-            :loading="loading">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
-            </el-option-group>
-
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
-                </div>
-            </el-option>
-        </el-select>
-
-        <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && !collapse" multiple
-            remote
-            reserve-keyword
-            :placeholder="placeholder"
-            :remote-method="remoteMethod"
-            :loading="loading">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
-            </el-option-group>
-
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
-                </div>
-            </el-option>
-        </el-select>
-
-        <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && collapse" multiple collapse-tags
-            remote
-            reserve-keyword
-            :placeholder="placeholder"
-            :remote-method="remoteMethod"
-            :loading="loading">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
-            </el-option-group>
-
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
-                </div>
-            </el-option>
-        </el-select>
-
-        <component v-bind:is="add_new_html" @submit="onSubmit"></component>
-
-        <select :name="name" v-model="real_model" class="d-none">
-            <option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
+        <select :name="name"  :id="name" v-model="selected" class="d-none">
+            <option v-for="option in sortOptions" :key="option.key" :value="option.key">{{ option.value }}</option>
         </select>
 
-        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
     </base-input>
 
     <span v-else>
-        <el-select
-            :class="'pl-20 mr-40'"
-            v-model="real_model"
-            @input="change"
-            filterable
-            remote
-            reserve-keyword
-            :placeholder="placeholder"
+        <el-select v-model="selected" :placeholder="placeholder" filterable remote reserve-keyword
+            @change="change" @visible-change="visibleChange" @remove-tag="removeTag" @clear="clear" @blur="blur" @focus="focus"
+            :disabled="disabled"
+            :multiple="multiple"
+            :readonly="readonly"
+            :collapse-tags="collapse"
             :remote-method="remoteMethod"
-            :loading="loading">
-                <div v-if="loading" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty loading">
-                        {{ loadingText }}
-                    </p>
-                </div>
+            :loading="loading"
+        >
 
-                <div v-else-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noMatchingDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
+            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                <p class="el-select-dropdown__empty">
+                    {{ noMatchingDataText }}
+                </p>
 
-                <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                    <p class="el-select-dropdown__empty">
-                        {{ noDataText }}
-                    </p>
-                    <ul class="el-scrollbar__view el-select-dropdown__list">
-                        <li class="el-select-dropdown__item el-select__footer">
-                            <div @click="onAddItem">
-                                <i class="fas fa-plus"></i>
-                                <span>
-                                    {{ add_new_text }}
-                                </span>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
+                <ul class="el-scrollbar__view el-select-dropdown__list">
+                    <li class="el-select-dropdown__item el-select__footer">
+                        <div @click="onAddItem">
+                            <i class="fas fa-plus"></i>
+                            <span>
+                                {{ addNew.text }}
+                            </span>
+                        </div>
+                    </li>
+                </ul>
+            </div>
 
-                <template slot="prefix">
-                    <span class="el-input__suffix-inner el-select-icon">
-                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+            <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                <p class="el-select-dropdown__empty">
+                    {{ noDataText }}
+                </p>
+                <ul class="el-scrollbar__view el-select-dropdown__list">
+                    <li class="el-select-dropdown__item el-select__footer">
+                        <div @click="onAddItem">
+                            <i class="fas fa-plus"></i>
+                            <span>
+                                {{ addNew.text }}
+                            </span>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+
+            <template slot="prefix">
+                <span class="el-input__suffix-inner el-select-icon">
+                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                </span>
+            </template>
+
+            <el-option v-if="!group" v-for="(option, index) in sortOptions"
+                :key="index"
+                :label="option.value"
+                :value="option.key">
+                <span class="float-left">{{ option.value }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ addNew.new_text }}</span>
+            </el-option>
+
+            <el-option-group
+                v-if="group"
+                v-for="(group_options, name) in sortOptions"
+                :key="name"
+                :label="name">
+                <el-option
+                    v-for="(label, value) in group_options"
+                    :key="value"
+                    :label="label"
+                    :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ addNew.new_text }}</span>
+                </el-option>
+            </el-option-group>
+
+            <el-option class="el-select__footer" :disabled="true"  :value="add_new">
+                <div @click="onAddItem">
+                    <i class="fas fa-plus"></i>
+                    <span>
+                        {{ addNew.text }}
                     </span>
-                </template>
+                </div>
+            </el-option>
 
-                <el-option v-if="!group" v-for="option in selectOptions"
-                :key="option.id"
-                :label="option.name"
-                :value="option.id">
-                    <span class="float-left">{{ option.name }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.id]">{{ new_text }}</span>
-                </el-option>
-
-                <el-option-group
-                    v-if="group"
-                    v-for="(options, name) in selectOptions"
-                    :key="name"
-                    :label="name">
-                    <el-option
-                        v-for="(label, value) in options"
-                        :key="value"
-                        :label="label"
-                        :value="value">
-                        <span class="float-left">{{ label }}</span>
-                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                    </el-option>
-                </el-option-group>
-
-                <el-option v-if="!loading && addNew.status && selectOptions != null && selectOptions.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                    <div @click="onAddItem">
-                        <i class="fas fa-plus"></i>
-                        <span>
-                            {{ add_new_text }}
-                        </span>
-                    </div>
-                </el-option>
         </el-select>
 
-        <span class="badge badge-success badge-resize float-right mr-2" v-if="new_options[real_model]">{{ new_text }}</span>
+        <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
+
+        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[selected]">{{ addNew.new_text }}</span>
+
+        <select :name="name"  :id="name" v-model="selected" class="d-none">
+            <option v-for="option in sortOptions" :key="option.key" :value="option.key">{{ option.value }}</option>
+        </select>
     </span>
 </template>
 
@@ -535,42 +234,54 @@ export default {
             default: null,
             description: "Selectbox label text"
         },
+
         placeholder: {
             type: String,
             default: '',
             description: "Selectbox input placeholder text"
         },
+
         formClasses: {
             type: Array,
             default: null,
             description: "Selectbox input class name"
         },
+
         formError: {
             type: String,
             default: null,
             description: "Selectbox input error message"
         },
+
+        icon: {
+            type: String,
+            description: "Prepend icon (left)"
+        },
+
         name: {
             type: String,
             default: null,
             description: "Selectbox attribute name"
         },
+
         value: {
-            type: [String, Number, Array],
+            type: [String, Number, Array, Object],
             default: '',
             description: "Selectbox selected value"
         },
+
         options: null,
 
-        model: {
-            type: [String, Number],
-            default: null,
-            description: "Selectbox selected model"
+        option_sortable: {
+            type: String,
+            default: 'value',
+            description: "Option Sortable type (key|value)"
         },
 
-        icon: {
-            type: String,
-            description: "Prepend icon (left)"
+        model: {
+            type: [String, Number, Array, Object],
+            default: null,
+            description: "Selectbox selected model"
         },
 
         addNew: {
@@ -589,26 +300,30 @@ export default {
             description: "Selectbox Add New Item Feature"
         },
 
-        group:  {
+        group: {
             type: Boolean,
             default: false,
             description: "Selectbox option group status"
         },
+
         multiple: {
             type: Boolean,
             default: false,
             description: "Multible feature status"
         },
+
         readonly: {
             type: Boolean,
             default: false,
             description: "Selectbox disabled status"
         },
+
         disabled: {
             type: Boolean,
             default: false,
             description: "Selectbox disabled status"
         },
+
         collapse:  {
             type: Boolean,
             default: false,
@@ -620,11 +335,13 @@ export default {
             default: 'Loading...',
             description: "Selectbox loading message"
         },
+
         noDataText: {
             type: String,
             default: 'No Data',
             description: "Selectbox empty options message"
         },
+
         noMatchingDataText: {
             type: String,
             default: 'No Matchign Data',
@@ -650,56 +367,116 @@ export default {
 
     data() {
         return {
-            list: [],
             add_new: {
                 text: this.addNew.text,
                 show: false,
                 path: this.addNew.path,
                 type: this.addNew.type, // modal, inline
                 field: this.addNew.field,
-                buttons: this.addNew.buttons
+                buttons: this.addNew.buttons,
             },
-            add_new_text: this.addNew.text,
-            new_text: this.addNew.new_text,
-            selectOptions: this.options,
-            real_model: this.model,
             add_new_html: '',
-            form: {},
+
+            selected: this.model,
+
+            sort_options: [],
+            new_options: {},
             loading: false,
-            new_options: false,
         }
     },
 
     created() {
-        this.new_options = {};
+        // Option set sort_option data
+        if (!Array.isArray(this.options)) {
+            for (const [key, value] of Object.entries(this.options)) {
+                this.sort_options.push({
+                    key: key,
+                    value: value
+                });
+            }
+        } else {
+            this.options.forEach(function (option, index) {
+                this.sort_options.push({
+                    index: index,
+                    key: option.id,
+                    value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name  
+                });
+            }, this);
+        }
+    },
+
+    computed: {
+        sortOptions() {
+            this.sort_options.sort(function (a, b) {
+                var nameA = a.value.toUpperCase(); // ignore upper and lowercase
+                var nameB = b.value.toUpperCase(); // ignore upper and lowercase
+
+                if (nameA < nameB) {
+                    return -1;
+                }
+
+                if (nameA > nameB) {
+                    return 1;
+                }
+
+                // names must be equal
+                return 0;
+            });
+
+            return this.sort_options;
+        },
     },
 
     mounted() {
-        if (this.multiple) {
-            if (!this.value.length) {
-                this.real_model = [];
+        // Check Here..
+        this.selected = this.value;
+
+        if (this.model.length) {
+            if (eval(this.model) !== undefined) {
+                this.selected = eval(this.model);
             } else {
-                let pre_value = [];
-
-                this.value.forEach(item => {
-                    pre_value.push(item.toString());
-                });
-
-                this.real_model = pre_value;
+                this.selected = this.model;
             }
-            
-        } else {
-            this.real_model = this.value;
         }
 
-        this.$emit('interface', this.real_model);
+        if (this.multiple && !this.selected.length) {
+            this.selected = [];
+        }
+
+        this.$emit('interface', this.selected);
 
         setTimeout(function() {
-            //this.change(); for invoice item
+            this.change();
         }.bind(this), 800);
     },
 
     methods: {
+        change() {
+            this.$emit('interface', this.selected);
+
+            this.$emit('change', this.selected);
+        },
+
+        visibleChange(event) {
+            this.$emit('visible-change', event);
+        },
+
+        removeTag(event) {
+            this.$emit('remove-tag', event);
+        },
+
+        clear(event) {
+            this.$emit('clear', event);
+        },
+
+        blur(event) {
+            this.$emit('blur', event);
+        },
+
+        focus(event) {
+            this.$emit('focus', event);
+        },
+
         remoteMethod(query) {
             if (document.getElementById('form-select-' + this.name)) {
                 document.getElementById('form-select-' + this.name).getElementsByTagName("input")[0].readOnly = false;
@@ -745,38 +522,6 @@ export default {
             }
         },
 
-        change() {
-            if (typeof(this.real_model) === 'object' && !Array.isArray(this.real_model)) {
-                return false;
-            }
-
-            if (Array.isArray(this.real_model) && !this.real_model.length) {
-                return false;
-            }
-
-            this.$emit('interface', this.real_model);
-            this.$emit('change', this.real_model);
-
-            if (Array.isArray(this.selectOptions)) {
-                this.selectOptions.forEach(item => {
-                    if (item.id == this.real_model) {
-                        this.$emit('label', item.name);
-                        this.$emit('option', item);
-
-                        return true;
-                    }
-                });
-            }
-        },
-
-        onPressEnter() {
-            alert('Press Enter');
-        },
-
-        OnPressTab() {
-            alert('Press Tab');
-        },
-
         async onAddItem() {
             // Get Select Input value
             if (this.title) {
@@ -785,11 +530,11 @@ export default {
                 var value = this.$children[0].$children[0].$refs.input.value;
             }
 
-            if (value === '') {
-                return false;
-            }
-
             if (this.add_new.type == 'inline') {
+                if (value === '') {
+                    return false;
+                }
+
                 await this.addInline(value);
             } else {
                 await this.onModal(value);
@@ -926,14 +671,18 @@ export default {
                 this.form.loading = false;
 
                 if (response.data.success) {
-                    if (!Object.keys(this.options).length) {
-                        this.selectOptions =  [];
-                    }
+                    this.sort_options.push({
+                        key: response.data.data[this.add_new.field.key].toString(),
+                        value: response.data.data[this.add_new.field.value],
+                    });
 
-                    this.selectOptions.push(response.data.data);
-                    //this.selectOptions[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
                     this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
-                    this.real_model = response.data.data[this.add_new.field.key];//.toString();
+
+                    if (this.multiple) {
+                        this.selected.push(response.data.data[this.add_new.field.key].toString());
+                    } else {
+                        this.selected = response.data.data[this.add_new.field.key].toString();
+                    }
 
                     this.add_new.show = false;
 
@@ -962,7 +711,7 @@ export default {
             this.add_new.show = false;
             this.add_new.html = null;
             this.add_new_html = null;
-            
+
             let documentClasses = document.body.classList;
 
             documentClasses.remove("modal-open");
@@ -972,68 +721,6 @@ export default {
 
         },
     },
-
-    watch: {
-        options: function (options) {
-            // update options
-            this.selectOptions = options;
-
-            if (Object.keys(this.new_options).length) {
-                if (!Object.keys(this.options).length) {
-                    this.selectOptions =  [];
-                }
-
-                Object.values(this.new_options).forEach(item => {
-                    this.selectOptions.push(item);
-                });
-            }
-        },
-
-        real_model: function (value) {
-            if (this.multiple) {
-                return;
-            }
-
-            if (this.real_model != value) {
-                this.change();
-            }
-
-            let e = $.Event('keyup');
-            e.keyCode= 9; // tab
-            $('#' + this.name).trigger(e);
-
-            let event = new window.KeyboardEvent('keydown', { keyCode: 9 }); // Tab key
-
-            window.dispatchEvent(event);
-        },
-
-        value: function (value) {
-            if (this.multiple) {
-                if (Array.isArray(this.real_model) && !this.real_model.length) {
-                    this.real_model = value;
-                } else {
-                    let pre_value = [];
-
-                    value.forEach(item => {
-                        pre_value.push(item.toString());
-                    });
-
-                    this.real_model = pre_value;
-                }
-            } else {
-                //this.real_model = value.toString();
-                this.real_model = value;
-            }
-        },
-
-        model: function (value) {
-            if (this.multiple) {
-                this.real_model = value;
-            } else {
-                this.real_model = value;
-            }
-        }
-    },
 }
 </script>
 
@@ -1046,10 +733,6 @@ export default {
         padding: 10px 0 0 !important;
     }
 
-    .el-select-dropdown__empty.loading {
-        padding: 10px 0 !important;
-    }
-
     .el-select__footer {
         text-align: center;
         border-top: 1px solid #dee2e6;
@@ -1085,4 +768,8 @@ export default {
         margin-right: 35px;
         position: relative;
     }
+
+    .badge.badge-pill.badge-success {
+        border-radius: 0.375rem;
+    }
 </style>

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 11/19] 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'), []) }}
 

From 870db531fe2df6a3494a4717ad2b127dd4a8c65e 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 21:01:52 +0300
Subject: [PATCH 12/19] refs select remote file

---
 .../js/components/AkauntingSelectRemote.vue   | 76 ++++++++++++-------
 .../select_remote_add_new_group.blade.php     |  2 +
 .../form/select_remote_group.blade.php        |  2 +
 3 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index cf365b2c4..1cbd1288a 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -280,7 +280,7 @@ export default {
 
         model: {
             type: [String, Number, Array, Object],
-            default: null,
+            default: '',
             description: "Selectbox selected model"
         },
 
@@ -386,23 +386,7 @@ export default {
     },
 
     created() {
-        // Option set sort_option data
-        if (!Array.isArray(this.options)) {
-            for (const [key, value] of Object.entries(this.options)) {
-                this.sort_options.push({
-                    key: key,
-                    value: value
-                });
-            }
-        } else {
-            this.options.forEach(function (option, index) {
-                this.sort_options.push({
-                    index: index,
-                    key: option.id,
-                    value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name  
-                });
-            }, this);
-        }
+        this.setSortOptions();
     },
 
     computed: {
@@ -451,6 +435,26 @@ export default {
     },
 
     methods: {
+        setSortOptions() {
+            // Option set sort_option data
+            if (!Array.isArray(this.options)) {
+                for (const [key, value] of Object.entries(this.options)) {
+                    this.sort_options.push({
+                        key: key,
+                        value: value
+                    });
+                }
+            } else {
+                this.options.forEach(function (option, index) {
+                    this.sort_options.push({
+                        index: index,
+                        key: option.id,
+                        value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name  
+                    });
+                }, this);
+            }
+        },
+
         change() {
             this.$emit('interface', this.selected);
 
@@ -485,18 +489,23 @@ export default {
             if (query !== '') {
                 this.loading = true;
 
-               if (!this.remoteAction) {
-                   this.remoteAction = url + '/common/items/autocomplete';
+                let path = this.remoteAction;
+
+               if (!path) {
+                   path = url + '/common/items/autocomplete';
                }
 
+               if (path.search('/?') !== -1) {
+                    path += '?search=' + query;
+               } else {
+                    path += '&search=' + query;
+               }
+
+               path += '&currency_code=' + this.currencyCode;
+
                 window.axios({
                     method: 'GET',
-                    url: this.remoteAction,
-                    params: {
-                        type: this.remoteType,
-                        query: query,
-                        currency_code: this.currencyCode,
-                    },
+                    url: path,
                     headers: {
                         'X-CSRF-TOKEN': window.Laravel.csrfToken,
                         'X-Requested-With': 'XMLHttpRequest',
@@ -507,9 +516,18 @@ export default {
                     this.loading = false;
 
                     if (response.data.data) {
-                        this.selectOptions = response.data.data;
+                        let data = response.data.data;
+
+                        this.sort_options = [];
+
+                        data.forEach(function (option) {
+                            this.sort_options.push({
+                                key: option.id.toString(),
+                                value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name  
+                            });
+                        }, this);
                     } else {
-                        this.selectOptions = [];
+                        this.sortOptions = [];
                     }
                 })
                 .catch(e => {
@@ -518,7 +536,7 @@ export default {
                     // always executed
                 });
             } else {
-                this.selectOptions = this.options;
+                this.setSortOptions();
             }
         },
 
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
index 542acef27..71f6e7a63 100644
--- a/resources/views/partials/form/select_remote_add_new_group.blade.php
+++ b/resources/views/partials/form/select_remote_add_new_group.blade.php
@@ -3,6 +3,8 @@
     <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
diff --git a/resources/views/partials/form/select_remote_group.blade.php b/resources/views/partials/form/select_remote_group.blade.php
index b234abc2a..c660a5b82 100644
--- a/resources/views/partials/form/select_remote_group.blade.php
+++ b/resources/views/partials/form/select_remote_group.blade.php
@@ -3,6 +3,8 @@
     <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

From 8ed62127d13d25531fffccd7b3e111936880218d 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 21:20:50 +0300
Subject: [PATCH 13/19] remote type clear..

---
 resources/assets/js/components/AkauntingSearch.vue       | 5 -----
 resources/assets/js/components/AkauntingSelectRemote.vue | 9 ++-------
 resources/views/auth/users/create.blade.php              | 2 +-
 resources/views/auth/users/edit.blade.php                | 2 +-
 resources/views/common/items/create.blade.php            | 2 +-
 resources/views/common/items/edit.blade.php              | 2 +-
 resources/views/modals/items/create.blade.php            | 2 +-
 .../form/multi_select_remote_add_new_group.blade.php     | 3 +--
 .../partials/form/multi_select_remote_group.blade.php    | 3 +--
 .../partials/form/select_remote_add_new_group.blade.php  | 3 +--
 .../views/partials/form/select_remote_group.blade.php    | 3 +--
 resources/views/purchases/bills/create.blade.php         | 4 ++--
 resources/views/purchases/bills/edit.blade.php           | 4 ++--
 resources/views/purchases/payments/create.blade.php      | 4 ++--
 resources/views/purchases/payments/edit.blade.php        | 4 ++--
 resources/views/sales/invoices/create.blade.php          | 4 ++--
 resources/views/sales/invoices/edit.blade.php            | 4 ++--
 resources/views/sales/revenues/create.blade.php          | 4 ++--
 resources/views/sales/revenues/edit.blade.php            | 4 ++--
 resources/views/settings/default/edit.blade.php          | 4 ++--
 20 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index 639849c4a..3d49182a4 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -124,11 +124,6 @@
                 default: null,
                 description: "Selectbox remote action path"
             },
-            remoteType: {
-                type: String,
-                default: 'invoice',
-                description: "Ger remote item type."
-            },
         },
 
         data() {
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index 1cbd1288a..1a6cd9473 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -353,11 +353,6 @@ export default {
             default: null,
             description: "Selectbox remote action path"
         },
-        remoteType: {
-            type: String,
-            default: 'invoice',
-            description: "Ger remote item type."
-        },
         currencyCode: {
             type: String,
             default: 'USD',
@@ -449,7 +444,7 @@ export default {
                     this.sort_options.push({
                         index: index,
                         key: option.id,
-                        value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name  
+                        value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name
                     });
                 }, this);
             }
@@ -523,7 +518,7 @@ export default {
                         data.forEach(function (option) {
                             this.sort_options.push({
                                 key: option.id.toString(),
-                                value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name  
+                                value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name
                             });
                         }, this);
                     } else {
diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php
index cffa741ab..9e37092f9 100644
--- a/resources/views/auth/users/create.blade.php
+++ b/resources/views/auth/users/create.blade.php
@@ -48,7 +48,7 @@
                     @endif
 
                     @can('read-common-companies')
-                    {{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, [], ['required' => 'required', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }}
+                    {{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, [], ['required' => 'required', 'remote_action' => route('companies.index')]) }}
                     @endcan
 
                     @can('read-auth-roles')
diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php
index 29c02178f..3012d3831 100644
--- a/resources/views/auth/users/edit.blade.php
+++ b/resources/views/auth/users/edit.blade.php
@@ -49,7 +49,7 @@
                     @endif
 
                     @can('read-common-companies')
-                        {{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required', 'disabled' => (in_array('customer', $user->roles()->pluck('name')->toArray())) ? 'true' : 'false', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }}
+                        {{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required', 'disabled' => (in_array('customer', $user->roles()->pluck('name')->toArray())) ? 'true' : 'false', 'remote_action' => route('companies.index')]) }}
                     @endcan
 
                     @can('read-auth-roles')
diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php
index f3f90ca52..62023f1a7 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::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::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['path' => route('modals.categories.create') . '?type=item']) }}
 
                     {{ 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 8e429d902..5c2676b28 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::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::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']) }}
 
                     {{ 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 ba7250919..53a16e9a5 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::selectRemoteGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['remote_action' => route('categories.index'). '?type=item', 'remote_type' => 'category']) }}
+        {{ Form::selectRemoteGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['remote_action' => route('categories.index'). '?type=item']) }}
 
         {!! 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
index b00f49516..6bb4ebe1c 100644
--- 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
@@ -84,9 +84,8 @@
         @endif
 
         remote-action="{{ $attributes['remote_action'] }}"
-        remote-type="{{ $attributes['remote_type'] }}"
 
-        @if (!empty($attributes['currecny_code'])) 
+        @if (!empty($attributes['currecny_code']))
         currency-code="{{ $attributes['currecny_code'] }}"
         @endif
 
diff --git a/resources/views/partials/form/multi_select_remote_group.blade.php b/resources/views/partials/form/multi_select_remote_group.blade.php
index 699dcb591..3af3c8772 100644
--- a/resources/views/partials/form/multi_select_remote_group.blade.php
+++ b/resources/views/partials/form/multi_select_remote_group.blade.php
@@ -62,9 +62,8 @@
         @endif
 
         remote-action="{{ $attributes['remote_action'] }}"
-        remote-type="{{ $attributes['remote_type'] }}"
 
-        @if (!empty($attributes['currecny_code'])) 
+        @if (!empty($attributes['currecny_code']))
         currency-code="{{ $attributes['currecny_code'] }}"
         @endif
 
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
index 71f6e7a63..f0f02af21 100644
--- a/resources/views/partials/form/select_remote_add_new_group.blade.php
+++ b/resources/views/partials/form/select_remote_add_new_group.blade.php
@@ -78,9 +78,8 @@
         @endif
 
         remote-action="{{ $attributes['remote_action'] }}"
-        remote-type="'{{ $attributes['remote_type'] }}"
 
-        @if (!empty($attributes['currecny_code'])) 
+        @if (!empty($attributes['currecny_code']))
         currency-code="{{ $attributes['currecny_code'] }}"
         @endif
 
diff --git a/resources/views/partials/form/select_remote_group.blade.php b/resources/views/partials/form/select_remote_group.blade.php
index c660a5b82..cc3c4c14a 100644
--- a/resources/views/partials/form/select_remote_group.blade.php
+++ b/resources/views/partials/form/select_remote_group.blade.php
@@ -56,9 +56,8 @@
         @endif
 
         remote-action="{{ $attributes['remote_action'] }}"
-        remote-type="'{{ $attributes['remote_type'] }}"
 
-        @if (!empty($attributes['currecny_code'])) 
+        @if (!empty($attributes['currecny_code']))
         currency-code="{{ $attributes['currecny_code'] }}"
         @endif
 
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 889c5d671..4244463df 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::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::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')]) }}
 
                     {{ 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::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::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']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index e665d1bd3..05fa03797 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::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::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')]) }}
 
                     {{ 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::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::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']) }}
 
                     {{ Form::recurring('edit', $bill) }}
 
diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php
index e963a3465..dc5cc48ed 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::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::selectRemoteAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, setting('default.vendor'), ['path' => route('modals.vendors.create'), 'remote_action' => route('vendors.index')]) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ 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::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']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/purchases/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php
index 31a65e97d..634a86ebc 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::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::selectRemoteAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, $payment->contact_id, ['path' => route('modals.vendors.create'), 'remote_action' => route('vendors.index')]) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ 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::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']) }}
 
                     {{ Form::recurring('edit', $payment) }}
 
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index 4bd9e32e4..194ed9721 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::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::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')]) }}
 
                     {{ 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::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::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']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index dcca01385..925203bfb 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::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::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')]) }}
 
                     {{ 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::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::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']) }}
 
                     {{ Form::recurring('edit', $invoice) }}
 
diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php
index e26ead0d7..eae39f5a4 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::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::selectRemoteAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, setting('default.contact'), ['path' => route('modals.customers.create'), 'remote_action' => route('customers.index')]) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ 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::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']) }}
 
                     {{ Form::recurring('create') }}
 
diff --git a/resources/views/sales/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php
index f67bef82f..1e10f4f34 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::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::selectRemoteAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, $revenue->contact_id, ['path' => route('modals.customers.create'), 'remote_action' => route('customers.index')]) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
-                    {{ 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::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']) }}
 
                     {{ Form::recurring('edit', $revenue) }}
 
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index 84dbc6740..c4073bdd0 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::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::selectRemoteGroup('income_category', trans('settings.default.income_category'), 'folder', $sales_categories, setting('default.income_category'), ['remote_action' => route('categories.index'). '?type=income']) }}
 
-                {{ 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::selectRemoteGroup('expense_category', trans('settings.default.expense_category'), 'folder', $purchases_categories, setting('default.expense_category'), ['remote_action' => route('categories.index'). '?type=expense']) }}
 
                 {{ Form::selectGroup('tax', trans_choice('general.taxes', 1), 'percent', $taxes, setting('default.tax'), []) }}
 

From c49c56f05de65bab015d8e081564827891e5bd2f 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 22:27:54 +0300
Subject: [PATCH 14/19] remove take for item tax

---
 app/Http/Controllers/Common/Items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php
index 1f99856f9..33eaf5e99 100644
--- a/app/Http/Controllers/Common/Items.php
+++ b/app/Http/Controllers/Common/Items.php
@@ -52,7 +52,7 @@ class Items extends Controller
     {
         $categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
-        $taxes = Tax::enabled()->orderBy('name')->get()->take(setting('default.select_limit'))->pluck('title', 'id');
+        $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 
         return view('common.items.create', compact('categories', 'taxes'));
     }

From 5c7a886a998bcad012b51417763087c0b3ead354 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 22:29:45 +0300
Subject: [PATCH 15/19] forget add item edit take for category,

---
 app/Http/Controllers/Common/Items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php
index 33eaf5e99..7c03a71eb 100644
--- a/app/Http/Controllers/Common/Items.php
+++ b/app/Http/Controllers/Common/Items.php
@@ -129,7 +129,7 @@ class Items extends Controller
      */
     public function edit(Item $item)
     {
-        $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');
 

From 66ac9eceb137972333a9a8b6ab293abe58a83bbf Mon Sep 17 00:00:00 2001
From: Sevan Nerse <nerse.sevan@gmail.com>
Date: Wed, 11 Nov 2020 13:18:13 +0300
Subject: [PATCH 16/19] scope is added for the code field of InvoiceTotal model

---
 app/Models/Sale/InvoiceTotal.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Models/Sale/InvoiceTotal.php b/app/Models/Sale/InvoiceTotal.php
index c04fa59c1..d619506cc 100644
--- a/app/Models/Sale/InvoiceTotal.php
+++ b/app/Models/Sale/InvoiceTotal.php
@@ -31,6 +31,11 @@ class InvoiceTotal extends Model
         return $this->belongsTo('App\Models\Sale\Invoice');
     }
 
+    public function scopeCode($query, $code)
+    {
+        return $query->where('code', '=', $code);
+    }
+
     /**
      * Convert amount to double.
      *

From 5536866d4fea721b27389c8df985a691c0c26e2a Mon Sep 17 00:00:00 2001
From: Sevan Nerse <nerse.sevan@gmail.com>
Date: Wed, 11 Nov 2020 13:22:50 +0300
Subject: [PATCH 17/19] scope is added for the code field of BillTotal model

---
 app/Models/Purchase/BillTotal.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Models/Purchase/BillTotal.php b/app/Models/Purchase/BillTotal.php
index de6a531f5..1ee33301a 100644
--- a/app/Models/Purchase/BillTotal.php
+++ b/app/Models/Purchase/BillTotal.php
@@ -31,6 +31,11 @@ class BillTotal extends Model
         return $this->belongsTo('App\Models\Purchase\Bill');
     }
 
+    public function scopeCode($query, $code)
+    {
+        return $query->where('code', '=', $code);
+    }
+
     /**
      * Convert amount to double.
      *

From 1deeece33a8e2403eac124e4a5eddb0f06d2bd08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Wed, 11 Nov 2020 14:26:30 +0300
Subject: [PATCH 18/19] added view components support for modules

---
 app/Console/Stubs/Modules/component.stub      | 28 +++++++++++++++++++
 .../Stubs/Modules/scaffold/provider.stub      | 12 ++++++++
 config/module.php                             |  3 +-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 app/Console/Stubs/Modules/component.stub

diff --git a/app/Console/Stubs/Modules/component.stub b/app/Console/Stubs/Modules/component.stub
new file mode 100644
index 000000000..916f91861
--- /dev/null
+++ b/app/Console/Stubs/Modules/component.stub
@@ -0,0 +1,28 @@
+<?php
+
+namespace $NAMESPACE$;
+
+use Illuminate\View\Component;
+
+class $CLASS$ extends Component
+{
+    /**
+     * Create a new component instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     *
+     * @return \Illuminate\Contracts\View\View|string
+     */
+    public function render()
+    {
+        return view('$ALIAS$::$VIEW_NAME$');
+    }
+}
diff --git a/app/Console/Stubs/Modules/scaffold/provider.stub b/app/Console/Stubs/Modules/scaffold/provider.stub
index 2e5fe8c62..d0b076d68 100644
--- a/app/Console/Stubs/Modules/scaffold/provider.stub
+++ b/app/Console/Stubs/Modules/scaffold/provider.stub
@@ -2,6 +2,7 @@
 
 namespace $NAMESPACE$;
 
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider as Provider;
 
 class $NAME$ extends Provider
@@ -14,6 +15,7 @@ class $NAME$ extends Provider
     public function boot()
     {
         $this->loadViews();
+        $this->loadViewComponents();
         $this->loadTranslations();
         $this->loadMigrations();
         //$this->loadConfig();
@@ -39,6 +41,16 @@ class $NAME$ extends Provider
         $this->loadViewsFrom(__DIR__ . '/../Resources/views', '$ALIAS$');
     }
 
+    /**
+     * Load view components.
+     *
+     * @return void
+     */
+    public function loadViewComponents()
+    {
+        Blade::componentNamespace('$COMPONENT_NAMESPACE$', '$ALIAS$');
+    }
+
     /**
      * Load translations.
      *
diff --git a/config/module.php b/config/module.php
index 28ca352c9..ba4a9338a 100644
--- a/config/module.php
+++ b/config/module.php
@@ -111,7 +111,7 @@ return [
             'resource' => ['path' => 'Http/Resources', 'generate' => false],
             'asset' => ['path' => 'Resources/assets', 'generate' => false],
             'lang' => ['path' => 'Resources/lang/en-GB', 'generate' => true],
-            'views' => ['path' => 'Resources/views', 'generate' => true],
+            'view' => ['path' => 'Resources/views', 'generate' => true],
             'test' => ['path' => 'Tests', 'generate' => false],
             'repository' => ['path' => 'Repositories', 'generate' => false],
             'event' => ['path' => 'Events', 'generate' => false],
@@ -122,6 +122,7 @@ return [
             'email' => ['path' => 'Emails', 'generate' => false],
             'notification' => ['path' => 'Notifications', 'generate' => false],
             'route' => ['path' => 'Routes', 'generate' => true],
+            'component' => ['path' => 'View/Components', 'generate' => false],
         ],
     ],
 

From 2b0255b4871d690874bc9d448f6d3058cd198325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 11 Nov 2020 14:33:49 +0300
Subject: [PATCH 19/19] search-string config check columns

---
 app/View/Components/SearchString.php          |  38 ++++-
 config/search-string.php                      |  50 ++++--
 .../assets/js/components/AkauntingSearch.vue  | 150 ++++++++++++++----
 resources/lang/en-GB/search_string.php        |   9 ++
 resources/views/auth/users/index.blade.php    |   8 +-
 .../views/components/search-string.blade.php  |  12 ++
 6 files changed, 213 insertions(+), 54 deletions(-)
 create mode 100644 resources/lang/en-GB/search_string.php

diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
index 51ef8500c..d7f615cad 100644
--- a/app/View/Components/SearchString.php
+++ b/app/View/Components/SearchString.php
@@ -4,6 +4,7 @@ namespace App\View\Components;
 
 use Illuminate\View\Component;
 use Illuminate\Support\Str;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 class SearchString extends Component
 {
@@ -44,7 +45,11 @@ class SearchString extends Component
                 if (!is_array($options)) {
                     $column = $options;
                 }
-    
+                
+                if (!$this->isFilter($column, $options)) {
+                    continue;
+                }
+
                 $this->filters[] = [
                     'key' => $this->getFilterKey($column, $options),
                     'value' => $this->getFilterName($column),
@@ -58,6 +63,17 @@ class SearchString extends Component
         return view('components.search-string');
     }
 
+    protected function isFilter($column, $options)
+    {
+        $filter = true;
+    
+        if (empty($this->getFilterUrl($column, $options)) && (!isset($options['date']) && !isset($options['boolean']))) {
+            $filter = false;
+        }
+
+        return $filter;
+    }
+
     protected function getFilterKey($column, $options)
     {
         if (isset($options['relationship'])) {
@@ -71,20 +87,22 @@ class SearchString extends Component
     {
         if (strpos($column, '_id') !== false) {
             $column = str_replace('_id', '', $column);
+        } else if (strpos($column, '_code') !== false) {
+            $column = str_replace('_code', '', $column);
         }
 
         $plural = Str::plural($column, 2);
 
         if (trans_choice('general.' . $plural, 1) !== 'general.' . $plural) {
             return trans_choice('general.' . $plural, 1);
-        } elseif (trans_choice('search_string.colmuns.' . $plural, 1) !== 'search_string.colmuns.' . $plural) {
-            return trans_choice('search_string.colmuns.' . $plural, 1);
+        } elseif (trans_choice('search_string.columns.' . $plural, 1) !== 'search_string.columns.' . $plural) {
+            return trans_choice('search_string.columns.' . $plural, 1);
         }
 
         $name = trans('general.' . $column);
     
         if ($name == 'general.' . $column) {
-            $name = trans('search_string.colmuns.' . $column);
+            $name = trans('search_string.columns.' . $column);
         }
 
         return $name;
@@ -98,6 +116,10 @@ class SearchString extends Component
             $type = 'boolean';
         }
 
+        if (isset($options['date'])) {
+            $type = 'date';
+        }
+
         return $type;
     }
 
@@ -105,7 +127,7 @@ class SearchString extends Component
     {
         $url = '';
 
-        if (isset($options['boolean'])) {
+        if (isset($options['boolean']) || isset($options['date'])) {
             return $url;
         }
 
@@ -128,7 +150,11 @@ class SearchString extends Component
     
             $plural = Str::plural($column, 2);
 
-            $url = route($url . $plural . '.index');
+            try {
+                $url = route($url . $plural . '.index');
+            } catch (\Exception $e) {
+                $url = '';
+            }
         }
 
         return $url;
diff --git a/config/search-string.php b/config/search-string.php
index cf316c474..c8895694f 100644
--- a/config/search-string.php
+++ b/config/search-string.php
@@ -69,7 +69,9 @@ return [
             'number' => ['searchable' => true],
             'bank_name' => ['searchable' => true],
             'bank_address' => ['searchable' => true],
-            'currency' => ['relationship' => true],
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
             'enabled' => ['boolean' => true],
         ],
     ],
@@ -87,16 +89,24 @@ return [
     App\Models\Banking\Transaction::class => [
         'columns' => [
             'type',
-            'account_id',
+            'account_id' => [
+                'route' => 'accounts.index'
+            ],
             'paid_at' => ['date' => true],
             'amount',
-            'currency_code',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
             'document_id',
-            'contact_id',
+            'contact_id' => [
+                'route' => 'customers.index'
+            ],
             'description' => ['searchable' => true],
             'payment_method',
             'reference',
-            'category_id',
+            'category_id' => [
+                'route' => 'categories.index'
+            ],
             'parent_id',
         ],
     ],
@@ -123,6 +133,8 @@ return [
             'category_id' => [
                 'route' => ['categories.index', 'search=type:item']
             ],
+            'sales_price',
+            'purchase_price',
         ],
     ],
 
@@ -135,7 +147,9 @@ return [
             'phone' => ['searchable' => true],
             'address' => ['searchable' => true],
             'website' => ['searchable' => true],
-            'currency_code',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
             'reference',
             'user_id',
             'enabled' => ['boolean' => true],
@@ -150,14 +164,20 @@ return [
             'billed_at' => ['date' => true],
             'due_at' => ['date' => true],
             'amount',
-            'currency_code',
-            'contact_id',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
+            'contact_id' => [
+                'route' => 'vendors.index'
+            ],
             'contact_name' => ['searchable' => true],
             'contact_email' => ['searchable' => true],
             'contact_tax_number',
             'contact_phone' => ['searchable' => true],
             'contact_address' => ['searchable' => true],
-            'category_id',
+            'category_id' => [
+                'route' => 'categories.index'
+            ],
             'parent_id',
         ],
     ],
@@ -170,14 +190,20 @@ return [
             'invoiced_at' => ['date' => true],
             'due_at' => ['date' => true],
             'amount',
-            'currency_code',
-            'contact_id',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
+            'contact_id' => [
+                'route' => 'customer.index'
+            ],
             'contact_name' => ['searchable' => true],
             'contact_email' => ['searchable' => true],
             'contact_tax_number',
             'contact_phone' => ['searchable' => true],
             'contact_address' => ['searchable' => true],
-            'category_id',
+            'category_id' => [
+                'route' => 'categories.index'
+            ],
             'parent_id',
         ],
     ],
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index a69b0f896..cdbe637ea 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -17,6 +17,7 @@
 
     <div class="dropdown input-full">
       <input
+        v-if="!show_date"
         type="text"
         class="form-control"
         :placeholder="placeholder"
@@ -27,6 +28,20 @@
         @keyup.enter="onInputConfirm"
       />
 
+      <flat-picker
+        v-else
+        @on-open="onInputFocus"
+        :config="dateConfig"
+        class="form-control datepicker"
+        :placeholder="placeholder"
+        :ref="'input-search-date-field-' + _uid"
+        v-model="search"
+        @focus="onInputFocus"
+        @input="onInputDateSelected"
+        @keyup.enter="onInputConfirm"
+      >
+      </flat-picker>
+
       <button type="button" class="btn btn-link clear" @click="onSearchAndFilterClear">
         <i class="el-tag__close el-icon-close"></i>
       </button>
@@ -62,9 +77,16 @@
 </template>
 
 <script>
+import flatPicker from "vue-flatpickr-component";
+import "flatpickr/dist/flatpickr.css";
+
 export default {
   name: 'akaunting-search',
 
+  components: {
+    flatPicker
+  },
+
   props: {
     placeholder: {
       type: String,
@@ -106,6 +128,8 @@ export default {
       default: () => [],
       description: 'List of filters'
     },
+
+    dateConfig: null,
   },
 
   model: {
@@ -131,6 +155,7 @@ export default {
       selected_values: [],
       values: [],
       current_value: null,
+      show_date: false,
     };
   },
 
@@ -140,13 +165,59 @@ export default {
         return;
       }
 
-      this.visible[this.filter_last_step] = true;
+      if (this.filter_last_step != 'values' || (this.filter_last_step == 'values' && this.selected_options[this.filter_index].type != 'date')) {
+        this.visible[this.filter_last_step] = true;
+
+        this.$nextTick(() => {
+          this.$refs['input-search-field-' + this._uid].focus();
+        });
+      } else {
+        this.show_date = true;
+
+        this.$nextTick(() => {
+          this.$refs['input-search-date-field-' + this._uid].focus();
+        });
+      }
+
+      console.log('Focus :' + this.filter_last_step);
+    },
+
+    onInputDateSelected(event) {
+      this.filtered[this.filter_index].value = event;
+
+      this.selected_values.push({
+        key: event,
+        value: event,
+      });
+
+      this.$emit('change', this.filtered);
+
+      this.show_date = false;
+      this.search = '';
 
       this.$nextTick(() => {
         this.$refs['input-search-field-' + this._uid].focus();
       });
 
-      console.log('Focus :' + this.filter_last_step);
+      this.filter_index++;
+
+      if (this.filter_list.length) {
+        this.visible = {
+          options: true,
+          operator: false,
+          values: false,
+        };
+      } else {
+        this.visible = {
+          options: false,
+          operator: false,
+          values: false,
+        };
+      }
+
+      this.show_date = false;
+
+      this.filter_last_step = 'options';
     },
 
     onInput(evt) {
@@ -158,24 +229,26 @@ export default {
         option_url += '?search=' + this.search;
       }
 
-      window.axios.get(option_url)
-      .then(response => {
-          this.values = [];
+      if (option_url) {
+        window.axios.get(option_url)
+        .then(response => {
+            this.values = [];
 
-          let data = response.data.data;
+            let data = response.data.data;
 
-          data.forEach(function (item) {
-            this.values.push({
-              key: item.id,
-              value: item.name
-            });
-          }, this);
+            data.forEach(function (item) {
+              this.values.push({
+                key: item.id,
+                value: item.name
+              });
+            }, this);
 
-          this.option_values[value] = this.values;
-      })
-      .catch(error => {
+            this.option_values[value] = this.values;
+        })
+        .catch(error => {
 
-      });
+        });
+      }
 
       this.$emit('input', evt.target.value);
     },
@@ -202,7 +275,6 @@ export default {
 
         args += this.selected_options[index].key + ':' + this.selected_values[index].key + ' ';
 
-
         serach_string[path][this.selected_options[index].key] = {
           'key': this.selected_values[index].key,
           'value': this.selected_values[index].value
@@ -218,7 +290,7 @@ export default {
       this.current_value = value;
 
       let option = false;
-      let option_url = url;
+      let option_url = false;
 
       for (let i = 0; i < this.filter_list.length; i++) {
         if (this.filter_list[i].key == value) {
@@ -249,14 +321,14 @@ export default {
 
       this.search = '';
 
-      if (!this.option_values[value]) {
+      if (!this.option_values[value] && option_url) {
         window.axios.get(option_url)
         .then(response => {
             let data = response.data.data;
 
             data.forEach(function (item) {
               this.values.push({
-                key: item.id,
+                key: (item.code) ? item.code : item.id,
                 value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name
               });
             }, this);
@@ -267,7 +339,7 @@ export default {
 
         });
       } else {
-        this.values = this.option_values[value];
+        this.values = (this.option_values[value]) ? this.option_values[value] : [];
       }
 
       this.$nextTick(() => {
@@ -288,15 +360,29 @@ export default {
 
       this.$emit('change', this.filtered);
 
-      this.$nextTick(() => {
-        this.$refs['input-search-field-' + this._uid].focus();
-      });
+      if (this.selected_options[this.filter_index].type != 'date') {
+        this.$nextTick(() => {
+          this.$refs['input-search-field-' + this._uid].focus();
+        });
 
-      this.visible = {
-        options: false,
-        operator: false,
-        values: true,
-      };
+        this.visible = {
+          options: false,
+          operator: false,
+          values: true,
+        };
+      } else {
+        this.show_date = true;
+
+        this.$nextTick(() => {
+          this.$refs['input-search-date-field-' + this._uid].focus();
+        });
+
+        this.visible = {
+          options: false,
+          operator: false,
+          values: false,
+        };
+      }
 
       this.filter_last_step = 'values';
     },
@@ -338,6 +424,8 @@ export default {
         };
       }
 
+      this.show_date = false;
+
       this.filter_last_step = 'options';
     },
 
@@ -586,4 +674,8 @@ export default {
   -webkit-box-shadow: none !important;
     box-shadow: none !important;
 }
+
+.searh-field .form-control.datepicker.flatpickr-input {
+  padding: inherit !important;
+}
 </style>
diff --git a/resources/lang/en-GB/search_string.php b/resources/lang/en-GB/search_string.php
new file mode 100644
index 000000000..c80e57706
--- /dev/null
+++ b/resources/lang/en-GB/search_string.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+
+    'columns' => [
+        'last_logged_in_at' => 'Last Login',
+    ],
+
+];
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php
index a5d283672..b8b958cca 100644
--- a/resources/views/auth/users/index.blade.php
+++ b/resources/views/auth/users/index.blade.php
@@ -11,18 +11,12 @@
 @section('content')
     <div class="card">
         <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
-            {!! Form::open([
-                'method' => 'GET',
-                'route' => 'users.index',
-                'role' => 'form',
-                'class' => 'mb-0'
-            ]) !!}
+
                 <div class="align-items-center" v-if="!bulk_action.show">
                     <x-search-string model="App\Models\Auth\User" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.users', $bulk_actions, ['group' => 'auth', 'type' => 'users']) }}
-            {!! Form::close() !!}
         </div>
 
         <div class="table-responsive">
diff --git a/resources/views/components/search-string.blade.php b/resources/views/components/search-string.blade.php
index fe89a5f41..eadab11df 100644
--- a/resources/views/components/search-string.blade.php
+++ b/resources/views/components/search-string.blade.php
@@ -7,4 +7,16 @@
     no-matching-data-text="{{ trans('general.no_matching_data') }}"
     value="{{ request()->get('search', null) }}"
     :filters="{{ json_encode($filters) }}"
+    :date-config="{
+        allowInput: true,
+        altInput: true,
+        altFormat: 'Y-m-d',
+        dateFormat: 'Y-m-d',
+        @if (!empty($attributes['min-date']))
+        minDate: {{ $attributes['min-date'] }}
+        @endif
+        @if (!empty($attributes['max-date']))
+        maxDate: {{ $attributes['max-date'] }}
+        @endif
+    }"
 ></akaunting-search>