Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Fixes for no invitation

Browse Source
This commit is contained in:
David Bomba 2020-10-03 18:09:48 +10:00
parent 1390e739e3
commit ee8ae09314
2 changed files with 69 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -213,7 +213,9 @@ trait MakesInvoiceValues
$data['$number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
$data['$entity.terms'] = ['value' => $this->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')];
$data['$terms'] = &$data['$entity.terms'];
$data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
if($invitation)
$data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
// $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
}
@ -222,7 +224,9 @@ trait MakesInvoiceValues
$data['$number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.quote_number')];
$data['$entity.terms'] = ['value' => $this->terms ?: '&nbsp;', 'label' => ctrans('texts.quote_terms')];
$data['$terms'] = &$data['$entity.terms'];
$data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_quote').'</a>', 'label' => ctrans('texts.view_quote')];
if($invitation)
$data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_quote').'</a>', 'label' => ctrans('texts.view_quote')];
// $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_quote')];
}
@ -231,7 +235,9 @@ trait MakesInvoiceValues
$data['$number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.credit_number')];
$data['$entity.terms'] = ['value' => $this->terms ?: '&nbsp;', 'label' => ctrans('texts.credit_terms')];
$data['$terms'] = &$data['$entity.terms'];
$data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_credit').'</a>', 'label' => ctrans('texts.view_credit')];
if($invitation)
$data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_credit').'</a>', 'label' => ctrans('texts.view_credit')];
// $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_credit')];
}

110
composer.lock generated
View File

@ -108,16 +108,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.158.0",
"version": "3.158.1",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "59345aa45161a8f83c3a0027a7df9567ae72cc85"
"reference": "55ae8bdf2eb2f9774193fa79c6fc436835c42db4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/59345aa45161a8f83c3a0027a7df9567ae72cc85",
"reference": "59345aa45161a8f83c3a0027a7df9567ae72cc85",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/55ae8bdf2eb2f9774193fa79c6fc436835c42db4",
"reference": "55ae8bdf2eb2f9774193fa79c6fc436835c42db4",
"shasum": ""
},
"require": {
@ -189,7 +189,7 @@
"s3",
"sdk"
],
"time": "2020-10-01T18:41:53+00:00"
"time": "2020-10-02T18:16:40+00:00"
},
{
"name": "brick/math",
@ -355,23 +355,23 @@
},
{
"name": "clue/stream-filter",
"version": "v1.4.1",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/clue/php-stream-filter.git",
"reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71"
"reference": "aeb7d8ea49c7963d3b581378955dbf5bc49aa320"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/clue/php-stream-filter/zipball/5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71",
"reference": "5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71",
"url": "https://api.github.com/repos/clue/php-stream-filter/zipball/aeb7d8ea49c7963d3b581378955dbf5bc49aa320",
"reference": "aeb7d8ea49c7963d3b581378955dbf5bc49aa320",
"shasum": ""
},
"require": {
"php": ">=5.3"
},
"require-dev": {
"phpunit/phpunit": "^5.0 || ^4.8"
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36"
},
"type": "library",
"autoload": {
@ -389,7 +389,7 @@
"authors": [
{
"name": "Christian Lück",
"email": "christian@lueck.tv"
"email": "christian@clue.engineering"
}
],
"description": "A simple and modern approach to stream filtering in PHP",
@ -403,7 +403,17 @@
"stream_filter_append",
"stream_filter_register"
],
"time": "2019-04-09T12:31:48+00:00"
"funding": [
{
"url": "https://clue.engineering/support",
"type": "custom"
},
{
"url": "https://github.com/clue",
"type": "github"
}
],
"time": "2020-10-02T12:38:20+00:00"
},
{
"name": "composer/ca-bundle",
@ -1804,16 +1814,16 @@
},
{
"name": "google/auth",
"version": "v1.13.0",
"version": "v1.14.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-auth-library-php.git",
"reference": "173191f5defd1d9ae8bdfc28da31b63eb73dd34e"
"reference": "95c23ebd89a0a4d1b511aed81426f57388ab7268"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/173191f5defd1d9ae8bdfc28da31b63eb73dd34e",
"reference": "173191f5defd1d9ae8bdfc28da31b63eb73dd34e",
"url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/95c23ebd89a0a4d1b511aed81426f57388ab7268",
"reference": "95c23ebd89a0a4d1b511aed81426f57388ab7268",
"shasum": ""
},
"require": {
@ -1852,7 +1862,7 @@
"google",
"oauth2"
],
"time": "2020-09-18T20:03:05+00:00"
"time": "2020-10-02T22:20:36+00:00"
},
{
"name": "graham-campbell/result-type",
@ -2487,16 +2497,16 @@
},
{
"name": "laravel/framework",
"version": "v8.7.1",
"version": "v8.8.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "3fb29e904a152b3e1fe49581f66ba5e02fe991f2"
"reference": "0bdd5c6f12cb7cb6644e484169656245af417735"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/3fb29e904a152b3e1fe49581f66ba5e02fe991f2",
"reference": "3fb29e904a152b3e1fe49581f66ba5e02fe991f2",
"url": "https://api.github.com/repos/laravel/framework/zipball/0bdd5c6f12cb7cb6644e484169656245af417735",
"reference": "0bdd5c6f12cb7cb6644e484169656245af417735",
"shasum": ""
},
"require": {
@ -2646,7 +2656,7 @@
"framework",
"laravel"
],
"time": "2020-09-29T15:39:07+00:00"
"time": "2020-10-02T14:33:08+00:00"
},
{
"name": "laravel/slack-notification-channel",
@ -5928,16 +5938,16 @@
},
{
"name": "sentry/sentry",
"version": "3.0.1",
"version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php.git",
"reference": "b39248013660036d222681a359990284904a5db3"
"reference": "a35c6c71693a72f2fedb9b6f9644ced52268771d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/b39248013660036d222681a359990284904a5db3",
"reference": "b39248013660036d222681a359990284904a5db3",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/a35c6c71693a72f2fedb9b6f9644ced52268771d",
"reference": "a35c6c71693a72f2fedb9b6f9644ced52268771d",
"shasum": ""
},
"require": {
@ -6024,7 +6034,7 @@
"type": "custom"
}
],
"time": "2020-10-01T12:10:56+00:00"
"time": "2020-10-02T14:16:36+00:00"
},
{
"name": "sentry/sentry-laravel",
@ -9850,16 +9860,16 @@
},
{
"name": "facade/ignition",
"version": "2.3.7",
"version": "2.3.8",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
"reference": "b364db8860a63c1fb58b72b9718863c21df08762"
"reference": "e8fed9c382cd1d02b5606688576a35619afdf82c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/facade/ignition/zipball/b364db8860a63c1fb58b72b9718863c21df08762",
"reference": "b364db8860a63c1fb58b72b9718863c21df08762",
"url": "https://api.github.com/repos/facade/ignition/zipball/e8fed9c382cd1d02b5606688576a35619afdf82c",
"reference": "e8fed9c382cd1d02b5606688576a35619afdf82c",
"shasum": ""
},
"require": {
@ -9918,7 +9928,7 @@
"laravel",
"page"
],
"time": "2020-09-06T19:26:27+00:00"
"time": "2020-10-01T23:01:14+00:00"
},
{
"name": "facade/ignition-contracts",
@ -10658,16 +10668,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "9.1.11",
"version": "9.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "c9394cb9d07ecfa9351b96f2e296bad473195f4d"
"reference": "53a4b737e83be724efd2bc4e7b929b9a30c48972"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c9394cb9d07ecfa9351b96f2e296bad473195f4d",
"reference": "c9394cb9d07ecfa9351b96f2e296bad473195f4d",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/53a4b737e83be724efd2bc4e7b929b9a30c48972",
"reference": "53a4b737e83be724efd2bc4e7b929b9a30c48972",
"shasum": ""
},
"require": {
@ -10695,7 +10705,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "9.1-dev"
"dev-master": "9.2-dev"
}
},
"autoload": {
@ -10727,7 +10737,7 @@
"type": "github"
}
],
"time": "2020-09-19T05:29:17+00:00"
"time": "2020-10-02T03:37:32+00:00"
},
{
"name": "phpunit/php-file-iterator",
@ -10956,16 +10966,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.3.11",
"version": "9.4.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "f7316ea106df7c9507f4fdaa88c47bc10a3b27a1"
"reference": "ef533467a7974c4b6c354f3eff42a115910bd4e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f7316ea106df7c9507f4fdaa88c47bc10a3b27a1",
"reference": "f7316ea106df7c9507f4fdaa88c47bc10a3b27a1",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ef533467a7974c4b6c354f3eff42a115910bd4e5",
"reference": "ef533467a7974c4b6c354f3eff42a115910bd4e5",
"shasum": ""
},
"require": {
@ -10981,7 +10991,7 @@
"phar-io/version": "^3.0.2",
"php": ">=7.3",
"phpspec/prophecy": "^1.11.1",
"phpunit/php-code-coverage": "^9.1.11",
"phpunit/php-code-coverage": "^9.2",
"phpunit/php-file-iterator": "^3.0.4",
"phpunit/php-invoker": "^3.1",
"phpunit/php-text-template": "^2.0.2",
@ -11012,7 +11022,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "9.3-dev"
"dev-master": "9.4-dev"
}
},
"autoload": {
@ -11051,7 +11061,7 @@
"type": "github"
}
],
"time": "2020-09-24T08:08:49+00:00"
"time": "2020-10-02T03:54:37+00:00"
},
{
"name": "scrivo/highlight.php",
@ -11182,16 +11192,16 @@
},
{
"name": "sebastian/code-unit",
"version": "1.0.6",
"version": "1.0.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit.git",
"reference": "d3a241b6028ff9d8e97d2b6ebd4090d01f92fad8"
"reference": "59236be62b1bb9919e6d7f60b0b832dc05cef9ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/d3a241b6028ff9d8e97d2b6ebd4090d01f92fad8",
"reference": "d3a241b6028ff9d8e97d2b6ebd4090d01f92fad8",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/59236be62b1bb9919e6d7f60b0b832dc05cef9ab",
"reference": "59236be62b1bb9919e6d7f60b0b832dc05cef9ab",
"shasum": ""
},
"require": {
@ -11230,7 +11240,7 @@
"type": "github"
}
],
"time": "2020-09-28T05:28:46+00:00"
"time": "2020-10-02T14:47:54+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",