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-06-05 17:06:04 +03:00
commit e0ccf314b2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Common/Item.php
View File

@ -107,7 +107,7 @@ class Item extends Model
return $query; return $query;
} }
return $query->whereIn($this->qualifyColumn('type'), $type); return $query->where($this->qualifyColumn('type'), $type);
} }
/** /**

4
app/Traits/Import.php
View File

@ -323,8 +323,10 @@ trait Import
return $contact->id; return $contact->id;
} }
public function getItemIdFromName($row, $type = 'product') public function getItemIdFromName($row, $type = null)
{ {
$type = !empty($type) ? $type : (!empty($row['item_type']) ? $row['item_type'] : 'product');
$item_id = Item::type($type)->where('name', $row['item_name'])->pluck('id')->first(); $item_id = Item::type($type)->where('name', $row['item_name'])->pluck('id')->first();
if (!empty($item_id)) { if (!empty($item_id)) {