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

Default country in listing #152 #153

Browse Source
This commit is contained in:
Diatrex 2019-11-20 12:50:07 +03:00
parent b9e9743a3b
commit b5a7634fdf
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,12 +228,12 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
$id = $object->id;
$seo = str_slug($object->name);
$seo = str_replace('_', '-', $seo);
return \route('adv_detail_seo', [$id, $seo]);
return \route('adv_detail_seo', [$seo, $id]);
}
$id = $object->getObject()->id;
$seo = str_slug($object->getObject()->name);
$seo = str_replace('_', '-', $seo);
return \route('adv_detail_seo', [$id, $seo]);
return \route('adv_detail_seo', [$seo, $id]);
}
public function getAdvDetailLinkByAdId($id)
@ -243,7 +243,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
$id = $adv->id;
$seo = str_slug($adv->name);
$seo = str_replace('_', '-', $seo);
return \route('adv_detail_seo', [$id, $seo]);
return \route('adv_detail_seo', [$seo, $id]);
}
}

14
addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
View File

@ -110,11 +110,19 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
],
'getlocations' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations',
'advs/main' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advsMainPage',
'advs/adv/{id}' => [
// 'advs/adv/{id}' => [
// 'as' => 'adv_detail',
// 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
// ],
// 'advs/adv/{id}/{seo}' => [
// 'as' => 'adv_detail_seo',
// 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
// ],
'ad/{id}' => [
'as' => 'adv_detail',
'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
],
'advs/adv/{id}/{seo}' => [
'ad/{seo}/{id}' => [
'as' => 'adv_detail_seo',
'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
],
@ -123,7 +131,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@map'
],
'advs/categories' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@index',
'advs/categories/{cat}' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@listByCat',
'advs/c/{cat}' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@listByCat',
'advs/module_active' => 'Visiosoft\AdvsModule\Http\Controller\advsController@index',
'advs/create_adv' => [
'as' => "create_adv",

14
addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php
View File

@ -8,12 +8,24 @@ class CategoriesController extends PublicController {
public function listByCat($cat) {
$advs = DB::table('advs_advs')
->where('category_id', $cat)
->where('cat1', $cat)
->orwhere('cat2', $cat)
->orwhere('cat3', $cat)
->orwhere('cat4', $cat)
->orwhere('cat5', $cat)
->orwhere('cat6', $cat)
->orwhere('cat7', $cat)
->leftJoin('users_users as u1', 'advs_advs.created_by_id', '=', 'u1.id')
->leftJoin('advs_advs_translations as t1', 'advs_advs.id', '=', 't1.id')
->select('advs_advs.*','u1.username as owner', 't1.name as name')
->get();
foreach ($advs as $adv) {
if (strpos($adv->cover_photo, 'http') !== 0 && strpos($adv->cover_photo, '/') !== 0) {
$adv->cover_photo = "/$adv->cover_photo";
}
}
return $this->view->make('visiosoft.module.advs::list/list', compact('advs'));
}
}

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

@ -245,8 +245,10 @@ class AdvsController extends PublicController
return redirect($this->request->headers->get('referer'));
}
public function view($id)
public function view($seo, $id = null)
{
$id = is_null($id) ? $seo : $id;
$categories = array();
$categories_id = array();
$isActiveComplaints = $this->adv_model->is_enabled('complaints');