From ea0ef763bf1befe53ff926d204fc81f820352969 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 6 Jul 2022 11:51:24 +1000 Subject: [PATCH] Remove paid to date from credits --- app/Services/PdfMaker/Design.php | 8 +++ composer.lock | 113 +++++++++++++++++-------------- 2 files changed, 72 insertions(+), 49 deletions(-) diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index 46d232e29b45..838eb4f4daa9 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -781,6 +781,14 @@ class Design extends BaseDesign } } + if ($this->entity instanceof Credit) { + // We don't want to show Balanace due on the quotes. + if (in_array('$paid_to_date', $variables)) { + $variables = \array_diff($variables, ['$paid_to_date']); + } + + } + foreach (['discount'] as $property) { $variable = sprintf('%s%s', '$', $property); diff --git a/composer.lock b/composer.lock index c544b3794afb..e4c1ea78da04 100644 --- a/composer.lock +++ b/composer.lock @@ -434,16 +434,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.229.0", + "version": "3.230.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "5e01f0809682060dc5018bf5f267f40c32f4944d" + "reference": "474f351aff22cc7a61016c1de79d7d2fe6c80d2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5e01f0809682060dc5018bf5f267f40c32f4944d", - "reference": "5e01f0809682060dc5018bf5f267f40c32f4944d", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/474f351aff22cc7a61016c1de79d7d2fe6c80d2b", + "reference": "474f351aff22cc7a61016c1de79d7d2fe6c80d2b", "shasum": "" }, "require": { @@ -519,9 +519,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.229.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.230.0" }, - "time": "2022-06-29T18:15:30+00:00" + "time": "2022-07-05T18:19:42+00:00" }, { "name": "bacon/bacon-qr-code", @@ -741,16 +741,16 @@ }, { "name": "checkout/checkout-sdk-php", - "version": "2.5.1", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/checkout/checkout-sdk-php.git", - "reference": "097b862487f7583fd0fab47a08e3dc0800f5c3e4" + "reference": "ab1e493ac9aa9c0350f58f069f6157b2a02a7e27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/097b862487f7583fd0fab47a08e3dc0800f5c3e4", - "reference": "097b862487f7583fd0fab47a08e3dc0800f5c3e4", + "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/ab1e493ac9aa9c0350f58f069f6157b2a02a7e27", + "reference": "ab1e493ac9aa9c0350f58f069f6157b2a02a7e27", "shasum": "" }, "require": { @@ -803,9 +803,9 @@ ], "support": { "issues": "https://github.com/checkout/checkout-sdk-php/issues", - "source": "https://github.com/checkout/checkout-sdk-php/tree/2.5.1" + "source": "https://github.com/checkout/checkout-sdk-php/tree/2.5.2" }, - "time": "2022-06-13T00:23:23+00:00" + "time": "2022-06-30T14:46:15+00:00" }, { "name": "cleverit/ubl_invoice", @@ -2369,16 +2369,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.255.0", + "version": "v0.256.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "2b895ceb08eb106f65e975221e5d2e971cf7470e" + "reference": "122e51021eb19b53f831904918460671d1e7259d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/2b895ceb08eb106f65e975221e5d2e971cf7470e", - "reference": "2b895ceb08eb106f65e975221e5d2e971cf7470e", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/122e51021eb19b53f831904918460671d1e7259d", + "reference": "122e51021eb19b53f831904918460671d1e7259d", "shasum": "" }, "require": { @@ -2407,9 +2407,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.255.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.256.0" }, - "time": "2022-06-27T01:30:11+00:00" + "time": "2022-07-04T01:10:37+00:00" }, { "name": "google/auth", @@ -4671,16 +4671,16 @@ }, { "name": "league/flysystem-aws-s3-v3", - "version": "1.0.29", + "version": "1.0.30", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "4e25cc0582a36a786c31115e419c6e40498f6972" + "reference": "af286f291ebab6877bac0c359c6c2cb017eb061d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972", - "reference": "4e25cc0582a36a786c31115e419c6e40498f6972", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d", + "reference": "af286f291ebab6877bac0c359c6c2cb017eb061d", "shasum": "" }, "require": { @@ -4716,9 +4716,23 @@ "description": "Flysystem adapter for the AWS S3 SDK v3.x", "support": { "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/1.0.29" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/1.0.30" }, - "time": "2020-10-08T18:58:37+00:00" + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "custom" + }, + { + "url": "https://github.com/frankdejonge", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/flysystem", + "type": "tidelift" + } + ], + "time": "2022-07-02T13:51:38+00:00" }, { "name": "league/flysystem-cached-adapter", @@ -7645,16 +7659,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.5", + "version": "v0.11.6", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "c23686f9c48ca202710dbb967df8385a952a2daf" + "reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf", - "reference": "c23686f9c48ca202710dbb967df8385a952a2daf", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/3f5b5f8aaa979fbd0d1783173f4c82ad529fe621", + "reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621", "shasum": "" }, "require": { @@ -7715,9 +7729,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.5" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.6" }, - "time": "2022-05-27T18:03:49+00:00" + "time": "2022-07-03T16:40:23+00:00" }, { "name": "ralouphie/getallheaders", @@ -12838,16 +12852,16 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.6.7", + "version": "v3.6.8", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298" + "reference": "814b36a08a60f4159cdcbb1c466a6a0027440b6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298", - "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/814b36a08a60f4159cdcbb1c466a6a0027440b6c", + "reference": "814b36a08a60f4159cdcbb1c466a6a0027440b6c", "shasum": "" }, "require": { @@ -12907,7 +12921,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7" + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.8" }, "funding": [ { @@ -12919,7 +12933,7 @@ "type": "github" } ], - "time": "2022-02-09T07:52:32+00:00" + "time": "2022-06-08T15:03:05+00:00" }, { "name": "brianium/paratest", @@ -13312,16 +13326,16 @@ }, { "name": "doctrine/annotations", - "version": "1.13.2", + "version": "1.13.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + "reference": "648b0343343565c4a056bfc8392201385e8d89f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0", + "reference": "648b0343343565c4a056bfc8392201385e8d89f0", "shasum": "" }, "require": { @@ -13333,9 +13347,10 @@ "require-dev": { "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", + "phpstan/phpstan": "^1.4.10 || ^1.8.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2" + "symfony/cache": "^4.4 || ^5.2", + "vimeo/psalm": "^4.10" }, "type": "library", "autoload": { @@ -13378,9 +13393,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.2" + "source": "https://github.com/doctrine/annotations/tree/1.13.3" }, - "time": "2021-08-05T19:00:23+00:00" + "time": "2022-07-02T10:48:51+00:00" }, { "name": "doctrine/instantiator", @@ -13519,16 +13534,16 @@ }, { "name": "facade/ignition", - "version": "2.17.5", + "version": "2.17.6", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "1d71996f83c9a5a7807331b8986ac890352b7a0c" + "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/1d71996f83c9a5a7807331b8986ac890352b7a0c", - "reference": "1d71996f83c9a5a7807331b8986ac890352b7a0c", + "url": "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c", + "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c", "shasum": "" }, "require": { @@ -13593,7 +13608,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2022-02-23T18:31:24+00:00" + "time": "2022-06-30T18:26:59+00:00" }, { "name": "facade/ignition-contracts",