diff --git a/app/Http/Controllers/OneTimeTokenController.php b/app/Http/Controllers/OneTimeTokenController.php
index 34b6ca8fb9..d5079ce055 100644
--- a/app/Http/Controllers/OneTimeTokenController.php
+++ b/app/Http/Controllers/OneTimeTokenController.php
@@ -72,8 +72,8 @@ class OneTimeTokenController extends BaseController
$data = [
'user_id' => auth()->user()->id,
- 'company_key'=> auth()->company()->company_key,
- 'context' => $requst->input('context'),
+ 'company_key'=> auth()->user()->company()->company_key,
+ 'context' => $request->input('context'),
];
Cache::put( $hash, $data, 3600 );
diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php
index 74232e3fc7..cf5cc73a7d 100644
--- a/app/Http/Controllers/Traits/VerifiesUserEmail.php
+++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php
@@ -43,6 +43,15 @@ trait VerifiesUserEmail
$user->confirmation_code = null;
$user->save();
+ if(isset($user->oauth_user_id)){
+
+ return $this->render('auth.confirmed', [
+ 'root' => 'themes',
+ 'message' => ctrans('texts.security_confirmation'),
+ ]);
+
+ }
+
if (is_null($user->password) || empty($user->password) || Hash::check('', $user->password)) {
return $this->render('auth.confirmation_with_password', ['root' => 'themes', 'user_id' => $user->hashed_id]);
}
diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php
index e0dec9726c..8a70e621be 100644
--- a/app/Jobs/RecurringInvoice/SendRecurring.php
+++ b/app/Jobs/RecurringInvoice/SendRecurring.php
@@ -68,15 +68,6 @@ class SendRecurring implements ShouldQueue
->fillDefaults()
->save();
- nlog("Invoice {$invoice->number} created");
-
- $invoice->invitations->each(function ($invitation) use ($invoice) {
- if ($invitation->contact && strlen($invitation->contact->email) >=1) {
- EmailEntity::dispatch($invitation, $invoice->company);
- nlog("Firing email for invoice {$invoice->number}");
- }
- });
-
nlog("updating recurring invoice dates");
/* Set next date here to prevent a recurring loop forming */
$this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate()->format('Y-m-d');
@@ -99,6 +90,15 @@ class SendRecurring implements ShouldQueue
$invoice->entityEmailEvent($invoice->invitations->first(), 'invoice', 'email_template_invoice');
}
+ nlog("Invoice {$invoice->number} created");
+
+ $invoice->invitations->each(function ($invitation) use ($invoice) {
+ if ($invitation->contact && strlen($invitation->contact->email) >=1) {
+ EmailEntity::dispatch($invitation, $invoice->company);
+ nlog("Firing email for invoice {$invoice->number}");
+ }
+ });
+
if ($invoice->client->getSetting('auto_bill_date') == 'on_send_date' && $this->recurring_invoice->auto_bill_enabled) {
nlog("attempting to autobill {$invoice->number}");
$invoice->service()->autoBill()->save();
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index cac9576518..25a8ae6cb4 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -33,7 +33,7 @@ class PaymentEmailEngine extends BaseEmailEngine
public $contact;
private $helpers;
-
+
public function __construct($payment, $contact, $template_data = null)
{
$this->payment = $payment;
@@ -169,7 +169,7 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$company3'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company3', $this->settings->custom_value3, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'company3')];
$data['$company4'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company4', $this->settings->custom_value4, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'company4')];
- $data['$view_link'] = ['value' => ''.ctrans('texts.view_payment').'', 'label' => ctrans('texts.view_payment')];
+ $data['$view_link'] = ['value' => ''.ctrans('texts.view_payment').'', 'label' => ctrans('texts.view_payment')];
$data['$view_url'] = ['value' => $this->payment->getLink(), 'label' => ctrans('texts.view_payment')];
$data['$invoices'] = ['value' => $this->formatInvoices(), 'label' => ctrans('texts.invoices')];
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index 49b77217b1..33ee07c3c2 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -127,7 +127,7 @@ class TemplateEngine
$this->body = EmailTemplateDefaults::getDefaultTemplate($this->template, $this->settings_entity->locale());
}
}
-
+
return $this;
}
@@ -276,7 +276,7 @@ class TemplateEngine
$documents['wrapper']->saveHTML();
$documents['body'] = new \DOMDocument();
- $documents['body']->loadHTML(empty($body) ? '' : (new CssToInlineStyles())->convert($body, $styles));
+ $documents['body']->loadHTML(empty($body) ? '' : mb_convert_encoding((new CssToInlineStyles())->convert($body, $styles), 'HTML-ENTITIES', 'UTF-8'));
$table_html ='
diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 37ecd9887a..3e7ce126f4 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -422,6 +422,11 @@ trait GeneratesCounter
*/
private function resetCounters(Client $client)
{
+ $reset_counter_frequency = (int)$client->getSetting('reset_counter_frequency_id');
+
+ if($reset_counter_frequency == 0)
+ return;
+
$timezone = Timezone::find($client->getSetting('timezone_id'));
$reset_date = Carbon::parse($client->getSetting('reset_counter_date'), $timezone->name);
@@ -430,7 +435,7 @@ trait GeneratesCounter
return false;
}
- switch ($client->company->reset_counter_frequency_id) {
+ switch ($reset_counter_frequency) {
case RecurringInvoice::FREQUENCY_DAILY:
$reset_date->addDay();
break;
diff --git a/composer.lock b/composer.lock
index 25bd1c789e..e031074892 100644
--- a/composer.lock
+++ b/composer.lock
@@ -51,16 +51,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.178.0",
+ "version": "3.178.6",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "214e3d98c54277cd8965f1cf307dce39631407bf"
+ "reference": "0aa83b522d5ffa794c02e7411af87a0e241a3082"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/214e3d98c54277cd8965f1cf307dce39631407bf",
- "reference": "214e3d98c54277cd8965f1cf307dce39631407bf",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0aa83b522d5ffa794c02e7411af87a0e241a3082",
+ "reference": "0aa83b522d5ffa794c02e7411af87a0e241a3082",
"shasum": ""
},
"require": {
@@ -135,9 +135,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.178.0"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.178.6"
},
- "time": "2021-04-08T18:13:16+00:00"
+ "time": "2021-04-19T18:13:17+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -1089,43 +1089,6 @@
},
"time": "2020-10-02T16:03:48+00:00"
},
- {
- "name": "dnoegel/php-xdg-base-dir",
- "version": "v0.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
- "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
- "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "XdgBaseDir\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "implementation of xdg base directory specification for php",
- "support": {
- "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
- "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
- },
- "time": "2019-12-04T15:06:13+00:00"
- },
{
"name": "doctrine/cache",
"version": "1.10.2",
@@ -1228,16 +1191,16 @@
},
{
"name": "doctrine/dbal",
- "version": "2.13.0",
+ "version": "2.13.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "67d56d3203b33db29834e6b2fcdbfdc50535d796"
+ "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/67d56d3203b33db29834e6b2fcdbfdc50535d796",
- "reference": "67d56d3203b33db29834e6b2fcdbfdc50535d796",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9",
+ "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9",
"shasum": ""
},
"require": {
@@ -1252,6 +1215,7 @@
"jetbrains/phpstorm-stubs": "2020.2",
"phpstan/phpstan": "0.12.81",
"phpunit/phpunit": "^7.5.20|^8.5|9.5.0",
+ "squizlabs/php_codesniffer": "3.6.0",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "4.6.4"
},
@@ -1314,7 +1278,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/2.13.0"
+ "source": "https://github.com/doctrine/dbal/tree/2.13.1"
},
"funding": [
{
@@ -1330,7 +1294,7 @@
"type": "tidelift"
}
],
- "time": "2021-03-28T18:10:53+00:00"
+ "time": "2021-04-17T17:30:19+00:00"
},
{
"name": "doctrine/deprecations",
@@ -2021,16 +1985,16 @@
},
{
"name": "google/apiclient-services",
- "version": "v0.167.0",
+ "version": "v0.170.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git",
- "reference": "46b71684a100f3d976e0321cf24f487b314add68"
+ "reference": "b45ddc3d82b2c8f328d869d55db88c1885d898ee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/46b71684a100f3d976e0321cf24f487b314add68",
- "reference": "46b71684a100f3d976e0321cf24f487b314add68",
+ "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/b45ddc3d82b2c8f328d869d55db88c1885d898ee",
+ "reference": "b45ddc3d82b2c8f328d869d55db88c1885d898ee",
"shasum": ""
},
"require": {
@@ -2056,9 +2020,9 @@
],
"support": {
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
- "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.167.0"
+ "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.170.0"
},
- "time": "2021-03-22T11:26:04+00:00"
+ "time": "2021-04-20T20:34:12+00:00"
},
{
"name": "google/auth",
@@ -2795,16 +2759,16 @@
},
{
"name": "laravel/framework",
- "version": "v8.36.2",
+ "version": "v8.38.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "0debd8ad6b5aa1f61ccc73910adf049af4ca0444"
+ "reference": "26a73532c54d2c090692bf2e3e64e449669053ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/0debd8ad6b5aa1f61ccc73910adf049af4ca0444",
- "reference": "0debd8ad6b5aa1f61ccc73910adf049af4ca0444",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/26a73532c54d2c090692bf2e3e64e449669053ba",
+ "reference": "26a73532c54d2c090692bf2e3e64e449669053ba",
"shasum": ""
},
"require": {
@@ -2959,7 +2923,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-04-07T12:37:22+00:00"
+ "time": "2021-04-20T13:50:21+00:00"
},
{
"name": "laravel/slack-notification-channel",
@@ -3320,16 +3284,16 @@
},
{
"name": "league/csv",
- "version": "9.7.0",
+ "version": "9.7.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/csv.git",
- "reference": "4cacd9c72c4aa8bdbef43315b2ca25c46a0f833f"
+ "reference": "0ec57e8264ec92565974ead0d1724cf1026e10c1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/csv/zipball/4cacd9c72c4aa8bdbef43315b2ca25c46a0f833f",
- "reference": "4cacd9c72c4aa8bdbef43315b2ca25c46a0f833f",
+ "url": "https://api.github.com/repos/thephpleague/csv/zipball/0ec57e8264ec92565974ead0d1724cf1026e10c1",
+ "reference": "0ec57e8264ec92565974ead0d1724cf1026e10c1",
"shasum": ""
},
"require": {
@@ -3400,7 +3364,7 @@
"type": "github"
}
],
- "time": "2021-03-26T22:08:10+00:00"
+ "time": "2021-04-17T16:32:08+00:00"
},
{
"name": "league/flysystem",
@@ -3858,16 +3822,16 @@
},
{
"name": "livewire/livewire",
- "version": "v2.4.2",
+ "version": "v2.4.3",
"source": {
"type": "git",
"url": "https://github.com/livewire/livewire.git",
- "reference": "2495387841a3eb03ac62b2c984ccd2574303285b"
+ "reference": "69575f50bb7f8a49a41f9bd6bd16c73a6ef4fda3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/livewire/livewire/zipball/2495387841a3eb03ac62b2c984ccd2574303285b",
- "reference": "2495387841a3eb03ac62b2c984ccd2574303285b",
+ "url": "https://api.github.com/repos/livewire/livewire/zipball/69575f50bb7f8a49a41f9bd6bd16c73a6ef4fda3",
+ "reference": "69575f50bb7f8a49a41f9bd6bd16c73a6ef4fda3",
"shasum": ""
},
"require": {
@@ -3918,7 +3882,7 @@
"description": "A front-end framework for Laravel.",
"support": {
"issues": "https://github.com/livewire/livewire/issues",
- "source": "https://github.com/livewire/livewire/tree/v2.4.2"
+ "source": "https://github.com/livewire/livewire/tree/v2.4.3"
},
"funding": [
{
@@ -3926,7 +3890,7 @@
"type": "github"
}
],
- "time": "2021-04-04T15:46:50+00:00"
+ "time": "2021-04-16T14:27:45+00:00"
},
{
"name": "maennchen/zipstream-php",
@@ -4756,16 +4720,16 @@
},
{
"name": "opis/closure",
- "version": "3.6.1",
+ "version": "3.6.2",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
- "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5"
+ "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
- "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5",
+ "url": "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6",
+ "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6",
"shasum": ""
},
"require": {
@@ -4815,9 +4779,9 @@
],
"support": {
"issues": "https://github.com/opis/closure/issues",
- "source": "https://github.com/opis/closure/tree/3.6.1"
+ "source": "https://github.com/opis/closure/tree/3.6.2"
},
- "time": "2020-11-07T02:01:34+00:00"
+ "time": "2021-04-09T13:42:10+00:00"
},
{
"name": "paragonie/constant_time_encoding",
@@ -5460,16 +5424,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "3.0.7",
+ "version": "3.0.8",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "d369510df0ebd5e1a5d0fe3d4d23c55fa87a403d"
+ "reference": "d9615a6fb970d9933866ca8b4036ec3407b020b6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d369510df0ebd5e1a5d0fe3d4d23c55fa87a403d",
- "reference": "d369510df0ebd5e1a5d0fe3d4d23c55fa87a403d",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d9615a6fb970d9933866ca8b4036ec3407b020b6",
+ "reference": "d9615a6fb970d9933866ca8b4036ec3407b020b6",
"shasum": ""
},
"require": {
@@ -5551,7 +5515,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
- "source": "https://github.com/phpseclib/phpseclib/tree/3.0.7"
+ "source": "https://github.com/phpseclib/phpseclib/tree/3.0.8"
},
"funding": [
{
@@ -5567,7 +5531,7 @@
"type": "tidelift"
}
],
- "time": "2021-04-06T14:00:11+00:00"
+ "time": "2021-04-19T03:20:48+00:00"
},
{
"name": "pragmarx/google2fa",
@@ -6097,20 +6061,19 @@
},
{
"name": "psy/psysh",
- "version": "v0.10.7",
+ "version": "v0.10.8",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "a395af46999a12006213c0c8346c9445eb31640c"
+ "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a395af46999a12006213c0c8346c9445eb31640c",
- "reference": "a395af46999a12006213c0c8346c9445eb31640c",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3",
+ "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3",
"shasum": ""
},
"require": {
- "dnoegel/php-xdg-base-dir": "0.1.*",
"ext-json": "*",
"ext-tokenizer": "*",
"nikic/php-parser": "~4.0|~3.0|~2.0|~1.3",
@@ -6167,9 +6130,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.10.7"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.10.8"
},
- "time": "2021-03-14T02:14:56+00:00"
+ "time": "2021-04-10T16:23:39+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -6920,16 +6883,16 @@
},
{
"name": "stripe/stripe-php",
- "version": "v7.76.0",
+ "version": "v7.77.0",
"source": {
"type": "git",
"url": "https://github.com/stripe/stripe-php.git",
- "reference": "47e66d4186712be33c593fe820dccf270a04d5d6"
+ "reference": "f6724447481f6fb8c2e714165e092adad9ca470a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/stripe/stripe-php/zipball/47e66d4186712be33c593fe820dccf270a04d5d6",
- "reference": "47e66d4186712be33c593fe820dccf270a04d5d6",
+ "url": "https://api.github.com/repos/stripe/stripe-php/zipball/f6724447481f6fb8c2e714165e092adad9ca470a",
+ "reference": "f6724447481f6fb8c2e714165e092adad9ca470a",
"shasum": ""
},
"require": {
@@ -6975,9 +6938,9 @@
],
"support": {
"issues": "https://github.com/stripe/stripe-php/issues",
- "source": "https://github.com/stripe/stripe-php/tree/v7.76.0"
+ "source": "https://github.com/stripe/stripe-php/tree/v7.77.0"
},
- "time": "2021-03-22T16:50:21+00:00"
+ "time": "2021-04-12T17:19:16+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -7218,16 +7181,16 @@
},
{
"name": "symfony/deprecation-contracts",
- "version": "v2.2.0",
+ "version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
+ "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
- "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
+ "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
"shasum": ""
},
"require": {
@@ -7236,7 +7199,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-main": "2.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -7265,7 +7228,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/master"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0"
},
"funding": [
{
@@ -7281,7 +7244,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-07T11:33:47+00:00"
+ "time": "2021-03-23T23:28:01+00:00"
},
{
"name": "symfony/error-handler",
@@ -7439,16 +7402,16 @@
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v2.2.0",
+ "version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2"
+ "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2",
- "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11",
+ "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11",
"shasum": ""
},
"require": {
@@ -7461,7 +7424,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-main": "2.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -7498,7 +7461,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0"
+ "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0"
},
"funding": [
{
@@ -7514,7 +7477,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-07T11:33:47+00:00"
+ "time": "2021-03-23T23:28:01+00:00"
},
{
"name": "symfony/filesystem",
@@ -7727,16 +7690,16 @@
},
{
"name": "symfony/http-client-contracts",
- "version": "v2.3.1",
+ "version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client-contracts.git",
- "reference": "41db680a15018f9c1d4b23516059633ce280ca33"
+ "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/41db680a15018f9c1d4b23516059633ce280ca33",
- "reference": "41db680a15018f9c1d4b23516059633ce280ca33",
+ "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4",
+ "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4",
"shasum": ""
},
"require": {
@@ -7747,9 +7710,8 @@
},
"type": "library",
"extra": {
- "branch-version": "2.3",
"branch-alias": {
- "dev-main": "2.3-dev"
+ "dev-main": "2.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -7786,7 +7748,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1"
+ "source": "https://github.com/symfony/http-client-contracts/tree/v2.4.0"
},
"funding": [
{
@@ -7802,7 +7764,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-14T17:08:19+00:00"
+ "time": "2021-04-11T23:07:08+00:00"
},
{
"name": "symfony/http-foundation",
@@ -9191,21 +9153,21 @@
},
{
"name": "symfony/service-contracts",
- "version": "v2.2.0",
+ "version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
+ "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
- "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+ "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
- "psr/container": "^1.0"
+ "psr/container": "^1.1"
},
"suggest": {
"symfony/service-implementation": ""
@@ -9213,7 +9175,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-main": "2.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -9250,7 +9212,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/master"
+ "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
},
"funding": [
{
@@ -9266,7 +9228,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-07T11:33:47+00:00"
+ "time": "2021-04-01T10:43:52+00:00"
},
{
"name": "symfony/string",
@@ -9446,16 +9408,16 @@
},
{
"name": "symfony/translation-contracts",
- "version": "v2.3.0",
+ "version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105"
+ "reference": "95c812666f3e91db75385749fe219c5e494c7f95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e2eaa60b558f26a4b0354e1bbb25636efaaad105",
- "reference": "e2eaa60b558f26a4b0354e1bbb25636efaaad105",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95",
+ "reference": "95c812666f3e91db75385749fe219c5e494c7f95",
"shasum": ""
},
"require": {
@@ -9467,7 +9429,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev"
+ "dev-main": "2.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -9504,7 +9466,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
+ "source": "https://github.com/symfony/translation-contracts/tree/v2.4.0"
},
"funding": [
{
@@ -9520,7 +9482,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-28T13:05:58+00:00"
+ "time": "2021-03-23T23:28:01+00:00"
},
{
"name": "symfony/var-dumper",
@@ -10723,6 +10685,43 @@
],
"time": "2020-12-08T13:29:20+00:00"
},
+ {
+ "name": "dnoegel/php-xdg-base-dir",
+ "version": "v0.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
+ "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+ "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "XdgBaseDir\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "implementation of xdg base directory specification for php",
+ "support": {
+ "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
+ "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
+ },
+ "time": "2019-12-04T15:06:13+00:00"
+ },
{
"name": "doctrine/annotations",
"version": "1.12.1",
@@ -10864,16 +10863,16 @@
},
{
"name": "facade/flare-client-php",
- "version": "1.6.1",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/facade/flare-client-php.git",
- "reference": "f2b0969f2d9594704be74dbeb25b201570a98098"
+ "reference": "6bf380035890cb0a09b9628c491ae3866b858522"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/flare-client-php/zipball/f2b0969f2d9594704be74dbeb25b201570a98098",
- "reference": "f2b0969f2d9594704be74dbeb25b201570a98098",
+ "url": "https://api.github.com/repos/facade/flare-client-php/zipball/6bf380035890cb0a09b9628c491ae3866b858522",
+ "reference": "6bf380035890cb0a09b9628c491ae3866b858522",
"shasum": ""
},
"require": {
@@ -10917,7 +10916,7 @@
],
"support": {
"issues": "https://github.com/facade/flare-client-php/issues",
- "source": "https://github.com/facade/flare-client-php/tree/1.6.1"
+ "source": "https://github.com/facade/flare-client-php/tree/1.7.0"
},
"funding": [
{
@@ -10925,20 +10924,20 @@
"type": "github"
}
],
- "time": "2021-04-08T08:50:01+00:00"
+ "time": "2021-04-12T09:30:36+00:00"
},
{
"name": "facade/ignition",
- "version": "2.8.2",
+ "version": "2.8.3",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "cb7f790e6306caeb4a9ffe21e59942b7128cc630"
+ "reference": "a8201d51aae83addceaef9344592a3b068b5d64d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/cb7f790e6306caeb4a9ffe21e59942b7128cc630",
- "reference": "cb7f790e6306caeb4a9ffe21e59942b7128cc630",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/a8201d51aae83addceaef9344592a3b068b5d64d",
+ "reference": "a8201d51aae83addceaef9344592a3b068b5d64d",
"shasum": ""
},
"require": {
@@ -11002,7 +11001,7 @@
"issues": "https://github.com/facade/ignition/issues",
"source": "https://github.com/facade/ignition"
},
- "time": "2021-04-08T10:42:53+00:00"
+ "time": "2021-04-09T20:45:59+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -11231,21 +11230,21 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.18.5",
+ "version": "v2.18.6",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "e0f6d05c8b157f50029ca6c65c19ed2694f475bf"
+ "reference": "5fed214993e7863cef88a08f214344891299b9e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/e0f6d05c8b157f50029ca6c65c19ed2694f475bf",
- "reference": "e0f6d05c8b157f50029ca6c65c19ed2694f475bf",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/5fed214993e7863cef88a08f214344891299b9e4",
+ "reference": "5fed214993e7863cef88a08f214344891299b9e4",
"shasum": ""
},
"require": {
"composer/semver": "^1.4 || ^2.0 || ^3.0",
- "composer/xdebug-handler": "^1.2",
+ "composer/xdebug-handler": "^1.2 || ^2.0",
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
@@ -11323,7 +11322,7 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
- "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.5"
+ "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.6"
},
"funding": [
{
@@ -11331,7 +11330,7 @@
"type": "github"
}
],
- "time": "2021-04-06T18:37:33+00:00"
+ "time": "2021-04-19T19:45:11+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -11632,16 +11631,16 @@
},
{
"name": "nunomaduro/collision",
- "version": "v5.3.0",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
- "reference": "aca63581f380f63a492b1e3114604e411e39133a"
+ "reference": "41b7e9999133d5082700d31a1d0977161df8322a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/collision/zipball/aca63581f380f63a492b1e3114604e411e39133a",
- "reference": "aca63581f380f63a492b1e3114604e411e39133a",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/41b7e9999133d5082700d31a1d0977161df8322a",
+ "reference": "41b7e9999133d5082700d31a1d0977161df8322a",
"shasum": ""
},
"require": {
@@ -11716,7 +11715,7 @@
"type": "patreon"
}
],
- "time": "2021-01-25T15:34:13+00:00"
+ "time": "2021-04-09T13:38:32+00:00"
},
{
"name": "openlss/lib-array2xml",
@@ -13549,16 +13548,16 @@
},
{
"name": "swagger-api/swagger-ui",
- "version": "v3.46.0",
+ "version": "v3.47.1",
"source": {
"type": "git",
"url": "https://github.com/swagger-api/swagger-ui.git",
- "reference": "cc408812fc927e265da158bf68239530740ab4cc"
+ "reference": "0f8548c0d443fa37f10a45948d5f2babf685c657"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/cc408812fc927e265da158bf68239530740ab4cc",
- "reference": "cc408812fc927e265da158bf68239530740ab4cc",
+ "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/0f8548c0d443fa37f10a45948d5f2babf685c657",
+ "reference": "0f8548c0d443fa37f10a45948d5f2babf685c657",
"shasum": ""
},
"type": "library",
@@ -13604,9 +13603,9 @@
],
"support": {
"issues": "https://github.com/swagger-api/swagger-ui/issues",
- "source": "https://github.com/swagger-api/swagger-ui/tree/v3.46.0"
+ "source": "https://github.com/swagger-api/swagger-ui/tree/v3.47.1"
},
- "time": "2021-03-31T18:50:40+00:00"
+ "time": "2021-04-15T21:56:21+00:00"
},
{
"name": "symfony/debug",
diff --git a/config/cache.php b/config/cache.php
index b054ca87d6..58ecd82e65 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -101,4 +101,4 @@ return [
'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
-];
+];
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 533fa49001..1e416435f3 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''),
- 'app_version' => '5.1.49',
- 'app_tag' => '5.1.49-release',
+ 'app_version' => '5.1.50',
+ 'app_tag' => '5.1.50-release',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),
diff --git a/config/queue.php b/config/queue.php
index 8f826c982b..35ff52ffca 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -86,4 +86,4 @@ return [
'table' => 'failed_jobs',
],
-];
+];
\ No newline at end of file
diff --git a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
index 302ecba4b8..b7f7de23ae 100644
--- a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
+++ b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
@@ -36,7 +36,7 @@ class IdNumberFieldsForMissingEntities extends Migration
Schema::table('vendors', function (Blueprint $table) {
$table->text('vendor_hash')->nullable();
$table->text('public_notes')->nullable();
- $table->unique(['company_id', 'number']);
+ // $table->unique(['company_id', 'number']);
});
Schema::table('vendor_contacts', function (Blueprint $table) {