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 %}