Merge pull request #8916 from turbo124/v5-develop

v5.7.36
This commit is contained in:
David Bomba 2023-10-29 10:23:27 +11:00 committed by GitHub
commit 521ed8844d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions

View File

@ -1 +1 @@
5.7.35
5.7.36

View File

@ -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.7.35'),
'app_tag' => env('APP_TAG','5.7.35'),
'app_version' => env('APP_VERSION','5.7.36'),
'app_tag' => env('APP_TAG','5.7.36'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

View File

@ -12,9 +12,9 @@
namespace Tests\Pdf;
use App\DataMapper\CompanySettings;
use Tests\TestCase;
use App\Models\Design;
use App\Models\Account;
use App\Models\Company;
use App\Models\Country;
use App\Models\Invoice;
@ -24,6 +24,7 @@ use App\Services\Pdf\PdfMock;
use Beganovich\Snappdf\Snappdf;
use App\Services\Pdf\PdfBuilder;
use App\Services\Pdf\PdfService;
use App\DataMapper\CompanySettings;
use App\Services\Pdf\PdfConfiguration;
/**
@ -47,7 +48,11 @@ class PdfmockTest extends TestCase
'entity_type' => 'invoice',
];
$entity = (new \App\Services\Pdf\PdfMock($data, Company::factory()->make()))->build()->initEntity();
$company = Company::factory()->make();
$account = Account::factory()->make();
$company->setRelation('account', $account);
$entity = (new \App\Services\Pdf\PdfMock($data,$company))->build()->initEntity();
$this->assertInstanceOf(Invoice::class, $entity);
$this->assertNotNull($entity->client);
@ -71,7 +76,11 @@ class PdfmockTest extends TestCase
'entity_type' => 'invoice',
];
$pdf_mock = (new PdfMock($data, Company::factory()->make()))->build();
$company = Company::factory()->make();
$account = Account::factory()->make();
$company->setRelation('account', $account);
$pdf_mock = (new PdfMock($data, $company))->build();
$mock = $pdf_mock->initEntity();
$pdf_service = new PdfService($mock->invitation);