item autocomplete by sku

app/Http/Controllers/Api/Expenses/Bills.php

@@ -67,6 +67,7 @@ class Bills extends ApiController
 
                     $item_id = $item['item_id'];
 
+                    $item['name'] = $item_object->name;
                     $item_sku = $item_object->sku;
 
                     // Increase stock (item bought)
@@ -143,6 +144,7 @@ class Bills extends ApiController
 
                     $item_id = $item['item_id'];
 
+                    $item['name'] = $item_object->name;
                     $item_sku = $item_object->sku;
                 } elseif (!empty($item['sku'])) {
                     $item_sku = $item['sku'];

app/Http/Controllers/Api/Incomes/Invoices.php

@@ -83,6 +83,7 @@ class Invoices extends ApiController
 
                     $item_id = $item['item_id'];
 
+                    $item['name'] = $item_object->name;
                     $item_sku = $item_object->sku;
 
                     // Decrease stock (item sold)
@@ -201,6 +202,7 @@ class Invoices extends ApiController
 
                     $item_id = $item['item_id'];
 
+                    $item['name'] = $item_object->name;
                     $item_sku = $item_object->sku;
                 } elseif (!empty($item['sku'])) {
                     $item_sku = $item['sku'];

app/Http/Controllers/Expenses/Bills.php

@@ -159,6 +159,7 @@ class Bills extends Controller
                 if (!empty($item['item_id'])) {
                     $item_object = Item::find($item['item_id']);
 
+                    $item['name'] = $item_object->name;
                     $item_sku = $item_object->sku;
 
                     // Increase stock (item bought)
@@ -348,6 +349,7 @@ class Bills extends Controller
                 if (!empty($item['item_id'])) {
                     $item_object = Item::find($item['item_id']);
 
+                    $item['name'] = $item_object->name;
                     $item_sku = $item_object->sku;
                 }
 

app/Http/Controllers/Incomes/Invoices.php

@@ -163,6 +163,7 @@ class Invoices extends Controller
                 if (!empty($item['item_id'])) {
                     $item_object = Item::find($item['item_id']);
 
+                    $item['name'] = $item_object->name;
                     $item_sku = $item_object->sku;
 
                     // Decrease stock (item sold)
@@ -369,6 +370,7 @@ class Invoices extends Controller
                 if (!empty($item['item_id'])) {
                     $item_object = Item::find($item['item_id']);
 
+                    $item['name'] = $item_object->name;
                     $item_sku = $item_object->sku;
                 }
 

app/Http/Controllers/Items/Items.php

@@ -195,9 +195,10 @@ class Items extends Controller
 
         $currency = Currency::where('code', $currency_code)->first();
 
-        $filter_data = array(
+        $filter_data = [
-            'name' => $query
+            'name' => $query,
-        );
+            'sku' => $query,
+        ];
 
         $items = Item::getItems($filter_data);
 

app/Models/Item/Item.php

@@ -87,13 +87,15 @@ class Item extends Model
             return Item::all();
         }
 
-        $query = Item::select('id as item_id', 'name', 'sale_price', 'purchase_price', 'tax_id');
+        $query = Item::select('id as item_id', 'name', 'sku', 'sale_price', 'purchase_price', 'tax_id');
 
         $query->where('quantity', '>', '0');
 
-        foreach ($filter_data as $key => $value) {
+        $query->where(function ($query) use ($filter_data) {
-            $query->where($key, 'LIKE', "%" . $value  . "%");
+            foreach ($filter_data as $key => $value) {
-        }
+                $query->orWhere($key, 'LIKE', "%" . $value  . "%");
+            }
+        });
 
         return $query->get();
     }

resources/views/expenses/bills/create.blade.php

@@ -197,7 +197,7 @@
                 $(this).typeahead({
                     minLength: 3,
                     displayText:function (data) {
-                        return data.name;
+                        return data.name + ' (' + data.sku + ')';
                     },
                     source: function (query, process) {
                         $.ajax({

resources/views/expenses/bills/edit.blade.php

@@ -242,7 +242,7 @@
                 $(this).typeahead({
                     minLength: 3,
                     displayText:function (data) {
-                        return data.name;
+                        return data.name + ' (' + data.sku + ')';
                     },
                     source: function (query, process) {
                         $.ajax({

resources/views/incomes/invoices/create.blade.php

@@ -198,7 +198,7 @@
                 $(this).typeahead({
                     minLength: 3,
                     displayText:function (data) {
-                        return data.name;
+                        return data.name + ' (' + data.sku + ')';
                     },
                     source: function (query, process) {
                         $.ajax({

resources/views/incomes/invoices/edit.blade.php

@@ -241,7 +241,7 @@
                 $(this).typeahead({
                     minLength: 3,
                     displayText:function (data) {
-                        return data.name;
+                        return data.name + ' (' + data.sku + ')';
                     },
                     source: function (query, process) {
                         $.ajax({