Merge pull request #10788 from turbo124/v5-develop

v5.11.60
This commit is contained in:
David Bomba 2025-03-19 10:04:34 +11:00 committed by GitHub
commit 5375b590c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 231 additions and 213 deletions

View File

@ -1 +1 @@
5.11.59
5.11.60

View File

@ -182,6 +182,19 @@ class ClientFilters extends QueryFilters
return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
}
if ($sort_col[0] == 'name') {
return $this->builder
->select('clients.*')
->selectSub(function($query) {
$query->from('client_contacts')
->whereColumn('client_contacts.client_id', 'clients.id')
->whereNull('client_contacts.deleted_at')
->select(\DB::raw('COALESCE(NULLIF(first_name, ""), email) as contact_info'))
->limit(1);
}, 'first_contact_name')
->orderByRaw("COALESCE(NULLIF(clients.name, ''), first_contact_name) " . $dir);
}
return $this->builder->orderBy($sort_col[0], $dir);
}

View File

@ -40,8 +40,6 @@ class ValidInvoiceScheme implements ValidationRule, ValidatorAwareRule
$r = new EInvoice();
$errors = $r->validateRequest($value['Invoice'], InvoiceLevel::class);
nlog($errors);
foreach ($errors as $key => $msg) {
@ -51,10 +49,53 @@ class ValidInvoiceScheme implements ValidationRule, ValidatorAwareRule
);
}
if(isset($value['Invoice']['InvoicePeriod'][0]['Description'])){
$parts = explode('|', $value['Invoice']['InvoicePeriod'][0]['Description']);
$parts_count = count($parts);
if($parts_count == 2)
{
if(!$this->isValidDateSyntax($parts[0])){
$this->validator->errors()->add(
"e_invoice.InvoicePeriod.Description.0.StartDate",
ctrans('texts.invalid_date_create_syntax')
);
}
elseif (!$this->isValidDateSyntax($parts[1])){
$this->validator->errors()->add(
"e_invoice.InvoicePeriod.Description.0.EndDate",
ctrans('texts.invalid_date_create_syntax')
);
}
}
elseif($parts_count == 1 && strlen($value['Invoice']['InvoicePeriod'][0]['Description']) > 2)
{
$this->validator->errors()->add(
"e_invoice.InvoicePeriod.Description.0.StartDate",
ctrans('texts.start_and_end_date_required')
);
}
}
}
}
private function isValidDateSyntax(string $date_string): bool
{
try {
$date = date_create($date_string);
return $date !== false && $date instanceof \DateTime;
} catch (\Exception $e) {
return false;
}
}
/**
* Set the current validator.
*/

View File

@ -18,6 +18,7 @@ class Markdown
{
$converter = new \League\CommonMark\CommonMarkConverter([
'allow_unsafe_links' => false,
// 'html_input' => 'allow',
]);
return $converter->convert($markdown);

View File

@ -59,6 +59,12 @@ class PdfBuilder
$this->commonmark = new CommonMarkConverter([
'allow_unsafe_links' => false,
'renderer' => [
'block_separator' => "\n",
'inner_separator' => "\n",
'soft_break' => "\n",
],
'html_input' => 'escape',
]);
}
@ -1930,7 +1936,7 @@ class PdfBuilder
{
foreach ($items as $key => $item) {
foreach ($item as $variable => $value) {
$item[$variable] = str_replace("\n", '<br>', $value);
$item[$variable] = str_replace("\n", '<br/>', $value);
}
$items[$key] = $item;
@ -2096,10 +2102,10 @@ class PdfBuilder
if ($this->service->company->markdown_enabled && $this->isMarkdown($child['content'])) {
// $child['content'] = str_ireplace(['<br>', '<br/>', '<br />'], "\r", $child['content']); //13-05-2025 - testing whether /r or <br/> can work
$child['content'] = str_ireplace(['<br>', '<br/>', '<br />'], "<br/>", $child['content']); //13-05-2025 - testing whether /r or <br/> can work
$child['content'] = str_ireplace(['<br>', '<br/>', '<br />'], "\r\n", $child['content']); //19-05-2025 - pivotting back to this, and allowing html_input for commonmark.
$child['content'] = $this->commonmark->convert($child['content']); //@phpstan-ignore-line
$child['content'] = nl2br($child['content']); //19-05-2025 - This allows us to use <br> and markdown and still get our spacing.
}
$contains_html = str_contains($child['content'], '<') && str_contains($child['content'], '>');

View File

@ -72,7 +72,7 @@ class QuickbooksService
$this->sdk = DataService::Configure($merged);
$this->sdk->enableLog();
$this->sdk->setMinorVersion("73");
$this->sdk->setMinorVersion("75");
$this->sdk->throwExceptionOnError(true);
$this->checkToken();

359
composer.lock generated
View File

@ -4010,27 +4010,30 @@
},
{
"name": "horstoeko/stringmanagement",
"version": "v1.0.11",
"version": "v1.0.12",
"source": {
"type": "git",
"url": "https://github.com/horstoeko/stringmanagement.git",
"reference": "57f0c2bae4cba941902a02d8166d1f03fb52d08a"
"reference": "d304a094e34c39d35f275bccf4944176dd8f1722"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/horstoeko/stringmanagement/zipball/57f0c2bae4cba941902a02d8166d1f03fb52d08a",
"reference": "57f0c2bae4cba941902a02d8166d1f03fb52d08a",
"url": "https://api.github.com/repos/horstoeko/stringmanagement/zipball/d304a094e34c39d35f275bccf4944176dd8f1722",
"reference": "d304a094e34c39d35f275bccf4944176dd8f1722",
"shasum": ""
},
"require": {
"php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3"
"php": ">=7.3"
},
"require-dev": {
"nette/php-generator": "*",
"pdepend/pdepend": "^2",
"phpdocumentor/reflection-docblock": "^5",
"phploc/phploc": "^7",
"phpmd/phpmd": "^2",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan": "^1|^2",
"phpunit/phpunit": "^9",
"rector/rector": "*",
"sebastian/phpcpd": "^6",
"squizlabs/php_codesniffer": "^3"
},
@ -4058,22 +4061,22 @@
],
"support": {
"issues": "https://github.com/horstoeko/stringmanagement/issues",
"source": "https://github.com/horstoeko/stringmanagement/tree/v1.0.11"
"source": "https://github.com/horstoeko/stringmanagement/tree/v1.0.12"
},
"time": "2023-02-12T14:16:40+00:00"
"time": "2025-03-15T09:04:46+00:00"
},
{
"name": "horstoeko/zugferd",
"version": "v1.0.106",
"version": "v1.0.110",
"source": {
"type": "git",
"url": "https://github.com/horstoeko/zugferd.git",
"reference": "e575f67aaf08f670e435ba01d188b6faa62655a0"
"reference": "7323d947b6d6b4b4df466733228c812e9cb88c99"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/horstoeko/zugferd/zipball/e575f67aaf08f670e435ba01d188b6faa62655a0",
"reference": "e575f67aaf08f670e435ba01d188b6faa62655a0",
"url": "https://api.github.com/repos/horstoeko/zugferd/zipball/7323d947b6d6b4b4df466733228c812e9cb88c99",
"reference": "7323d947b6d6b4b4df466733228c812e9cb88c99",
"shasum": ""
},
"require": {
@ -4132,9 +4135,9 @@
],
"support": {
"issues": "https://github.com/horstoeko/zugferd/issues",
"source": "https://github.com/horstoeko/zugferd/tree/v1.0.106"
"source": "https://github.com/horstoeko/zugferd/tree/v1.0.110"
},
"time": "2025-02-03T13:26:12+00:00"
"time": "2025-03-13T01:48:45+00:00"
},
{
"name": "horstoeko/zugferdvisualizer",
@ -5158,16 +5161,16 @@
},
{
"name": "laravel/framework",
"version": "v11.44.1",
"version": "v11.44.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d"
"reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/0883d4175f4e2b5c299e7087ad3c74f2ce195c6d",
"reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d",
"url": "https://api.github.com/repos/laravel/framework/zipball/f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
"reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
"shasum": ""
},
"require": {
@ -5369,20 +5372,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-03-05T15:34:10+00:00"
"time": "2025-03-12T14:34:30+00:00"
},
{
"name": "laravel/octane",
"version": "v2.8.1",
"version": "v2.8.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/octane.git",
"reference": "951023e3c0ee8934d9f8338fd6495a0a969eefc4"
"reference": "74fef270e9f7d2dfbfd8f272de81aac839942c29"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/octane/zipball/951023e3c0ee8934d9f8338fd6495a0a969eefc4",
"reference": "951023e3c0ee8934d9f8338fd6495a0a969eefc4",
"url": "https://api.github.com/repos/laravel/octane/zipball/74fef270e9f7d2dfbfd8f272de81aac839942c29",
"reference": "74fef270e9f7d2dfbfd8f272de81aac839942c29",
"shasum": ""
},
"require": {
@ -5409,7 +5412,7 @@
"mockery/mockery": "^1.5.1",
"nunomaduro/collision": "^6.4.0|^7.5.2|^8.0",
"orchestra/testbench": "^8.21|^9.0|^10.0",
"phpstan/phpstan": "^1.10.15",
"phpstan/phpstan": "^2.1.7",
"phpunit/phpunit": "^10.4|^11.5",
"spiral/roadrunner-cli": "^2.6.0",
"spiral/roadrunner-http": "^3.3.0"
@ -5459,7 +5462,7 @@
"issues": "https://github.com/laravel/octane/issues",
"source": "https://github.com/laravel/octane"
},
"time": "2025-02-19T20:28:29+00:00"
"time": "2025-03-12T14:26:35+00:00"
},
{
"name": "laravel/prompts",
@ -5522,16 +5525,16 @@
},
{
"name": "laravel/scout",
"version": "v10.13.1",
"version": "v10.14.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/scout.git",
"reference": "577535cd93474e4c915e7469cbfa597c41aef8e2"
"reference": "840d18e3d68b17c59663fc687497c49c0ff0d295"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/scout/zipball/577535cd93474e4c915e7469cbfa597c41aef8e2",
"reference": "577535cd93474e4c915e7469cbfa597c41aef8e2",
"url": "https://api.github.com/repos/laravel/scout/zipball/840d18e3d68b17c59663fc687497c49c0ff0d295",
"reference": "840d18e3d68b17c59663fc687497c49c0ff0d295",
"shasum": ""
},
"require": {
@ -5599,7 +5602,7 @@
"issues": "https://github.com/laravel/scout/issues",
"source": "https://github.com/laravel/scout"
},
"time": "2025-02-18T18:39:33+00:00"
"time": "2025-03-18T14:00:31+00:00"
},
{
"name": "laravel/serializable-closure",
@ -6910,16 +6913,16 @@
},
{
"name": "livewire/livewire",
"version": "v3.6.1",
"version": "v3.6.2",
"source": {
"type": "git",
"url": "https://github.com/livewire/livewire.git",
"reference": "0df0a762698176d714e42e2dfed92b6b9e24b8e4"
"reference": "8f8914731f5eb43b6bb145d87c8d5a9edfc89313"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/livewire/livewire/zipball/0df0a762698176d714e42e2dfed92b6b9e24b8e4",
"reference": "0df0a762698176d714e42e2dfed92b6b9e24b8e4",
"url": "https://api.github.com/repos/livewire/livewire/zipball/8f8914731f5eb43b6bb145d87c8d5a9edfc89313",
"reference": "8f8914731f5eb43b6bb145d87c8d5a9edfc89313",
"shasum": ""
},
"require": {
@ -6974,7 +6977,7 @@
"description": "A front-end framework for Laravel.",
"support": {
"issues": "https://github.com/livewire/livewire/issues",
"source": "https://github.com/livewire/livewire/tree/v3.6.1"
"source": "https://github.com/livewire/livewire/tree/v3.6.2"
},
"funding": [
{
@ -6982,7 +6985,7 @@
"type": "github"
}
],
"time": "2025-03-04T21:48:52+00:00"
"time": "2025-03-12T20:24:15+00:00"
},
{
"name": "maennchen/zipstream-php",
@ -7405,16 +7408,16 @@
},
{
"name": "mollie/mollie-api-php",
"version": "v2.78.0",
"version": "v2.79.0",
"source": {
"type": "git",
"url": "https://github.com/mollie/mollie-api-php.git",
"reference": "2a8dcd26d45e3486a8240f2d8473b7ddd8fe8103"
"reference": "ad078c1b07da16c6571b16401a286143a5da188c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/2a8dcd26d45e3486a8240f2d8473b7ddd8fe8103",
"reference": "2a8dcd26d45e3486a8240f2d8473b7ddd8fe8103",
"url": "https://api.github.com/repos/mollie/mollie-api-php/zipball/ad078c1b07da16c6571b16401a286143a5da188c",
"reference": "ad078c1b07da16c6571b16401a286143a5da188c",
"shasum": ""
},
"require": {
@ -7491,9 +7494,9 @@
],
"support": {
"issues": "https://github.com/mollie/mollie-api-php/issues",
"source": "https://github.com/mollie/mollie-api-php/tree/v2.78.0"
"source": "https://github.com/mollie/mollie-api-php/tree/v2.79.0"
},
"time": "2025-02-13T12:27:56+00:00"
"time": "2025-03-11T09:51:00+00:00"
},
{
"name": "monolog/monolog",
@ -10454,16 +10457,16 @@
},
{
"name": "psy/psysh",
"version": "v0.12.7",
"version": "v0.12.8",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
"reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
"reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625",
"reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625",
"shasum": ""
},
"require": {
@ -10527,9 +10530,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
"source": "https://github.com/bobthecow/psysh/tree/v0.12.8"
},
"time": "2024-12-10T01:58:33+00:00"
"time": "2025-03-16T03:05:19+00:00"
},
{
"name": "pusher/pusher-php-server",
@ -17757,16 +17760,16 @@
},
{
"name": "filp/whoops",
"version": "2.17.0",
"version": "2.18.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "075bc0c26631110584175de6523ab3f1652eb28e"
"reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e",
"reference": "075bc0c26631110584175de6523ab3f1652eb28e",
"url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
"reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
"shasum": ""
},
"require": {
@ -17816,7 +17819,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.17.0"
"source": "https://github.com/filp/whoops/tree/2.18.0"
},
"funding": [
{
@ -17824,20 +17827,20 @@
"type": "github"
}
],
"time": "2025-01-25T12:00:00+00:00"
"time": "2025-03-15T12:00:00+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.71.0",
"version": "v3.72.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "3825ffdc69501e1c9230291b79f036a0c0d8749d"
"reference": "900389362c43d116fee1ffc51f7878145fa61b57"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3825ffdc69501e1c9230291b79f036a0c0d8749d",
"reference": "3825ffdc69501e1c9230291b79f036a0c0d8749d",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/900389362c43d116fee1ffc51f7878145fa61b57",
"reference": "900389362c43d116fee1ffc51f7878145fa61b57",
"shasum": ""
},
"require": {
@ -17867,18 +17870,18 @@
"symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
},
"require-dev": {
"facile-it/paraunit": "^1.3.1 || ^2.5",
"infection/infection": "^0.29.10",
"justinrainbow/json-schema": "^5.3 || ^6.0",
"facile-it/paraunit": "^1.3.1 || ^2.6",
"infection/infection": "^0.29.14",
"justinrainbow/json-schema": "^5.3 || ^6.2",
"keradus/cli-executor": "^2.1",
"mikey179/vfsstream": "^1.6.12",
"php-coveralls/php-coveralls": "^2.7",
"php-cs-fixer/accessible-object": "^1.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
"phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.7",
"symfony/var-dumper": "^5.4.48 || ^6.4.18 || ^7.2.0",
"symfony/yaml": "^5.4.45 || ^6.4.18 || ^7.2.0"
"phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.12",
"symfony/var-dumper": "^5.4.48 || ^6.4.18 || ^7.2.3",
"symfony/yaml": "^5.4.45 || ^6.4.18 || ^7.2.3"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
@ -17919,7 +17922,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.71.0"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.72.0"
},
"funding": [
{
@ -17927,7 +17930,7 @@
"type": "github"
}
],
"time": "2025-03-07T23:06:56+00:00"
"time": "2025-03-13T11:25:37+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@ -17980,6 +17983,47 @@
},
"time": "2020-07-09T08:09:16+00:00"
},
{
"name": "iamcal/sql-parser",
"version": "v0.5",
"source": {
"type": "git",
"url": "https://github.com/iamcal/SQLParser.git",
"reference": "644fd994de3b54e5d833aecf406150aa3b66ca88"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/iamcal/SQLParser/zipball/644fd994de3b54e5d833aecf406150aa3b66ca88",
"reference": "644fd994de3b54e5d833aecf406150aa3b66ca88",
"shasum": ""
},
"require-dev": {
"php-coveralls/php-coveralls": "^1.0",
"phpunit/phpunit": "^5|^6|^7|^8|^9"
},
"type": "library",
"autoload": {
"psr-4": {
"iamcal\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Cal Henderson",
"email": "cal@iamcal.com"
}
],
"description": "MySQL schema parser",
"support": {
"issues": "https://github.com/iamcal/SQLParser/issues",
"source": "https://github.com/iamcal/SQLParser/tree/v0.5"
},
"time": "2024-03-22T22:46:32+00:00"
},
{
"name": "laracasts/cypress",
"version": "3.03",
@ -18041,34 +18085,34 @@
},
{
"name": "larastan/larastan",
"version": "v2.9.14",
"version": "v2.10.0",
"source": {
"type": "git",
"url": "https://github.com/larastan/larastan.git",
"reference": "78f7f8da613e54edb2ab4afa5bede045228fb843"
"reference": "05519d721277604487a3ca71bdee87739d8d8716"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/larastan/larastan/zipball/78f7f8da613e54edb2ab4afa5bede045228fb843",
"reference": "78f7f8da613e54edb2ab4afa5bede045228fb843",
"url": "https://api.github.com/repos/larastan/larastan/zipball/05519d721277604487a3ca71bdee87739d8d8716",
"reference": "05519d721277604487a3ca71bdee87739d8d8716",
"shasum": ""
},
"require": {
"ext-json": "*",
"illuminate/console": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/container": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/database": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/http": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/support": "^9.52.16 || ^10.28.0 || ^11.16",
"iamcal/sql-parser": "^0.5.0",
"illuminate/console": "^9.52.20 || ^10.48.28 || ^11.41.3",
"illuminate/container": "^9.52.20 || ^10.48.28 || ^11.41.3",
"illuminate/contracts": "^9.52.20 || ^10.48.28 || ^11.41.3",
"illuminate/database": "^9.52.20 || ^10.48.28 || ^11.41.3",
"illuminate/http": "^9.52.20 || ^10.48.28 || ^11.41.3",
"illuminate/pipeline": "^9.52.20 || ^10.48.28 || ^11.41.3",
"illuminate/support": "^9.52.20 || ^10.48.28 || ^11.41.3",
"php": "^8.0.2",
"phpmyadmin/sql-parser": "^5.9.0",
"phpstan/phpstan": "^1.12.17"
},
"require-dev": {
"doctrine/coding-standard": "^12.0",
"laravel/framework": "^9.52.16 || ^10.28.0 || ^11.16",
"laravel/framework": "^9.52.20 || ^10.48.28 || ^11.41.3",
"mockery/mockery": "^1.5.1",
"nikic/php-parser": "^4.19.1",
"orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
@ -18122,7 +18166,7 @@
],
"support": {
"issues": "https://github.com/larastan/larastan/issues",
"source": "https://github.com/larastan/larastan/tree/v2.9.14"
"source": "https://github.com/larastan/larastan/tree/v2.10.0"
},
"funding": [
{
@ -18130,7 +18174,7 @@
"type": "github"
}
],
"time": "2025-02-06T21:03:14+00:00"
"time": "2025-03-14T21:52:58+00:00"
},
{
"name": "mockery/mockery",
@ -18217,20 +18261,20 @@
},
{
"name": "nunomaduro/collision",
"version": "v8.6.1",
"version": "v8.7.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
"reference": "86f003c132143d5a2ab214e19933946409e0cae7"
"reference": "586cb8181a257a2152b6a855ca8d9598878a1a26"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/86f003c132143d5a2ab214e19933946409e0cae7",
"reference": "86f003c132143d5a2ab214e19933946409e0cae7",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/586cb8181a257a2152b6a855ca8d9598878a1a26",
"reference": "586cb8181a257a2152b6a855ca8d9598878a1a26",
"shasum": ""
},
"require": {
"filp/whoops": "^2.16.0",
"filp/whoops": "^2.17.0",
"nunomaduro/termwind": "^2.3.0",
"php": "^8.2.0",
"symfony/console": "^7.2.1"
@ -18240,14 +18284,14 @@
"phpunit/phpunit": "<11.5.3 || >=12.0.0"
},
"require-dev": {
"larastan/larastan": "^2.9.12",
"laravel/framework": "^11.39.1",
"laravel/pint": "^1.20.0",
"laravel/sail": "^1.40.0",
"laravel/sanctum": "^4.0.7",
"laravel/tinker": "^2.10.0",
"orchestra/testbench-core": "^9.9.2",
"pestphp/pest": "^3.7.3",
"larastan/larastan": "^2.10.0",
"laravel/framework": "^11.44.2",
"laravel/pint": "^1.21.2",
"laravel/sail": "^1.41.0",
"laravel/sanctum": "^4.0.8",
"laravel/tinker": "^2.10.1",
"orchestra/testbench-core": "^9.12.0",
"pestphp/pest": "^3.7.4",
"sebastian/environment": "^6.1.0 || ^7.2.0"
},
"type": "library",
@ -18311,7 +18355,7 @@
"type": "patreon"
}
],
"time": "2025-01-23T13:41:43+00:00"
"time": "2025-03-14T22:37:40+00:00"
},
{
"name": "phar-io/manifest",
@ -18501,107 +18545,18 @@
},
"time": "2025-02-21T17:47:03+00:00"
},
{
"name": "phpmyadmin/sql-parser",
"version": "5.11.0",
"source": {
"type": "git",
"url": "https://github.com/phpmyadmin/sql-parser.git",
"reference": "07044bc8c13abd542756c3fd34dc66a5d6dee8e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/07044bc8c13abd542756c3fd34dc66a5d6dee8e4",
"reference": "07044bc8c13abd542756c3fd34dc66a5d6dee8e4",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
"phpmyadmin/motranslator": "<3.0"
},
"require-dev": {
"phpbench/phpbench": "^1.1",
"phpmyadmin/coding-standard": "^3.0",
"phpmyadmin/motranslator": "^4.0 || ^5.0",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^1.12",
"phpstan/phpstan-deprecation-rules": "^1.2",
"phpstan/phpstan-phpunit": "^1.4",
"phpstan/phpstan-strict-rules": "^1.6",
"phpunit/phpunit": "^8.5 || ^9.6",
"psalm/plugin-phpunit": "^0.16.1",
"vimeo/psalm": "^4.11",
"zumba/json-serializer": "~3.0.2"
},
"suggest": {
"ext-mbstring": "For best performance",
"phpmyadmin/motranslator": "Translate messages to your favorite locale"
},
"bin": [
"bin/highlight-query",
"bin/lint-query",
"bin/sql-parser",
"bin/tokenize-query"
],
"type": "library",
"autoload": {
"psr-4": {
"PhpMyAdmin\\SqlParser\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "The phpMyAdmin Team",
"email": "developers@phpmyadmin.net",
"homepage": "https://www.phpmyadmin.net/team/"
}
],
"description": "A validating SQL lexer and parser with a focus on MySQL dialect.",
"homepage": "https://github.com/phpmyadmin/sql-parser",
"keywords": [
"analysis",
"lexer",
"parser",
"query linter",
"sql",
"sql lexer",
"sql linter",
"sql parser",
"sql syntax highlighter",
"sql tokenizer"
],
"support": {
"issues": "https://github.com/phpmyadmin/sql-parser/issues",
"source": "https://github.com/phpmyadmin/sql-parser"
},
"funding": [
{
"url": "https://www.phpmyadmin.net/donate/",
"type": "other"
}
],
"time": "2025-02-22T20:00:59+00:00"
},
{
"name": "phpstan/phpstan",
"version": "1.12.20",
"version": "1.12.21",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "3240b1972042c7f73cf1045e879ea5bd5f761bb7"
"reference": "14276fdef70575106a3392a4ed553c06a984df28"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/3240b1972042c7f73cf1045e879ea5bd5f761bb7",
"reference": "3240b1972042c7f73cf1045e879ea5bd5f761bb7",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/14276fdef70575106a3392a4ed553c06a984df28",
"reference": "14276fdef70575106a3392a4ed553c06a984df28",
"shasum": ""
},
"require": {
@ -18646,7 +18601,7 @@
"type": "github"
}
],
"time": "2025-03-05T13:37:43+00:00"
"time": "2025-03-09T09:24:50+00:00"
},
{
"name": "phpunit/php-code-coverage",
@ -18973,16 +18928,16 @@
},
{
"name": "phpunit/phpunit",
"version": "11.5.12",
"version": "11.5.13",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "d42785840519401ed2113292263795eb4c0f95da"
"reference": "3bbb8d54b3a6718e51fd48cd478079f5f49b82bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d42785840519401ed2113292263795eb4c0f95da",
"reference": "d42785840519401ed2113292263795eb4c0f95da",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3bbb8d54b3a6718e51fd48cd478079f5f49b82bd",
"reference": "3bbb8d54b3a6718e51fd48cd478079f5f49b82bd",
"shasum": ""
},
"require": {
@ -19009,7 +18964,7 @@
"sebastian/exporter": "^6.3.0",
"sebastian/global-state": "^7.0.2",
"sebastian/object-enumerator": "^6.0.1",
"sebastian/type": "^5.1.0",
"sebastian/type": "^5.1.2",
"sebastian/version": "^5.0.2",
"staabm/side-effects-detector": "^1.0.5"
},
@ -19054,7 +19009,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.12"
"source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.13"
},
"funding": [
{
@ -19070,7 +19025,7 @@
"type": "tidelift"
}
],
"time": "2025-03-07T07:31:03+00:00"
"time": "2025-03-18T13:41:57+00:00"
},
{
"name": "react/cache",
@ -20415,16 +20370,16 @@
},
{
"name": "sebastian/type",
"version": "5.1.0",
"version": "5.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
"reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac"
"reference": "a8a7e30534b0eb0c77cd9d07e82de1a114389f5e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac",
"reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac",
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/a8a7e30534b0eb0c77cd9d07e82de1a114389f5e",
"reference": "a8a7e30534b0eb0c77cd9d07e82de1a114389f5e",
"shasum": ""
},
"require": {
@ -20460,7 +20415,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/type/issues",
"security": "https://github.com/sebastianbergmann/type/security/policy",
"source": "https://github.com/sebastianbergmann/type/tree/5.1.0"
"source": "https://github.com/sebastianbergmann/type/tree/5.1.2"
},
"funding": [
{
@ -20468,7 +20423,7 @@
"type": "github"
}
],
"time": "2024-09-17T13:12:04+00:00"
"time": "2025-03-18T13:35:50+00:00"
},
{
"name": "sebastian/version",

View File

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

View File

@ -5567,6 +5567,8 @@ $lang = array(
'upgrade_plan' => 'Upgrade Plan',
'upgrade_popup_premium_business_plus_pricing' => 'Pricing? Let\'s talk!',
'plan_selected' => 'Plan Selected',
'invalid_date_create_syntax' => 'Invalid date syntax',
'start_and_end_date_required' => 'Start and end date are required',
);
return $lang;

View File

@ -94,7 +94,7 @@
padding-top: 1rem;
padding-bottom: 1rem;
display: grid;
grid-template-columns: minmax(0, 2fr) auto minmax(0, 1fr);
grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
align-items: start;
border-top: 1px solid #d8d8d8;
border-bottom: 1px solid #d8d8d8;