diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index 49daf28c86..7215731229 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -1043,7 +1043,7 @@ class BaseExport /** @var array $status_parameters */ $status_parameters = explode(',', $status); -nlog($status_parameters); + if (in_array('all', $status_parameters) || count($status_parameters) == 0) { return $query; } @@ -1512,7 +1512,7 @@ nlog($status_parameters); public function processMetaData(array $row, $resource): array { - nlog($row); + // nlog($row); $class = get_class($resource); $entity = ''; diff --git a/composer.json b/composer.json index 776e063dfa..17a06e6b32 100644 --- a/composer.json +++ b/composer.json @@ -116,8 +116,7 @@ "twig/twig": "^3.14", "twilio/sdk": "^6.40", "wikimedia/composer-merge-plugin": "^2.1", - "wildbit/postmark-php": "^4.0", - "invoiceninja/admin-api": "dev-main" + "wildbit/postmark-php": "^4.0" }, "require-dev": { "barryvdh/laravel-debugbar": "^3.6", diff --git a/composer.lock b/composer.lock index e693b4f9e1..ee48b0958d 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": "f6635e28eff8ba2e1ba889d1ef9dd2d6", + "content-hash": "4361272676d998d08fb1926198065b39", "packages": [ { "name": "adrienrn/php-mimetyper", @@ -1342,16 +1342,16 @@ }, { "name": "checkout/checkout-sdk-php", - "version": "3.2.8", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/checkout/checkout-sdk-php.git", - "reference": "61a9d9e8b7d64f39ee58cc625c48eebd5d22c058" + "reference": "b5fc1bf2bfe90426f763cfb8a8a2207f91968b2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/61a9d9e8b7d64f39ee58cc625c48eebd5d22c058", - "reference": "61a9d9e8b7d64f39ee58cc625c48eebd5d22c058", + "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/b5fc1bf2bfe90426f763cfb8a8a2207f91968b2d", + "reference": "b5fc1bf2bfe90426f763cfb8a8a2207f91968b2d", "shasum": "" }, "require": { @@ -1404,9 +1404,9 @@ ], "support": { "issues": "https://github.com/checkout/checkout-sdk-php/issues", - "source": "https://github.com/checkout/checkout-sdk-php/tree/3.2.8" + "source": "https://github.com/checkout/checkout-sdk-php/tree/3.3.0" }, - "time": "2025-04-22T08:03:18+00:00" + "time": "2025-06-06T11:42:26+00:00" }, { "name": "clue/stream-filter", @@ -3184,7 +3184,7 @@ }, { "name": "google/apiclient-services", - "version": "v0.397.1", + "version": "v0.398.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", @@ -3222,7 +3222,7 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.397.1" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.398.0" }, "time": "2025-06-04T17:28:44+00:00" }, @@ -4219,16 +4219,16 @@ }, { "name": "horstoeko/zugferd", - "version": "v1.0.114", + "version": "v1.0.115", "source": { "type": "git", "url": "https://github.com/horstoeko/zugferd.git", - "reference": "e7869f79b28056add87a82d405e9153711af4436" + "reference": "9bbf0c06942645001d10e88d6e26ff6d8983da2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/e7869f79b28056add87a82d405e9153711af4436", - "reference": "e7869f79b28056add87a82d405e9153711af4436", + "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/9bbf0c06942645001d10e88d6e26ff6d8983da2c", + "reference": "9bbf0c06942645001d10e88d6e26ff6d8983da2c", "shasum": "" }, "require": { @@ -4287,9 +4287,9 @@ ], "support": { "issues": "https://github.com/horstoeko/zugferd/issues", - "source": "https://github.com/horstoeko/zugferd/tree/v1.0.114" + "source": "https://github.com/horstoeko/zugferd/tree/v1.0.115" }, - "time": "2025-04-29T15:50:06+00:00" + "time": "2025-06-06T08:14:02+00:00" }, { "name": "horstoeko/zugferdvisualizer", @@ -4667,65 +4667,6 @@ ], "time": "2022-05-21T17:30:32+00:00" }, - { - "name": "invoiceninja/admin-api", - "version": "dev-main", - "dist": { - "type": "path", - "url": "../admin-api", - "reference": "1ba06bff5aa7fd37ad607431fa71d4a1652f97d8" - }, - "require": { - "afosto/yaac": "^1.5", - "asm/php-ansible": "dev-main", - "ext-curl": "*", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-simplexml": "*", - "illuminate/database": "^11", - "illuminate/support": "^11", - "imdhemy/laravel-purchases": "^1.7", - "php": "^8.2|^8.3|^8.4" - }, - "require-dev": { - "larastan/larastan": "^3.0", - "orchestra/testbench": "^9.0", - "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^11.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "InvoiceNinja\\AdminApi\\Providers\\AdminApiServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "InvoiceNinja\\AdminApi\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "InvoiceNinja\\AdminApi\\Tests\\": "tests/" - } - }, - "license": [ - "Elastic" - ], - "authors": [ - { - "name": "David Bomba", - "email": "turbo124@gmail.com" - } - ], - "description": "API endpoints for the admin interface", - "transport-options": { - "relative": true - } - }, { "name": "invoiceninja/einvoice", "version": "dev-main", @@ -11420,16 +11361,16 @@ }, { "name": "sentry/sentry", - "version": "4.11.1", + "version": "4.13.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "53dc0bcb6a667cac5b760b46f98d5380e63e02ca" + "reference": "b54a0eaedfc27fc2da587e64455a66cd29cd3c4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/53dc0bcb6a667cac5b760b46f98d5380e63e02ca", - "reference": "53dc0bcb6a667cac5b760b46f98d5380e63e02ca", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/b54a0eaedfc27fc2da587e64455a66cd29cd3c4d", + "reference": "b54a0eaedfc27fc2da587e64455a66cd29cd3c4d", "shasum": "" }, "require": { @@ -11493,7 +11434,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.11.1" + "source": "https://github.com/getsentry/sentry-php/tree/4.13.0" }, "funding": [ { @@ -11505,20 +11446,20 @@ "type": "custom" } ], - "time": "2025-05-12T11:30:33+00:00" + "time": "2025-06-10T15:39:27+00:00" }, { "name": "sentry/sentry-laravel", - "version": "4.14.0", + "version": "4.14.1", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-laravel.git", - "reference": "d0b285c118910a81d845831a2290fd50a482d59f" + "reference": "8b71a9209e8a01cb5728e743e99299d87d688010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/d0b285c118910a81d845831a2290fd50a482d59f", - "reference": "d0b285c118910a81d845831a2290fd50a482d59f", + "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/8b71a9209e8a01cb5728e743e99299d87d688010", + "reference": "8b71a9209e8a01cb5728e743e99299d87d688010", "shasum": "" }, "require": { @@ -11582,7 +11523,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-laravel/issues", - "source": "https://github.com/getsentry/sentry-laravel/tree/4.14.0" + "source": "https://github.com/getsentry/sentry-laravel/tree/4.14.1" }, "funding": [ { @@ -11594,7 +11535,7 @@ "type": "custom" } ], - "time": "2025-06-02T08:31:09+00:00" + "time": "2025-06-07T07:52:41+00:00" }, { "name": "setasign/fpdf", @@ -18030,16 +17971,16 @@ }, { "name": "filp/whoops", - "version": "2.18.1", + "version": "2.18.2", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26" + "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26", - "reference": "8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26", + "url": "https://api.github.com/repos/filp/whoops/zipball/89dabca1490bc77dbcab41c2b20968c7e44bf7c3", + "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3", "shasum": "" }, "require": { @@ -18089,7 +18030,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.18.1" + "source": "https://github.com/filp/whoops/tree/2.18.2" }, "funding": [ { @@ -18097,7 +18038,7 @@ "type": "github" } ], - "time": "2025-06-03T18:56:14+00:00" + "time": "2025-06-11T20:42:19+00:00" }, { "name": "friendsofphp/php-cs-fixer", @@ -18356,16 +18297,16 @@ }, { "name": "larastan/larastan", - "version": "v2.11.0", + "version": "v2.11.2", "source": { "type": "git", "url": "https://github.com/larastan/larastan.git", - "reference": "484dabe3d75c7573b08c6a946d40b26211374396" + "reference": "1aae902a5851c03dc1a58cbd9010a0c3ef8def63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/larastan/larastan/zipball/484dabe3d75c7573b08c6a946d40b26211374396", - "reference": "484dabe3d75c7573b08c6a946d40b26211374396", + "url": "https://api.github.com/repos/larastan/larastan/zipball/1aae902a5851c03dc1a58cbd9010a0c3ef8def63", + "reference": "1aae902a5851c03dc1a58cbd9010a0c3ef8def63", "shasum": "" }, "require": { @@ -18433,7 +18374,7 @@ ], "support": { "issues": "https://github.com/larastan/larastan/issues", - "source": "https://github.com/larastan/larastan/tree/v2.11.0" + "source": "https://github.com/larastan/larastan/tree/v2.11.2" }, "funding": [ { @@ -18441,7 +18382,7 @@ "type": "github" } ], - "time": "2025-04-21T20:12:00+00:00" + "time": "2025-06-10T22:06:33+00:00" }, { "name": "mockery/mockery", @@ -18528,23 +18469,23 @@ }, { "name": "nunomaduro/collision", - "version": "v8.8.0", + "version": "v8.8.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8" + "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/4cf9f3b47afff38b139fb79ce54fc71799022ce8", - "reference": "4cf9f3b47afff38b139fb79ce54fc71799022ce8", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/44ccb82e3e21efb5446748d2a3c81a030ac22bd5", + "reference": "44ccb82e3e21efb5446748d2a3c81a030ac22bd5", "shasum": "" }, "require": { - "filp/whoops": "^2.18.0", - "nunomaduro/termwind": "^2.3.0", + "filp/whoops": "^2.18.1", + "nunomaduro/termwind": "^2.3.1", "php": "^8.2.0", - "symfony/console": "^7.2.5" + "symfony/console": "^7.3.0" }, "conflict": { "laravel/framework": "<11.44.2 || >=13.0.0", @@ -18552,15 +18493,15 @@ }, "require-dev": { "brianium/paratest": "^7.8.3", - "larastan/larastan": "^3.2", - "laravel/framework": "^11.44.2 || ^12.6", - "laravel/pint": "^1.21.2", - "laravel/sail": "^1.41.0", - "laravel/sanctum": "^4.0.8", + "larastan/larastan": "^3.4.2", + "laravel/framework": "^11.44.2 || ^12.18", + "laravel/pint": "^1.22.1", + "laravel/sail": "^1.43.1", + "laravel/sanctum": "^4.1.1", "laravel/tinker": "^2.10.1", - "orchestra/testbench-core": "^9.12.0 || ^10.1", - "pestphp/pest": "^3.8.0", - "sebastian/environment": "^7.2.0 || ^8.0" + "orchestra/testbench-core": "^9.12.0 || ^10.4", + "pestphp/pest": "^3.8.2", + "sebastian/environment": "^7.2.1 || ^8.0" }, "type": "library", "extra": { @@ -18623,7 +18564,7 @@ "type": "patreon" } ], - "time": "2025-04-03T14:33:09+00:00" + "time": "2025-06-11T01:04:21+00:00" }, { "name": "phar-io/manifest", @@ -21457,8 +21398,7 @@ "beganovich/snappdf": 20, "horstoeko/orderx": 20, "invoiceninja/einvoice": 20, - "socialiteproviders/apple": 20, - "invoiceninja/admin-api": 20 + "socialiteproviders/apple": 20 }, "prefer-stable": true, "prefer-lowest": false,