Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9705 from turbo124/v5-develop

Browse Source 
v5.10.4
This commit is contained in:
David Bomba 2024-06-27 14:57:55 +10:00 committed by GitHub
commit e1af50d6eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 93 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.10.3 5.10.4

7
app/Console/Commands/PostUpdate.php
View File

@ -54,13 +54,6 @@ class PostUpdate extends Command
info('finished migrating'); info('finished migrating');
$output = [];
// exec('vendor/bin/composer install --no-dev -o', $output);
info(print_r($output, 1));
info('finished running composer install ');
try { try {
// Artisan::call('optimize'); // Artisan::call('optimize');
Artisan::call('config:clear'); Artisan::call('config:clear');

4
app/DataMapper/Analytics/AccountPlatform.php
View File

@ -54,8 +54,8 @@ class AccountPlatform extends GenericMixedMetric
public function __construct($string_metric5, $string_metric6, $string_metric7) public function __construct($string_metric5, $string_metric6, $string_metric7)
{ {
$this->string_metric5 = $string_metric5; $this->string_metric5 = mb_convert_encoding($string_metric5, 'UTF-8');
$this->string_metric6 = $string_metric6; $this->string_metric6 = mb_convert_encoding($string_metric6, 'UTF-8');
$this->string_metric7 = $string_metric7; $this->string_metric7 = $string_metric7;
} }
} }

4
app/DataMapper/Analytics/DbQuery.php
View File

@ -73,7 +73,7 @@ class DbQuery extends GenericMixedMetric
$this->string_metric6 = $string_metric6; $this->string_metric6 = $string_metric6;
$this->double_metric2 = $double_metric2; $this->double_metric2 = $double_metric2;
$this->string_metric7 = $string_metric7; $this->string_metric7 = $string_metric7;
$this->string_metric8 = $string_metric8; $this->string_metric8 = mb_convert_encoding($string_metric8, "UTF-8");
$this->string_metric9 = $string_metric9; $this->string_metric9 = mb_convert_encoding($string_metric9, "UTF-8");
} }
} }

12
app/Models/Company.php
View File

@ -112,12 +112,12 @@ use Laracasts\Presenter\PresentableTrait;
* @property int $notify_vendor_when_paid * @property int $notify_vendor_when_paid
* @property int $invoice_task_hours * @property int $invoice_task_hours
* @property int $deleted_at * @property int $deleted_at
* @property string $smtp_username * @property string|null $smtp_username
* @property string $smtp_password * @property string|null $smtp_password
* @property string $smtp_host * @property string|null $smtp_host
* @property string $smtp_port * @property string|null $smtp_port
* @property string $smtp_encryption * @property string|null $smtp_encryption
* @property string $smtp_local_domain * @property string|null $smtp_local_domain
* @property boolean $smtp_verify_peer * @property boolean $smtp_verify_peer
* @property-read \App\Models\Account $account * @property-read \App\Models\Account $account
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities

10
app/PaymentDrivers/BTCPayPaymentDriver.php
View File

@ -131,9 +131,11 @@ class BTCPayPaymentDriver extends BaseDriver
$this->payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$btcpayRep->metadata->InvoiceNinjaPaymentHash])->firstOrFail(); $this->payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$btcpayRep->metadata->InvoiceNinjaPaymentHash])->firstOrFail();
$StatusId = Payment::STATUS_PENDING; $StatusId = Payment::STATUS_PENDING;
if ($this->payment_hash->payment_id == null) { if ($this->payment_hash->payment_id == null) {
//$_invoice = collect($this->payment_hash->data->invoices)->first();
$_invoice = Invoice::query()->where('number', $btcpayRep->metadata->orderId)->first(); $_invoice = Invoice::with('client')->withTrashed()->find($this->payment_hash->fee_invoice_id);
$this->client = Client::find($_invoice->client_id);
$this->client = $_invoice->client;
$dataPayment = [ $dataPayment = [
'payment_method' => $this->payment_method, 'payment_method' => $this->payment_method,
'payment_type' => PaymentType::CRYPTO, 'payment_type' => PaymentType::CRYPTO,
@ -144,7 +146,7 @@ class BTCPayPaymentDriver extends BaseDriver
$payment = $this->createPayment($dataPayment, $StatusId); $payment = $this->createPayment($dataPayment, $StatusId);
} else { } else {
/** @var \App\Models\Payment $payment */ /** @var \App\Models\Payment $payment */
$payment = Payment::find($this->payment_hash->payment_id); $payment = Payment::withTrashed()->find($this->payment_hash->payment_id);
$StatusId = $payment->status_id; $StatusId = $payment->status_id;
} }
switch ($btcpayRep->type) { switch ($btcpayRep->type) {

15
app/Services/Client/PaymentMethod.php
View File

@ -180,6 +180,21 @@ class PaymentMethod
} }
} }
if (($this->client->getSetting('use_credits_payment') == 'option' || $this->client->getSetting('use_credits_payment') == 'always') && $this->client->service()->getCreditBalance() > 0) {
// Show credits as only payment option if both statements are true.
if (
$this->client->service()->getCreditBalance() > $this->amount
&& $this->client->getSetting('use_credits_payment') == 'always') {
$payment_urls = [];
}
$this->payment_urls[] = [
'label' => ctrans('texts.apply_credit'),
'company_gateway_id' => CompanyGateway::GATEWAY_CREDIT,
'gateway_type_id' => GatewayType::CREDIT,
];
}
return $this; return $this;
} }

3
app/Services/Payment/UpdateInvoicePayment.php
View File

@ -127,8 +127,6 @@ class UpdateInvoicePayment
return; return;
} }
if (strlen($invoice->number) > 1 && str_starts_with($invoice->number, "####")) { if (strlen($invoice->number) > 1 && str_starts_with($invoice->number, "####")) {
$invoice->number = ''; $invoice->number = '';
} }
@ -140,7 +138,6 @@ class UpdateInvoicePayment
->save(); ->save();
} }
/* Updates the company ledger */ /* Updates the company ledger */
$this->payment $this->payment
->ledger() ->ledger()

2
app/Services/Subscription/SubscriptionService.php
View File

@ -1118,7 +1118,7 @@ class SubscriptionService
*/ */
public function triggerWebhook($context) public function triggerWebhook($context)
{ {
if (empty($this->subscription->webhook_configuration['post_purchase_url']) || is_null($this->subscription->webhook_configuration['post_purchase_url']) || strlen($this->subscription->webhook_configuration['post_purchase_url']) < 1) { if (empty($this->subscription->webhook_configuration['post_purchase_url']) || is_null($this->subscription->webhook_configuration['post_purchase_url']) || strlen($this->subscription->webhook_configuration['post_purchase_url']) < 1) { //@phpstan-ignore-line
return ["message" => "Success", "status_code" => 200]; return ["message" => "Success", "status_code" => 200];
} }

2
app/Services/Subscription/SubscriptionStatus.php
View File

@ -174,7 +174,7 @@ class SubscriptionStatus extends AbstractService
*/ */
private function checkRefundable(): self private function checkRefundable(): self
{ {
if(!$this->recurring_invoice->subscription->refund_period || (int)$this->recurring_invoice->subscription->refund_period == 0) { if(!$this->recurring_invoice->subscription->refund_period || (int)$this->recurring_invoice->subscription->refund_period == 0) {//@phpstan-ignore-line
return $this->setRefundable(false); return $this->setRefundable(false);
} }

10
app/Services/Template/TemplateService.php
View File

@ -436,11 +436,11 @@ class TemplateService
} }
match ($key) { match ($key) {
'variables' => $processed = $value->first() ?? [], 'variables' => $processed = $value->first() ?? [], //@phpstan-ignore-line
'invoices' => $processed = (new HtmlEngine($value->first()->invitations()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [], 'invoices' => $processed = (new HtmlEngine($value->first()->invitations()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [],
'quotes' => $processed = (new HtmlEngine($value->first()->invitations()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [], 'quotes' => $processed = (new HtmlEngine($value->first()->invitations()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [],
'credits' => $processed = (new HtmlEngine($value->first()->invitations()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [], 'credits' => $processed = (new HtmlEngine($value->first()->invitations()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [],
'payments' => $processed = (new PaymentHtmlEngine($value->first(), $value->first()->client->contacts()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [], 'payments' => $processed = (new PaymentHtmlEngine($value->first(), $value->first()->client->contacts()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [], //@phpstan-ignore-line
'tasks' => $processed = [], 'tasks' => $processed = [],
'projects' => $processed = [], 'projects' => $processed = [],
'purchase_orders' => (new VendorHtmlEngine($value->first()->invitations()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [], 'purchase_orders' => (new VendorHtmlEngine($value->first()->invitations()->first()))->setSettings($this->getSettings())->generateLabelsAndValues() ?? [],
@ -533,7 +533,7 @@ class TemplateService
'tax_rate3' => (float) $invoice->tax_rate3, 'tax_rate3' => (float) $invoice->tax_rate3,
'total_taxes' => Number::formatMoney($invoice->total_taxes, $invoice->client), 'total_taxes' => Number::formatMoney($invoice->total_taxes, $invoice->client),
'total_taxes_raw' => $invoice->total_taxes, 'total_taxes_raw' => $invoice->total_taxes,
'is_amount_discount' => (bool) $invoice->is_amount_discount ?? false, 'is_amount_discount' => (bool) $invoice->is_amount_discount ?? false,//@phpstan-ignore-line
'footer' => $invoice->footer ?? '', 'footer' => $invoice->footer ?? '',
'partial' => $invoice->partial ?? 0, 'partial' => $invoice->partial ?? 0,
'partial_due_date' => $this->translateDate($invoice->partial_due_date, $invoice->client->date_format(), $invoice->client->locale()), 'partial_due_date' => $this->translateDate($invoice->partial_due_date, $invoice->client->date_format(), $invoice->client->locale()),
@ -864,7 +864,7 @@ class TemplateService
'tax_rate3' => (float) $credit->tax_rate3, 'tax_rate3' => (float) $credit->tax_rate3,
'total_taxes' => Number::formatMoney($credit->total_taxes, $credit->client), 'total_taxes' => Number::formatMoney($credit->total_taxes, $credit->client),
'total_taxes_raw' => $credit->total_taxes, 'total_taxes_raw' => $credit->total_taxes,
'is_amount_discount' => (bool) $credit->is_amount_discount ?? false, 'is_amount_discount' => (bool) $credit->is_amount_discount ?? false, //@phpstan-ignore-line
'footer' => $credit->footer ?? '', 'footer' => $credit->footer ?? '',
'partial' => $credit->partial ?? 0, 'partial' => $credit->partial ?? 0,
'partial_due_date' => $this->translateDate($credit->partial_due_date, $credit->client->date_format(), $credit->client->locale()), 'partial_due_date' => $this->translateDate($credit->partial_due_date, $credit->client->date_format(), $credit->client->locale()),
@ -1014,7 +1014,7 @@ class TemplateService
'custom_value4' => (string) $project->custom_value4 ?: '', 'custom_value4' => (string) $project->custom_value4 ?: '',
'color' => (string) $project->color ?: '', 'color' => (string) $project->color ?: '',
'current_hours' => (int) $project->current_hours ?: 0, 'current_hours' => (int) $project->current_hours ?: 0,
'tasks' => ($project->tasks && !$nested) ? $this->processTasks($project->tasks, true) : [], 'tasks' => ($project->tasks && !$nested) ? $this->processTasks($project->tasks, true) : [], //@phpstan-ignore-line
'client' => $project->client ? [ 'client' => $project->client ? [
'name' => $project->client->present()->name(), 'name' => $project->client->present()->name(),
'balance' => $project->client->balance, 'balance' => $project->client->balance,

2
app/Transformers/ProductTransformer.php
View File

@ -74,7 +74,7 @@ class ProductTransformer extends EntityTransformer
'notes' => $product->notes ?: '', 'notes' => $product->notes ?: '',
'cost' => (float) $product->cost ?: 0, 'cost' => (float) $product->cost ?: 0,
'price' => (float) $product->price ?: 0, 'price' => (float) $product->price ?: 0,
'quantity' => is_numeric($product->quantity) ? (float) $product->quantity : (float) 1.0, 'quantity' => is_numeric($product->quantity) ? (float) $product->quantity : (float) 1.0, //@phpstan-ignore-line
'tax_name1' => $product->tax_name1 ?: '', 'tax_name1' => $product->tax_name1 ?: '',
'tax_rate1' => (float) $product->tax_rate1 ?: 0, 'tax_rate1' => (float) $product->tax_rate1 ?: 0,
'tax_name2' => $product->tax_name2 ?: '', 'tax_name2' => $product->tax_name2 ?: '',

2
app/Transformers/PurchaseOrderTransformer.php
View File

@ -78,7 +78,7 @@ class PurchaseOrderTransformer extends EntityTransformer
{ {
$transformer = new VendorTransformer($this->serializer); $transformer = new VendorTransformer($this->serializer);
if (!$purchase_order->vendor) { if (!$purchase_order->vendor) {//@phpstan-ignore-line
return null; return null;
} }

2
app/Transformers/TaskTransformer.php
View File

@ -67,7 +67,7 @@ class TaskTransformer extends EntityTransformer
{ {
$transformer = new UserTransformer($this->serializer); $transformer = new UserTransformer($this->serializer);
if (!$task->user) { if (!$task->user) { //@phpstan-ignore-line
return null; return null;
} }

2
composer.json
View File

@ -100,7 +100,7 @@
"symfony/http-client": "^6.0", "symfony/http-client": "^6.0",
"symfony/mailgun-mailer": "^6.1", "symfony/mailgun-mailer": "^6.1",
"symfony/postmark-mailer": "^6.1", "symfony/postmark-mailer": "^6.1",
"turbo124/beacon": "^2.0", "turbo124/beacon": "^2",
"twig/intl-extra": "^3.7", "twig/intl-extra": "^3.7",
"twig/twig": "^3", "twig/twig": "^3",
"twilio/sdk": "^6.40", "twilio/sdk": "^6.40",

96
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "628af85e7b23ea07b68733208d210c92", "content-hash": "7c67ca71986b97fc72bba5eba530e878",
"packages": [ "packages": [
{ {
"name": "adrienrn/php-mimetyper", "name": "adrienrn/php-mimetyper",
@ -481,16 +481,16 @@
}, },
{ {
"name": "aws/aws-crt-php", "name": "aws/aws-crt-php",
"version": "v1.2.5", "version": "v1.2.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/awslabs/aws-crt-php.git", "url": "https://github.com/awslabs/aws-crt-php.git",
"reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b" "reference": "a63485b65b6b3367039306496d49737cf1995408"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/0ea1f04ec5aa9f049f97e012d1ed63b76834a31b", "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/a63485b65b6b3367039306496d49737cf1995408",
"reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b", "reference": "a63485b65b6b3367039306496d49737cf1995408",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -529,22 +529,22 @@
], ],
"support": { "support": {
"issues": "https://github.com/awslabs/aws-crt-php/issues", "issues": "https://github.com/awslabs/aws-crt-php/issues",
"source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.5" "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.6"
}, },
"time": "2024-04-19T21:30:56+00:00" "time": "2024-06-13T17:21:28+00:00"
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.314.6", "version": "3.315.0",
"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": "d04da330b0201edab71edd33a03b8d5ad6e4a313" "reference": "a7f6026f00771025c32548dac321541face0dedc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d04da330b0201edab71edd33a03b8d5ad6e4a313", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a7f6026f00771025c32548dac321541face0dedc",
"reference": "d04da330b0201edab71edd33a03b8d5ad6e4a313", "reference": "a7f6026f00771025c32548dac321541face0dedc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -624,9 +624,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.314.6" "source": "https://github.com/aws/aws-sdk-php/tree/3.315.0"
}, },
"time": "2024-06-20T18:09:51+00:00" "time": "2024-06-26T18:08:22+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -2581,16 +2581,16 @@
}, },
{ {
"name": "google/apiclient-services", "name": "google/apiclient-services",
"version": "v0.360.0", "version": "v0.361.0",
"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": "e48813050e660c7dcbe48cb6556461efe6381a54" "reference": "f90e9a059ce5a6076b4fc8571a4fac6564012782"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/e48813050e660c7dcbe48cb6556461efe6381a54", "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/f90e9a059ce5a6076b4fc8571a4fac6564012782",
"reference": "e48813050e660c7dcbe48cb6556461efe6381a54", "reference": "f90e9a059ce5a6076b4fc8571a4fac6564012782",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2619,9 +2619,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.360.0" "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.361.0"
}, },
"time": "2024-06-17T01:06:20+00:00" "time": "2024-06-23T01:02:19+00:00"
}, },
{ {
"name": "google/auth", "name": "google/auth",
@ -4609,16 +4609,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v11.11.1", "version": "v11.12.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "c9b52e84bd18f155e5ba59b948c7da3e7f37e87f" "reference": "9a6d9cea83cfa6b9e8eda05c89741d0411d8ebe8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/c9b52e84bd18f155e5ba59b948c7da3e7f37e87f", "url": "https://api.github.com/repos/laravel/framework/zipball/9a6d9cea83cfa6b9e8eda05c89741d0411d8ebe8",
"reference": "c9b52e84bd18f155e5ba59b948c7da3e7f37e87f", "reference": "9a6d9cea83cfa6b9e8eda05c89741d0411d8ebe8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4810,7 +4810,7 @@
"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": "2024-06-20T10:54:53+00:00" "time": "2024-06-25T19:33:56+00:00"
}, },
{ {
"name": "laravel/pint", "name": "laravel/pint",
@ -6513,16 +6513,16 @@
}, },
{ {
"name": "mollie/mollie-api-php", "name": "mollie/mollie-api-php",
"version": "v2.68.0", "version": "v2.69.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mollie/mollie-api-php.git", "url": "https://github.com/mollie/mollie-api-php.git",
"reference": "a3c383a76b20e3efaa39377c22e570396714830d" "reference": "9a53f8bd6c89ae3e62982921a2f9d8ed68f9900d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/a3c383a76b20e3efaa39377c22e570396714830d", "url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/9a53f8bd6c89ae3e62982921a2f9d8ed68f9900d",
"reference": "a3c383a76b20e3efaa39377c22e570396714830d", "reference": "9a53f8bd6c89ae3e62982921a2f9d8ed68f9900d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6599,9 +6599,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/mollie/mollie-api-php/issues", "issues": "https://github.com/mollie/mollie-api-php/issues",
"source": "https://github.com/mollie/mollie-api-php/tree/v2.68.0" "source": "https://github.com/mollie/mollie-api-php/tree/v2.69.0"
}, },
"time": "2024-06-10T09:50:59+00:00" "time": "2024-06-24T11:52:46+00:00"
}, },
{ {
"name": "moneyphp/money", "name": "moneyphp/money",
@ -9022,16 +9022,16 @@
}, },
{ {
"name": "phpseclib/phpseclib", "name": "phpseclib/phpseclib",
"version": "3.0.38", "version": "3.0.39",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpseclib/phpseclib.git", "url": "https://github.com/phpseclib/phpseclib.git",
"reference": "b18b8788e51156c4dd97b7f220a31149a0052067" "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b18b8788e51156c4dd97b7f220a31149a0052067", "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211ebc399c6e73c225a018435fe5ae209d1d1485",
"reference": "b18b8788e51156c4dd97b7f220a31149a0052067", "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9112,7 +9112,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpseclib/phpseclib/issues", "issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.38" "source": "https://github.com/phpseclib/phpseclib/tree/3.0.39"
}, },
"funding": [ "funding": [
{ {
@ -9128,7 +9128,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-06-17T10:11:32+00:00" "time": "2024-06-24T06:27:33+00:00"
}, },
{ {
"name": "phpstan/phpdoc-parser", "name": "phpstan/phpdoc-parser",
@ -14820,16 +14820,16 @@
}, },
{ {
"name": "turbo124/beacon", "name": "turbo124/beacon",
"version": "v2.0.0", "version": "v2.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/turbo124/beacon.git", "url": "https://github.com/turbo124/beacon.git",
"reference": "6397c3fa575e9b670718b6f31f04bdf20aa83a72" "reference": "95f3de3bdcbb786329cd7050f319520588920466"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/turbo124/beacon/zipball/6397c3fa575e9b670718b6f31f04bdf20aa83a72", "url": "https://api.github.com/repos/turbo124/beacon/zipball/95f3de3bdcbb786329cd7050f319520588920466",
"reference": "6397c3fa575e9b670718b6f31f04bdf20aa83a72", "reference": "95f3de3bdcbb786329cd7050f319520588920466",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -14876,9 +14876,9 @@
"turbo124" "turbo124"
], ],
"support": { "support": {
"source": "https://github.com/turbo124/beacon/tree/v2.0.0" "source": "https://github.com/turbo124/beacon/tree/v2.0.2"
}, },
"time": "2024-05-31T23:01:02+00:00" "time": "2024-06-27T01:23:05+00:00"
}, },
{ {
"name": "twig/intl-extra", "name": "twig/intl-extra",
@ -19006,16 +19006,16 @@
}, },
{ {
"name": "spatie/error-solutions", "name": "spatie/error-solutions",
"version": "1.0.1", "version": "1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/spatie/error-solutions.git", "url": "https://github.com/spatie/error-solutions.git",
"reference": "d60d4d2ef4b7701c86134ded959667cac6215233" "reference": "9782ba6e25cb026cc653619e01ca695d428b3f03"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/spatie/error-solutions/zipball/d60d4d2ef4b7701c86134ded959667cac6215233", "url": "https://api.github.com/repos/spatie/error-solutions/zipball/9782ba6e25cb026cc653619e01ca695d428b3f03",
"reference": "d60d4d2ef4b7701c86134ded959667cac6215233", "reference": "9782ba6e25cb026cc653619e01ca695d428b3f03",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -19068,7 +19068,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/spatie/error-solutions/issues", "issues": "https://github.com/spatie/error-solutions/issues",
"source": "https://github.com/spatie/error-solutions/tree/1.0.1" "source": "https://github.com/spatie/error-solutions/tree/1.0.2"
}, },
"funding": [ "funding": [
{ {
@ -19076,7 +19076,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-06-21T10:09:00+00:00" "time": "2024-06-26T13:09:17+00:00"
}, },
{ {
"name": "spatie/flare-client-php", "name": "spatie/flare-client-php",

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.10.3'), 'app_version' => env('APP_VERSION', '5.10.4'),
'app_tag' => env('APP_TAG', '5.10.3'), 'app_tag' => env('APP_TAG', '5.10.4'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),