shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk
2023-03-09 14:07:43 +03:00
parent 62ccb79c2d 9c3f635c53
commit a1da29d908
46 changed files with 404 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Traits/Categories.php
View File

@@ -7,7 +7,7 @@ use Illuminate\Support\Str;
trait Categories
{
public function getCategoryTypes(): array
public function getCategoryTypes(bool $translate = true): array
{
$types = [];
$configs = config('type.category');
@@ -21,7 +21,7 @@ trait Categories
$name = $attr['alias'] . '::' . $name;
}
$types[$type] = trans_choice($name, 1);
$types[$type] = $translate ? trans_choice($name, 1) : $name;
}
return $types;

3
app/Traits/Import.php
View File

@@ -172,6 +172,7 @@ trait Import
$data = [
'company_id' => company_id(),
'type' => !empty($row['account_type']) ? $row['account_type'] : 'bank',
'currency_code' => $row['currency_code'],
'name' => !empty($row['account_name']) ? $row['account_name'] : $row['currency_code'],
'number' => !empty($row['account_number']) ? $row['account_number'] : (string) rand(1, 10000),
@@ -198,6 +199,7 @@ trait Import
$data = [
'company_id' => company_id(),
'type' => !empty($row['account_type']) ? $row['account_type'] : 'bank',
'name' => $row['account_name'],
'number' => !empty($row['account_number']) ? $row['account_number'] : (string) rand(1, 10000),
'currency_code' => !empty($row['currency_code']) ? $row['currency_code'] : default_currency(),
@@ -224,6 +226,7 @@ trait Import
$data = [
'company_id' => company_id(),
'type' => !empty($row['account_type']) ? $row['account_type'] : 'bank',
'number' => $row['account_number'],
'name' => !empty($row['account_name']) ? $row['account_name'] : $row['account_number'],
'currency_code' => !empty($row['currency_code']) ? $row['currency_code'] : default_currency(),