From 47b134607ef21bb19a76f0df4000630ed1c58098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 26 Sep 2022 12:20:42 +0300 Subject: [PATCH 1/9] fixed `psr-cache` <> `laravel-excel` conflict https://github.com/SpartnerNL/Laravel-Excel/issues/3731 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 093763a76..63ebe11ff 100644 --- a/composer.json +++ b/composer.json @@ -65,6 +65,7 @@ "maatwebsite/excel": "3.1.*", "mnsami/composer-custom-directory-installer": "2.0.*", "plank/laravel-mediable": "^5.4", + "psr/simple-cache": "^2.0", "riverskies/laravel-mobile-detect": "^1.3", "santigarcor/laratrust": "^7.0", "simple-icons/simple-icons": "^6.0", From 0204f0c0f644419b29860015356fe48faeb7264d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 26 Sep 2022 12:22:49 +0300 Subject: [PATCH 2/9] added symfony mailer packages --- composer.json | 5 +- composer.lock | 348 +++++++++++++++++++++++++++++++++++++----------- config/mail.php | 1 + 3 files changed, 275 insertions(+), 79 deletions(-) diff --git a/composer.json b/composer.json index 63ebe11ff..ee922f39e 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,10 @@ "simple-icons/simple-icons": "^6.0", "simshaun/recurr": "^5.0", "staudenmeir/belongs-to-through": "^2.12", - "staudenmeir/eloquent-has-many-deep": "^1.15" + "staudenmeir/eloquent-has-many-deep": "^1.15", + "symfony/mailgun-mailer": "^6.0", + "symfony/postmark-mailer": "^6.0", + "symfony/sendgrid-mailer": "^6.0" }, "require-dev": { "beyondcode/laravel-dump-server": "^1.5", diff --git a/composer.lock b/composer.lock index bda461c70..d82b46925 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e03cb791860742d0ede59fd842fa32cb", + "content-hash": "1694ff93a23898b124fff1c484c314c2", "packages": [ { "name": "akaunting/laravel-apexcharts", @@ -542,16 +542,16 @@ }, { "name": "akaunting/laravel-setting", - "version": "1.2.7", + "version": "1.2.8", "source": { "type": "git", "url": "https://github.com/akaunting/laravel-setting.git", - "reference": "10186327e3b93fca56eaa9e4d8ee2ead189f0332" + "reference": "598cacc042cb5081366f03e5229edbe2a2f17cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/laravel-setting/zipball/10186327e3b93fca56eaa9e4d8ee2ead189f0332", - "reference": "10186327e3b93fca56eaa9e4d8ee2ead189f0332", + "url": "https://api.github.com/repos/akaunting/laravel-setting/zipball/598cacc042cb5081366f03e5229edbe2a2f17cdf", + "reference": "598cacc042cb5081366f03e5229edbe2a2f17cdf", "shasum": "" }, "require": { @@ -603,22 +603,22 @@ ], "support": { "issues": "https://github.com/akaunting/laravel-setting/issues", - "source": "https://github.com/akaunting/laravel-setting/tree/1.2.7" + "source": "https://github.com/akaunting/laravel-setting/tree/1.2.8" }, - "time": "2021-04-23T22:38:26+00:00" + "time": "2022-09-23T10:56:17+00:00" }, { "name": "akaunting/laravel-sortable", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/akaunting/laravel-sortable.git", - "reference": "8a5f702d282934c998933f82c3372aab48238ace" + "reference": "3102d2c53bc9ef89b697331a7a1c8d8463738f22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/laravel-sortable/zipball/8a5f702d282934c998933f82c3372aab48238ace", - "reference": "8a5f702d282934c998933f82c3372aab48238ace", + "url": "https://api.github.com/repos/akaunting/laravel-sortable/zipball/3102d2c53bc9ef89b697331a7a1c8d8463738f22", + "reference": "3102d2c53bc9ef89b697331a7a1c8d8463738f22", "shasum": "" }, "require": { @@ -667,9 +667,9 @@ ], "support": { "issues": "https://github.com/akaunting/laravel-sortable/issues", - "source": "https://github.com/akaunting/laravel-sortable/tree/1.0.5" + "source": "https://github.com/akaunting/laravel-sortable/tree/1.0.6" }, - "time": "2022-06-10T12:46:42+00:00" + "time": "2022-09-23T10:54:50+00:00" }, { "name": "akaunting/laravel-version", @@ -907,16 +907,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.235.12", + "version": "3.235.15", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "e0ebecfb0284dc44dc99a172cd9c68c40739904c" + "reference": "635914c29fc875c58a85fdf981c27f1f561eaf50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e0ebecfb0284dc44dc99a172cd9c68c40739904c", - "reference": "e0ebecfb0284dc44dc99a172cd9c68c40739904c", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/635914c29fc875c58a85fdf981c27f1f561eaf50", + "reference": "635914c29fc875c58a85fdf981c27f1f561eaf50", "shasum": "" }, "require": { @@ -995,9 +995,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.235.12" + "source": "https://github.com/aws/aws-sdk-php/tree/3.235.15" }, - "time": "2022-09-20T18:18:07+00:00" + "time": "2022-09-23T18:16:52+00:00" }, { "name": "balping/json-raw-encoder", @@ -1844,16 +1844,16 @@ }, { "name": "doctrine/dbal", - "version": "3.4.4", + "version": "3.4.5", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "4cbbe6e4b9ef6c69d5f4c968c637476f47bb54f5" + "reference": "a5a58773109c0abb13e658c8ccd92aeec8d07f9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/4cbbe6e4b9ef6c69d5f4c968c637476f47bb54f5", - "reference": "4cbbe6e4b9ef6c69d5f4c968c637476f47bb54f5", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/a5a58773109c0abb13e658c8ccd92aeec8d07f9e", + "reference": "a5a58773109c0abb13e658c8ccd92aeec8d07f9e", "shasum": "" }, "require": { @@ -1935,7 +1935,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.4.4" + "source": "https://github.com/doctrine/dbal/tree/3.4.5" }, "funding": [ { @@ -1951,7 +1951,7 @@ "type": "tidelift" } ], - "time": "2022-09-01T21:26:42+00:00" + "time": "2022-09-23T17:48:57+00:00" }, { "name": "doctrine/deprecations", @@ -2256,24 +2256,24 @@ }, { "name": "dompdf/dompdf", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "79573d8b8a141ec8a17312515de8740eed014fa9" + "reference": "c5310df0e22c758c85ea5288175fc6cd777bc085" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9", - "reference": "79573d8b8a141ec8a17312515de8740eed014fa9", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c5310df0e22c758c85ea5288175fc6cd777bc085", + "reference": "c5310df0e22c758c85ea5288175fc6cd777bc085", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", "masterminds/html5": "^2.0", - "phenx/php-font-lib": "^0.5.4", - "phenx/php-svg-lib": "^0.3.3 || ^0.4.0", + "phenx/php-font-lib": ">=0.5.4 <1.0.0", + "phenx/php-svg-lib": ">=0.3.3 <1.0.0", "php": "^7.1 || ^8.0" }, "require-dev": { @@ -2304,25 +2304,17 @@ ], "authors": [ { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - }, - { - "name": "Brian Sweeney", - "email": "eclecticgeek@gmail.com" - }, - { - "name": "Gabriel Bull", - "email": "me@gabrielbull.com" + "name": "The Dompdf Community", + "homepage": "https://github.com/dompdf/dompdf/blob/master/AUTHORS.md" } ], "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", "homepage": "https://github.com/dompdf/dompdf", "support": { "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/v2.0.0" + "source": "https://github.com/dompdf/dompdf/tree/v2.0.1" }, - "time": "2022-06-21T21:14:57+00:00" + "time": "2022-09-22T13:43:41+00:00" }, { "name": "dragonmantank/cron-expression", @@ -5250,16 +5242,16 @@ }, { "name": "league/flysystem", - "version": "3.5.1", + "version": "3.5.2", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "f14993c6e394450ac4649da35264df0544d0234e" + "reference": "c73c4eb31f2e883b3897ab5591aa2dbc48112433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f14993c6e394450ac4649da35264df0544d0234e", - "reference": "f14993c6e394450ac4649da35264df0544d0234e", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c73c4eb31f2e883b3897ab5591aa2dbc48112433", + "reference": "c73c4eb31f2e883b3897ab5591aa2dbc48112433", "shasum": "" }, "require": { @@ -5321,7 +5313,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.5.1" + "source": "https://github.com/thephpleague/flysystem/tree/3.5.2" }, "funding": [ { @@ -5337,7 +5329,7 @@ "type": "tidelift" } ], - "time": "2022-09-18T18:23:19+00:00" + "time": "2022-09-23T18:59:16+00:00" }, { "name": "league/flysystem-aws-s3-v3", @@ -7192,21 +7184,21 @@ }, { "name": "phenx/php-svg-lib", - "version": "0.4.1", + "version": "0.5.0", "source": { "type": "git", "url": "https://github.com/dompdf/php-svg-lib.git", - "reference": "4498b5df7b08e8469f0f8279651ea5de9626ed02" + "reference": "76876c6cf3080bcb6f249d7d59705108166a6685" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02", - "reference": "4498b5df7b08e8469f0f8279651ea5de9626ed02", + "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685", + "reference": "76876c6cf3080bcb6f249d7d59705108166a6685", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": "^7.1 || ^7.2 || ^7.3 || ^7.4 || ^8.0", + "php": "^7.1 || ^8.0", "sabberworm/php-css-parser": "^8.4" }, "require-dev": { @@ -7232,9 +7224,9 @@ "homepage": "https://github.com/PhenX/php-svg-lib", "support": { "issues": "https://github.com/dompdf/php-svg-lib/issues", - "source": "https://github.com/dompdf/php-svg-lib/tree/0.4.1" + "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.0" }, - "time": "2022-03-07T12:52:04+00:00" + "time": "2022-09-06T12:16:56+00:00" }, { "name": "php-http/discovery", @@ -7717,16 +7709,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.24.1", + "version": "1.25.2", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6" + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6", - "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5", "shasum": "" }, "require": { @@ -7743,33 +7735,34 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", - "ezyang/htmlpurifier": "^4.13", + "ezyang/htmlpurifier": "^4.15", "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", "php": "^7.3 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/simple-cache": "^1.0 || ^2.0" + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dompdf/dompdf": "^1.0 || ^2.0", "friendsofphp/php-cs-fixer": "^3.2", - "jpgraph/jpgraph": "^4.0", + "mitoteam/jpgraph": "10.2.4", "mpdf/mpdf": "8.1.1", "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.7", - "tecnickcom/tcpdf": "^6.4" + "tecnickcom/tcpdf": "6.5" }, "suggest": { - "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)", - "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "ext-intl": "PHP Internationalization Functions", + "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", "mpdf/mpdf": "Option for rendering PDF with PDF Writer", - "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)" + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" }, "type": "library", "autoload": { @@ -7815,9 +7808,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.24.1" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2" }, - "time": "2022-07-18T19:50:48+00:00" + "time": "2022-09-25T17:21:01+00:00" }, { "name": "phpoption/phpoption", @@ -9920,6 +9913,71 @@ ], "time": "2022-08-03T05:17:36+00:00" }, + { + "name": "symfony/mailgun-mailer", + "version": "v6.0.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/mailgun-mailer.git", + "reference": "f0d032c26683b26f4bc26864e09b1e08fa55226e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/f0d032c26683b26f4bc26864e09b1e08fa55226e", + "reference": "f0d032c26683b26f4bc26864e09b1e08fa55226e", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/mailer": "^5.4|^6.0" + }, + "require-dev": { + "symfony/http-client": "^5.4|^6.0" + }, + "type": "symfony-mailer-bridge", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mailer\\Bridge\\Mailgun\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Mailgun Mailer Bridge", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/mailgun-mailer/tree/v6.0.7" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-03-24T17:11:42+00:00" + }, { "name": "symfony/mime", "version": "v6.0.12", @@ -10738,6 +10796,71 @@ ], "time": "2022-05-24T11:49:31+00:00" }, + { + "name": "symfony/postmark-mailer", + "version": "v6.0.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/postmark-mailer.git", + "reference": "8405569233efb0140e55eb6236c9e55693f058ff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/postmark-mailer/zipball/8405569233efb0140e55eb6236c9e55693f058ff", + "reference": "8405569233efb0140e55eb6236c9e55693f058ff", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/mailer": "^5.4|^6.0" + }, + "require-dev": { + "symfony/http-client": "^5.4|^6.0" + }, + "type": "symfony-mailer-bridge", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mailer\\Bridge\\Postmark\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Postmark Mailer Bridge", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/postmark-mailer/tree/v6.0.7" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-03-24T17:11:42+00:00" + }, { "name": "symfony/process", "version": "v6.0.11", @@ -10887,6 +11010,71 @@ ], "time": "2022-07-20T13:45:53+00:00" }, + { + "name": "symfony/sendgrid-mailer", + "version": "v6.0.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/sendgrid-mailer.git", + "reference": "0a433d03c89ebe5ee133e4422344b9fa9f71a29b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/sendgrid-mailer/zipball/0a433d03c89ebe5ee133e4422344b9fa9f71a29b", + "reference": "0a433d03c89ebe5ee133e4422344b9fa9f71a29b", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/mailer": "^5.4|^6.0" + }, + "require-dev": { + "symfony/http-client": "^5.4|^6.0" + }, + "type": "symfony-mailer-bridge", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mailer\\Bridge\\Sendgrid\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Sendgrid Mailer Bridge", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/sendgrid-mailer/tree/v6.0.7" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-03-24T17:11:42+00:00" + }, { "name": "symfony/service-contracts", "version": "v3.0.2", @@ -12779,16 +12967,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.24", + "version": "9.5.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", - "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", "shasum": "" }, "require": { @@ -12810,14 +12998,14 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.1", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, "suggest": { @@ -12861,7 +13049,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" }, "funding": [ { @@ -12871,9 +13059,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-08-30T07:42:16+00:00" + "time": "2022-09-25T03:44:45+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/mail.php b/config/mail.php index 61f230d60..0e23eb558 100644 --- a/config/mail.php +++ b/config/mail.php @@ -54,6 +54,7 @@ return [ 'postmark' => [ 'transport' => 'postmark', + 'message_stream_id' => env('POSTMARK_MESSAGE_STREAM_ID'), ], 'sendgrid' => [ From ae87bb0ac8deee341e05f68cd829da7f8f258402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 26 Sep 2022 14:39:12 +0300 Subject: [PATCH 3/9] composer update --- composer.json | 1 + composer.lock | 164 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 164 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ee922f39e..578e296ee 100644 --- a/composer.json +++ b/composer.json @@ -72,6 +72,7 @@ "simshaun/recurr": "^5.0", "staudenmeir/belongs-to-through": "^2.12", "staudenmeir/eloquent-has-many-deep": "^1.15", + "symfony/http-client": "^6.0", "symfony/mailgun-mailer": "^6.0", "symfony/postmark-mailer": "^6.0", "symfony/sendgrid-mailer": "^6.0" diff --git a/composer.lock b/composer.lock index d82b46925..7538a752e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1694ff93a23898b124fff1c484c314c2", + "content-hash": "dedbfb3494422b9cf147050caaa42795", "packages": [ { "name": "akaunting/laravel-apexcharts", @@ -9655,6 +9655,168 @@ ], "time": "2022-07-29T07:39:48+00:00" }, + { + "name": "symfony/http-client", + "version": "v6.0.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client.git", + "reference": "411f73ad1a797f327d100d27fa5d715b947a8272" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client/zipball/411f73ad1a797f327d100d27fa5d715b947a8272", + "reference": "411f73ad1a797f327d100d27fa5d715b947a8272", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "psr/log": "^1|^2|^3", + "symfony/http-client-contracts": "^3", + "symfony/service-contracts": "^1.0|^2|^3" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "1.0", + "symfony/http-client-implementation": "3.0" + }, + "require-dev": { + "amphp/amp": "^2.5", + "amphp/http-client": "^4.2.1", + "amphp/http-tunnel": "^1.0", + "amphp/socket": "^1.1", + "guzzlehttp/promises": "^1.4", + "nyholm/psr7": "^1.0", + "php-http/httplug": "^1.0|^2.0", + "psr/http-client": "^1.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/stopwatch": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-client/tree/v6.0.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-08-02T16:01:06+00:00" + }, + { + "name": "symfony/http-client-contracts", + "version": "v3.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client-contracts.git", + "reference": "4184b9b63af1edaf35b6a7974c6f1f9f33294129" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/4184b9b63af1edaf35b6a7974c6f1f9f33294129", + "reference": "4184b9b63af1edaf35b6a7974c6f1f9f33294129", + "shasum": "" + }, + "require": { + "php": ">=8.0.2" + }, + "suggest": { + "symfony/http-client-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\HttpClient\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to HTTP clients", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/http-client-contracts/tree/v3.0.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-04-12T16:11:42+00:00" + }, { "name": "symfony/http-foundation", "version": "v6.0.12", From 06e669e2638253b838ab15a2bf5a53fc5f7156df Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 26 Sep 2022 16:42:13 +0300 Subject: [PATCH 4/9] backend controlled for title component --- app/View/Components/Title.php | 46 ++++++++++++++++++++++ resources/views/components/title.blade.php | 4 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 app/View/Components/Title.php diff --git a/app/View/Components/Title.php b/app/View/Components/Title.php new file mode 100644 index 000000000..ce424d479 --- /dev/null +++ b/app/View/Components/Title.php @@ -0,0 +1,46 @@ +textSize = $this->getTextSize($textSize); + } + + /** + * Get the view / contents that represent the component. + * + * @return \Illuminate\Contracts\View\View|string + */ + public function render() + { + return view('components.title'); + } + + protected function getTextSize($textSize) + { + switch ($textSize) { + case 'short': + $textSize = '15'; + break; + default: + $textSize = '25'; + break; + } + + return $textSize; + } +} diff --git a/resources/views/components/title.blade.php b/resources/views/components/title.blade.php index 63e9532c7..13d910f79 100644 --- a/resources/views/components/title.blade.php +++ b/resources/views/components/title.blade.php @@ -1,8 +1,10 @@ @php $slot_isHtml = strlen(strip_tags($slot)) < strlen($slot); + + $slot_is_string = strval(strlen($slot)); @endphp -@if (strlen($slot) >= 25 && ! $slot_isHtml) +@if ($slot_is_string >= $textSize && ! $slot_isHtml)
{!! $slot !!} From 94a9d736e302b9c26f86b14ae8977bad01f5ddd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 27 Sep 2022 11:21:03 +0300 Subject: [PATCH 5/9] reverted temp fix for `laravel-excel` --- composer.json | 1 - composer.lock | 29 +++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 578e296ee..a91b7161c 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,6 @@ "maatwebsite/excel": "3.1.*", "mnsami/composer-custom-directory-installer": "2.0.*", "plank/laravel-mediable": "^5.4", - "psr/simple-cache": "^2.0", "riverskies/laravel-mobile-detect": "^1.3", "santigarcor/laratrust": "^7.0", "simple-icons/simple-icons": "^6.0", diff --git a/composer.lock b/composer.lock index 7538a752e..7df6a3f4c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dedbfb3494422b9cf147050caaa42795", + "content-hash": "2a93789b0f787bd0efe26fa564af486f", "packages": [ { "name": "akaunting/laravel-apexcharts", @@ -907,16 +907,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.235.15", + "version": "3.236.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "635914c29fc875c58a85fdf981c27f1f561eaf50" + "reference": "bff1f1ade00c758ea27f498baee1fa16901e5bfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/635914c29fc875c58a85fdf981c27f1f561eaf50", - "reference": "635914c29fc875c58a85fdf981c27f1f561eaf50", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bff1f1ade00c758ea27f498baee1fa16901e5bfd", + "reference": "bff1f1ade00c758ea27f498baee1fa16901e5bfd", "shasum": "" }, "require": { @@ -995,9 +995,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.235.15" + "source": "https://github.com/aws/aws-sdk-php/tree/3.236.0" }, - "time": "2022-09-23T18:16:52+00:00" + "time": "2022-09-26T18:13:07+00:00" }, { "name": "balping/json-raw-encoder", @@ -5723,23 +5723,24 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.40", + "version": "3.1.41", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "8a54972e3d616c74687c3cbff15765555761885c" + "reference": "f7a1c3159fab8b4069a67c30e71810b358a2797e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/8a54972e3d616c74687c3cbff15765555761885c", - "reference": "8a54972e3d616c74687c3cbff15765555761885c", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/f7a1c3159fab8b4069a67c30e71810b358a2797e", + "reference": "f7a1c3159fab8b4069a67c30e71810b358a2797e", "shasum": "" }, "require": { "ext-json": "*", "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0", "php": "^7.0|^8.0", - "phpoffice/phpspreadsheet": "^1.18" + "phpoffice/phpspreadsheet": "^1.18", + "psr/simple-cache": "^1.0|^2.0" }, "require-dev": { "orchestra/testbench": "^6.0|^7.0", @@ -5785,7 +5786,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.40" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.41" }, "funding": [ { @@ -5797,7 +5798,7 @@ "type": "github" } ], - "time": "2022-05-02T13:50:01+00:00" + "time": "2022-09-26T14:55:28+00:00" }, { "name": "maennchen/zipstream-php", From a8730e6ea30b08f32c14b7b09efb595eaf6c019a Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 28 Sep 2022 10:14:43 +0300 Subject: [PATCH 6/9] active tab control according to url --- resources/views/components/tabs/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/components/tabs/index.blade.php b/resources/views/components/tabs/index.blade.php index 60a0bcf13..9b1171122 100644 --- a/resources/views/components/tabs/index.blade.php +++ b/resources/views/components/tabs/index.blade.php @@ -1,6 +1,6 @@ @props(['active']) -
+
    has('override')) || ($attributes->has('override') && ! in_array('class', explode(',', $attributes->get('override'))))) ? $attributes->merge(['class' => 'flex items-center']) : $attributes }}> {!! $navs !!} From ba398cad7f99f73a62ce24e70644759f2e358a3f Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 28 Sep 2022 11:41:06 +0300 Subject: [PATCH 7/9] added variable in modal add new --- resources/assets/js/components/AkauntingModalAddNew.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index 1846ca549..3fc07e890 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/resources/assets/js/components/AkauntingModalAddNew.vue @@ -228,6 +228,7 @@ export default { '#efef32' ], min_date: false, + selected_card: null } }, @@ -288,7 +289,13 @@ export default { .catch(error => { }); }, - } + }, + + watch: { + 'selected_card': function (newVal, oldVal) { + this.form.card_id = newVal; + }, + }, }) }); } From 3907325c8f375e743df686935406886e146d5a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 28 Sep 2022 14:36:02 +0300 Subject: [PATCH 8/9] composer lock --- composer.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/composer.lock b/composer.lock index 7df6a3f4c..2ff7db660 100644 --- a/composer.lock +++ b/composer.lock @@ -907,16 +907,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.236.0", + "version": "3.236.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "bff1f1ade00c758ea27f498baee1fa16901e5bfd" + "reference": "1e8d1abe7582968df16a2e7a87c5dcc51d0dfd1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bff1f1ade00c758ea27f498baee1fa16901e5bfd", - "reference": "bff1f1ade00c758ea27f498baee1fa16901e5bfd", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1e8d1abe7582968df16a2e7a87c5dcc51d0dfd1b", + "reference": "1e8d1abe7582968df16a2e7a87c5dcc51d0dfd1b", "shasum": "" }, "require": { @@ -995,9 +995,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.236.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.236.1" }, - "time": "2022-09-26T18:13:07+00:00" + "time": "2022-09-27T18:19:10+00:00" }, { "name": "balping/json-raw-encoder", @@ -4481,16 +4481,16 @@ }, { "name": "laravel/framework", - "version": "v9.31.0", + "version": "v9.32.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "75013d4fffe3b24748d313fbbea53206351214f7" + "reference": "aae3b59f82434176546c9dd10804adda16da5278" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/75013d4fffe3b24748d313fbbea53206351214f7", - "reference": "75013d4fffe3b24748d313fbbea53206351214f7", + "url": "https://api.github.com/repos/laravel/framework/zipball/aae3b59f82434176546c9dd10804adda16da5278", + "reference": "aae3b59f82434176546c9dd10804adda16da5278", "shasum": "" }, "require": { @@ -4663,7 +4663,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-09-20T13:32:50+00:00" + "time": "2022-09-27T13:32:56+00:00" }, { "name": "laravel/sanctum", @@ -5723,16 +5723,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.41", + "version": "3.1.42", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "f7a1c3159fab8b4069a67c30e71810b358a2797e" + "reference": "b3938c9a4cf70d01173612fe35e64f31ca830132" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/f7a1c3159fab8b4069a67c30e71810b358a2797e", - "reference": "f7a1c3159fab8b4069a67c30e71810b358a2797e", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/b3938c9a4cf70d01173612fe35e64f31ca830132", + "reference": "b3938c9a4cf70d01173612fe35e64f31ca830132", "shasum": "" }, "require": { @@ -5786,7 +5786,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.41" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.42" }, "funding": [ { @@ -5798,7 +5798,7 @@ "type": "github" } ], - "time": "2022-09-26T14:55:28+00:00" + "time": "2022-09-28T11:25:11+00:00" }, { "name": "maennchen/zipstream-php", From 25110b73ee4f863a2000f3b3c2085041bcffaa49 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 30 Sep 2022 10:27:17 +0300 Subject: [PATCH 9/9] sub category icon on search --- .../assets/js/components/AkauntingSearch.vue | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue index ce11ddd7d..da79705f0 100644 --- a/resources/assets/js/components/AkauntingSearch.vue +++ b/resources/assets/js/components/AkauntingSearch.vue @@ -82,30 +82,33 @@
  • - +
  • @@ -462,7 +465,8 @@ export default { data.forEach(function (item) { this.values.push({ key: (item.code) ? item.code : item.id, - value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name + value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name, + level: (item.level) ? item.level : null, }); }, this); @@ -813,7 +817,6 @@ export default { this.values.sort(function (a, b) { var nameA = a.value.toUpperCase(); // ignore upper and lowercase var nameB = b.value.toUpperCase(); // ignore upper and lowercase - if (nameA < nameB) { return -1; } @@ -821,7 +824,6 @@ export default { if (nameA > nameB) { return 1; } - // names must be equal return 0; });