1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00

Fixes for template mocks

This commit is contained in:
David Bomba 2023-09-28 19:53:10 +10:00
parent f655064fa5
commit 0cc75973d2
4 changed files with 25 additions and 21 deletions

View File

@ -310,7 +310,7 @@ class PdfMock
'$created_by_user' => 'Derrick Monahan DDS Erna Wunsch', '$created_by_user' => 'Derrick Monahan DDS Erna Wunsch',
'$client.currency' => 'USD', '$client.currency' => 'USD',
'$company.country' => 'United States', '$company.country' => 'United States',
'$company.address' => 'United States<br/>', '$company.address' => 'Christiansen Garden<br/>70218 Lori Station Suite 529<br/>New Loy, Delaware 29359<br/>United States<br/>Phone: 1-240-886-2233<br/>Email: immanuel53@example.net<br/>',
'$tech_hero_image' => 'http://ninja.test:8000/images/pdf-designs/tech-hero-image.jpg', '$tech_hero_image' => 'http://ninja.test:8000/images/pdf-designs/tech-hero-image.jpg',
'$task.tax_name1' => '', '$task.tax_name1' => '',
'$task.tax_name2' => '', '$task.tax_name2' => '',

File diff suppressed because one or more lines are too long

View File

@ -379,6 +379,7 @@ class TemplateService
$it = new PaymentTransformer(); $it = new PaymentTransformer();
$it->setDefaultIncludes(['client','invoices','paymentables']); $it->setDefaultIncludes(['client','invoices','paymentables']);
$manager = new Manager(); $manager = new Manager();
$manager->parseIncludes(['client','invoices','paymentables']);
$resource = new \League\Fractal\Resource\Collection($payments, $it, null); $resource = new \League\Fractal\Resource\Collection($payments, $it, null);
$resources = $manager->createData($resource)->toArray(); $resources = $manager->createData($resource)->toArray();

36
composer.lock generated
View File

@ -485,16 +485,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.281.14", "version": "3.281.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "4b5b8aab08ef0add75f086bc03c7651799d187db" "reference": "8256b827274966396eccf8ad391ce88d7c53ffa0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4b5b8aab08ef0add75f086bc03c7651799d187db", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8256b827274966396eccf8ad391ce88d7c53ffa0",
"reference": "4b5b8aab08ef0add75f086bc03c7651799d187db", "reference": "8256b827274966396eccf8ad391ce88d7c53ffa0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -574,9 +574,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.281.14" "source": "https://github.com/aws/aws-sdk-php/tree/3.281.15"
}, },
"time": "2023-09-26T18:15:48+00:00" "time": "2023-09-27T18:06:59+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -1466,16 +1466,16 @@
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
"version": "v1.1.1", "version": "1.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/deprecations.git", "url": "https://github.com/doctrine/deprecations.git",
"reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
"reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1507,9 +1507,9 @@
"homepage": "https://www.doctrine-project.org/", "homepage": "https://www.doctrine-project.org/",
"support": { "support": {
"issues": "https://github.com/doctrine/deprecations/issues", "issues": "https://github.com/doctrine/deprecations/issues",
"source": "https://github.com/doctrine/deprecations/tree/v1.1.1" "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
}, },
"time": "2023-06-03T09:27:29+00:00" "time": "2023-09-27T20:04:15+00:00"
}, },
{ {
"name": "doctrine/event-manager", "name": "doctrine/event-manager",
@ -5834,16 +5834,16 @@
}, },
{ {
"name": "microsoft/microsoft-graph", "name": "microsoft/microsoft-graph",
"version": "1.106.0", "version": "1.107.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/microsoftgraph/msgraph-sdk-php.git", "url": "https://github.com/microsoftgraph/msgraph-sdk-php.git",
"reference": "a9f43d74131bb13cb1b5a999101d486b26601b8f" "reference": "63fed05d4d9c348db094f8d8a1d44ff9ce6887c7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/a9f43d74131bb13cb1b5a999101d486b26601b8f", "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/63fed05d4d9c348db094f8d8a1d44ff9ce6887c7",
"reference": "a9f43d74131bb13cb1b5a999101d486b26601b8f", "reference": "63fed05d4d9c348db094f8d8a1d44ff9ce6887c7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5880,9 +5880,9 @@
"homepage": "https://developer.microsoft.com/en-us/graph", "homepage": "https://developer.microsoft.com/en-us/graph",
"support": { "support": {
"issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues", "issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues",
"source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/1.106.0" "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/1.107.0"
}, },
"time": "2023-09-08T06:02:27+00:00" "time": "2023-09-27T06:43:40+00:00"
}, },
{ {
"name": "mollie/mollie-api-php", "name": "mollie/mollie-api-php",