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 branch 'dia' of https://github.com/openclassify/openclassify

Browse Source
This commit is contained in:
Diatrex 2020-11-14 11:55:28 +03:00
commit 2a32eec777
14 changed files with 178 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/default/visiosoft/advs-module/src/Adv/AdvPresenter.php
View File

@ -62,7 +62,7 @@ class AdvPresenter extends EntryPresenter
public function isCorporate()
{
$user_id = $this->getObject()->created_by;
if ($user_id->register_type != null) {
if ($user_id && $user_id->register_type != null) {
return $user_id->register_type;
} else {
return 1;

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

@ -436,9 +436,10 @@ class AdvsController extends PublicController
$user = null;
if (\request()->user) {
$user = $this->userRepository->find(\request()->user);
$showTitle = false;
$metaTitle = $user->name() . ' ' . trans('visiosoft.module.advs::field.ads');
if ($user = $this->userRepository->find(\request()->user)) {
$showTitle = false;
$metaTitle = $user->name() . ' ' . trans('visiosoft.module.advs::field.ads');
}
}
$this->template->set('showTitle', $showTitle);

3
addons/default/visiosoft/location-module/resources/config/settings/settings.php
View File

@ -94,7 +94,8 @@ return [
'options' => [
'slug' => 'slug',
'id' => 'id',
'order' => 'order'
'order' => 'order',
'name' => 'name',
],
],
],

23
addons/default/visiosoft/location-module/src/City/CityRepository.php
View File

@ -1,5 +1,6 @@
<?php namespace Visiosoft\LocationModule\City;
use Anomaly\Streams\Platform\Model\Location\LocationCitiesEntryTranslationsModel;
use Visiosoft\LocationModule\City\Contract\CityRepositoryInterface;
use Anomaly\Streams\Platform\Entry\EntryRepository;
@ -13,18 +14,38 @@ class CityRepository extends EntryRepository implements CityRepositoryInterface
*/
protected $model;
/**
* @var LocationCitiesEntryTranslationsModel
*/
private $citiesEntryTranslationsModel;
/**
* Create a new CityRepository instance.
*
* @param CityModel $model
*/
public function __construct(CityModel $model)
public function __construct(CityModel $model, LocationCitiesEntryTranslationsModel $citiesEntryTranslationsModel)
{
$this->model = $model;
$this->citiesEntryTranslationsModel = $citiesEntryTranslationsModel;
}
public function findById($id)
{
return $this->model->orderBy('created_at', 'DESC')->where('location_cities.id', $id)->first();
}
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc')
{
return $this->citiesEntryTranslationsModel->newQuery()
->select('entry_id as id', 'name')
->whereIn('locale', [
Request()->session()->get('_locale'),
setting_value('streams::default_locale'),
'en'
])
->whereIn('entry_id', $entryIDs)
->orderBy($orderBy, $direction)
->get();
}
}

2
addons/default/visiosoft/location-module/src/City/Contract/CityRepositoryInterface.php
View File

@ -5,4 +5,6 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface;
interface CityRepositoryInterface extends EntryRepositoryInterface
{
public function findById($id);
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc');
}

2
addons/default/visiosoft/location-module/src/Country/Contract/CountryRepositoryInterface.php
View File

@ -7,4 +7,6 @@ interface CountryRepositoryInterface extends EntryRepositoryInterface
public function findById($id);
public function viewAll();
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc');
}

26
addons/default/visiosoft/location-module/src/Country/CountryRepository.php
View File

@ -1,5 +1,6 @@
<?php namespace Visiosoft\LocationModule\Country;
use Anomaly\Streams\Platform\Model\Location\LocationCountriesEntryTranslationsModel;
use Visiosoft\LocationModule\Country\Contract\CountryRepositoryInterface;
use Anomaly\Streams\Platform\Entry\EntryRepository;
@ -13,14 +14,23 @@ class CountryRepository extends EntryRepository implements CountryRepositoryInte
*/
protected $model;
/**
* @var LocationCountriesEntryTranslationsModel
*/
private $countriesEntryTranslationsModel;
/**
* Create a new CountryRepository instance.
*
* @param CountryModel $model
*/
public function __construct(CountryModel $model)
public function __construct(
CountryModel $model,
LocationCountriesEntryTranslationsModel $countriesEntryTranslationsModel
)
{
$this->model = $model;
$this->countriesEntryTranslationsModel = $countriesEntryTranslationsModel;
}
public function findById($id)
{
@ -30,4 +40,18 @@ class CountryRepository extends EntryRepository implements CountryRepositoryInte
public function viewAll(){
return $this->model->get();
}
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc')
{
return $this->countriesEntryTranslationsModel->newQuery()
->select('entry_id as id', 'name')
->whereIn('locale', [
Request()->session()->get('_locale'),
setting_value('streams::default_locale'),
'en'
])
->whereIn('entry_id', $entryIDs)
->orderBy($orderBy, $direction)
->get();
}
}

2
addons/default/visiosoft/location-module/src/District/Contract/DistrictRepositoryInterface.php
View File

@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface;
interface DistrictRepositoryInterface extends EntryRepositoryInterface
{
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc');
}

26
addons/default/visiosoft/location-module/src/District/DistrictRepository.php
View File

@ -1,5 +1,6 @@
<?php namespace Visiosoft\LocationModule\District;
use Anomaly\Streams\Platform\Model\Location\LocationDistrictsEntryTranslationsModel;
use Visiosoft\LocationModule\District\Contract\DistrictRepositoryInterface;
use Anomaly\Streams\Platform\Entry\EntryRepository;
@ -13,13 +14,36 @@ class DistrictRepository extends EntryRepository implements DistrictRepositoryIn
*/
protected $model;
/**
* @var LocationDistrictsEntryTranslationsModel
*/
private $districtsEntryTranslationsModel;
/**
* Create a new DistrictRepository instance.
*
* @param DistrictModel $model
*/
public function __construct(DistrictModel $model)
public function __construct(
DistrictModel $model,
LocationDistrictsEntryTranslationsModel $districtsEntryTranslationsModel
)
{
$this->model = $model;
$this->districtsEntryTranslationsModel = $districtsEntryTranslationsModel;
}
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc')
{
return $this->districtsEntryTranslationsModel->newQuery()
->select('entry_id as id', 'name')
->whereIn('locale', [
Request()->session()->get('_locale'),
setting_value('streams::default_locale'),
'en'
])
->whereIn('entry_id', $entryIDs)
->orderBy($orderBy, $direction)
->get();
}
}

112
addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php
View File

@ -1,131 +1,95 @@
<?php namespace Visiosoft\LocationModule\Http\Controller;
use Anomaly\Streams\Platform\Http\Controller\PublicController;
use Visiosoft\LocationModule\City\CityModel;
use Visiosoft\LocationModule\Country\CountryModel;
use Visiosoft\LocationModule\District\DistrictModel;
use Visiosoft\LocationModule\Neighborhood\NeighborhoodModel;
use Visiosoft\LocationModule\Village\VillageModel;
use Visiosoft\LocationModule\City\Contract\CityRepositoryInterface;
use Visiosoft\LocationModule\Country\Contract\CountryRepositoryInterface;
use Visiosoft\LocationModule\District\Contract\DistrictRepositoryInterface;
use Visiosoft\LocationModule\Neighborhood\Contract\NeighborhoodRepositoryInterface;
use Visiosoft\LocationModule\Village\Contract\VillageRepositoryInterface;
use Illuminate\Support\Str;
class AjaxController extends PublicController
{
/**
* @var CountryModel
*/
private $country_model;
/**
* @var CityModel
*/
private $city_model;
/**
* @var DistrictModel
*/
private $district_model;
/**
* @var NeighborhoodModel
*/
private $neighborhood_model;
/**
* @var VillageModel
*/
private $village_model;
private $cityRepository;
private $countryRepository;
private $districtRepository;
private $neighborhoodRepository;
private $villageRepository;
/**
* AjaxController constructor.
* @param CountryModel $countryModel
*/
public function __construct(
CountryModel $countryModel,
CityModel $cityModel,
DistrictModel $districtModel,
NeighborhoodModel $neighborhoodModel,
VillageModel $villageModel)
CityRepositoryInterface $cityRepository,
CountryRepositoryInterface $countryRepository,
DistrictRepositoryInterface $districtRepository,
NeighborhoodRepositoryInterface $neighborhoodRepository,
VillageRepositoryInterface $villageRepository
)
{
$this->country_model = $countryModel;
$this->city_model = $cityModel;
$this->district_model = $districtModel;
$this->neighborhood_model = $neighborhoodModel;
$this->village_model = $villageModel;
parent::__construct();
$this->cityRepository = $cityRepository;
$this->countryRepository = $countryRepository;
$this->districtRepository = $districtRepository;
$this->neighborhoodRepository = $neighborhoodRepository;
$this->villageRepository = $villageRepository;
}
/**
* @return mixed
*/
public function getCountries()
{
if ($this->request->id)
return $this->country_model->find($this->request->id);
return $this->countryRepository->getModel()->find($this->request->id);
else {
$query = $this->country_model;
return $this->queryOrder($query);
$query = $this->countryRepository->getModel();
return $this->queryOrder($query, $this->countryRepository);
}
}
/**
* @return mixed
*/
public function getCities()
{
if ($this->request->id) {
$id = explode(',', $this->request->id);
$query = $this->city_model->whereIn('parent_country_id', $id);
$query = $this->cityRepository->getModel()->whereIn('parent_country_id', $id);
return $this->queryOrder($query);
return $this->queryOrder($query, $this->cityRepository);
}
}
/**
* @return mixed
*/
public function getDistricts()
{
if ($this->request->id) {
$id = explode(',', $this->request->id);
$query = $this->district_model->whereIn('parent_city_id', $id);
$query = $this->districtRepository->getModel()->whereIn('parent_city_id', $id);
return $this->queryOrder($query);
return $this->queryOrder($query, $this->districtRepository);
}
}
/**
* @return mixed
*/
public function getNeighborhoods()
{
if ($this->request->id) {
$id = explode(',', $this->request->id);
$query = $this->neighborhood_model->whereIn('parent_district_id', $id);
$query = $this->neighborhoodRepository->getModel()->whereIn('parent_district_id', $id);
return $this->queryOrder($query);
return $this->queryOrder($query, $this->neighborhoodRepository);
}
}
/**
* @return mixed
*/
public function getVillage()
{
if ($this->request->id) {
$id = explode(',', $this->request->id);
$query = $this->village_model->whereIn('parent_neighborhood_id', $id);
$query = $this->villageRepository->getModel()->whereIn('parent_neighborhood_id', $id);
return $this->queryOrder($query);
return $this->queryOrder($query, $this->villageRepository);
}
}
/**
* @return mixed
*/
public function getCity()
{
if ($this->request->name) {
$slug = Str::slug($this->request->name, '_');
if ($city = $this->city_model->newQuery()->where('slug', 'LIKE', $slug . '%')->first()) {
if ($city = $this->cityRepository->getModel()->newQuery()->where('slug', 'LIKE', $slug . '%')->first()) {
return ['success' => true, 'city' => $city];
} else {
return ['success' => false];
@ -133,11 +97,19 @@ class AjaxController extends PublicController
}
}
public function queryOrder($query)
public function queryOrder($query, $repository)
{
$sorting_type = setting_value('visiosoft.module.location::sorting_type');
$sorting_column = setting_value('visiosoft.module.location::sorting_column');
if ($repository->getModel()->isTranslatedAttribute($sorting_column)) {
return $repository->getByEntryIDsAndOrderByTransCol(
$query->pluck('id')->all(),
$sorting_column,
$sorting_type
);
}
return $query->orderBy($sorting_column, $sorting_type)->get();
}
}

2
addons/default/visiosoft/location-module/src/Neighborhood/Contract/NeighborhoodRepositoryInterface.php
View File

@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface;
interface NeighborhoodRepositoryInterface extends EntryRepositoryInterface
{
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc');
}

26
addons/default/visiosoft/location-module/src/Neighborhood/NeighborhoodRepository.php
View File

@ -1,5 +1,6 @@
<?php namespace Visiosoft\LocationModule\Neighborhood;
use Anomaly\Streams\Platform\Model\Location\LocationNeighborhoodsEntryTranslationsModel;
use Visiosoft\LocationModule\Neighborhood\Contract\NeighborhoodRepositoryInterface;
use Anomaly\Streams\Platform\Entry\EntryRepository;
@ -13,13 +14,36 @@ class NeighborhoodRepository extends EntryRepository implements NeighborhoodRepo
*/
protected $model;
/**
* @var LocationNeighborhoodsEntryTranslationsModel
*/
private $neighborhoodsEntryTranslationsModel;
/**
* Create a new NeighborhoodRepository instance.
*
* @param NeighborhoodModel $model
*/
public function __construct(NeighborhoodModel $model)
public function __construct(
NeighborhoodModel $model,
LocationNeighborhoodsEntryTranslationsModel $neighborhoodsEntryTranslationsModel
)
{
$this->model = $model;
$this->neighborhoodsEntryTranslationsModel = $neighborhoodsEntryTranslationsModel;
}
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc')
{
return $this->neighborhoodsEntryTranslationsModel->newQuery()
->select('entry_id as id', 'name')
->whereIn('locale', [
Request()->session()->get('_locale'),
setting_value('streams::default_locale'),
'en'
])
->whereIn('entry_id', $entryIDs)
->orderBy($orderBy, $direction)
->get();
}
}

2
addons/default/visiosoft/location-module/src/Village/Contract/VillageRepositoryInterface.php
View File

@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface;
interface VillageRepositoryInterface extends EntryRepositoryInterface
{
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc');
}

26
addons/default/visiosoft/location-module/src/Village/VillageRepository.php
View File

@ -1,5 +1,6 @@
<?php namespace Visiosoft\LocationModule\Village;
use Anomaly\Streams\Platform\Model\Location\LocationVillageEntryTranslationsModel;
use Visiosoft\LocationModule\Village\Contract\VillageRepositoryInterface;
use Anomaly\Streams\Platform\Entry\EntryRepository;
@ -13,13 +14,36 @@ class VillageRepository extends EntryRepository implements VillageRepositoryInte
*/
protected $model;
/**
* @var LocationVillageEntryTranslationsModel
*/
private $villageEntryTranslationsModel;
/**
* Create a new VillageRepository instance.
*
* @param VillageModel $model
*/
public function __construct(VillageModel $model)
public function __construct(
VillageModel $model,
LocationVillageEntryTranslationsModel $villageEntryTranslationsModel
)
{
$this->model = $model;
$this->villageEntryTranslationsModel = $villageEntryTranslationsModel;
}
public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc')
{
return $this->villageEntryTranslationsModel->newQuery()
->select('entry_id as id', 'name')
->whereIn('locale', [
Request()->session()->get('_locale'),
setting_value('streams::default_locale'),
'en'
])
->whereIn('entry_id', $entryIDs)
->orderBy($orderBy, $direction)
->get();
}
}