From a147b27dff72825844b981c28b565c5313942905 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 25 Sep 2020 14:08:44 +0300 Subject: [PATCH 1/6] =?UTF-8?q?#2101=20[hprojects-module]=20Housing=20Proj?= =?UTF-8?q?ects=20/=20Konut=20Projeleri=20Mod=C3=BCl=C3=BC=20yap=C4=B1lmas?= =?UTF-8?q?=C4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advs-module/src/Adv/AdvModel.php | 27 ++++++++++--------- .../src/AdvsModuleServiceProvider.php | 1 + 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index cc6507207..11c4e1007 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -1,27 +1,16 @@ is_get_adv && $this->stock; } + + public function getCity() + { + $cityModel = new CityModel(); + $city = $cityModel->newQuery()->find($this->city); + return $city ? $city->name : false; + } + + public function getDistrict() + { + $districtModel = new DistrictModel(); + $district = $districtModel->newQuery()->find($this->district); + return $district ? $district->name : false; + } } diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 4454fff6d..fbd8c6d9c 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -130,6 +130,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@store' ], 'advs/edit_advs/{id}' => [ + 'middleware' => 'auth', 'as' => 'visiosoft.module.advs::edit_adv', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@edit', ], From 0cb954c8e614abf93f036e2a046a9199a4905305 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 25 Sep 2020 17:08:01 +0300 Subject: [PATCH 2/6] =?UTF-8?q?#2101=20[hprojects-module]=20Housing=20Proj?= =?UTF-8?q?ects=20/=20Konut=20Projeleri=20Mod=C3=BCl=C3=BC=20yap=C4=B1lmas?= =?UTF-8?q?=C4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/default/visiosoft/advs-module/src/Adv/AdvModel.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index 11c4e1007..3e0b283ac 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -11,6 +11,7 @@ use Visiosoft\LocationModule\City\CityModel; use Visiosoft\LocationModule\Country\CountryModel; use Visiosoft\CartsModule\Cart\Command\GetCart; use Visiosoft\LocationModule\District\DistrictModel; +use Visiosoft\LocationModule\Neighborhood\NeighborhoodModel; class AdvModel extends AdvsAdvsEntryModel implements AdvInterface { @@ -363,4 +364,11 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface $district = $districtModel->newQuery()->find($this->district); return $district ? $district->name : false; } + + public function getNeighborhood() + { + $neighborhoodModel = new NeighborhoodModel(); + $neighborhood = $neighborhoodModel->newQuery()->find($this->neighborhood); + return $neighborhood ? $neighborhood->name : false; + } } From b4941cf6ca6a957f20bc3d1123214ea408a0862e Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 25 Sep 2020 17:37:37 +0300 Subject: [PATCH 3/6] #2162 oc.com admin login with prefilled password --- .../visiosoft/defaultadmin-theme/resources/views/login.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig index 6c75b8c39..e150db2bd 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig @@ -35,14 +35,14 @@
{% if setting_value('anomaly.module.users::login') == 'username' %} - {{ form.fields.username.setPlaceholder(form.fields.username.label).addAttribute('autofocus', 1).input|raw }} + {{ form.fields.username.setValue(app.request.get('username')).setPlaceholder(form.fields.username.label).addAttribute('autofocus', 1).input|raw }} {% else %} - {{ form.fields.email.setPlaceholder(form.fields.email.label).addAttribute('autofocus', 1).input|raw }} + {{ form.fields.email.setValue(app.request.get('username')).setPlaceholder(form.fields.email.label).addAttribute('autofocus', 1).input|raw }} {% endif %}
- {{ form.fields.password.setPlaceholder(form.fields.password.label).input|raw }} + {{ form.fields.password.setValue(app.request.get('password')).setPlaceholder(form.fields.password.label).input|raw }}
From e7e1c9e266e53089dc0fc419aed239a38133f862 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 28 Sep 2020 09:29:51 +0300 Subject: [PATCH 4/6] #2224 [advs-module] Fix lising page style --- .../default/visiosoft/advs-module/resources/css/list.css | 1 - .../resources/views/list/partials/display-mode.twig | 8 ++++---- .../resources/views/list/partials/list-filter.twig | 6 +++--- .../advs-module/src/Http/Controller/advsController.php | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css index 18f2e8896..9a5cdecf2 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list.css +++ b/addons/default/visiosoft/advs-module/resources/css/list.css @@ -113,7 +113,6 @@ .result-text { font-size: 13px; - margin: 0 -15px; } .result-text span:first-child { diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig index 3b2e9c73e..afee7be01 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig @@ -4,7 +4,7 @@ {% endif %}
@@ -12,21 +12,21 @@
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 4c51702b9..b94efc4d6 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -16,11 +16,11 @@ {% endset %} {% endif %} {{ formHtml }} -
+
-
-
+
+
{{ addBlock('ads-list/partials/list-filter',{ 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 f9c5bc7b2..12b1c3a43 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -293,7 +293,7 @@ class AdvsController extends PublicController $viewType = $this->requestHttp->cookie('viewType'); $catText = ''; - if (!isset($allCats)) { + if (!$allCats) { if (count($mainCats) == 1 || count($mainCats) == 2) { $catText = end($mainCats)['val']; } elseif (count($mainCats) > 2) { From a7414bf39bb0729908c7444c431eb6f13f7fe622 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 28 Sep 2020 09:45:39 +0300 Subject: [PATCH 5/6] #2131 no add to card button on mobile !212 --- .../advs-module/src/Http/Controller/advsController.php | 5 +++++ 1 file changed, 5 insertions(+) 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 12b1c3a43..e35b32ce5 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -305,6 +305,11 @@ class AdvsController extends PublicController $loop++; } } + + if ($cityId) { + $catText = "$cityId->name $catText"; + } + $this->template->set('showTitle', false); $this->template->set('meta_title', $catText); } From 311cbd6ee1675ef0cb2fa9c8c92a8126f7bdacbf Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 28 Sep 2020 11:33:16 +0300 Subject: [PATCH 6/6] #2131 no add to card button on mobile !212 --- .../advs-module/src/Http/Controller/advsController.php | 9 +++++++++ 1 file changed, 9 insertions(+) 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 868be0fdd..cd0839ab2 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -232,6 +232,15 @@ class AdvsController extends PublicController $advs = $this->adv_repository->searchAdvs('list', $param, $customParameters, null, $categoryId, $cityId); $advs = $this->adv_repository->addAttributes($advs); + if ($advs->currentPage() > $advs->lastPage()) { + unset($param['page']); + return redirect($this->fullLink( + $param, + \request()->url(), + array() + ), 301); + } + if ($isActiveDopings and $param != null) { $featured_advs = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->listFeatures($advs); }