Merge pull request #3088 from CihanSenturk/fix-import-created-by-issue

Fixed import created_by issue
akaunting · Nov 3, 2023 · f440e9e · f440e9e
2 parents a9d313e + 0fa3bf4
commit f440e9e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/Abstracts/Import.php b/app/Abstracts/Import.php
@@ -49,9 +49,7 @@ public function map($row): array
         $row['company_id'] = company_id();
 
         // created_by is equal to the owner id. Therefore, the value in export is owner email.
-        if (isset($row['created_by'])) {
-            $row['created_by'] = $this->getCreatedById($row);
-        }
+        $row['created_by'] = $this->getCreatedById($row);
 
         $row['created_from'] = $this->getSourcePrefix() . 'import';
 

diff --git a/app/Traits/Import.php b/app/Traits/Import.php
@@ -113,6 +113,10 @@ public function getCurrencyCode($row)
 
     public function getCreatedById($row)
     {
+        if (empty($row['created_by'])) {
+            return $this->user->id;
+        }
+
         $user = user_model_class()::where('email', $row['created_by'])->first();
 
         if (! empty($user)) {