Skip to content

Commit

Permalink
Merge branch 'main' of github.com-rx:rxcod9/joy-voyager-import into main
Browse files Browse the repository at this point in the history
  • Loading branch information
rxcod9 committed Dec 29, 2022
2 parents 95274b2 + 3c4f3e3 commit b5bb5b8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
3 changes: 1 addition & 2 deletions src/Http/Traits/ImportAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Joy\VoyagerImport\Jobs\AsyncImport;
use TCG\Voyager\Facades\Voyager;
use Maatwebsite\Excel\Excel;
Expand Down Expand Up @@ -76,7 +75,7 @@ public function import(Request $request)
$disk,
$readerType
);

return redirect()->back()->with([
'message' => __('joy-voyager-import::generic.successfully_imported') . " {$dataType->getTranslatedAttribute('display_name_singular')}",
'alert-type' => 'success',
Expand Down
8 changes: 4 additions & 4 deletions src/Jobs/AsyncImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ public function __construct(
$disk,
$readerType
) {
$this->user = $user;
$this->import = $import;
$this->file = $file;
$this->disk = $disk;
$this->user = $user;
$this->import = $import;
$this->file = $file;
$this->disk = $disk;
$this->readerType = $readerType;
}

Expand Down
7 changes: 3 additions & 4 deletions src/Notifications/Import.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Joy\VoyagerImport\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;

Expand All @@ -27,7 +26,7 @@ public function __construct(
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
Expand All @@ -38,7 +37,7 @@ public function via($notifiable)
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public function toMail($notifiable)
Expand All @@ -53,7 +52,7 @@ public function toMail($notifiable)
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
Expand Down

0 comments on commit b5bb5b8

Please sign in to comment.