Skip to content

Commit

Permalink
wip import
Browse files Browse the repository at this point in the history
  • Loading branch information
CihanSenturk committed Jun 16, 2023
1 parent c9f0649 commit 57dd721
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/Abstracts/Import.php
Expand Up @@ -42,9 +42,9 @@ public function map($row): array

// created_by is equal to the owner id. Therefore, the value in export is owner email.
if (isset($row['created_by'])) {
$row['created_by'] = User::where('email', $row['created_by'])->first()?->id ?? $this->user->id;
$row['created_by'] = $this->getCreatedById($row);
}

$row['created_from'] = $this->getSourcePrefix() . 'import';

// Make enabled field integer
Expand Down
12 changes: 12 additions & 0 deletions app/Traits/Import.php
Expand Up @@ -14,6 +14,7 @@
use App\Jobs\Setting\CreateCategory;
use App\Jobs\Setting\CreateCurrency;
use App\Jobs\Setting\CreateTax;
use App\Models\Auth\User;
use App\Models\Banking\Account;
use App\Models\Common\Contact;
use App\Models\Common\Item;
Expand Down Expand Up @@ -110,6 +111,17 @@ public function getCurrencyCode($row)
return $currency->code;
}

public function getCreatedById($row)
{
$user = User::where('email', $row['created_by'])->first();

if (! empty($user)) {
return $user->id;
}

return $this->user->id;
}

public function getDocumentId($row)
{
$id = isset($row['document_id']) ? $row['document_id'] : null;
Expand Down

0 comments on commit 57dd721

Please sign in to comment.