From 9bf22c2acb634c124df66a7d2923d681af98262f Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 20 Dec 2019 15:59:26 +0300 Subject: [PATCH 1/5] Integration with main bot --- ...siosoft.module.advs__create_advs_fields.php | 18 ++++++++++++++++++ ...siosoft.module.advs__create_advs_stream.php | 3 +++ .../src/LocationModuleServiceProvider.php | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/addons/default/visiosoft/advs-module/migrations/2018_09_25_211014_visiosoft.module.advs__create_advs_fields.php b/addons/default/visiosoft/advs-module/migrations/2018_09_25_211014_visiosoft.module.advs__create_advs_fields.php index 80e21e915..fa29c6dc9 100644 --- a/addons/default/visiosoft/advs-module/migrations/2018_09_25_211014_visiosoft.module.advs__create_advs_fields.php +++ b/addons/default/visiosoft/advs-module/migrations/2018_09_25_211014_visiosoft.module.advs__create_advs_fields.php @@ -79,6 +79,24 @@ class VisiosoftModuleAdvsCreateAdvsFields extends Migration "default_value" => NULL, ] ], + 'cat8' => [ + 'type' => 'anomaly.field_type.select', + 'config' => [ + "default_value" => NULL, + ] + ], + 'cat9' => [ + 'type' => 'anomaly.field_type.select', + 'config' => [ + "default_value" => NULL, + ] + ], + 'cat10' => [ + 'type' => 'anomaly.field_type.select', + 'config' => [ + "default_value" => NULL, + ] + ], 'parent_category' => [ 'type' => 'anomaly.field_type.relationship', 'config' => [ diff --git a/addons/default/visiosoft/advs-module/migrations/2018_09_25_211039_visiosoft.module.advs__create_advs_stream.php b/addons/default/visiosoft/advs-module/migrations/2018_09_25_211039_visiosoft.module.advs__create_advs_stream.php index 30e9dcd7b..49193a5af 100644 --- a/addons/default/visiosoft/advs-module/migrations/2018_09_25_211039_visiosoft.module.advs__create_advs_stream.php +++ b/addons/default/visiosoft/advs-module/migrations/2018_09_25_211039_visiosoft.module.advs__create_advs_stream.php @@ -42,6 +42,9 @@ class VisiosoftModuleAdvsCreateAdvsStream extends Migration 'cat5', 'cat6', 'cat7', + 'cat8', + 'cat9', + 'cat10', 'price' => [ 'required' => true ], diff --git a/addons/default/visiosoft/location-module/src/LocationModuleServiceProvider.php b/addons/default/visiosoft/location-module/src/LocationModuleServiceProvider.php index b957e4c71..260b09956 100644 --- a/addons/default/visiosoft/location-module/src/LocationModuleServiceProvider.php +++ b/addons/default/visiosoft/location-module/src/LocationModuleServiceProvider.php @@ -1,7 +1,19 @@ CityModel::class, + LocationDistrictsEntryModel::class => DistrictModel::class, + LocationNeighborhoodsEntryModel::class => NeighborhoodModel::class, // AdvsCfValuesEntryModel::class => CfValueModel::class, // AdvsCustomFieldAdvsEntryModel::class => CustomFieldAdvModel::class, // AdvsCustomFieldsEntryModel::class => CustomFieldModel::class, @@ -130,6 +145,9 @@ class LocationModuleServiceProvider extends AddonServiceProvider * @type array|null */ protected $singletons = [ + CityRepositoryInterface::class => CityRepository::class, + DistrictRepositoryInterface::class => DistrictRepository::class, + NeighborhoodRepositoryInterface::class => NeighborhoodRepository::class, // CfValueRepositoryInterface::class => CfValueRepository::class, // CustomFieldAdvRepositoryInterface::class => CustomFieldAdvRepository::class, // CustomFieldRepositoryInterface::class => CustomFieldRepository::class, From 08a4f35223033eedf37dd26baeffc3c1f828b421 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 23 Dec 2019 11:07:40 +0300 Subject: [PATCH 2/5] #587 [sahibinden-module] Getting custom fields dynamically --- .../advs-module/src/Http/Controller/Admin/AdvsController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index 946e5e5f5..59cbc1b52 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -86,6 +86,8 @@ class AdvsController extends AdminController 'wrapper' => function (EntryInterface $entry, Request $request) { if (strpos($entry->cover_photo, 'http') === 0) { $wrapper = ''; + } else if (is_null($entry->cover_photo)) { + $wrapper = ''; } else { $wrapper = ''; } From af20bc8cb376dc2e25519a8a4b27079db2e3f2cc Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 23 Dec 2019 12:55:56 +0300 Subject: [PATCH 3/5] #170 Search by date, is there foto/video or Map --- .../advs-module/resources/lang/en/field.php | 30 ++++++ .../views/list/partials/list-filter.twig | 99 ++++++++++++++++++- .../advs-module/src/Adv/AdvRepository.php | 21 ++++ 3 files changed, 149 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index ab2d4b5e9..8058541aa 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -19,6 +19,18 @@ return [ 'price' => [ 'name' => 'Price' ], + 'date' => [ + 'name' => 'Date' + ], + 'photo' => [ + 'name' => 'Photo' + ], + 'video' => [ + 'name' => 'Video' + ], + 'map' => [ + 'name' => 'Map' + ], 'stock' => [ 'name' => 'Stock' ], @@ -220,4 +232,22 @@ return [ 'min' => [ 'name' => 'Min', ], + 'in_the_last_24_hours' => [ + 'name' => 'In The Last 24 Hours' + ], + 'in_the_last_week' => [ + 'name' => 'In The Last Week' + ], + 'in_the_last_month' => [ + 'name' => 'In The Last Month' + ], + 'ads_with_photo' => [ + 'name' => 'Ads With Photo' + ], + 'ads_with_video' => [ + 'name' => 'Ads With Video' + ], + 'yes' => [ + 'name' => 'Yes' + ] ]; 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 a9b8d3507..2c8e7940e 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 @@ -19,6 +19,103 @@ 'villages':villages })|raw }} + +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + + +
+ +
+
+
+ + +
+
+ + +
+
+
+
+ + + +
+ +
+
+
+ + +
+
+
+
+ + +
- +
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index f8182647e..84fdc2a26 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -2,6 +2,7 @@ use Anomaly\SettingsModule\Setting\Contract\SettingRepositoryInterface; use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryModel; +use Illuminate\Support\Carbon; use Illuminate\Support\Facades\DB; use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; use Anomaly\Streams\Platform\Entry\EntryRepository; @@ -112,6 +113,26 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') <=" . $int; $query = $query->whereRaw($column); } + if (!empty($param['date'])) { + if ($param['date'] === 'day') { + $query = $query->where('advs_advs.publish_at', '>=', Carbon::now()->subDay()); + } elseif ($param['date'] === 'week') { + $query = $query->where('advs_advs.publish_at', '>=', Carbon::now()->subWeek()); + } elseif ($param['date'] === 'month') { + $query = $query->where('advs_advs.publish_at', '>=', Carbon::now()->subMonth()); + } + } + if (!empty($param['photo'])) { + $query = $query->whereNotNull('cover_photo'); + } +// if (!empty($param['video'])) { +// $int = (int)$num; +// $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') <=" . $int; +// $query = $query->whereRaw($column); +// } + if (!empty($param['map']) && $param['map'] == true) { + $query = $query->whereNotNull('map_Val'); + } foreach ($param as $para => $value) { if (substr($para, 0, 3) === "cf_") { From 330786bfe6b8fe1feccb6cc8967693fab50b8839 Mon Sep 17 00:00:00 2001 From: alp Date: Mon, 23 Dec 2019 20:22:38 +0300 Subject: [PATCH 4/5] Language added & Style fixed --- .../visiosoft/advs-module/resources/lang/tr/field.php | 2 +- .../advs-module/resources/views/new-ad/new-create.twig | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php index c611468a0..d6afaac68 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php @@ -179,7 +179,7 @@ return [ "edit_adv" => "İlanı Düzenle", "mandatory_fields" => "Zorunlu alanlar", "ad_post" => "İlan Yayını", - "sell_item" => "Bir ürün veya hizmet satmak", + "sell_item" => "Detaylı bilgileri giriniz", "search_save" => "Favori arama başarıyla kaydedildi", "address" => "Adres", "email" => "E-Posta", diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index f4c4af341..ab95f040d 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -36,12 +36,6 @@
-

- {{ trans('visiosoft.module.advs::field.sell_item') }} - - * {{ trans('visiosoft.module.advs::field.mandatory_fields') }} - -

{{ nameField|raw }} @@ -52,7 +46,7 @@
-