Skip to content

Commit

Permalink
Merge branch 'main' of github.com-rx:rxcod9/joy-voyager-export into main
Browse files Browse the repository at this point in the history
  • Loading branch information
rxcod9 committed Dec 29, 2022
2 parents 971da8a + 684968d commit 88b0205
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Changelog

## v1.2.31 - 2022-12-19

v1.2.31

## 1.0.0

- initial release
2 changes: 1 addition & 1 deletion src/Exports/AllDataTypesExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function sheets(): array
$exportClass = 'joy-voyager-export.' . $dataType->slug . '.export';
}

$export = app()->make($exportClass);
$export = app()->make($exportClass);
$sheets[] = $export->set(
$dataType,
[],
Expand Down
1 change: 0 additions & 1 deletion src/Exports/DataTypeExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// use App\Models\User;

use Illuminate\Console\OutputStyle;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Arr;
Expand Down
10 changes: 5 additions & 5 deletions src/Jobs/AsyncExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ public function __construct(
$disk,
$writerType
) {
$this->user = $user;
$this->export = $export;
$this->path = $path;
$this->url = $url;
$this->disk = $disk;
$this->user = $user;
$this->export = $export;
$this->path = $path;
$this->url = $url;
$this->disk = $disk;
$this->writerType = $writerType;
}

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

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

Expand All @@ -25,13 +24,13 @@ public function __construct(
$url
) {
$this->path = $path;
$this->url = $url;
$this->url = $url;
}

/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @param mixed $notifiable
* @return array
*/
public function via($notifiable)
Expand All @@ -42,7 +41,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 @@ -57,14 +56,14 @@ public function toMail($notifiable)
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @param mixed $notifiable
* @return array
*/
public function toArray($notifiable)
{
return [
'path' => $this->path,
'url' => $this->url,
'url' => $this->url,
];
}
}

0 comments on commit 88b0205

Please sign in to comment.