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

#503 fixed updated ad for deleted category

Browse Source
This commit is contained in:
vedatakd 2019-10-30 10:44:07 +03:00
parent 6b7af0233f
commit b28bc5c212
4 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/default/visiosoft/advs-module/resources/lang/en/message.php
View File

@ -22,4 +22,5 @@ return [
'cancelBtn' => "or Cancel",
'link' => "",
],
'update_category_info' => 'Please update category.',
];

1
addons/default/visiosoft/advs-module/resources/lang/tr/message.php
View File

@ -22,4 +22,5 @@ return [
'cancelBtn' => "ve ya İptal",
'link' => "",
],
'update_category_info' => 'Lütfen kategoriyi güncelleyiniz.',
];

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

@ -62,7 +62,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$join->on('advs_advs.id', '=', 'advs_advs_translations.entry_id');
$join->where('advs_advs_translations.locale', '=', Request()->session()->get('_locale'));
});
if (!empty($param['keyword'])) {
$delimiter = '_';
$keyword = str_slug($param['keyword'], $delimiter);
@ -167,19 +167,19 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
if (substr($para, 4, 3) === "cf_") {
$id = substr($para, 7);
$minmax = substr($para, 0, 3);
if($minmax == 'min'){
if ($minmax == 'min') {
$num = $param[$minmax.'_cf_'.$id];
$num = $param[$minmax . '_cf_' . $id];
$int = (int)$num;
$column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') >= '" . $int ."'";
$column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') >= '" . $int . "'";
$query = $query->whereRaw($column);
}
if($minmax == 'max'){
if ($minmax == 'max') {
$num = $param[$minmax.'_cf_'.$id];
$num = $param[$minmax . '_cf_' . $id];
$int = (int)$num;
$column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') <= '" . $int ."'";
$column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') <= '" . $int . "'";
$query = $query->whereRaw($column);
}
@ -201,7 +201,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'])) {
@ -250,12 +250,17 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$cat1 = CategoryModel::query()->where('cats_category.id', $adv->cat1)->first();
$cat2 = CategoryModel::query()->where('cats_category.id', $adv->cat2)->first();
$adv->setAttribute('cat1_name', $cat1->name);
if ($cat2 == null) {
$adv->setAttribute('cat2_name', "");
} else {
if (!is_null($cat1))
$adv->setAttribute('cat1_name', $cat1->name);
else
$adv->setAttribute('cat1_name', "");
if (!is_null($cat2))
$adv->setAttribute('cat2_name', $cat2->name);
}
else
$adv->setAttribute('cat2_name', "");
return $adv;
}

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

@ -257,11 +257,14 @@ class AdvsController extends PublicController
$cat = "cat" . $i;
if ($adv->$cat != null) {
$item = $this->category_repository->getItem($adv->$cat);
$categories['cat' . $i] = [
'name' => $item->name,
'id' => $item->id
];
$categories_id[] = $item->id;
if (!is_null($item)) {
$categories['cat' . $i] = [
'name' => $item->name,
'id' => $item->id
];
$categories_id[] = $item->id;
}
}
}
@ -681,8 +684,13 @@ class AdvsController extends PublicController
for ($i = 1; $i < 7; $i++) {
if ($adv[$cat . $i] != null) {
$name = $categoryRepository->getSingleCat($adv[$cat . $i]);
$cats_d['cat' . $i] = $name->name;
$cats['cat' . $i] = $name->id;
if (!is_null($name)) {
$cats_d['cat' . $i] = $name->name;
$cats['cat' . $i] = $name->id;
} else {
$this->messages->info(trans('visiosoft.module.advs::message.update_category_info'));
}
}
}