diff --git a/app/Http/Controllers/Api/Expenses/Bills.php b/app/Http/Controllers/Api/Expenses/Bills.php index a4475c5fb..caabf8d05 100644 --- a/app/Http/Controllers/Api/Expenses/Bills.php +++ b/app/Http/Controllers/Api/Expenses/Bills.php @@ -59,12 +59,17 @@ class Bills extends ApiController if ($request['item']) { foreach ($request['item'] as $item) { + $item_id = 0; $item_sku = ''; if (!empty($item['item_id'])) { $item_object = Item::find($item['item_id']); + $item_id = $item['item_id']; + $item_sku = $item_object->sku; + } elseif (!empty($item['sku'])) { + $item_sku = $item['sku']; } $tax = $tax_id = 0; @@ -79,7 +84,7 @@ class Bills extends ApiController $tax = $item['tax']; } - $bill_item['item_id'] = $item['item_id']; + $bill_item['item_id'] = $item_id; $bill_item['name'] = $item['name']; $bill_item['sku'] = $item_sku; $bill_item['quantity'] = $item['quantity']; @@ -126,12 +131,17 @@ class Bills extends ApiController BillItem::where('bill_id', $bill->id)->delete(); foreach ($request['item'] as $item) { + $item_id = 0; $item_sku = ''; if (!empty($item['item_id'])) { $item_object = Item::find($item['item_id']); + $item_id = $item['item_id']; + $item_sku = $item_object->sku; + } elseif (!empty($item['sku'])) { + $item_sku = $item['sku']; } $tax = $tax_id = 0; @@ -146,7 +156,7 @@ class Bills extends ApiController $tax = $item['tax']; } - $bill_item['item_id'] = $item['item_id']; + $bill_item['item_id'] = $item_id; $bill_item['name'] = $item['name']; $bill_item['sku'] = $item_sku; $bill_item['quantity'] = $item['quantity']; diff --git a/app/Http/Controllers/Api/Incomes/Invoices.php b/app/Http/Controllers/Api/Incomes/Invoices.php index 743d52b36..7ba02179e 100644 --- a/app/Http/Controllers/Api/Incomes/Invoices.php +++ b/app/Http/Controllers/Api/Incomes/Invoices.php @@ -59,12 +59,17 @@ class Invoices extends ApiController if ($request['item']) { foreach ($request['item'] as $item) { + $item_id = 0; $item_sku = ''; if (!empty($item['item_id'])) { $item_object = Item::find($item['item_id']); + $item_id = $item['item_id']; + $item_sku = $item_object->sku; + } elseif (!empty($item['sku'])) { + $item_sku = $item['sku']; } $tax = $tax_id = 0; @@ -79,7 +84,7 @@ class Invoices extends ApiController $tax = $item['tax']; } - $invoice_item['item_id'] = $item['item_id']; + $invoice_item['item_id'] = $item_id; $invoice_item['name'] = $item['name']; $invoice_item['sku'] = $item_sku; $invoice_item['quantity'] = $item['quantity']; @@ -126,12 +131,17 @@ class Invoices extends ApiController InvoiceItem::where('invoice_id', $invoice->id)->delete(); foreach ($request['item'] as $item) { + $item_id = 0; $item_sku = ''; if (!empty($item['item_id'])) { $item_object = Item::find($item['item_id']); + $item_id = $item['item_id']; + $item_sku = $item_object->sku; + } elseif (!empty($item['sku'])) { + $item_sku = $item['sku']; } $tax = $tax_id = 0; @@ -146,7 +156,7 @@ class Invoices extends ApiController $tax = $item['tax']; } - $invoice_item['item_id'] = $item['item_id']; + $invoice_item['item_id'] = $item_id; $invoice_item['name'] = $item['name']; $invoice_item['sku'] = $item_sku; $invoice_item['quantity'] = $item['quantity'];