From 0396525fa7ec8f8e0078cd5e9ae8459772f2f2f8 Mon Sep 17 00:00:00 2001 From: diashalabi Date: Mon, 4 Oct 2021 14:59:03 +0300 Subject: [PATCH 1/6] #4590 yenikurs.ocify.site improvments --- .../resources/config/settings/sections.php | 1 - .../resources/config/settings/settings.php | 7 ------- .../resources/css/new-create-new.scss | 2 +- .../resources/views/new-ad/new-create.twig | 2 +- .../advs-module/src/Adv/AdvModel.php | 19 +++++++++++++++++++ .../advs-module/src/Adv/AdvRepository.php | 1 - .../src/Adv/Contract/AdvInterface.php | 4 ++++ .../src/Http/Controller/AdvsController.php | 13 +++++++++++-- 8 files changed, 36 insertions(+), 13 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index 2d6d88a69..0c9081ea4 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -60,7 +60,6 @@ return [ 'hide_standard_price_field', 'hide_options_field', 'hide_village_field', - 'hide_configurations', 'make_all_fields_required', 'make_map_required', 'show_breadcrumb_when_creating_ad', diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index e3a092c52..3c1cf4ab6 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -146,13 +146,6 @@ return [ 'mode' => 'checkbox' ] ], - 'hide_configurations' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - 'mode' => 'checkbox' - ] - ], 'make_all_fields_required' => [ 'type' => 'anomaly.field_type.boolean', 'config' => [ diff --git a/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss b/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss index f93008c30..139cbef8c 100644 --- a/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss +++ b/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss @@ -133,7 +133,7 @@ label { color: #4A4A4A; font-weight: 600; - input { + input, textarea { box-shadow: 0 calc(1rem / 16) calc(2rem / 16) rgba(0, 0, 0, .04); font-size: calc(17rem / 16); padding: 1.1rem 1.5rem; 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 a6bd38144..760e4c697 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 @@ -79,7 +79,7 @@ {% if setting_value('visiosoft.module.advs::market_place') %} - {{ addBlock('new-ad/fields', {'adv': adv})|raw }} + {{ addBlock('new-ad/fields', {'adv': adv, 'rawClassified': rawClassified})|raw }} {% endif %}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index dc33073a6..81148d09f 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -551,4 +551,23 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface ->where('status', '=', 'approved') ->where('slug', '!=', ''); } + + public function setConfig($key, $value) + { + $config = $this->config; + $config = $config ? (array) json_decode($config) : []; + + $config[$key] = $value; + + $this->config = json_encode($config); + $this->save(); + } + + public function getConfig($key) + { + $config = $this->config; + $config = $config ? (array) json_decode($config) : []; + + return $config[$key] ?? null; + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 9ca14836a..70abc6a69 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -277,7 +277,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface ->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') - ->inRandomOrder() ->first(); if ($adv) { diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php index 8d7913146..4db2bd4f3 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php @@ -99,4 +99,8 @@ interface AdvInterface extends EntryInterface public function lastCategory(); public function scopeCurrent($query); + + public function setConfig($key, $value); + + public function getConfig($key); } 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 526f83d9c..b8046c2ed 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -769,7 +769,8 @@ class AdvsController extends PublicController } return $this->view->make('visiosoft.module.advs::new-ad/new-create', compact( - 'request', 'formBuilder', 'cats_d', 'custom_fields')); + 'formBuilder', 'cats_d', 'custom_fields' + )); } public function store @@ -840,6 +841,10 @@ class AdvsController extends PublicController $adv->is_get_adv = ($this->request->is_get_adv and $get_categories_status) ? true : false; $adv->save(); + if ($adv->is_get_adv) { + $orderNote = \request('order_note') ?? ''; + $adv->setConfig('order_note', trim($orderNote)); + } //Todo Create Event if (is_module_installed('visiosoft.module.customfields')) { @@ -956,6 +961,7 @@ class AdvsController extends PublicController public function edit($id) { $adv = $this->adv_repository->find($id); + $rawClassified = $adv; if (is_null($adv)) { $this->messages->error(trans('visiosoft.module.advs::message.no_add_found')); @@ -1011,7 +1017,10 @@ class AdvsController extends PublicController return $this->view->make( 'visiosoft.module.advs::new-ad/new-create', - compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice','is_options', 'configurations') + compact( + 'id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', + 'hidePrice','is_options', 'configurations', 'rawClassified' + ) ); } From 6efa927337cb7abda53de9d8d22f4e582b845986 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 5 Oct 2021 18:11:52 +0300 Subject: [PATCH 2/6] #2019 AD export as CSV --- .../Http/Controller/Admin/AdvsController.php | 17 +++++++++++++---- .../resources/lang/en/control_panel.php | 3 +++ .../resources/lang/tr/control_panel.php | 3 +++ .../resources/views/form/advs-export.twig | 17 +++++++++++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/views/form/advs-export.twig 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 8491d6b38..139a74034 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 @@ -3,6 +3,7 @@ use Anomaly\SettingsModule\Setting\Contract\SettingRepositoryInterface; use Anomaly\Streams\Platform\Application\Application; use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryTranslationsModel; +use Anomaly\Streams\Platform\Ui\Form\FormBuilder; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Illuminate\Filesystem\Filesystem; use Illuminate\Http\Request; @@ -160,7 +161,7 @@ class AdvsController extends AdminController height: 20px; border: 1px solid #2980b9; border-radius: 3px; - background-image: + background-image: repeating-linear-gradient( -45deg, #2980b9, @@ -185,15 +186,23 @@ class AdvsController extends AdminController - + Return Back"; echo "
Return Admin Panel"; } - public function exportAdvs() + public function exportAdvs(FormBuilder $builder, Request $request) { - return Excel::download(new AdvsExport(), 'advs-' . time() . '.xlsx'); + if ($request['format'] === 'csv' || $request['format'] === 'xlsx') { + return Excel::download(new AdvsExport(), 'advs-' . time() . '.' . $request['format']); + } + + $builder->setOptions([ + 'form_view' => 'visiosoft.theme.defaultadmin::form/advs-export', + ]); + + return $builder->render(); } public function advancedUpdate() diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php index 95afa8f55..44f05cf79 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php +++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php @@ -10,4 +10,7 @@ return [ // Users Module 'search_by_gsm_number' => 'Search By GSM Number', + + // Adv Export + 'choose_file_type' => 'Choose File Type For Export', ]; diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php index 838fdffe9..f8c89546a 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php +++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php @@ -10,4 +10,7 @@ return [ // Users Module 'search_by_gsm_number' => 'GSM Numarasına Göre Ara', + + // Adv Export + 'choose_file_type' => 'Dışa Aktarmak İçin Dosya Türünü Seçin', ]; diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/form/advs-export.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/form/advs-export.twig new file mode 100644 index 000000000..d922d0dc5 --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/form/advs-export.twig @@ -0,0 +1,17 @@ +{% block content %} +
+
+
+
+
+
+
+
{{ trans('visiosoft.theme.defaultadmin::control_panel.choose_file_type') }}:
+
+
+ CSV + XLSX +
+
+
+{% endblock %} From 7086912374d5df34ff5e1b6b9aa70bae6368fb7a Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 6 Oct 2021 10:37:51 +0300 Subject: [PATCH 3/6] #4656 category image error --- .../visiosoft/cats-module/src/Category/CategoryModel.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index d72983576..ad2ef643c 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -16,8 +16,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface if ($this->icon === null) { return $this->dispatch(new MakeImageInstance('visiosoft.module.advs::images/listing/sample-cat-icon.svg', 'img'))->url(); } - - return url($this->icon); + return $this->dispatch(new MakeImageInstance($this->icon, 'img'))->url(); } public function getCat($id) From c71a0144b3db0ba1892ecdb73c34a765c7ed8600 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 6 Oct 2021 10:40:12 +0300 Subject: [PATCH 4/6] #4656 category image error --- .../visiosoft/cats-module/src/Category/CategoryModel.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index ad2ef643c..b977a8d47 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -13,10 +13,9 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface public function getIconUrlAttribute() { - if ($this->icon === null) { - return $this->dispatch(new MakeImageInstance('visiosoft.module.advs::images/listing/sample-cat-icon.svg', 'img'))->url(); - } - return $this->dispatch(new MakeImageInstance($this->icon, 'img'))->url(); + return $this->dispatch( + new MakeImageInstance($this->icon ?? 'visiosoft.module.advs::images/listing/sample-cat-icon.svg', 'img') + )->url(); } public function getCat($id) From d4c23cee6785959e3b1e28de762cf60c886bd290 Mon Sep 17 00:00:00 2001 From: diashalabi Date: Wed, 6 Oct 2021 11:04:04 +0300 Subject: [PATCH 5/6] #4601 Membership Resources Report --- .../src/Http/Controller/MyProfileController.php | 1 - .../profile-module/src/ProfileModuleServiceProvider.php | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php index 1fa2d90d1..ded768322 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php @@ -6,7 +6,6 @@ use Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; use Visiosoft\AdvsModule\Adv\AdvModel; use Visiosoft\AdvsModule\Adv\Event\ChangeStatusAd; use Visiosoft\AdvsModule\Status\Contract\StatusRepositoryInterface; diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index ede582c74..418e309fe 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -187,6 +187,10 @@ class ProfileModuleServiceProvider extends AddonServiceProvider public function boot(AddonCollection $addonCollection) { + if ($utmSource = request('utm_source')) { + setcookie('utm_source', $utmSource); + } + $slug = 'export'; $section = [ 'title' => 'visiosoft.module.profile::button.export', From 33cff4c13816b2ca11d76a209f756f2d7af5b528 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 6 Oct 2021 13:01:12 +0300 Subject: [PATCH 6/6] remove city required --- ...17_112645_visiosoft.module.profile__create_adress_stream.php | 2 +- .../profile-module/src/Adress/Form/AdressFormFields.php | 2 +- .../src/Adress/FormCompany/AddressCompanyFormFields.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php b/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php index 2966ab2d9..519ecc411 100644 --- a/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php +++ b/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php @@ -39,7 +39,7 @@ class VisiosoftModuleProfileCreateAdressStream extends Migration 'required' => true, ], 'city' => [ - 'required' => true, + 'required' => false, ], 'district', 'adress_content' => [ diff --git a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php index 054930ac9..1fca2141d 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php +++ b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php @@ -22,7 +22,7 @@ class AdressFormFields 'required' => true, ], 'city' => [ - 'required' => true, + 'required' => false, ], 'district' => [ 'required' => setting_value( 'visiosoft.module.profile::required_district'), diff --git a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php index 52ada8320..5e7ccee46 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php +++ b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php @@ -28,7 +28,7 @@ class AddressCompanyFormFields 'required' => true, ], 'city' => [ - 'required' => true, + 'required' => false, ], 'district', 'adress_content' => [