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

item autocomplete by sku

Browse Source
This commit is contained in:
denisdulici 2018-04-10 17:36:48 +03:00
parent 094e9d3002
commit 98bcefc1b2
10 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/Expenses/Bills.php
View File

@ -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'];

2
app/Http/Controllers/Api/Incomes/Invoices.php
View File

@ -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'];

2
app/Http/Controllers/Expenses/Bills.php
View File

@ -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;
}

2
app/Http/Controllers/Incomes/Invoices.php
View File

@ -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;
}

7
app/Http/Controllers/Items/Items.php
View File

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

10
app/Models/Item/Item.php
View File

@ -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($key, 'LIKE', "%" . $value . "%");
}
$query->where(function ($query) use ($filter_data) {
foreach ($filter_data as $key => $value) {
$query->orWhere($key, 'LIKE', "%" . $value . "%");
}
});
return $query->get();
}

2
resources/views/expenses/bills/create.blade.php
View File

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

2
resources/views/expenses/bills/edit.blade.php
View File

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

2
resources/views/incomes/invoices/create.blade.php
View File

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

2
resources/views/incomes/invoices/edit.blade.php
View File

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