Skip to content

Commit

Permalink
fixed queue import user issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@CihanSenturk
CihanSenturk committed Feb 7, 2024
1 parent f8f8e6c commit 67df492
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions app/Traits/Import.php
View file
Expand Up @@ -101,7 +101,7 @@ public function getCurrencyCode($row)
'precision' => isset($row['currency_precision']) ? $row['currency_precision'] : currency($row['currency_code'])->getPrecision(),
'decimal_mark' => isset($row['currency_decimal_mark']) ? $row['currency_decimal_mark'] : currency($row['currency_code'])->getDecimalMark(),
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new CurrencyRequest)->rules());
Expand All @@ -114,7 +114,7 @@ public function getCurrencyCode($row)
public function getCreatedById($row)
{
if (empty($row['created_by'])) {
return $this->user->id;
return $this->user?->id;
}

$user = user_model_class()::where('email', $row['created_by'])->first();
Expand Down Expand Up @@ -217,7 +217,7 @@ public function getAccountIdFromCurrency($row)
'opening_balance' => !empty($row['opening_balance']) ? $row['opening_balance'] : 0,
'enabled' => 1,
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new AccountRequest)->rules());
Expand All @@ -244,7 +244,7 @@ public function getAccountIdFromName($row)
'opening_balance' => !empty($row['opening_balance']) ? $row['opening_balance'] : 0,
'enabled' => 1,
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new AccountRequest)->rules());
Expand All @@ -271,7 +271,7 @@ public function getAccountIdFromNumber($row)
'opening_balance' => !empty($row['opening_balance']) ? $row['opening_balance'] : 0,
'enabled' => 1,
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new AccountRequest)->rules());
Expand All @@ -296,7 +296,7 @@ public function getCategoryIdFromName($row, $type)
'color' => !empty($row['category_color']) ? $row['category_color'] : '#' . dechex(rand(0x000000, 0xFFFFFF)),
'enabled' => 1,
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new CategoryRequest)->rules());
Expand All @@ -322,7 +322,7 @@ public function getContactIdFromEmail($row, $type)
'currency_code' => !empty($row['contact_currency']) ? $row['contact_currency'] : default_currency(),
'enabled' => 1,
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new ContactRequest)->rules());
Expand All @@ -348,7 +348,7 @@ public function getContactIdFromName($row, $type)
'currency_code' => !empty($row['contact_currency']) ? $row['contact_currency'] : default_currency(),
'enabled' => 1,
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new ContactRequest)->rules());
Expand Down Expand Up @@ -377,7 +377,7 @@ public function getItemIdFromName($row, $type = null)
'purchase_price' => !empty($row['purchase_price']) ? $row['purchase_price'] : (!empty($row['price']) ? $row['price'] : 0),
'enabled' => 1,
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new ItemRequest())->rules());
Expand All @@ -402,7 +402,7 @@ public function getTaxIdFromRate($row, $type = 'normal')
'name' => !empty($row['tax_name']) ? $row['tax_name'] : (string) $row['tax_rate'],
'enabled' => 1,
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()?->id,
];

Validator::validate($data, (new TaxRequest())->rules());
Expand Down

0 comments on commit 67df492

Please sign in to comment.