mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 21:14:35 -04:00
Fixes for import
This commit is contained in:
=
parent
07af666ca4
commit
2cf97caaaf
@ -223,11 +223,10 @@ class SendReminders implements ShouldQueue
|
|||||||
event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars()));
|
event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars()));
|
||||||
|
|
||||||
$invoice->last_sent_date = now();
|
$invoice->last_sent_date = now();
|
||||||
$invoice->reminder_last_send = now();
|
|
||||||
$invoice->next_send_date = $this->calculateNextSendDate($invoice);
|
$invoice->next_send_date = $this->calculateNextSendDate($invoice);
|
||||||
|
|
||||||
if(in_array($template, ['reminder1', 'reminder2', 'reminder3']))
|
if(in_array($template, ['reminder1', 'reminder2', 'reminder3']))
|
||||||
$invoice->{$template."_send"} = now();
|
$invoice->{$template."_sent"} = now();
|
||||||
|
|
||||||
|
|
||||||
$invoice->save();
|
$invoice->save();
|
||||||
|
|||||||
@ -972,6 +972,7 @@ class Import implements ShouldQueue
|
|||||||
|
|
||||||
$modified['company_id'] = $this->company->id;
|
$modified['company_id'] = $this->company->id;
|
||||||
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
||||||
|
$modified['user_id'] = $this->processUserId($resource);
|
||||||
|
|
||||||
$cgt = ClientGatewayToken::Create($modified);
|
$cgt = ClientGatewayToken::Create($modified);
|
||||||
|
|
||||||
@ -1001,7 +1002,7 @@ class Import implements ShouldQueue
|
|||||||
unset($modified['id']);
|
unset($modified['id']);
|
||||||
|
|
||||||
$modified['company_id'] = $this->company->id;
|
$modified['company_id'] = $this->company->id;
|
||||||
$modified['user_id'] = $this->transformId('users', $resource['user_id']);
|
$modified['user_id'] = $this->processUserId($resource);
|
||||||
|
|
||||||
$task_status = TaskStatus::Create($modified);
|
$task_status = TaskStatus::Create($modified);
|
||||||
|
|
||||||
@ -1031,7 +1032,7 @@ class Import implements ShouldQueue
|
|||||||
unset($modified['id']);
|
unset($modified['id']);
|
||||||
|
|
||||||
$modified['company_id'] = $this->company->id;
|
$modified['company_id'] = $this->company->id;
|
||||||
$modified['user_id'] = $this->transformId('users', $resource['user_id']);
|
$modified['user_id'] = $this->processUserId($resource);
|
||||||
|
|
||||||
$expense_category = ExpenseCategory::Create($modified);
|
$expense_category = ExpenseCategory::Create($modified);
|
||||||
|
|
||||||
@ -1060,7 +1061,7 @@ class Import implements ShouldQueue
|
|||||||
unset($modified['id']);
|
unset($modified['id']);
|
||||||
|
|
||||||
$modified['company_id'] = $this->company->id;
|
$modified['company_id'] = $this->company->id;
|
||||||
$modified['user_id'] = $this->transformId('users', $resource['user_id']);
|
$modified['user_id'] = $this->processUserId($resource);
|
||||||
|
|
||||||
if(isset($modified['client_id']))
|
if(isset($modified['client_id']))
|
||||||
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
||||||
@ -1101,7 +1102,7 @@ class Import implements ShouldQueue
|
|||||||
unset($modified['id']);
|
unset($modified['id']);
|
||||||
|
|
||||||
$modified['company_id'] = $this->company->id;
|
$modified['company_id'] = $this->company->id;
|
||||||
$modified['user_id'] = $this->transformId('users', $resource['user_id']);
|
$modified['user_id'] = $this->processUserId($resource);
|
||||||
|
|
||||||
if(isset($modified['client_id']))
|
if(isset($modified['client_id']))
|
||||||
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
||||||
@ -1134,7 +1135,7 @@ class Import implements ShouldQueue
|
|||||||
unset($modified['id']);
|
unset($modified['id']);
|
||||||
|
|
||||||
$modified['company_id'] = $this->company->id;
|
$modified['company_id'] = $this->company->id;
|
||||||
$modified['user_id'] = $this->transformId('users', $resource['user_id']);
|
$modified['user_id'] = $this->processUserId($resource);
|
||||||
|
|
||||||
if(isset($resource['client_id']))
|
if(isset($resource['client_id']))
|
||||||
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
||||||
|
|||||||
@ -38,7 +38,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder1 > 0) {
|
$settings->num_days_reminder1 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder1);
|
$reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder1);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,7 +47,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder1 > 0) {
|
$settings->num_days_reminder1 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder1);
|
$reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder1);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,7 +56,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder1 > 0) {
|
$settings->num_days_reminder1 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder1);
|
$reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder1);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -62,7 +65,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder2 > 0) {
|
$settings->num_days_reminder2 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder2);
|
$reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder2);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,7 +74,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder2 > 0) {
|
$settings->num_days_reminder2 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder2);
|
$reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder2);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,7 +83,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder2 > 0) {
|
$settings->num_days_reminder2 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder2);
|
$reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder2);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,7 +92,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder3 > 0) {
|
$settings->num_days_reminder3 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder3);
|
$reminder_date = Carbon::parse($this->date)->addDays($settings->num_days_reminder3);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,7 +101,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder3 > 0) {
|
$settings->num_days_reminder3 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder3);
|
$reminder_date = Carbon::parse($this->due_date)->subDays($settings->num_days_reminder3);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -102,7 +110,8 @@ trait MakesReminders
|
|||||||
$settings->num_days_reminder3 > 0) {
|
$settings->num_days_reminder3 > 0) {
|
||||||
$reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder3);
|
$reminder_date = Carbon::parse($this->due_date)->addDays($settings->num_days_reminder3);
|
||||||
|
|
||||||
$date_collection->push($reminder_date->format('Y-m-d'));
|
if($reminder_date->gt(Carbon::parse($this->next_send_date)));
|
||||||
|
$date_collection->push($reminder_date->format('Y-m-d'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
172
composer.lock
generated
172
composer.lock
generated
@ -116,16 +116,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "aws/aws-sdk-php",
|
"name": "aws/aws-sdk-php",
|
||||||
"version": "3.158.18",
|
"version": "3.158.22",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/aws/aws-sdk-php.git",
|
"url": "https://github.com/aws/aws-sdk-php.git",
|
||||||
"reference": "75aebc2f5dfd23ad7272ff1d59c521bc2a8e2802"
|
"reference": "0aae6d7d0e9fc40ace69ed7f7785d7ddab4dabd0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/75aebc2f5dfd23ad7272ff1d59c521bc2a8e2802",
|
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0aae6d7d0e9fc40ace69ed7f7785d7ddab4dabd0",
|
||||||
"reference": "75aebc2f5dfd23ad7272ff1d59c521bc2a8e2802",
|
"reference": "0aae6d7d0e9fc40ace69ed7f7785d7ddab4dabd0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -200,9 +200,9 @@
|
|||||||
"support": {
|
"support": {
|
||||||
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
|
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
|
||||||
"issues": "https://github.com/aws/aws-sdk-php/issues",
|
"issues": "https://github.com/aws/aws-sdk-php/issues",
|
||||||
"source": "https://github.com/aws/aws-sdk-php/tree/3.158.18"
|
"source": "https://github.com/aws/aws-sdk-php/tree/3.158.22"
|
||||||
},
|
},
|
||||||
"time": "2020-10-30T18:12:38+00:00"
|
"time": "2020-11-06T19:13:12+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "brick/math",
|
"name": "brick/math",
|
||||||
@ -521,16 +521,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "composer/composer",
|
"name": "composer/composer",
|
||||||
"version": "2.0.4",
|
"version": "2.0.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/composer/composer.git",
|
"url": "https://github.com/composer/composer.git",
|
||||||
"reference": "4053eab90a7cdf0b81dd93073dc6c18c15d487fd"
|
"reference": "0934b44a86d4c43e416674e80cd6c94044cd23b3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/composer/composer/zipball/4053eab90a7cdf0b81dd93073dc6c18c15d487fd",
|
"url": "https://api.github.com/repos/composer/composer/zipball/0934b44a86d4c43e416674e80cd6c94044cd23b3",
|
||||||
"reference": "4053eab90a7cdf0b81dd93073dc6c18c15d487fd",
|
"reference": "0934b44a86d4c43e416674e80cd6c94044cd23b3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -598,7 +598,7 @@
|
|||||||
"support": {
|
"support": {
|
||||||
"irc": "irc://irc.freenode.org/composer",
|
"irc": "irc://irc.freenode.org/composer",
|
||||||
"issues": "https://github.com/composer/composer/issues",
|
"issues": "https://github.com/composer/composer/issues",
|
||||||
"source": "https://github.com/composer/composer/tree/2.0.4"
|
"source": "https://github.com/composer/composer/tree/2.0.5"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@ -614,7 +614,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-30T21:39:11+00:00"
|
"time": "2020-11-06T19:57:15+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "composer/package-versions-deprecated",
|
"name": "composer/package-versions-deprecated",
|
||||||
@ -1893,16 +1893,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "google/apiclient-services",
|
"name": "google/apiclient-services",
|
||||||
"version": "v0.152",
|
"version": "v0.153",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/googleapis/google-api-php-client-services.git",
|
"url": "https://github.com/googleapis/google-api-php-client-services.git",
|
||||||
"reference": "e1cc05269e852d62677387f831271ad984b245f8"
|
"reference": "db62bb19f32f81c9551f223c72be0682eb58ebd8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/e1cc05269e852d62677387f831271ad984b245f8",
|
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/db62bb19f32f81c9551f223c72be0682eb58ebd8",
|
||||||
"reference": "e1cc05269e852d62677387f831271ad984b245f8",
|
"reference": "db62bb19f32f81c9551f223c72be0682eb58ebd8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1928,9 +1928,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
|
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
|
||||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.152"
|
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.153"
|
||||||
},
|
},
|
||||||
"time": "2020-10-25T00:25:04+00:00"
|
"time": "2020-11-01T00:25:23+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "google/auth",
|
"name": "google/auth",
|
||||||
@ -2662,16 +2662,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v8.12.3",
|
"version": "v8.13.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "6707480c5f0db7aa07537f9ad93255b64b65b85e"
|
"reference": "37a0abd4f3dbc51e2256296b45f8be72c8fe2196"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/6707480c5f0db7aa07537f9ad93255b64b65b85e",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/37a0abd4f3dbc51e2256296b45f8be72c8fe2196",
|
||||||
"reference": "6707480c5f0db7aa07537f9ad93255b64b65b85e",
|
"reference": "37a0abd4f3dbc51e2256296b45f8be72c8fe2196",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -2825,26 +2825,26 @@
|
|||||||
"issues": "https://github.com/laravel/framework/issues",
|
"issues": "https://github.com/laravel/framework/issues",
|
||||||
"source": "https://github.com/laravel/framework"
|
"source": "https://github.com/laravel/framework"
|
||||||
},
|
},
|
||||||
"time": "2020-10-29T22:01:29+00:00"
|
"time": "2020-11-03T14:13:19+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/slack-notification-channel",
|
"name": "laravel/slack-notification-channel",
|
||||||
"version": "v2.2.0",
|
"version": "v2.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/slack-notification-channel.git",
|
"url": "https://github.com/laravel/slack-notification-channel.git",
|
||||||
"reference": "98e0fe5c8dda645e6af914285af7b742e167462a"
|
"reference": "f8a3893d9de36b86e941dac76c06c28141209970"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/98e0fe5c8dda645e6af914285af7b742e167462a",
|
"url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/f8a3893d9de36b86e941dac76c06c28141209970",
|
||||||
"reference": "98e0fe5c8dda645e6af914285af7b742e167462a",
|
"reference": "f8a3893d9de36b86e941dac76c06c28141209970",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"guzzlehttp/guzzle": "^6.0|^7.0",
|
"guzzlehttp/guzzle": "^6.0|^7.0",
|
||||||
"illuminate/notifications": "~5.8.0|^6.0|^7.0|^8.0",
|
"illuminate/notifications": "~5.8.0|^6.0|^7.0|^8.0",
|
||||||
"php": "^7.1.3"
|
"php": "^7.1.3|^8.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"mockery/mockery": "^1.0",
|
"mockery/mockery": "^1.0",
|
||||||
@ -2884,22 +2884,22 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/laravel/slack-notification-channel/issues",
|
"issues": "https://github.com/laravel/slack-notification-channel/issues",
|
||||||
"source": "https://github.com/laravel/slack-notification-channel/tree/v2.2.0"
|
"source": "https://github.com/laravel/slack-notification-channel/tree/v2.3.0"
|
||||||
},
|
},
|
||||||
"time": "2020-08-25T18:21:34+00:00"
|
"time": "2020-11-03T19:18:22+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/socialite",
|
"name": "laravel/socialite",
|
||||||
"version": "v5.0.3",
|
"version": "v5.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/socialite.git",
|
"url": "https://github.com/laravel/socialite.git",
|
||||||
"reference": "8197acf2fe5446a2800b95d250c1da72fd6051bc"
|
"reference": "14082c665186348028e5bde17ab33b21b36dac79"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/socialite/zipball/8197acf2fe5446a2800b95d250c1da72fd6051bc",
|
"url": "https://api.github.com/repos/laravel/socialite/zipball/14082c665186348028e5bde17ab33b21b36dac79",
|
||||||
"reference": "8197acf2fe5446a2800b95d250c1da72fd6051bc",
|
"reference": "14082c665186348028e5bde17ab33b21b36dac79",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -2908,13 +2908,13 @@
|
|||||||
"illuminate/http": "^6.0|^7.0|^8.0",
|
"illuminate/http": "^6.0|^7.0|^8.0",
|
||||||
"illuminate/support": "^6.0|^7.0|^8.0",
|
"illuminate/support": "^6.0|^7.0|^8.0",
|
||||||
"league/oauth1-client": "^1.0",
|
"league/oauth1-client": "^1.0",
|
||||||
"php": "^7.2"
|
"php": "^7.2|^8.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"illuminate/contracts": "^6.0|^7.0",
|
"illuminate/contracts": "^6.0|^7.0",
|
||||||
"mockery/mockery": "^1.0",
|
"mockery/mockery": "^1.0",
|
||||||
"orchestra/testbench": "^4.0|^5.0|^6.0",
|
"orchestra/testbench": "^4.0|^5.0|^6.0",
|
||||||
"phpunit/phpunit": "^8.0"
|
"phpunit/phpunit": "^8.0|^9.3"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
@ -2955,7 +2955,7 @@
|
|||||||
"issues": "https://github.com/laravel/socialite/issues",
|
"issues": "https://github.com/laravel/socialite/issues",
|
||||||
"source": "https://github.com/laravel/socialite"
|
"source": "https://github.com/laravel/socialite"
|
||||||
},
|
},
|
||||||
"time": "2020-10-21T12:45:02+00:00"
|
"time": "2020-11-03T19:24:43+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/tinker",
|
"name": "laravel/tinker",
|
||||||
@ -3027,23 +3027,23 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/ui",
|
"name": "laravel/ui",
|
||||||
"version": "v3.0.0",
|
"version": "v3.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/ui.git",
|
"url": "https://github.com/laravel/ui.git",
|
||||||
"reference": "ff6af4f0bc5a5bfe73352cdc03dbfffc4ace92d8"
|
"reference": "444072cb2f8baaa15172c5cde2bd30d188c3b7e7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/ui/zipball/ff6af4f0bc5a5bfe73352cdc03dbfffc4ace92d8",
|
"url": "https://api.github.com/repos/laravel/ui/zipball/444072cb2f8baaa15172c5cde2bd30d188c3b7e7",
|
||||||
"reference": "ff6af4f0bc5a5bfe73352cdc03dbfffc4ace92d8",
|
"reference": "444072cb2f8baaa15172c5cde2bd30d188c3b7e7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"illuminate/console": "^8.0",
|
"illuminate/console": "^8.0",
|
||||||
"illuminate/filesystem": "^8.0",
|
"illuminate/filesystem": "^8.0",
|
||||||
"illuminate/support": "^8.0",
|
"illuminate/support": "^8.0",
|
||||||
"php": "^7.3"
|
"php": "^7.3|^8.0"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
@ -3079,9 +3079,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/laravel/ui/issues",
|
"issues": "https://github.com/laravel/ui/issues",
|
||||||
"source": "https://github.com/laravel/ui/tree/v3.0.0"
|
"source": "https://github.com/laravel/ui/tree/v3.1.0"
|
||||||
},
|
},
|
||||||
"time": "2020-09-11T15:34:08+00:00"
|
"time": "2020-11-03T19:51:21+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/commonmark",
|
"name": "league/commonmark",
|
||||||
@ -4501,16 +4501,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "opis/closure",
|
"name": "opis/closure",
|
||||||
"version": "3.6.0",
|
"version": "3.6.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/opis/closure.git",
|
"url": "https://github.com/opis/closure.git",
|
||||||
"reference": "c547f8262a5fa9ff507bd06cc394067b83a75085"
|
"reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/opis/closure/zipball/c547f8262a5fa9ff507bd06cc394067b83a75085",
|
"url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
|
||||||
"reference": "c547f8262a5fa9ff507bd06cc394067b83a75085",
|
"reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -4560,9 +4560,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/opis/closure/issues",
|
"issues": "https://github.com/opis/closure/issues",
|
||||||
"source": "https://github.com/opis/closure/tree/3.6.0"
|
"source": "https://github.com/opis/closure/tree/3.6.1"
|
||||||
},
|
},
|
||||||
"time": "2020-10-11T21:42:15+00:00"
|
"time": "2020-11-07T02:01:34+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "php-http/client-common",
|
"name": "php-http/client-common",
|
||||||
@ -6319,16 +6319,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sentry/sentry",
|
"name": "sentry/sentry",
|
||||||
"version": "3.0.3",
|
"version": "3.0.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/getsentry/sentry-php.git",
|
"url": "https://github.com/getsentry/sentry-php.git",
|
||||||
"reference": "e9f9cc24150da81f54f80611c565778d957c0aa3"
|
"reference": "745b3faafdc865ea8de75e0dc61ddfdd36a31d9c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/e9f9cc24150da81f54f80611c565778d957c0aa3",
|
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/745b3faafdc865ea8de75e0dc61ddfdd36a31d9c",
|
||||||
"reference": "e9f9cc24150da81f54f80611c565778d957c0aa3",
|
"reference": "745b3faafdc865ea8de75e0dc61ddfdd36a31d9c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -6407,7 +6407,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/getsentry/sentry-php/issues",
|
"issues": "https://github.com/getsentry/sentry-php/issues",
|
||||||
"source": "https://github.com/getsentry/sentry-php/tree/3.0.3"
|
"source": "https://github.com/getsentry/sentry-php/tree/3.0.4"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@ -6419,20 +6419,20 @@
|
|||||||
"type": "custom"
|
"type": "custom"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-12T08:11:29+00:00"
|
"time": "2020-11-06T11:58:00+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sentry/sentry-laravel",
|
"name": "sentry/sentry-laravel",
|
||||||
"version": "2.1.1",
|
"version": "2.2.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/getsentry/sentry-laravel.git",
|
"url": "https://github.com/getsentry/sentry-laravel.git",
|
||||||
"reference": "882d1cd98f41582afa3840a0c7c650d091d66898"
|
"reference": "f4c663b6510e793a180dee6b3a7c95c339f7fd8a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/882d1cd98f41582afa3840a0c7c650d091d66898",
|
"url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/f4c663b6510e793a180dee6b3a7c95c339f7fd8a",
|
||||||
"reference": "882d1cd98f41582afa3840a0c7c650d091d66898",
|
"reference": "f4c663b6510e793a180dee6b3a7c95c339f7fd8a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -6492,7 +6492,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/getsentry/sentry-laravel/issues",
|
"issues": "https://github.com/getsentry/sentry-laravel/issues",
|
||||||
"source": "https://github.com/getsentry/sentry-laravel/tree/2.1.1"
|
"source": "https://github.com/getsentry/sentry-laravel/tree/2.2.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@ -6504,20 +6504,20 @@
|
|||||||
"type": "custom"
|
"type": "custom"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-08T08:30:08+00:00"
|
"time": "2020-11-04T14:56:24+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "spatie/browsershot",
|
"name": "spatie/browsershot",
|
||||||
"version": "3.40.0",
|
"version": "3.40.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/spatie/browsershot.git",
|
"url": "https://github.com/spatie/browsershot.git",
|
||||||
"reference": "0aa3a683448efe9c7f2d34fee80dec62bafd6c90"
|
"reference": "7793556fdacaff56fcc45b0e45bb9f0f72a50803"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/spatie/browsershot/zipball/0aa3a683448efe9c7f2d34fee80dec62bafd6c90",
|
"url": "https://api.github.com/repos/spatie/browsershot/zipball/7793556fdacaff56fcc45b0e45bb9f0f72a50803",
|
||||||
"reference": "0aa3a683448efe9c7f2d34fee80dec62bafd6c90",
|
"reference": "7793556fdacaff56fcc45b0e45bb9f0f72a50803",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -6562,7 +6562,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/spatie/browsershot/issues",
|
"issues": "https://github.com/spatie/browsershot/issues",
|
||||||
"source": "https://github.com/spatie/browsershot/tree/3.40.0"
|
"source": "https://github.com/spatie/browsershot/tree/3.40.1"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@ -6570,7 +6570,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-10-07T20:56:21+00:00"
|
"time": "2020-11-06T09:19:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "spatie/image",
|
"name": "spatie/image",
|
||||||
@ -9772,16 +9772,16 @@
|
|||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
{
|
{
|
||||||
"name": "amphp/amp",
|
"name": "amphp/amp",
|
||||||
"version": "v2.5.0",
|
"version": "v2.5.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/amphp/amp.git",
|
"url": "https://github.com/amphp/amp.git",
|
||||||
"reference": "f220a51458bf4dd0dedebb171ac3457813c72bbc"
|
"reference": "ecdc3c476b3ccff02f8e5d5bcc04f7ccfd18751c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/amphp/amp/zipball/f220a51458bf4dd0dedebb171ac3457813c72bbc",
|
"url": "https://api.github.com/repos/amphp/amp/zipball/ecdc3c476b3ccff02f8e5d5bcc04f7ccfd18751c",
|
||||||
"reference": "f220a51458bf4dd0dedebb171ac3457813c72bbc",
|
"reference": "ecdc3c476b3ccff02f8e5d5bcc04f7ccfd18751c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -9849,7 +9849,7 @@
|
|||||||
"support": {
|
"support": {
|
||||||
"irc": "irc://irc.freenode.org/amphp",
|
"irc": "irc://irc.freenode.org/amphp",
|
||||||
"issues": "https://github.com/amphp/amp/issues",
|
"issues": "https://github.com/amphp/amp/issues",
|
||||||
"source": "https://github.com/amphp/amp/tree/master"
|
"source": "https://github.com/amphp/amp/tree/v2.5.1"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@ -9857,7 +9857,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-07-14T21:47:18+00:00"
|
"time": "2020-11-03T16:23:45+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "amphp/byte-stream",
|
"name": "amphp/byte-stream",
|
||||||
@ -12958,16 +12958,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "swagger-api/swagger-ui",
|
"name": "swagger-api/swagger-ui",
|
||||||
"version": "v3.36.1",
|
"version": "v3.36.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/swagger-api/swagger-ui.git",
|
"url": "https://github.com/swagger-api/swagger-ui.git",
|
||||||
"reference": "7a0c1ea556a4b393bace21f80a5c65acaed7a49f"
|
"reference": "69518cf5e5554b3d7fa731892efe1f05a60682f9"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/7a0c1ea556a4b393bace21f80a5c65acaed7a49f",
|
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/69518cf5e5554b3d7fa731892efe1f05a60682f9",
|
||||||
"reference": "7a0c1ea556a4b393bace21f80a5c65acaed7a49f",
|
"reference": "69518cf5e5554b3d7fa731892efe1f05a60682f9",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
@ -13013,9 +13013,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/swagger-api/swagger-ui/issues",
|
"issues": "https://github.com/swagger-api/swagger-ui/issues",
|
||||||
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.36.1"
|
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.36.2"
|
||||||
},
|
},
|
||||||
"time": "2020-10-29T17:39:16+00:00"
|
"time": "2020-11-06T17:40:21+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/debug",
|
"name": "symfony/debug",
|
||||||
@ -13213,16 +13213,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "vimeo/psalm",
|
"name": "vimeo/psalm",
|
||||||
"version": "4.1.0",
|
"version": "4.1.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/vimeo/psalm.git",
|
"url": "https://github.com/vimeo/psalm.git",
|
||||||
"reference": "8929bde5354595dc61947b7e27cfe59db45e3bb0"
|
"reference": "16bfbd9224698bd738c665f33039fade2a1a3977"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/vimeo/psalm/zipball/8929bde5354595dc61947b7e27cfe59db45e3bb0",
|
"url": "https://api.github.com/repos/vimeo/psalm/zipball/16bfbd9224698bd738c665f33039fade2a1a3977",
|
||||||
"reference": "8929bde5354595dc61947b7e27cfe59db45e3bb0",
|
"reference": "16bfbd9224698bd738c665f33039fade2a1a3977",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -13312,9 +13312,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/vimeo/psalm/issues",
|
"issues": "https://github.com/vimeo/psalm/issues",
|
||||||
"source": "https://github.com/vimeo/psalm/tree/4.1.0"
|
"source": "https://github.com/vimeo/psalm/tree/4.1.1"
|
||||||
},
|
},
|
||||||
"time": "2020-10-29T23:55:10+00:00"
|
"time": "2020-11-02T05:54:12+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "webmozart/assert",
|
"name": "webmozart/assert",
|
||||||
|
|||||||
1152
package-lock.json
generated
1152
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user