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

added event to global search

Browse Source
This commit is contained in:
denisdulici 2020-05-09 16:44:58 +03:00
parent 88c4861c0a
commit 0fb16de851
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Events/Common/GlobalSearched.php Normal file
View File

@ -0,0 +1,22 @@
<?php
namespace App\Events\Common;
use Illuminate\Queue\SerializesModels;
class GlobalSearched
{
use SerializesModels;
public $search;
/**
* Create a new event instance.
*
* @param $search
*/
public function __construct($search)
{
$this->search = $search;
}
}

47
app/Http/Controllers/Common/Search.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Controllers\Common; namespace App\Http\Controllers\Common;
use App\Abstracts\Http\Controller; use App\Abstracts\Http\Controller;
use App\Events\Common\GlobalSearched;
use App\Models\Banking\Account; use App\Models\Banking\Account;
use App\Models\Banking\Transaction; use App\Models\Banking\Transaction;
use App\Models\Common\Contact; use App\Models\Common\Contact;
@ -19,48 +20,48 @@ class Search extends Controller
*/ */
public function index() public function index()
{ {
$results = array(); $search = new \stdClass();
$search->results = [];
$search->keyword = request('keyword');
$keyword = request('keyword'); $accounts = Account::enabled()->usingSearchString($search->keyword)->get();
$accounts = Account::enabled()->usingSearchString($keyword)->get();
if ($accounts->count()) { if ($accounts->count()) {
foreach ($accounts as $account) { foreach ($accounts as $account) {
$results[] = (object)[ $search->results[] = (object) [
'id' => $account->id, 'id' => $account->id,
'name' => $account->name, 'name' => $account->name,
'type' => trans_choice('general.accounts', 1), 'type' => trans_choice('general.accounts', 1),
'color' => '#55588b', 'color' => '#55588b',
'href' => url('banking/accounts/' . $account->id . '/edit'), 'href' => route('accounts.edit', $account->id),
]; ];
} }
} }
$items = Item::enabled()->usingSearchString($keyword)->get(); $items = Item::enabled()->usingSearchString($search->keyword)->get();
if ($items->count()) { if ($items->count()) {
foreach ($items as $item) { foreach ($items as $item) {
$results[] = (object)[ $search->results[] = (object) [
'id' => $item->id, 'id' => $item->id,
'name' => $item->name, 'name' => $item->name,
'type' => trans_choice('general.items', 1), 'type' => trans_choice('general.items', 1),
'color' => '#efad32', 'color' => '#efad32',
'href' => url('common/items/' . $item->id . '/edit'), 'href' => route('items.edit', $item->id),
]; ];
} }
} }
$invoices = Invoice::usingSearchString($keyword)->get(); $invoices = Invoice::usingSearchString($search->keyword)->get();
if ($invoices->count()) { if ($invoices->count()) {
foreach ($invoices as $invoice) { foreach ($invoices as $invoice) {
$results[] = (object)[ $search->results[] = (object) [
'id' => $invoice->id, 'id' => $invoice->id,
'name' => $invoice->invoice_number . ' - ' . $invoice->contact_name, 'name' => $invoice->invoice_number . ' - ' . $invoice->contact_name,
'type' => trans_choice('general.invoices', 1), 'type' => trans_choice('general.invoices', 1),
'color' => '#6da252', 'color' => '#6da252',
'href' => url('sales/invoices/' . $invoice->id), 'href' => route('invoices.show', $invoice->id),
]; ];
} }
}/* }/*
@ -79,30 +80,30 @@ class Search extends Controller
} }
}*/ }*/
$customers = Contact::customer()->enabled()->usingSearchString($keyword)->get(); $customers = Contact::customer()->enabled()->usingSearchString($search->keyword)->get();
if ($customers->count()) { if ($customers->count()) {
foreach ($customers as $customer) { foreach ($customers as $customer) {
$results[] = (object)[ $search->results[] = (object) [
'id' => $customer->id, 'id' => $customer->id,
'name' => $customer->name, 'name' => $customer->name,
'type' => trans_choice('general.customers', 1), 'type' => trans_choice('general.customers', 1),
'color' => '#328aef', 'color' => '#328aef',
'href' => url('sales/customers/' . $customer->id), 'href' => route('customers.show', $customer->id),
]; ];
} }
} }
$bills = Bill::usingSearchString($keyword)->get(); $bills = Bill::usingSearchString($search->keyword)->get();
if ($bills->count()) { if ($bills->count()) {
foreach ($bills as $bill) { foreach ($bills as $bill) {
$results[] = (object)[ $search->results[] = (object) [
'id' => $bill->id, 'id' => $bill->id,
'name' => $bill->bill_number . ' - ' . $bill->contact_name, 'name' => $bill->bill_number . ' - ' . $bill->contact_name,
'type' => trans_choice('general.bills', 1), 'type' => trans_choice('general.bills', 1),
'color' => '#ef3232', 'color' => '#ef3232',
'href' => url('purchases/bills/' . $bill->id), 'href' => route('bills.show', $bill->id),
]; ];
} }
} }
@ -121,20 +122,22 @@ class Search extends Controller
} }
}*/ }*/
$vendors = Contact::vendor()->enabled()->usingSearchString($keyword)->get(); $vendors = Contact::vendor()->enabled()->usingSearchString($search->keyword)->get();
if ($vendors->count()) { if ($vendors->count()) {
foreach ($vendors as $vendor) { foreach ($vendors as $vendor) {
$results[] = (object)[ $search->results[] = (object) [
'id' => $vendor->id, 'id' => $vendor->id,
'name' => $vendor->name, 'name' => $vendor->name,
'type' => trans_choice('general.vendors', 1), 'type' => trans_choice('general.vendors', 1),
'color' => '#efef32', 'color' => '#efef32',
'href' => url('purchases/vendors/' . $vendor->id), 'href' => route('vendors.show', $vendor->id),
]; ];
} }
} }
return response()->json((object) $results); event(new GlobalSearched($search));
return response()->json((object) $search->results);
} }
} }