diff --git a/VERSION.txt b/VERSION.txt index f3cb8c412987..3b867ccd76c3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.6.31 \ No newline at end of file +5.7.0 \ No newline at end of file diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 51222f5ab43e..a8f43eae85a3 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -1065,7 +1065,7 @@ class BaseController extends Controller $data = $this->first_load; } } else { - $included = request()->input('include'); + $included = request()->input('include', ''); $included = explode(',', $included); foreach ($included as $include) { diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php index d40c569ba05b..8525a88eb80e 100644 --- a/app/Models/CompanyGateway.php +++ b/app/Models/CompanyGateway.php @@ -411,7 +411,7 @@ class CompanyGateway extends BaseModel $fee = 0; - if ($fees_and_limits->adjust_fee_percent) { + if ($fees_and_limits->adjust_fee_percent ?? false) { $adjusted_fee = 0; if ($fees_and_limits->fee_amount) { diff --git a/composer.json b/composer.json index 42082bfb62c7..92c31140f2c1 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "authorizenet/authorizenet": "^2.0", "awobaz/compoships": "^2.1", "bacon/bacon-qr-code": "^2.0", - "beganovich/snappdf": "^3", + "beganovich/snappdf": "^4", "braintree/braintree_php": "^6.0", "checkout/checkout-sdk-php": "^3.0", "cleverit/ubl_invoice": "^1.3", diff --git a/composer.lock b/composer.lock index fea6971d7c21..899fef7f165a 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": "c6e70e26e10d4836ad93323a7efd7eb5", + "content-hash": "8e1e0864e98afc97b30e13631480c86b", "packages": [ { "name": "adrienrn/php-mimetyper", @@ -674,24 +674,24 @@ }, { "name": "beganovich/snappdf", - "version": "v3.1.0", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/beganovich/snappdf.git", - "reference": "b2656c2c67be086b535cd13a704e27caaf5a7570" + "reference": "e3ba325281fa35faa139add57b6183e22ed71cc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beganovich/snappdf/zipball/b2656c2c67be086b535cd13a704e27caaf5a7570", - "reference": "b2656c2c67be086b535cd13a704e27caaf5a7570", + "url": "https://api.github.com/repos/beganovich/snappdf/zipball/e3ba325281fa35faa139add57b6183e22ed71cc1", + "reference": "e3ba325281fa35faa139add57b6183e22ed71cc1", "shasum": "" }, "require": { "ext-zip": "*", - "php": "^8.0|^8.1", - "symfony/console": "^6.0", - "symfony/filesystem": "^6.0", - "symfony/process": "^6.0" + "php": "^8.1|^8.2", + "symfony/console": "^6.2", + "symfony/filesystem": "^6.2", + "symfony/process": "^6.2" }, "require-dev": { "ext-fileinfo": "*", @@ -720,9 +720,9 @@ "description": "Convert webpages or HTML into the PDF file using Chromium or Google Chrome.", "support": { "issues": "https://github.com/beganovich/snappdf/issues", - "source": "https://github.com/beganovich/snappdf/tree/v3.1.0" + "source": "https://github.com/beganovich/snappdf/tree/v4.0.0" }, - "time": "2022-09-14T10:35:47+00:00" + "time": "2023-04-22T07:49:46+00:00" }, { "name": "braintree/braintree_php", @@ -2586,16 +2586,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.312.0", + "version": "v0.312.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "45d47fed73b28254c511882bc743b1690a99558d" + "reference": "d13797cf251ec0d62f00b70dfa8642aa9550900d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/45d47fed73b28254c511882bc743b1690a99558d", - "reference": "45d47fed73b28254c511882bc743b1690a99558d", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/d13797cf251ec0d62f00b70dfa8642aa9550900d", + "reference": "d13797cf251ec0d62f00b70dfa8642aa9550900d", "shasum": "" }, "require": { @@ -2624,9 +2624,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.312.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.312.1" }, - "time": "2023-08-14T00:56:12+00:00" + "time": "2023-08-21T00:52:13+00:00" }, { "name": "google/auth", diff --git a/config/ninja.php b/config/ninja.php index 233559f73bbf..646f456a9cd1 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,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.6.31'), - 'app_tag' => env('APP_TAG','5.6.31'), + 'app_version' => env('APP_VERSION','5.7.0'), + 'app_tag' => env('APP_TAG','5.7.0'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/tests/Feature/InvoiceEmailTest.php b/tests/Feature/InvoiceEmailTest.php index b95761272d50..9bfcb5512402 100644 --- a/tests/Feature/InvoiceEmailTest.php +++ b/tests/Feature/InvoiceEmailTest.php @@ -11,16 +11,15 @@ namespace Tests\Feature; -use Tests\TestCase; -use Tests\MockAccountData; use App\Jobs\Entity\EmailEntity; -use Illuminate\Support\Facades\Event; use App\Utils\Traits\GeneratesCounter; use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\Session; -use Illuminate\Validation\ValidationException; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\Bus; +use Illuminate\Support\Facades\Session; +use Illuminate\Validation\ValidationException; +use Tests\MockAccountData; +use Tests\TestCase; /** * @test @@ -51,10 +50,10 @@ class InvoiceEmailTest extends TestCase public function testTemplateValidation() { $data = [ - "body" => "hey what's up", - "entity" => 'invoice', - "entity_id"=> $this->invoice->hashed_id, - "subject"=> 'Reminder $number', + "body" => "hey what's up", + "entity" => 'invoice', + "entity_id"=> $this->invoice->hashed_id, + "subject"=> 'Reminder $number', "template"=> "first_custom" ]; @@ -152,7 +151,7 @@ class InvoiceEmailTest extends TestCase EmailEntity::dispatch($invitation, $invitation->company); - Bus::assertDispatched(EmailEntity::class); + Bus::assertDispatched(EmailEntity::class); } }); @@ -183,7 +182,7 @@ class InvoiceEmailTest extends TestCase EmailEntity::dispatch($invitation, $invitation->company); -Bus::assertDispatched(EmailEntity::class); + Bus::assertDispatched(EmailEntity::class); } }); @@ -209,7 +208,7 @@ Bus::assertDispatched(EmailEntity::class); EmailEntity::dispatch($invitation, $invitation->company); -Bus::assertDispatched(EmailEntity::class); + Bus::assertDispatched(EmailEntity::class); } });