From 1a2c7116e5738046a9b2d2e30ee99963b287220f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 31 May 2023 16:53:09 +0300
Subject: [PATCH 1/5] version update 3.0.14 to 3.0.15

---
 config/version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/version.php b/config/version.php
index 864a13997..0d7416c3c 100644
--- a/config/version.php
+++ b/config/version.php
@@ -10,13 +10,13 @@ return [
 
     'minor'     =>  '0',
 
-    'patch'     =>  '14',
+    'patch'     =>  '15',
 
     'build'     =>  '',
 
     'status'    =>  'Stable',
 
-    'date'      =>  '25-April-2023',
+    'date'      =>  '31-May-2023',
 
     'time'      =>  '17:00',
 

From 094537c935a9e52e2d2818ba519b8a19c093e4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?=
 <53110792+CihanSenturk@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:11:38 +0300
Subject: [PATCH 2/5] fix tab pagination issue

---
 resources/assets/js/mixins/global.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js
index 37721aeb3..d2d111dbe 100644
--- a/resources/assets/js/mixins/global.js
+++ b/resources/assets/js/mixins/global.js
@@ -469,6 +469,9 @@ export default {
         onChangePaginationLimit(event) {
             let path = '';
 
+            let split_href = window.location.href.split('#');
+            let href = split_href[0];
+
             if (window.location.search.length) {
                 if (window.location.search.includes('limit')) {
                     let queries = [];
@@ -496,10 +499,14 @@ export default {
                     });
 
                 } else {
-                    path = window.location.href + '&limit=' + event.target.getAttribute("value");
+                    path = href + '&limit=' + event.target.getAttribute("value");
                 }
             } else {
-                path = window.location.href + '?limit=' + event.target.getAttribute("value");
+                path = href + '?limit=' + event.target.getAttribute("value");
+            }
+
+            if (split_href[1]) {
+                path +=  '#' + split_href[1];
             }
 
             window.location.href = path;

From 7241be1df114fb22f089035eef403d7211c836ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Thu, 1 Jun 2023 13:20:50 +0300
Subject: [PATCH 3/5] ensure users is not empty

---
 app/Listeners/Email/SendInvalidEmailNotification.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Listeners/Email/SendInvalidEmailNotification.php b/app/Listeners/Email/SendInvalidEmailNotification.php
index 2ad5e82fe..46e897c10 100644
--- a/app/Listeners/Email/SendInvalidEmailNotification.php
+++ b/app/Listeners/Email/SendInvalidEmailNotification.php
@@ -10,7 +10,11 @@ class SendInvalidEmailNotification
 {
     public function handle(Event $event): void
     {
-        $users = company()->users;
+        $users = company()?->users;
+
+        if (empty($users)) {
+            return;
+        }
 
         $this->notifyAdminsAboutInvalidContactEmail($event, $users);
 

From 315e10bb784a54d86817a12a2619db0b4f92cbd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Thu, 1 Jun 2023 13:34:38 +0300
Subject: [PATCH 4/5] added default item type

---
 app/Traits/Import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Traits/Import.php b/app/Traits/Import.php
index 129baf2d7..da1719998 100644
--- a/app/Traits/Import.php
+++ b/app/Traits/Import.php
@@ -323,7 +323,7 @@ trait Import
         return $contact->id;
     }
 
-    public function getItemIdFromName($row, $type)
+    public function getItemIdFromName($row, $type = 'product')
     {
         $item_id = Item::type($type)->where('name', $row['item_name'])->pluck('id')->first();
 

From f6872ca8c9a9fcbc675928fc637e49993a9220a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Thu, 1 Jun 2023 13:35:07 +0300
Subject: [PATCH 5/5] qualify column

---
 app/Models/Common/Item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Common/Item.php b/app/Models/Common/Item.php
index 64e5dbf9a..915583c5e 100644
--- a/app/Models/Common/Item.php
+++ b/app/Models/Common/Item.php
@@ -107,7 +107,7 @@ class Item extends Model
             return $query;
         }
 
-        return $query->whereIn('type', $type);
+        return $query->whereIn($this->qualifyColumn('type'), $type);
     }
 
     /**