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-05-26 16:07:17 +03:00
commit ece0c27972
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,15 @@ class Item extends Model
return $query->whereNotNull($price_type . '_price'); return $query->whereNotNull($price_type . '_price');
} }
public function scopeType($query, $type)
{
if (empty($type)) {
return $query;
}
return $query->whereIn('type', $type);
}
/** /**
* Get the item id. * Get the item id.
* *

20
app/Traits/Import.php
View File

@ -137,12 +137,14 @@ trait Import
return is_null($id) ? $id : (int) $id; return is_null($id) ? $id : (int) $id;
} }
public function getItemId($row) public function getItemId($row, $type = null)
{ {
$id = isset($row['item_id']) ? $row['item_id'] : null; $id = isset($row['item_id']) ? $row['item_id'] : null;
$type = !empty($type) ? $type : (!empty($row['item_type']) ? $row['item_type'] : 'product');
if (empty($id) && !empty($row['item_name'])) { if (empty($id) && !empty($row['item_name'])) {
$id = $this->getItemIdFromName($row); $id = $this->getItemIdFromName($row, $type);
} }
return is_null($id) ? $id : (int) $id; return is_null($id) ? $id : (int) $id;
@ -246,7 +248,7 @@ trait Import
public function getCategoryIdFromName($row, $type) public function getCategoryIdFromName($row, $type)
{ {
$category_id = Category::withSubCategory()->where('name', $row['category_name'])->pluck('id')->first(); $category_id = Category::type($type)->withSubCategory()->where('name', $row['category_name'])->pluck('id')->first();
if (!empty($category_id)) { if (!empty($category_id)) {
return $category_id; return $category_id;
@ -271,7 +273,7 @@ trait Import
public function getContactIdFromEmail($row, $type) public function getContactIdFromEmail($row, $type)
{ {
$contact_id = Contact::where('email', $row['contact_email'])->pluck('id')->first(); $contact_id = Contact::type($type)->where('email', $row['contact_email'])->pluck('id')->first();
if (!empty($contact_id)) { if (!empty($contact_id)) {
return $contact_id; return $contact_id;
@ -297,7 +299,7 @@ trait Import
public function getContactIdFromName($row, $type) public function getContactIdFromName($row, $type)
{ {
$contact_id = Contact::where('name', $row['contact_name'])->pluck('id')->first(); $contact_id = Contact::type($type)->where('name', $row['contact_name'])->pluck('id')->first();
if (!empty($contact_id)) { if (!empty($contact_id)) {
return $contact_id; return $contact_id;
@ -321,9 +323,9 @@ trait Import
return $contact->id; return $contact->id;
} }
public function getItemIdFromName($row) public function getItemIdFromName($row, $type)
{ {
$item_id = Item::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)) {
return $item_id; return $item_id;
@ -331,7 +333,7 @@ trait Import
$data = [ $data = [
'company_id' => company_id(), 'company_id' => company_id(),
'type' => !empty($row['item_type']) ? $row['item_type'] : (!empty($row['type']) ? $row['type'] : 'product'), 'type' => $type,
'name' => $row['item_name'], 'name' => $row['item_name'],
'description' => !empty($row['item_description']) ? $row['item_description'] : null, 'description' => !empty($row['item_description']) ? $row['item_description'] : null,
'sale_price' => !empty($row['sale_price']) ? $row['sale_price'] : (!empty($row['price']) ? $row['price'] : 0), 'sale_price' => !empty($row['sale_price']) ? $row['sale_price'] : (!empty($row['price']) ? $row['price'] : 0),
@ -350,7 +352,7 @@ trait Import
public function getTaxIdFromRate($row, $type = 'normal') public function getTaxIdFromRate($row, $type = 'normal')
{ {
$tax_id = Tax::where('rate', $row['tax_rate'])->pluck('id')->first(); $tax_id = Tax::type($type)->where('rate', $row['tax_rate'])->pluck('id')->first();
if (!empty($tax_id)) { if (!empty($tax_id)) {
return $tax_id; return $tax_id;