From c2e61c9a401050014311bd374fb0808ccaeed365 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 13 Jan 2020 13:05:29 +0300 Subject: [PATCH 1/2] create section block --- .../advs-module/resources/views/ad-detail/partials/content.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig index 3044719df..a4384b160 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/content.twig @@ -32,3 +32,5 @@ + +{{ addBlock('ad-detail/section',{'adv':adv})|raw }} \ No newline at end of file From adca6d42fc4132f3b76cb883b93bcc39945ab1d7 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 13 Jan 2020 18:46:44 +0300 Subject: [PATCH 2/2] add event adv parameters --- .../visiosoft/advs-module/src/Adv/AdvRepository.php | 7 ++++++- .../default/visiosoft/advs-module/src/Adv/Event/EditAd.php | 3 ++- .../advs-module/src/Http/Controller/advsController.php | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 572f15dc0..70fdd6799 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -207,11 +207,16 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface } } + +// //UPDATE `default_advs_advs` SET `coor` = (PointFromText('POINT(41.085022 28.804754)')) WHERE `default_advs_advs`.`id` = 8 +// //SELECT * FROM `default_advs_advs` WHERE ST_DISTANCE(ST_GeomFromText('POINT(41.0709052 28.829627)'), coor) < 20 + 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']); } + if ($isActiveDopings) { if ($param == null) { $DopingModel = new DopingModel(); @@ -292,7 +297,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $adv = $this->model ->where('advs_advs.id', $id) ->leftJoin('users_users as u1', 'advs_advs.created_by_id', '=', 'u1.id') - ->select('advs_advs.*','u1.first_name as first_name', 'u1.last_name as last_name', 'u1.id as owner_id') + ->select('advs_advs.*', 'u1.first_name as first_name', 'u1.last_name as last_name', 'u1.id as owner_id') ->inRandomOrder() ->first(); diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/EditAd.php b/addons/default/visiosoft/advs-module/src/Adv/Event/EditAd.php index 470b6778d..ed5646b47 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Event/EditAd.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Event/EditAd.php @@ -3,10 +3,11 @@ class EditAd { - public function __construct($request,$settings) + public function __construct($request, $settings, $adv) { $this->request = $request; $this->settings = $settings; + $this->adv = $adv; } public function getRequest() diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 2f0de1df8..022b5840b 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -625,7 +625,7 @@ class AdvsController extends PublicController if ($adv->slug == "") { $events->dispatch(new CreateAd($request->update_id, $settings));//Create Notify } else { - $events->dispatch(new EditAd($request->update_id, $settings));//Update Notify + $events->dispatch(new EditAd($request->update_id, $settings, $adv));//Update Notify }