waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed queue import user issue

This commit is contained in:
Cihan Şentürk 2024-02-07 17:27:08 +03:00 committed by GitHub
parent f8f8e6c795
commit 67df49273f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Traits/Import.php
View File

@ -101,7 +101,7 @@ trait Import
'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());
@ -114,7 +114,7 @@ trait Import
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();
@ -217,7 +217,7 @@ trait Import
'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());
@ -244,7 +244,7 @@ trait Import
'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());
@ -271,7 +271,7 @@ trait Import
'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());
@ -296,7 +296,7 @@ trait Import
'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());
@ -322,7 +322,7 @@ trait Import
'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());
@ -348,7 +348,7 @@ trait Import
'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());
@ -377,7 +377,7 @@ trait Import
'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());
@ -402,7 +402,7 @@ trait Import
'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());