From e67e297ca2ac9c6e9923bcc4018a68580b5a0326 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 27 Jun 2025 19:06:03 +1000 Subject: [PATCH] Updated dependencies --- .../StoreRecurringInvoiceRequest.php | 7 +++- .../UpdateRecurringInvoiceRequest.php | 6 +++ app/Services/EDocument/Jobs/SendEDocument.php | 2 + composer.lock | 37 +++++++++---------- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php index 8af793f769..98a4dbe7c6 100644 --- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php @@ -121,6 +121,11 @@ class StoreRecurringInvoiceRequest extends Request $input['vendor_id'] = $this->decodePrimaryKey($input['vendor_id']); } + + if (array_key_exists('location_id', $input) && is_string($input['location_id'])) { + $input['location_id'] = $this->decodePrimaryKey($input['location_id']); + } + if (array_key_exists('project_id', $input) && is_string($input['project_id'])) { $input['project_id'] = $this->decodePrimaryKey($input['project_id']); } @@ -172,7 +177,7 @@ class StoreRecurringInvoiceRequest extends Request if (array_key_exists('exchange_rate', $input) && (is_null($input['exchange_rate']) || $input['exchange_rate'] == 0)) { $input['exchange_rate'] = 1; } - + $this->replace($input); } diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php index 27c19ccaa0..f426dfc933 100644 --- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php @@ -104,6 +104,12 @@ class UpdateRecurringInvoiceRequest extends Request $input['client_id'] = $this->decodePrimaryKey($input['client_id']); } + + if (array_key_exists('location_id', $input) && is_string($input['location_id'])) { + $input['location_id'] = $this->decodePrimaryKey($input['location_id']); + } + + if (isset($input['vendor_id'])) { $input['vendor_id'] = $this->decodePrimaryKey($input['vendor_id']); } diff --git a/app/Services/EDocument/Jobs/SendEDocument.php b/app/Services/EDocument/Jobs/SendEDocument.php index b5cf588a7c..dbb5593cb0 100644 --- a/app/Services/EDocument/Jobs/SendEDocument.php +++ b/app/Services/EDocument/Jobs/SendEDocument.php @@ -70,6 +70,8 @@ class SendEDocument implements ShouldQueue return; //Bad Actor present. } + $model = $model->service()->markSent()->save(); + /** Concrete implementation current linked to Storecove only */ $p = new Peppol($model); $p->run(); diff --git a/composer.lock b/composer.lock index df94dacb0c..176ff8b0cf 100644 --- a/composer.lock +++ b/composer.lock @@ -1110,16 +1110,16 @@ }, { "name": "braintree/braintree_php", - "version": "6.26.0", + "version": "6.27.0", "source": { "type": "git", "url": "https://github.com/braintree/braintree_php.git", - "reference": "602bfe7876cc2f6c6c24bd68fef4c6de8c3a8195" + "reference": "2843f65ef19f5b2a0344b07a59a632df92857993" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/braintree/braintree_php/zipball/602bfe7876cc2f6c6c24bd68fef4c6de8c3a8195", - "reference": "602bfe7876cc2f6c6c24bd68fef4c6de8c3a8195", + "url": "https://api.github.com/repos/braintree/braintree_php/zipball/2843f65ef19f5b2a0344b07a59a632df92857993", + "reference": "2843f65ef19f5b2a0344b07a59a632df92857993", "shasum": "" }, "require": { @@ -1153,9 +1153,9 @@ "description": "Braintree PHP Client Library", "support": { "issues": "https://github.com/braintree/braintree_php/issues", - "source": "https://github.com/braintree/braintree_php/tree/6.26.0" + "source": "https://github.com/braintree/braintree_php/tree/6.27.0" }, - "time": "2025-05-28T19:18:19+00:00" + "time": "2025-06-26T19:49:44+00:00" }, { "name": "brick/math", @@ -10988,21 +10988,20 @@ }, { "name": "ramsey/uuid", - "version": "4.8.1", + "version": "4.9.0", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28" + "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28", - "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0", + "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0", "shasum": "" }, "require": { "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13", - "ext-json": "*", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" }, @@ -11061,9 +11060,9 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.8.1" + "source": "https://github.com/ramsey/uuid/tree/4.9.0" }, - "time": "2025-06-01T06:28:46+00:00" + "time": "2025-06-25T14:20:11+00:00" }, { "name": "razorpay/razorpay", @@ -19201,16 +19200,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.24", + "version": "11.5.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6b07ab1047155cf38f82dd691787a277782271dd" + "reference": "864ab32b3ff52058f917c5b19b3cef821e4a4f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6b07ab1047155cf38f82dd691787a277782271dd", - "reference": "6b07ab1047155cf38f82dd691787a277782271dd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/864ab32b3ff52058f917c5b19b3cef821e4a4f1b", + "reference": "864ab32b3ff52058f917c5b19b3cef821e4a4f1b", "shasum": "" }, "require": { @@ -19282,7 +19281,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.24" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.25" }, "funding": [ { @@ -19306,7 +19305,7 @@ "type": "tidelift" } ], - "time": "2025-06-20T11:31:02+00:00" + "time": "2025-06-27T04:36:07+00:00" }, { "name": "react/cache",