hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #53 from openclassify/onurure

Browse Source 
Onurure
This commit is contained in:
Fatih Alp 2019-07-24 12:41:17 +03:00 committed by GitHub
commit e2975de657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig
View File

@ -145,6 +145,29 @@
</div><!-- panel -->
{% endfor %}
{% for key,value in ranges %}
<!-- panel -->
<div class="panel-default panel-faq">
<!-- panel-heading -->
<div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-range{{ value.id }}">
<h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-minus"></i></span></h4>
</a>
</div><!-- panel-heading -->
<div id="accordion-range{{ value.id }}" class="panel-collapse collapse in">
<!-- panel-body -->
<div class="panel-body">
<input type="number" class="price-input" value="{{ app.request.get('min_cf_'~ value.id) }}" name="min_cf_{{ value.id }}" min="0" placeholder="Min"> - <input class="price-input" type="number" value="{{ app.request.get('max_cf_'~ value.id) }}" name="max_cf_{{ value.id }}" placeholder="Max">
</div><!-- panel-body -->
</div>
</div><!-- panel -->
{% endfor %}
<!-- panel -->
<div class="panel-default panel-faq">
<!-- panel-heading -->

44
addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
View File

@ -56,6 +56,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$query = $query->where('advs_advs.slug', '!=', "");
$query = $query->where('advs_advs.status', 'approved');
$query = $query->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
if (!empty($param['keyword'])) {
$delimiter = '_';
$keyword = str_slug($param['keyword'], $delimiter);
@ -103,10 +104,11 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
foreach ($param as $para => $value) {
if (substr($para, 0, 3) === "cf_") {
$id = substr($para, 3, 3);
$id = substr($para, 3);
$customParameters[] = ['id' => "$.cf" . $id, 'value' => $param[$para]];
}
}
foreach ($customParameters as $key => $customParameter) {
if ($key == 0) {
$jsonQuery = "(";
@ -140,6 +142,43 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$query = $query->whereRaw($jsonQuery);
}
if (!empty($param['max_price'])) {
$num = $param['max_price'];
$int = (int)$num;
$column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') <=" . $int;
$query = $query->whereRaw($column);
}
if (!empty($param['max_price'])) {
$num = $param['max_price'];
$int = (int)$num;
$column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') <=" . $int;
$query = $query->whereRaw($column);
}
foreach ($param as $para => $value) {
if (substr($para, 4, 3) === "cf_") {
$id = substr($para, 7);
$minmax = substr($para, 0, 3);
if($minmax == 'min'){
$num = $param[$minmax.'_cf_'.$id];
$int = (int)$num;
$column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') >= '" . $int ."'";
$query = $query->whereRaw($column);
}
if($minmax == 'max'){
$num = $param[$minmax.'_cf_'.$id];
$int = (int)$num;
$column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') <= '" . $int ."'";
$query = $query->whereRaw($column);
}
}
}
if (!empty($param['dlong']) && !empty($param['dlat']) && !empty($param['distance'])) {
$query = $query->whereNotNull('coor');
$query = $query->whereRaw("ST_DISTANCE(ST_GeomFromText('POINT(" . $param['dlong'] . " " . $param['dlat'] . ")'), coor) < " . $param['distance']);
@ -155,6 +194,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$join->on('advs_advs.id', '=', 'dopings_dopings.adv_name_id');
$join->where('dopings_dopings.doping_type_id', '=', 4);
});
$query = $query->select('advs_advs.*', 'dopings_dopings.id as doping');
}
if (!empty($param['sort_by'])) {
@ -173,12 +213,12 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$query = $query->orderBy('created_at', 'desc');
}
if ($type == "list") {
return $query->paginate($this->settings->value('streams::per_page'));
} else {
return $query->get();
}
}
public function softDeleteAdv($id)

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

@ -112,6 +112,7 @@ class AdvsController extends PublicController
$checkboxes = $returnvalues['checkboxes'];
$textfields = $returnvalues['textfields'];
$topfields = $returnvalues['topfields'];
$ranges = $returnvalues['ranges'];
}
if (!empty($param['user'])) {
@ -119,7 +120,7 @@ class AdvsController extends PublicController
$userProfile = $profileRepository->getProfile($user->id);
}
$compact = compact('advs', 'countries', 'mainCats', 'subCats', 'textfields', 'checkboxes', 'request',
'user', 'userProfile', 'featured_advs', 'type', 'topfields');
'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges');
Cookie::queue(Cookie::make('last_search', $request->getRequestUri(), 84000));

2
addons/default/visiosoft/default-theme/resources/css/default/main.css
View File

@ -2435,7 +2435,7 @@ a.verified i {
}
.adpost-details input[type="radio"] {
display: none;
/* display: none; */
}
.adpost-details input[type="radio"] + label:before,