hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 23:06:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dia' of https://github.com/openclassify/openclassify into master

Browse Source
This commit is contained in:
Diatrex 2020-08-14 12:59:24 +03:00
commit f166afe3d1
3 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php
View File

@ -4,6 +4,7 @@ use Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel;
use Anomaly\Streams\Platform\Ui\Table\TableBuilder; use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
use Anomaly\UsersModule\UsersModule; use Anomaly\UsersModule\UsersModule;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Visiosoft\AdvsModule\Adv\Table\Filter\NameDescFilterQuery;
use Visiosoft\AdvsModule\Adv\Table\Filter\UserFilterQuery; use Visiosoft\AdvsModule\Adv\Table\Filter\UserFilterQuery;
use Visiosoft\AdvsModule\Adv\Table\Handler\AdvHandler; use Visiosoft\AdvsModule\Adv\Table\Handler\AdvHandler;
use Visiosoft\AdvsModule\Adv\Table\Views\All; use Visiosoft\AdvsModule\Adv\Table\Views\All;
@ -40,10 +41,9 @@ class AdvTableBuilder extends TableBuilder
*/ */
protected $filters = [ protected $filters = [
'search' => [ 'search' => [
'fields' => [ 'filter' => 'input',
'name', 'placeholder' => 'visiosoft.module.advs::field.search',
'advs_desc', 'query' => NameDescFilterQuery::class,
]
], ],
'country', 'country',
'id' => [ 'id' => [

20
addons/default/visiosoft/advs-module/src/Adv/Table/Filter/NameDescFilterQuery.php Normal file
View File

@ -0,0 +1,20 @@
<?php namespace Visiosoft\AdvsModule\Adv\Table\Filter;
use Anomaly\Streams\Platform\Ui\Table\Component\Filter\Contract\FilterInterface;
use Illuminate\Database\Eloquent\Builder;
class NameDescFilterQuery
{
public function handle(Builder $query, FilterInterface $filter)
{
$appLocale = config('app.locale');
$defaultLocale = setting_value('streams::default_locale');
$query->join('advs_advs_translations', 'advs_advs.id', '=', 'advs_advs_translations.entry_id');
$query->where('name', 'LIKE', '%' . $filter->getValue() . '%');
$query->orWhere('advs_desc', 'LIKE', '%' . $filter->getValue() . '%');
$query->orderByRaw("FIELD(locale, '$defaultLocale', '$appLocale') DESC");
}
}

4
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -999,6 +999,7 @@ class AdvsController extends PublicController
public function addCart(Request $request) public function addCart(Request $request)
{ {
if (\auth()->check()) {
$id = $request->id; $id = $request->id;
$quantity = $request->quantity; $quantity = $request->quantity;
$name = $request->name; $name = $request->name;
@ -1012,6 +1013,9 @@ class AdvsController extends PublicController
$response['status'] = "error"; $response['status'] = "error";
$response['msg'] = trans('visiosoft.module.advs::message.error_added_cart'); $response['msg'] = trans('visiosoft.module.advs::message.error_added_cart');
} }
} else {
$response['status'] = "guest";
}
return $response; return $response;
} }