From 66a201c3bd261fe6e8cc87d607d8b252dd99334d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 30 Dec 2020 22:39:14 +0300
Subject: [PATCH] Select remote limit set edit selected key value added.

---
 app/Http/Controllers/Auth/Users.php         | 12 ++++++++++++
 app/Http/Controllers/Common/Items.php       |  4 ++++
 app/Http/Controllers/Purchases/Payments.php |  8 ++++++++
 app/Http/Controllers/Sales/Revenues.php     |  8 ++++++++
 app/Http/Controllers/Settings/Defaults.php  | 17 +++++++++++++++++
 5 files changed, 49 insertions(+)

diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php
index 6221d20b1..98a1721d2 100644
--- a/app/Http/Controllers/Auth/Users.php
+++ b/app/Http/Controllers/Auth/Users.php
@@ -125,6 +125,18 @@ class Users extends Controller
 
         $companies = user()->companies()->take(setting('default.select_limit'))->get()->sortBy('name')->pluck('name', 'id');
 
+        if ($user->company_ids) {
+            foreach($user->company_ids as $company_id) {
+                if (array_key_exists($company_id, $companies)) {
+                    continue;
+                }
+
+                $company = \App\Models\Common\Company::find($company_id);
+
+                $companies->put($company->id, $company->name);
+            }
+        }
+
         return view('auth.users.edit', compact('user', 'companies', 'roles', 'landing_pages'));
     }
 
diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php
index c981301d7..6c93a5996 100644
--- a/app/Http/Controllers/Common/Items.php
+++ b/app/Http/Controllers/Common/Items.php
@@ -131,6 +131,10 @@ class Items extends Controller
     {
         $categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
+        if ($item->category && !array_key_exists($item->category_id, $categories)) {
+            $categories->put($item->category->id, $item->category->name);
+        }
+
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 
         return view('common.items.edit', compact('item', 'categories', 'taxes'));
diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php
index 83b10c9e8..4c025d10d 100644
--- a/app/Http/Controllers/Purchases/Payments.php
+++ b/app/Http/Controllers/Purchases/Payments.php
@@ -150,8 +150,16 @@ class Payments extends Controller
 
         $vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
+        if ($payment->contact && !array_key_exists($payment->contact_id, $vendors)) {
+            $vendors->put($payment->contact->id, $payment->contact->name);
+        }
+
         $categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
+        if ($revenue->category && !array_key_exists($payment->category_id, $categories)) {
+            $categories->put($revenue->category->id, $revenue->category->name);
+        }
+
         $payment_methods = Modules::getPaymentMethods();
 
         $date_format = $this->getCompanyDateFormat();
diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php
index d13d54a9d..8bbe4e564 100644
--- a/app/Http/Controllers/Sales/Revenues.php
+++ b/app/Http/Controllers/Sales/Revenues.php
@@ -150,8 +150,16 @@ class Revenues extends Controller
 
         $customers = Contact::customer()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
+        if ($revenue->contact && !array_key_exists($revenue->contact_id, $vendors)) {
+            $customers->put($revenue->contact->id, $revenue->contact->name);
+        }
+
         $categories = Category::income()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
+        if ($revenue->category && !array_key_exists($revenue->category_id, $categories)) {
+            $categories->put($revenue->category->id, $revenue->category->name);
+        }
+
         $payment_methods = Modules::getPaymentMethods();
 
         $date_format = $this->getCompanyDateFormat();
diff --git a/app/Http/Controllers/Settings/Defaults.php b/app/Http/Controllers/Settings/Defaults.php
index ea1fd0f65..3bcc27cf8 100644
--- a/app/Http/Controllers/Settings/Defaults.php
+++ b/app/Http/Controllers/Settings/Defaults.php
@@ -18,8 +18,25 @@ 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');
+
+        $sale_category_id = setting('default.income_category');
+
+        if ($sale_category_id && !array_key_exists($sale_category_id, $sales_categories)) {
+            $category = Category::find($sale_category_id);
+
+            $sales_categories->put($category->id, $category->name);
+        }
+
         $purchases_categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
 
+        $expense_category_id = setting('default.expense_category');
+
+        if ($expense_category_id && !array_key_exists($expense_category_id, $purchases_categories)) {
+            $category = Category::find($expense_category_id);
+
+            $purchases_categories->put($category->id, $category->name);
+        }
+
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 
         $payment_methods = Modules::getPaymentMethods();