From 6efa927337cb7abda53de9d8d22f4e582b845986 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 5 Oct 2021 18:11:52 +0300 Subject: [PATCH 1/3] #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 064247b2e2968274f36a0d02a79dadfba72e6d5b Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 6 Oct 2021 12:58:20 +0300 Subject: [PATCH 2/3] #4633 Ajax request for header --- .../visiosoft/base-theme/resources/js/visiosoft.js | 11 +++++++++++ .../src/Http/Controller/CacheController.php | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/base-theme/resources/js/visiosoft.js b/addons/default/visiosoft/base-theme/resources/js/visiosoft.js index 06f7e0965..568308753 100644 --- a/addons/default/visiosoft/base-theme/resources/js/visiosoft.js +++ b/addons/default/visiosoft/base-theme/resources/js/visiosoft.js @@ -12,3 +12,14 @@ function crudAjax(params, url, type = 'GET', callback = () => {}, async = false, ...options }); } + +function getUserNavMenu(html, element) { + crudAjax({}, '/ajax/get-user-info', 'GET', function (callback) { + if (callback['userName']){ + element.html(html); + $(element).find('.addBlock').html(callback['addBlockHtml']); + $(element).find('.username').html(callback['userName']); + $(element).find('.profile-img').attr('src', `${callback['profileImg']}`); + } + }) +} diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php index ecb72a159..69535d352 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php @@ -1,6 +1,7 @@ user(); + $profile_img = $this->dispatch( + new MakeImageInstance($user->file ?: 'theme::images/no_profile.svg', 'img') + )->url(); $user = $user ? $user->first_name . ' ' . $user->last_name : $user; $getAddBlockHtml = new addBlock('navigation/dropdown', []); $addBlockHtml = $getAddBlockHtml->handle(); - return ['userName' => $user, 'addBlockHtml' => $addBlockHtml]; + return ['userName' => $user, 'profileImg' => $profile_img, 'addBlockHtml' => $addBlockHtml]; } } From 33cff4c13816b2ca11d76a209f756f2d7af5b528 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 6 Oct 2021 13:01:12 +0300 Subject: [PATCH 3/3] 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' => [