diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 2c6a3e1..314f8e0 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,11 +1,11 @@ blank_issues_enabled: false contact_links: - name: Ask a Question - url: https://github.com/rxcod9/joy-voyager-import/discussions/new?category=q-a + url: https://github.com/rxcod9/joy-voyager-bulk-update/discussions/new?category=q-a about: Ask the community for help - name: Feature Request - url: https://github.com/rxcod9/joy-voyager-import/discussions/new?category=ideas + url: https://github.com/rxcod9/joy-voyager-bulk-update/discussions/new?category=ideas about: Share ideas for new features - name: Bug Report - url: https://github.com/rxcod9/joy-voyager-import/issues/new + url: https://github.com/rxcod9/joy-voyager-bulk-update/issues/new about: Report a reproducable bug diff --git a/README.md b/README.md index f6113d3..5ede040 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# Joy VoyagerImport +# Joy VoyagerBulkUpdate -This [Laravel](https://laravel.com/)/[Voyager](https://voyager.devdojo.com/) module adds VoyagerImport support to Voyager. +This [Laravel](https://laravel.com/)/[Voyager](https://voyager.devdojo.com/) module adds VoyagerBulkUpdate support to Voyager. By 🐼 [Ramakant Gangwar](https://github.com/rxcod9). -[![Screenshot](https://raw.githubusercontent.com/rxcod9/joy-voyager-import/main/cover.jpg)](https://joy-voyager.herokuapp.com/) +[![Screenshot](https://raw.githubusercontent.com/rxcod9/joy-voyager-bulk-update/main/cover.jpg)](https://joy-voyager.herokuapp.com/) -[![Latest Version](https://img.shields.io/github/v/release/rxcod9/joy-voyager-import?style=flat-square)](https://github.com/rxcod9/joy-voyager-import/releases) -![GitHub Workflow Status](https://img.shields.io/github/workflow/status/rxcod9/joy-voyager-import/run-tests?label=tests) -[![Total Downloads](https://img.shields.io/packagist/dt/joy/voyager-import.svg?style=flat-square)](https://packagist.org/packages/joy/voyager-import) +[![Latest Version](https://img.shields.io/github/v/release/rxcod9/joy-voyager-bulk-update?style=flat-square)](https://github.com/rxcod9/joy-voyager-bulk-update/releases) +![GitHub Workflow Status](https://img.shields.io/github/workflow/status/rxcod9/joy-voyager-bulk-update/run-tests?label=tests) +[![Total Downloads](https://img.shields.io/packagist/dt/joy/voyager-bulk-update.svg?style=flat-square)](https://packagist.org/packages/joy/voyager-bulk-update) --- @@ -24,13 +24,13 @@ By 🐼 [Ramakant Gangwar](https://github.com/rxcod9). ```bash # 1. Require this Package in your fresh Laravel/Voyager project -composer require joy/voyager-import +composer require joy/voyager-bulk-update # 2. Publish everything -php artisan vendor:publish --provider="Joy\VoyagerImport\VoyagerImportServiceProvider" --force +php artisan vendor:publish --provider="Joy\VoyagerBulkUpdate\VoyagerBulkUpdateServiceProvider" --force # 3. OR Publish Voyager overrided actions blade [MANDATORY STEP FOR IMPORT BULK BUTTON TO WORK] -php artisan vendor:publish --provider="Joy\VoyagerImport\VoyagerImportServiceProvider" --tag=voyager-actions-views --force +php artisan vendor:publish --provider="Joy\VoyagerBulkUpdate\VoyagerBulkUpdateServiceProvider" --tag=voyager-actions-views --force ``` --- @@ -43,7 +43,7 @@ Installation generates. +In order to override views delivered by Voyager DataTable, copy contents from ``vendor/joy/voyager-bulk-update/resources/views`` to the ``views/vendor/joy-voyager-bulk-update`` directory of your Laravel installation. --> ## Working Example @@ -51,7 +51,7 @@ You can try laravel demo here [https://joy-voyager.herokuapp.com/admin/users](ht ## Documentation -Find yourself stuck using the package? Found a bug? Do you have general questions or suggestions for improving the joy voyager-import? Feel free to [create an issue on GitHub](https://github.com/rxcod9/joy-voyager-import/issues), we'll try to address it as soon as possible. +Find yourself stuck using the package? Found a bug? Do you have general questions or suggestions for improving the joy voyager-bulk-update? Feel free to [create an issue on GitHub](https://github.com/rxcod9/joy-voyager-bulk-update/issues), we'll try to address it as soon as possible. If you've found a bug regarding security please mail [gangwar.ramakant@gmail.com](mailto:gangwar.ramakant@gmail.com) instead of using the issue tracker. diff --git a/composer.json b/composer.json index 290a470..4ebb1f1 100644 --- a/composer.json +++ b/composer.json @@ -1,16 +1,16 @@ { - "name": "joy/voyager-import", - "description": "This Laravel/Voyager module adds VoyagerImport support to Voyager.", + "name": "joy/voyager-bulk-update", + "description": "This Laravel/Voyager module adds VoyagerBulkUpdate support to Voyager.", "keywords": [ "joy", - "voyager-import", - "joy-voyager-import", - "voyager-voyager-import", + "voyager-bulk-update", + "joy-voyager-bulk-update", + "voyager-voyager-bulk-update", "cms", "voyager", "laravel" ], - "homepage": "https://github.com/rxcod9/joy-voyager-import", + "homepage": "https://github.com/rxcod9/joy-voyager-bulk-update", "license": "MIT", "authors": [{ "name": "Ramakant Gangwar", @@ -36,7 +36,7 @@ }, "autoload": { "psr-4": { - "Joy\\VoyagerImport\\": "src" + "Joy\\VoyagerBulkUpdate\\": "src" }, "files": [ "src/helper.php" @@ -48,14 +48,14 @@ }, "autoload-dev": { "psr-4": { - "Joy\\VoyagerImport\\Tests\\": "tests" + "Joy\\VoyagerBulkUpdate\\Tests\\": "tests" } }, "extra": { "laravel": { "providers": [ - "Joy\\VoyagerImport\\VoyagerImportServiceProvider", - "Joy\\VoyagerImport\\ImportServiceProvider" + "Joy\\VoyagerBulkUpdate\\VoyagerBulkUpdateServiceProvider", + "Joy\\VoyagerBulkUpdate\\ImportServiceProvider" ] } }, diff --git a/config/voyager-import.php b/config/voyager-bulk-update.php similarity index 62% rename from config/voyager-import.php rename to config/voyager-bulk-update.php index ec56186..9e12e71 100644 --- a/config/voyager-import.php +++ b/config/voyager-bulk-update.php @@ -3,14 +3,14 @@ return [ /* - * If enabled for voyager-import package. + * If enabled for voyager-bulk-update package. */ - 'enabled' => env('VOYAGER_IMPORT_ENABLED', true), + 'enabled' => env('VOYAGER_BULK_UPDATE_ENABLED', true), /* - * If validation enabled for voyager-import package. + * If validation enabled for voyager-bulk-update package. */ - 'validation' => env('VOYAGER_IMPORT_VALIDATION_ENABLED', false), + 'validation' => env('VOYAGER_BULK_UPDATE_VALIDATION_ENABLED', false), /* | Here you can specify for which data type slugs import is enabled @@ -19,7 +19,7 @@ | */ - 'allowed_slugs' => array_filter(explode(',', env('VOYAGER_IMPORT_ALLOWED_SLUGS', '*'))), + 'allowed_slugs' => array_filter(explode(',', env('VOYAGER_BULK_UPDATE_ALLOWED_SLUGS', '*'))), /* | Here you can specify for which data type slugs import is not allowed @@ -28,17 +28,17 @@ | */ - 'not_allowed_slugs' => array_filter(explode(',', env('VOYAGER_IMPORT_NOT_ALLOWED_SLUGS', ''))), + 'not_allowed_slugs' => array_filter(explode(',', env('VOYAGER_BULK_UPDATE_NOT_ALLOWED_SLUGS', ''))), /* - * The config_key for voyager-import package. + * The config_key for voyager-bulk-update package. */ - 'config_key' => env('VOYAGER_IMPORT_CONFIG_KEY', 'joy-voyager-import'), + 'config_key' => env('VOYAGER_BULK_UPDATE_CONFIG_KEY', 'joy-voyager-bulk-update'), /* - * The route_prefix for voyager-import package. + * The route_prefix for voyager-bulk-update package. */ - 'route_prefix' => env('VOYAGER_IMPORT_ROUTE_PREFIX', 'joy-voyager-import'), + 'route_prefix' => env('VOYAGER_BULK_UPDATE_ROUTE_PREFIX', 'joy-voyager-bulk-update'), /* |-------------------------------------------------------------------------- @@ -50,13 +50,13 @@ */ 'controllers' => [ - 'namespace' => 'Joy\\VoyagerImport\\Http\\Controllers', + 'namespace' => 'Joy\\VoyagerBulkUpdate\\Http\\Controllers', ], /* | The default import disk. */ - 'disk' => env('VOYAGER_IMPORT_DISK', null), + 'disk' => env('VOYAGER_BULK_UPDATE_DISK', null), /* | The default import readerType. @@ -64,7 +64,7 @@ | Supported: "Xlsx", "Csv", "Ods", "Xls", | "Slk", "Xml", "Gnumeric", "Html" */ - 'readerType' => env('VOYAGER_IMPORT_READER_TYPE', 'Xlsx'), + 'readerType' => env('VOYAGER_BULK_UPDATE_READER_TYPE', 'Xlsx'), /* | The default import writerType. @@ -72,7 +72,7 @@ | Supported: "Xlsx", "Csv", "Csv", "Ods", "Xls", | "Slk", "Xml", "Gnumeric", "Html" */ - 'writerType' => env('VOYAGER_IMPORT_WRITER_TYPE', 'Xlsx'), + 'writerType' => env('VOYAGER_BULK_UPDATE_WRITER_TYPE', 'Xlsx'), /* | Here you can specify which mimes are allowed to upload @@ -81,7 +81,7 @@ | */ - 'allowed_mimes' => env('VOYAGER_IMPORT_ALLOWED_MIMES', 'xlsx,txt,csv,tsv,ods,xls,slk,xml,gnumeric,html'), + 'allowed_mimes' => env('VOYAGER_BULK_UPDATE_ALLOWED_MIMES', 'xlsx,txt,csv,tsv,ods,xls,slk,xml,gnumeric,html'), /* |-------------------------------------------------------------------------- diff --git a/phpunit.xml b/phpunit.xml index 30d5d5a..216784f 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -6,7 +6,7 @@ - + tests diff --git a/resources/views/bread/import.blade.php b/resources/views/bread/import.blade.php index db2012c..3a40d17 100644 --- a/resources/views/bread/import.blade.php +++ b/resources/views/bread/import.blade.php @@ -1,4 +1,4 @@ - {{ __('joy-voyager-import::generic.bulk_import') }} + {{ __('joy-voyager-bulk-update::generic.bulk_import') }} {{-- Bulk import modal --}}
@@ -20,7 +20,7 @@
    @@ -29,7 +29,7 @@ class='export-template-by-writer' data-writer-type="Xls" href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Xls" - title="{{ __('joy-voyager-import::generic.bulk_import_template') }}" + title="{{ __('joy-voyager-bulk-update::generic.bulk_import_template') }}" target="_blank" >Xls @@ -38,7 +38,7 @@ class='export-template-by-writer' class='export-template-by-writer' data-writer-type="Xlsx" href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Xlsx" - title="{{ __('joy-voyager-import::generic.bulk_import_template') }}" + title="{{ __('joy-voyager-bulk-update::generic.bulk_import_template') }}" target="_blank" >Xlsx @@ -47,7 +47,7 @@ class='export-template-by-writer' class='export-template-by-writer' data-writer-type="Ods" href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Ods" - title="{{ __('joy-voyager-import::generic.bulk_import_template') }}" + title="{{ __('joy-voyager-bulk-update::generic.bulk_import_template') }}" target="_blank" >Ods @@ -56,7 +56,7 @@ class='export-template-by-writer' class='export-template-by-writer' data-writer-type="Csv" href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Csv" - title="{{ __('joy-voyager-import::generic.bulk_import_template') }}" + title="{{ __('joy-voyager-bulk-update::generic.bulk_import_template') }}" target="_blank" >Csv @@ -65,7 +65,7 @@ class='export-template-by-writer' class='export-template-by-writer' data-writer-type="Html" href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Html" - title="{{ __('joy-voyager-import::generic.bulk_import_template') }}" + title="{{ __('joy-voyager-bulk-update::generic.bulk_import_template') }}" target="_blank" >Html @@ -77,7 +77,7 @@ class='export-template-by-writer' + value="{{ __('joy-voyager-bulk-update::generic.bulk_import_confirm') }} {{ strtolower($dataType->getTranslatedAttribute('display_name_plural')) }}"> @@ -122,7 +122,7 @@ class='export-template-by-writer' $bulkImportModal.modal('show'); // } else { // // No row selected - // toastr.warning('{{ __('joy-voyager-import::generic.bulk_import_nothing') }}'); + // toastr.warning('{{ __('joy-voyager-bulk-update::generic.bulk_import_nothing') }}'); // } }); }); diff --git a/routes/api.php b/routes/api.php index 3e7e12b..c344924 100644 --- a/routes/api.php +++ b/routes/api.php @@ -10,14 +10,14 @@ |-------------------------------------------------------------------------- | | This file is where you may override any of the routes that are included -| with VoyagerImport. +| with VoyagerBulkUpdate. | */ -Route::group(['as' => 'joy-voyager-import.'], function () { +Route::group(['as' => 'joy-voyager-bulk-update.'], function () { // event(new Routing()); @deprecated - $namespacePrefix = '\\' . config('joy-voyager-import.controllers.namespace') . '\\'; + $namespacePrefix = '\\' . config('joy-voyager-bulk-update.controllers.namespace') . '\\'; // event(new RoutingAfter()); @deprecated }); diff --git a/routes/web.php b/routes/web.php index 1933ace..04ee525 100644 --- a/routes/web.php +++ b/routes/web.php @@ -18,11 +18,11 @@ | */ -Route::group(['prefix' => config('joy-voyager-import.admin_prefix', 'admin')], function () { +Route::group(['prefix' => config('joy-voyager-bulk-update.admin_prefix', 'admin')], function () { Route::group(['as' => 'voyager.'], function () { // event(new Routing()); @deprecated - $namespacePrefix = '\\'.config('joy-voyager-import.controllers.namespace').'\\'; + $namespacePrefix = '\\'.config('joy-voyager-bulk-update.controllers.namespace').'\\'; Route::group(['middleware' => 'admin.user'], function () use ($namespacePrefix) { // event(new RoutingAdmin()); @deprecated diff --git a/src/Actions/ImportAction.php b/src/Actions/ImportAction.php index 76ec98f..8632af9 100644 --- a/src/Actions/ImportAction.php +++ b/src/Actions/ImportAction.php @@ -1,6 +1,6 @@ dataType->slug, - config('joy-voyager-import.allowed_slugs', ['*']) + config('joy-voyager-bulk-update.allowed_slugs', ['*']) ) && !isInPatterns( $this->dataType->slug, - config('joy-voyager-import.not_allowed_slugs', []) + config('joy-voyager-bulk-update.not_allowed_slugs', []) ); } @@ -83,7 +83,7 @@ public function massAction($ids, $comingFrom) // Check permission Gate::authorize('browse', app($dataType->model_name)); - $mimes = $this->mimes ?? config('joy-voyager-import.allowed_mimes'); + $mimes = $this->mimes ?? config('joy-voyager-bulk-update.allowed_mimes'); $validator = Validator::make(request()->all(), [ 'file' => 'required|mimes:' . $mimes, @@ -96,14 +96,14 @@ public function massAction($ids, $comingFrom) ]); } - $disk = $this->disk ?? config('joy-voyager-import.disk'); + $disk = $this->disk ?? config('joy-voyager-bulk-update.disk'); // @FIXME let me auto detect OR NOT?? - $readerType = null; //$this->readerType ?? config('joy-voyager-import.readerType', Excel::XLSX); + $readerType = null; //$this->readerType ?? config('joy-voyager-bulk-update.readerType', Excel::XLSX); - $importClass = 'joy-voyager-import.import'; + $importClass = 'joy-voyager-bulk-update.import'; - if (app()->bound("joy-voyager-import.$slug.import")) { - $importClass = "joy-voyager-import.$slug.import"; + if (app()->bound("joy-voyager-bulk-update.$slug.import")) { + $importClass = "joy-voyager-bulk-update.$slug.import"; } $import = app($importClass); @@ -118,17 +118,17 @@ public function massAction($ids, $comingFrom) ); return redirect($comingFrom)->with([ - 'message' => __('joy-voyager-import::generic.successfully_imported') . " {$dataType->getTranslatedAttribute('display_name_singular')}", + 'message' => __('joy-voyager-bulk-update::generic.successfully_imported') . " {$dataType->getTranslatedAttribute('display_name_singular')}", 'alert-type' => 'success', ]); } public function view() { - $view = 'joy-voyager-import::bread.import'; + $view = 'joy-voyager-bulk-update::bread.import'; - if (view()->exists('joy-voyager-import::' . $this->dataType->slug . '.import')) { - $view = 'joy-voyager-import::' . $this->dataType->slug . '.import'; + if (view()->exists('joy-voyager-bulk-update::' . $this->dataType->slug . '.import')) { + $view = 'joy-voyager-bulk-update::' . $this->dataType->slug . '.import'; } return $view; } diff --git a/src/Console/Commands/AllDataTypesImport.php b/src/Console/Commands/AllDataTypesImport.php index 6148d02..29dac6e 100644 --- a/src/Console/Commands/AllDataTypesImport.php +++ b/src/Console/Commands/AllDataTypesImport.php @@ -1,6 +1,6 @@ bound('joy-voyager-import.' . $dataType->slug . '.import')) { - $importClass = 'joy-voyager-import.' . $dataType->slug . '.import'; + if (app()->bound('joy-voyager-bulk-update.' . $dataType->slug . '.import')) { + $importClass = 'joy-voyager-bulk-update.' . $dataType->slug . '.import'; } $import = app($importClass); @@ -89,14 +89,14 @@ protected function getOptions() 'd', InputOption::VALUE_OPTIONAL, 'The disk to where you want to import', - config('joy-voyager-import.disk') + config('joy-voyager-bulk-update.disk') ], [ 'readerType', 'w', InputOption::VALUE_OPTIONAL, 'The readerType in which format you want to import', - config('joy-voyager-import.readerType', 'Xlsx') + config('joy-voyager-bulk-update.readerType', 'Xlsx') ], ]; } diff --git a/src/Console/Commands/DataTypeTemplateExport.php b/src/Console/Commands/DataTypeTemplateExport.php index 3fd2054..661c5ed 100644 --- a/src/Console/Commands/DataTypeTemplateExport.php +++ b/src/Console/Commands/DataTypeTemplateExport.php @@ -1,6 +1,6 @@ bound('joy-voyager-import.' . $dataType->slug . '.import-template')) { - $exportClass = 'joy-voyager-import.' . $dataType->slug . '.import-template'; + if (app()->bound('joy-voyager-bulk-update.' . $dataType->slug . '.import-template')) { + $exportClass = 'joy-voyager-bulk-update.' . $dataType->slug . '.import-template'; } $export = app($exportClass); @@ -93,14 +93,14 @@ protected function getOptions() 'd', InputOption::VALUE_OPTIONAL, 'The disk to where you want to export', - config('joy-voyager-import.disk') + config('joy-voyager-bulk-update.disk') ], [ 'writerType', 'w', InputOption::VALUE_OPTIONAL, 'The writerType in which format you want to export', - config('joy-voyager-import.writerType', 'Xlsx') + config('joy-voyager-bulk-update.writerType', 'Xlsx') ], ]; } diff --git a/src/Events/AllBreadDataImported.php b/src/Events/AllBreadDataImported.php index 382e426..859cd5f 100644 --- a/src/Events/AllBreadDataImported.php +++ b/src/Events/AllBreadDataImported.php @@ -1,6 +1,6 @@ get(); foreach ($dataTypes as $dataType) { - $exportClass = 'joy-voyager-import.import-template'; + $exportClass = 'joy-voyager-bulk-update.import-template'; - if (app()->bound('joy-voyager-import.' . $dataType->slug . '.import-template')) { - $exportClass = 'joy-voyager-import.' . $dataType->slug . '.import-template'; + if (app()->bound('joy-voyager-bulk-update.' . $dataType->slug . '.import-template')) { + $exportClass = 'joy-voyager-bulk-update.' . $dataType->slug . '.import-template'; } $export = app($exportClass); diff --git a/src/Exports/DataTypeTemplateExport.php b/src/Exports/DataTypeTemplateExport.php index c5e888e..d388bd8 100644 --- a/src/Exports/DataTypeTemplateExport.php +++ b/src/Exports/DataTypeTemplateExport.php @@ -1,6 +1,6 @@ authorize('browse', app($dataType->model_name)); - $mimes = $this->mimes ?? config('joy-voyager-import.allowed_mimes'); + $mimes = $this->mimes ?? config('joy-voyager-bulk-update.allowed_mimes'); $validator = Validator::make(request()->all(), [ 'file' => 'required|mimes:' . $mimes, @@ -45,13 +45,13 @@ public function import(Request $request) ]); } - $disk = $request->get('disk', config('joy-voyager-import.disk')); - $readerType = $request->get('readerType', config('joy-voyager-import.readerType', Excel::XLSX)); + $disk = $request->get('disk', config('joy-voyager-bulk-update.disk')); + $readerType = $request->get('readerType', config('joy-voyager-bulk-update.readerType', Excel::XLSX)); - $importClass = 'joy-voyager-import.import'; + $importClass = 'joy-voyager-bulk-update.import'; - if (app()->bound('joy-voyager-import.' . $dataType->slug . '.import')) { - $importClass = 'joy-voyager-import.' . $dataType->slug . '.import'; + if (app()->bound('joy-voyager-bulk-update.' . $dataType->slug . '.import')) { + $importClass = 'joy-voyager-bulk-update.' . $dataType->slug . '.import'; } $import = app($importClass); @@ -66,7 +66,7 @@ public function import(Request $request) ); return redirect()->back()->with([ - 'message' => __('joy-voyager-import::generic.successfully_imported') . " {$dataType->getTranslatedAttribute('display_name_singular')}", + 'message' => __('joy-voyager-bulk-update::generic.successfully_imported') . " {$dataType->getTranslatedAttribute('display_name_singular')}", 'alert-type' => 'success', ]); } diff --git a/src/Http/Traits/ImportAllAction.php b/src/Http/Traits/ImportAllAction.php index ad91fd6..cee5c6a 100644 --- a/src/Http/Traits/ImportAllAction.php +++ b/src/Http/Traits/ImportAllAction.php @@ -1,6 +1,6 @@ authorize('browse_bread'); - $mimes = $this->mimes ?? config('joy-voyager-import.allowed_mimes'); + $mimes = $this->mimes ?? config('joy-voyager-bulk-update.allowed_mimes'); $validator = Validator::make(request()->all(), [ 'file' => 'required|mimes:' . $mimes, @@ -38,10 +38,10 @@ public function importAll(Request $request) ]); } - $disk = $request->get('disk', config('joy-voyager-import.disk')); - $readerType = $request->get('readerType', config('joy-voyager-import.readerType', Excel::XLSX)); + $disk = $request->get('disk', config('joy-voyager-bulk-update.disk')); + $readerType = $request->get('readerType', config('joy-voyager-bulk-update.readerType', Excel::XLSX)); - $importClass = 'joy-voyager-import.import-all'; + $importClass = 'joy-voyager-bulk-update.import-all'; $import = app($importClass); @@ -54,7 +54,7 @@ public function importAll(Request $request) ); return redirect()->back()->with([ - 'message' => __('joy-voyager-import::generic.successfully_imported_all'), + 'message' => __('joy-voyager-bulk-update::generic.successfully_imported_all'), 'alert-type' => 'success', ]); } diff --git a/src/Http/Traits/ImportAllTemplateAction.php b/src/Http/Traits/ImportAllTemplateAction.php index f9237b9..13cd9d5 100644 --- a/src/Http/Traits/ImportAllTemplateAction.php +++ b/src/Http/Traits/ImportAllTemplateAction.php @@ -1,6 +1,6 @@ authorize('browse_bread'); - $writerType = $this->writerType ?? config('joy-voyager-import.writerType', Excel::XLSX); + $writerType = $this->writerType ?? config('joy-voyager-bulk-update.writerType', Excel::XLSX); $fileName = $this->fileName ?? ('import-all' . '.' . Str::lower($writerType)); - $exportClass = 'joy-voyager-import.import-all-template'; + $exportClass = 'joy-voyager-bulk-update.import-all-template'; $export = app($exportClass); diff --git a/src/Http/Traits/ImportTemplateAction.php b/src/Http/Traits/ImportTemplateAction.php index 2f18b96..8682595 100644 --- a/src/Http/Traits/ImportTemplateAction.php +++ b/src/Http/Traits/ImportTemplateAction.php @@ -1,6 +1,6 @@ authorize('browse', app($dataType->model_name)); - $writerType = $request->get('writerType', $this->writerType ?? config('joy-voyager-import.writerType', Excel::XLSX)); + $writerType = $request->get('writerType', $this->writerType ?? config('joy-voyager-bulk-update.writerType', Excel::XLSX)); $fileName = $this->fileName ?? ($dataType->slug . '.' . Str::lower($writerType)); - $exportClass = 'joy-voyager-import.import-template'; + $exportClass = 'joy-voyager-bulk-update.import-template'; - if (app()->bound('joy-voyager-import.' . $dataType->slug . '.import-template')) { - $exportClass = 'joy-voyager-import.' . $dataType->slug . '.import-template'; + if (app()->bound('joy-voyager-bulk-update.' . $dataType->slug . '.import-template')) { + $exportClass = 'joy-voyager-bulk-update.' . $dataType->slug . '.import-template'; } $export = app($exportClass); diff --git a/src/ImportServiceProvider.php b/src/ImportServiceProvider.php index 555908a..1e293ce 100644 --- a/src/ImportServiceProvider.php +++ b/src/ImportServiceProvider.php @@ -2,24 +2,24 @@ declare(strict_types=1); -namespace Joy\VoyagerImport; +namespace Joy\VoyagerBulkUpdate; use Illuminate\Contracts\Support\DeferrableProvider; use Illuminate\Support\ServiceProvider; -use Joy\VoyagerImport\Exports\AllDataTypesTemplateExport; -use Joy\VoyagerImport\Exports\DataTypeTemplateExport; -use Joy\VoyagerImport\Imports\AllDataTypesImport; -use Joy\VoyagerImport\Imports\DataTypeImport; +use Joy\VoyagerBulkUpdate\Exports\AllDataTypesTemplateExport; +use Joy\VoyagerBulkUpdate\Exports\DataTypeTemplateExport; +use Joy\VoyagerBulkUpdate\Imports\AllDataTypesImport; +use Joy\VoyagerBulkUpdate\Imports\DataTypeImport; /** * Class ImportServiceProvider * * @category Package - * @package JoyVoyagerImport + * @package JoyVoyagerBulkUpdate * @author Ramakant Gangwar * @copyright 2021 Copyright (c) Ramakant Gangwar (https://github.com/rxcod9) - * @license http://github.com/rxcod9/joy-voyager-import/blob/main/LICENSE New BSD License - * @link https://github.com/rxcod9/joy-voyager-import + * @license http://github.com/rxcod9/joy-voyager-bulk-update/blob/main/LICENSE New BSD License + * @link https://github.com/rxcod9/joy-voyager-bulk-update */ class ImportServiceProvider extends ServiceProvider implements DeferrableProvider { @@ -30,17 +30,17 @@ class ImportServiceProvider extends ServiceProvider implements DeferrableProvide */ public function register() { - $this->app->bind('joy-voyager-import.import', function ($app) { + $this->app->bind('joy-voyager-bulk-update.import', function ($app) { return new DataTypeImport(); }); - $this->app->bind('joy-voyager-import.import-template', function ($app) { + $this->app->bind('joy-voyager-bulk-update.import-template', function ($app) { return new DataTypeTemplateExport(); }); - $this->app->bind('joy-voyager-import.import-all', function ($app) { + $this->app->bind('joy-voyager-bulk-update.import-all', function ($app) { return new AllDataTypesImport(); }); - $this->app->bind('joy-voyager-import.import-all-template', function ($app) { + $this->app->bind('joy-voyager-bulk-update.import-all-template', function ($app) { return new AllDataTypesTemplateExport(); }); } @@ -53,10 +53,10 @@ public function register() public function provides() { return [ - 'joy-voyager-import.import', - 'joy-voyager-import.import-template', - 'joy-voyager-import.import-all', - 'joy-voyager-import.import-all-template' + 'joy-voyager-bulk-update.import', + 'joy-voyager-bulk-update.import-template', + 'joy-voyager-bulk-update.import-all', + 'joy-voyager-bulk-update.import-all-template' ]; } } diff --git a/src/Imports/AllDataTypesImport.php b/src/Imports/AllDataTypesImport.php index 117daff..09ad84d 100644 --- a/src/Imports/AllDataTypesImport.php +++ b/src/Imports/AllDataTypesImport.php @@ -1,8 +1,8 @@ get(); foreach ($dataTypes as $dataType) { - $importClass = 'joy-voyager-import.import'; + $importClass = 'joy-voyager-bulk-update.import'; - if (app()->bound('joy-voyager-import.' . $dataType->slug . '.import')) { - $importClass = 'joy-voyager-import.' . $dataType->slug . '.import'; + if (app()->bound('joy-voyager-bulk-update.' . $dataType->slug . '.import')) { + $importClass = 'joy-voyager-bulk-update.' . $dataType->slug . '.import'; } $import = app($importClass); diff --git a/src/Imports/DataTypeImport.php b/src/Imports/DataTypeImport.php index 642c143..d282128 100644 --- a/src/Imports/DataTypeImport.php +++ b/src/Imports/DataTypeImport.php @@ -1,13 +1,13 @@ dataType->model_name); $dataTypeUniqueColumn = config( - 'joy-voyager-import.unique_column.' . $this->dataType->slug + 'joy-voyager-bulk-update.unique_column.' . $this->dataType->slug ); if ($dataTypeUniqueColumn) { @@ -90,7 +90,7 @@ public function uniqueBy() public function rules(): array { - $isValidationEnabled = config('joy-voyager-import.validation', false) === true; + $isValidationEnabled = config('joy-voyager-bulk-update.validation', false) === true; if (!$isValidationEnabled) { // return []; } @@ -162,7 +162,7 @@ public function rules(): array */ public function customValidationMessages() { - $isValidationEnabled = config('joy-voyager-import.validation', false) === true; + $isValidationEnabled = config('joy-voyager-bulk-update.validation', false) === true; if (!$isValidationEnabled) { // return []; } diff --git a/src/VoyagerImportServiceProvider.php b/src/VoyagerBulkUpdateServiceProvider.php similarity index 73% rename from src/VoyagerImportServiceProvider.php rename to src/VoyagerBulkUpdateServiceProvider.php index 3786bc4..70440bc 100644 --- a/src/VoyagerImportServiceProvider.php +++ b/src/VoyagerBulkUpdateServiceProvider.php @@ -2,27 +2,27 @@ declare(strict_types=1); -namespace Joy\VoyagerImport; +namespace Joy\VoyagerBulkUpdate; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; -use Joy\VoyagerImport\Console\Commands\AllDataTypesImport; -use Joy\VoyagerImport\Console\Commands\AllDataTypesTemplateExport; -use Joy\VoyagerImport\Console\Commands\DataTypeImport; -use Joy\VoyagerImport\Console\Commands\DataTypeTemplateExport; +use Joy\VoyagerBulkUpdate\Console\Commands\AllDataTypesImport; +use Joy\VoyagerBulkUpdate\Console\Commands\AllDataTypesTemplateExport; +use Joy\VoyagerBulkUpdate\Console\Commands\DataTypeImport; +use Joy\VoyagerBulkUpdate\Console\Commands\DataTypeTemplateExport; use TCG\Voyager\Facades\Voyager; /** - * Class VoyagerImportServiceProvider + * Class VoyagerBulkUpdateServiceProvider * * @category Package - * @package JoyVoyagerImport + * @package JoyVoyagerBulkUpdate * @author Ramakant Gangwar * @copyright 2021 Copyright (c) Ramakant Gangwar (https://github.com/rxcod9) - * @license http://github.com/rxcod9/joy-voyager-import/blob/main/LICENSE New BSD License - * @link https://github.com/rxcod9/joy-voyager-import + * @license http://github.com/rxcod9/joy-voyager-bulk-update/blob/main/LICENSE New BSD License + * @link https://github.com/rxcod9/joy-voyager-bulk-update */ -class VoyagerImportServiceProvider extends ServiceProvider +class VoyagerBulkUpdateServiceProvider extends ServiceProvider { /** * Boot @@ -31,11 +31,11 @@ class VoyagerImportServiceProvider extends ServiceProvider */ public function boot() { - Voyager::addAction(\Joy\VoyagerImport\Actions\ImportAction::class); + Voyager::addAction(\Joy\VoyagerBulkUpdate\Actions\ImportAction::class); $this->registerPublishables(); - $this->loadViewsFrom(__DIR__ . '/../resources/views', 'joy-voyager-import'); + $this->loadViewsFrom(__DIR__ . '/../resources/views', 'joy-voyager-bulk-update'); $this->mapApiRoutes(); @@ -43,7 +43,7 @@ public function boot() $this->loadMigrationsFrom(__DIR__ . '/../database/migrations'); - $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'joy-voyager-import'); + $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'joy-voyager-bulk-update'); } /** @@ -64,7 +64,7 @@ protected function mapWebRoutes(): void */ protected function mapApiRoutes(): void { - Route::prefix(config('joy-voyager-import.route_prefix', 'api')) + Route::prefix(config('joy-voyager-bulk-update.route_prefix', 'api')) ->middleware('api') ->group(__DIR__ . '/../routes/api.php'); } @@ -76,7 +76,7 @@ protected function mapApiRoutes(): void */ public function register() { - $this->mergeConfigFrom(__DIR__ . '/../config/voyager-import.php', 'joy-voyager-import'); + $this->mergeConfigFrom(__DIR__ . '/../config/voyager-bulk-update.php', 'joy-voyager-bulk-update'); if ($this->app->runningInConsole()) { $this->registerCommands(); @@ -91,11 +91,11 @@ public function register() protected function registerPublishables(): void { $this->publishes([ - __DIR__ . '/../config/voyager-import.php' => config_path('joy-voyager-import.php'), + __DIR__ . '/../config/voyager-bulk-update.php' => config_path('joy-voyager-bulk-update.php'), ], 'config'); $this->publishes([ - __DIR__ . '/../resources/views' => resource_path('views/vendor/joy-voyager-import'), + __DIR__ . '/../resources/views' => resource_path('views/vendor/joy-voyager-bulk-update'), __DIR__ . '/../resources/views/bread/partials' => resource_path('views/vendor/voyager/bread/partials'), ], 'views'); @@ -104,7 +104,7 @@ protected function registerPublishables(): void ], 'voyager-actions-views'); $this->publishes([ - __DIR__ . '/../resources/lang' => resource_path('lang/vendor/joy-voyager-import'), + __DIR__ . '/../resources/lang' => resource_path('lang/vendor/joy-voyager-bulk-update'), ], 'translations'); } diff --git a/src/helper.php b/src/helper.php index 2b6d058..cbb4712 100644 --- a/src/helper.php +++ b/src/helper.php @@ -2,11 +2,11 @@ use Illuminate\Support\Str; -// if (! function_exists('joyVoyagerImport')) { +// if (! function_exists('joyVoyagerBulkUpdate')) { // /** // * Helper // */ -// function joyVoyagerImport($argument1 = null) +// function joyVoyagerBulkUpdate($argument1 = null) // { // // // } diff --git a/tests/TestCase.php b/tests/TestCase.php index feb1d97..239c10f 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -1,9 +1,9 @@