Merge branch '2.1-dev' of github.com:akaunting/akaunting into search-filter

# Conflicts:
#	resources/assets/js/components/AkauntingSearch.vue

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'));
     }

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');

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'));
     }

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');
 

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'));
     }

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();
 

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'));
     }

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();
 

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')->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');
 
         $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'
         ));

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)
+    {
+        $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.income_category' => setting('default.income_category', $income_category->id)]);
+        setting()->set(['default.expense_category' => setting('default.expense_category', $expense_category->id)]);
+
+        setting()->save();
+    }
 }

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
         ]);