diff --git a/config/datagrid.php b/config/datagrid.php index aeaf51a57..44fd576ba 100644 --- a/config/datagrid.php +++ b/config/datagrid.php @@ -30,7 +30,7 @@ return [ * * Accepted Value = integer */ - 'paginate' => false, + 'paginate' => true, 'operators' => [ 'eq' => "=", diff --git a/packages/Webkul/Admin/src/Exports/DataGridExport.php b/packages/Webkul/Admin/src/Exports/DataGridExport.php index 42aa9254c..e670f2d4d 100755 --- a/packages/Webkul/Admin/src/Exports/DataGridExport.php +++ b/packages/Webkul/Admin/src/Exports/DataGridExport.php @@ -41,12 +41,21 @@ class DataGridExport implements FromView, ShouldAutoSize public function view(): View { $pagination = false; + $results = []; + $columns = []; - dd($this->gridData); + foreach($this->gridData as $key => $data) { + if ($key == 'collection') { + $results = $data['data']; + } + if ($key == 'columns') { + $columns = $data; + } + } - // return view('admin::export.export', [ - // 'results' => $this->gridData->render($pagination)->results, - // 'columns' => $this->gridData->render($pagination)->columns, - // ]); + return view('admin::export.export', [ + 'results' => $results, + 'columns' => $columns, + ]); } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php index 9b1485773..e7f37115d 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php @@ -38,7 +38,7 @@ class ExportController extends Controller $results = (object) $data; - $file_name = class_basename($results); + $file_name = request()->all()['file_name']; if (request()->all()['format'] == 'csv') { return Excel::download(new DataGridExport($results), $file_name.'.csv'); diff --git a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php index a5e49369e..8253b414e 100755 --- a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php @@ -12,12 +12,12 @@

{{ __('admin::app.customers.customers.title') }}

- {{--
+
{{ __('admin::app.export.export') }} -
--}} +
{{ __('admin::app.customers.customers.add-title') }} @@ -25,32 +25,36 @@
-
@inject('customer','Webkul\Admin\DataGrids\CustomerDataGrid') {!! $customer->render() !!}
- {{-- +

{{ __('admin::app.export.download') }}

-
--}} +
@stop @push('scripts') -{{-- --}} + @endpush diff --git a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php index 659c27bc6..06a259808 100755 --- a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php @@ -2,15 +2,15 @@ @foreach ($columns as $column) - {{ $column->label }} + {{ $column['label'] }} @endforeach @foreach ($results as $result) - @foreach ($columns as $column) - {!! $column->render($result) !!} + @foreach ($result as $value) + {{ $value }} @endforeach @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php index b85fb7296..28d419d94 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php @@ -11,14 +11,14 @@

{{ __('admin::app.sales.invoices.title') }}

- {{--
+
{{ __('admin::app.export.export') }}
-
--}} +
@@ -27,25 +27,30 @@
- {{-- +

{{ __('admin::app.export.download') }}

-
--}} +
@stop @push('scripts') -{{-- --}} + @endpush \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php index 149b1eeff..994214274 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php @@ -11,14 +11,14 @@

{{ __('admin::app.sales.orders.title') }}

- {{--
+
{{ __('admin::app.export.export') }}
-
--}} +
@@ -27,25 +27,30 @@
- {{-- +

{{ __('admin::app.export.download') }}

-
--}} +
@stop @push('scripts') -{{-- --}} +