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

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

Browse Source
This commit is contained in:
Diatrex 2020-02-20 15:27:52 +03:00
commit cb79828f42
7 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/default/visiosoft/advs-module/resources/js/cats.js
View File

@ -13,7 +13,7 @@ $(document).ready(function () {
$(this).val(all[all.length-1]) $(this).val(all[all.length-1])
}) })
const filter = {}; var filter = {};
filter.getCats = (catId, divId) => { filter.getCats = (catId, divId) => {
$.ajax({ $.ajax({
type: 'get', type: 'get',

2
addons/default/visiosoft/advs-module/resources/js/list.js
View File

@ -1,4 +1,4 @@
const filter = {}; var filter = {};
filter.checkUser = () => { filter.checkUser = () => {
$.ajax({ $.ajax({

2
addons/default/visiosoft/advs-module/resources/js/new-create.js
View File

@ -7,7 +7,7 @@ function hideLoader() {
} }
const filter = {}; var filter = {};
// TODO will be unified // TODO will be unified

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

@ -97,14 +97,22 @@
style="max-height: 300px;"> style="max-height: 300px;">
<div class="row p-3 m-0"> <div class="row p-3 m-0">
<div class="form-check py-1"> <div class="form-check py-1">
<input class="form-check-input" type="checkbox" value="true" name="photo" <input class="form-check-input" type="checkbox"
{% if app.request.get('photo') == true %}
checked
{% endif %}
value="true" name="photo"
id="photo"> id="photo">
<label class="form-check-label" for="photo"> <label class="form-check-label" for="photo">
{{ trans("visiosoft.module.advs::field.ads_with_photo.name") }} {{ trans("visiosoft.module.advs::field.ads_with_photo.name") }}
</label> </label>
</div> </div>
<div class="form-check py-1"> <div class="form-check py-1">
<input class="form-check-input" type="checkbox" value="true" name="video" <input class="form-check-input" type="checkbox"
{% if app.request.get('video') == true %}
checked
{% endif %}
value="true" name="video"
id="video"> id="video">
<label class="form-check-label" for="video"> <label class="form-check-label" for="video">
{{ trans("visiosoft.module.advs::field.ads_with_video.name") }} {{ trans("visiosoft.module.advs::field.ads_with_video.name") }}
@ -177,7 +185,7 @@
{% for currency in active_currencies %} {% for currency in active_currencies %}
<option {% if app.request.get('currency') == currency %} <option {% if app.request.get('currency') == currency %}
selected selected
{% endif %}value="{{ currency }}">{{ currency }}</option> {% endif %}value="{{ currency }}">{{ currency_symbol(currency) }}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>

3
addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
View File

@ -168,7 +168,8 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
public function popularAdvs() public function popularAdvs()
{ {
return $this->getAdv()->orderBy('count_show_ad', 'desc')->limit(10)->get(); return $this->getAdv()->where('status', 'approved')
->orderBy('count_show_ad', 'desc')->limit(10)->get();
} }
public function advsofDay() public function advsofDay()

6
addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
View File

@ -47,7 +47,11 @@ class CategoryController extends AdminController
$this->messages->error('Selected category has no sub-categories.'); $this->messages->error('Selected category has no sub-categories.');
return back(); return back();
} }
$table->setTableEntries($categories); if($request->view != "trash")
{
$table->setTableEntries($categories);
}
return $table->render(); return $table->render();
} }

2
addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
View File

@ -82,7 +82,7 @@
<div class="modal-header"> <div class="modal-header">
<input type="text" id="searchLocation" class="form-control" <input type="text" id="searchLocation" class="form-control"
placeholder="{{ trans('visiosoft.module.location::message.placeholder') }}"> placeholder="{{ trans('visiosoft.module.location::message.placeholder') }}">
<button type="button" class="close filter-modal-close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close filter-modal-close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>