From 692594fe64ffe1b012623385aaf77612195ec836 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 18 Jan 2021 09:16:22 +0200 Subject: [PATCH 01/11] Update version --- app/Constants.php | 2 +- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Constants.php b/app/Constants.php index c215246a2141..15c1f55ade24 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -361,7 +361,7 @@ if (! defined('APP_NAME')) { define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest')); define('NINJA_DATE', '2000-01-01'); - define('NINJA_VERSION', '4.5.29' . env('NINJA_VERSION_SUFFIX')); + define('NINJA_VERSION', '4.5.30' . env('NINJA_VERSION_SUFFIX')); define('NINJA_TERMS_VERSION', '1.0.1'); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); diff --git a/docs/conf.py b/docs/conf.py index e523002b2000..217a77628f0a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,7 +59,7 @@ author = u'Invoice Ninja' # The short X.Y version. version = u'4.5' # The full version, including alpha/beta/rc tags. -release = u'4.5.29' +release = u'4.5.30' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 8b7b4b138e3b561371eb960ff8090438d7d565ea Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 20 Jan 2021 10:54:49 +0200 Subject: [PATCH 02/11] Update version --- app/Constants.php | 2 +- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Constants.php b/app/Constants.php index 15c1f55ade24..eed66b157d13 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -361,7 +361,7 @@ if (! defined('APP_NAME')) { define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest')); define('NINJA_DATE', '2000-01-01'); - define('NINJA_VERSION', '4.5.30' . env('NINJA_VERSION_SUFFIX')); + define('NINJA_VERSION', '4.5.31' . env('NINJA_VERSION_SUFFIX')); define('NINJA_TERMS_VERSION', '1.0.1'); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); diff --git a/docs/conf.py b/docs/conf.py index 217a77628f0a..7705fa2948ad 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,7 +59,7 @@ author = u'Invoice Ninja' # The short X.Y version. version = u'4.5' # The full version, including alpha/beta/rc tags. -release = u'4.5.30' +release = u'4.5.31' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From f7d1d95e3a64512cc86e578967f98c2da8c2c12a Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 20 Jan 2021 20:49:30 +0200 Subject: [PATCH 03/11] Update lang file --- resources/lang/en/texts.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 7d591f21248c..9f8ca25ba623 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -3902,6 +3902,25 @@ $LANG = array( 'recent_tasks' => 'Recent Tasks', 'recent_expenses' => 'Recent Expenses', 'upcoming_expenses' => 'Upcoming Expenses', + 'search_payment_term' => 'Search 1 Payment Term', + 'search_payment_terms' => 'Search :count Payment Terms', + 'save_and_preview' => 'Save and Preview', + 'save_and_email' => 'Save and Email', + 'converted_balance' => 'Converted Balance', + 'is_sent' => 'Is Sent', + 'document_upload' => 'Document Upload', + 'document_upload_help' => 'Enable clients to upload documents', + 'expense_total' => 'Expense Total', + 'enter_taxes' => 'Enter Taxes', + 'by_rate' => 'By Rate', + 'by_amount' => 'By Amount', + 'enter_amount' => 'Enter Amount', + 'before_taxes' => 'Before Taxes', + 'after_taxes' => 'After Taxes', + 'color' => 'Color', + 'show' => 'Show', + 'empty_columns' => 'Empty Columns', + 'project_name' => 'Project Name', ); return $LANG; From 3cc3548f6912ddaf0e71fc1de38d54ecb1ae2cf7 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 21 Jan 2021 07:59:30 +0200 Subject: [PATCH 04/11] Correct typo --- resources/lang/en/texts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 9f8ca25ba623..66ddb58dc199 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -3897,7 +3897,7 @@ $LANG = array( 'show_product_discount_help' => 'Display a line item discount field', 'tax_name3' => 'Tax Name 3', 'debug_mode_is_enabled' => 'Debug mode is enabled', - 'debug_mode_is_enabled_help' => 'Warning: it is intented for use on local machines, it can leak credentials. Click to learn more.', + 'debug_mode_is_enabled_help' => 'Warning: it is intended for use on local machines, it can leak credentials. Click to learn more.', 'running_tasks' => 'Running Tasks', 'recent_tasks' => 'Recent Tasks', 'recent_expenses' => 'Recent Expenses', From fa5281f5e5113b4b56a229151cfb9c7a4171324f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 22 Jan 2021 21:18:05 +1100 Subject: [PATCH 05/11] Security fixes + remove Cybersource gateway --- composer.lock | 619 +----------------- ..._22_101548_remove_cyber_source_gateway.php | 33 + 2 files changed, 34 insertions(+), 618 deletions(-) create mode 100644 database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php diff --git a/composer.lock b/composer.lock index fbe4d6b7f9a8..bfe231056bca 100644 --- a/composer.lock +++ b/composer.lock @@ -713,12 +713,6 @@ "phpstorm", "sublime" ], - "funding": [ - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], "time": "2020-08-10T08:22:48+00:00" }, { @@ -1286,20 +1280,6 @@ "ssl", "tls" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2021-01-12T12:10:35+00:00" }, { @@ -1378,20 +1358,6 @@ "dependency", "package" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-12-03T16:20:39+00:00" }, { @@ -1454,20 +1420,6 @@ "validation", "versioning" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-11-13T08:59:24+00:00" }, { @@ -1528,20 +1480,6 @@ "spdx", "validator" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-12-03T16:04:16+00:00" }, { @@ -1586,20 +1524,6 @@ "Xdebug", "performance" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-11-13T08:04:11+00:00" }, { @@ -2229,20 +2153,6 @@ "redis", "xcache" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", - "type": "tidelift" - } - ], "time": "2020-07-07T18:54:01+00:00" }, { @@ -2530,20 +2440,6 @@ "uppercase", "words" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", - "type": "tidelift" - } - ], "time": "2020-05-29T07:19:59+00:00" }, { @@ -2606,20 +2502,6 @@ "parser", "php" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -2719,12 +2601,6 @@ "validation", "validator" ], - "funding": [ - { - "url": "https://github.com/egulias", - "type": "github" - } - ], "time": "2020-12-29T14:50:06+00:00" }, { @@ -4180,16 +4056,6 @@ "thumbnail", "watermark" ], - "funding": [ - { - "url": "https://www.paypal.me/interventionphp", - "type": "custom" - }, - { - "url": "https://github.com/Intervention", - "type": "github" - } - ], "time": "2020-11-06T15:12:52+00:00" }, { @@ -4769,20 +4635,6 @@ } ], "description": "Update helper", - "funding": [ - { - "url": "https://github.com/kylekatarnls", - "type": "github" - }, - { - "url": "https://opencollective.com/Carbon", - "type": "open_collective" - }, - { - "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", - "type": "tidelift" - } - ], "time": "2020-04-07T20:44:10+00:00" }, { @@ -5142,12 +4994,6 @@ "transform", "write" ], - "funding": [ - { - "url": "https://github.com/sponsors/nyamsprod", - "type": "github" - } - ], "time": "2020-12-10T19:40:30+00:00" }, { @@ -5233,12 +5079,6 @@ "sftp", "storage" ], - "funding": [ - { - "url": "https://offset.earth/frankdejonge", - "type": "other" - } - ], "time": "2020-08-23T07:39:11+00:00" }, { @@ -5438,16 +5278,6 @@ } ], "description": "Mime-type detection for Flysystem", - "funding": [ - { - "url": "https://github.com/frankdejonge", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/flysystem", - "type": "tidelift" - } - ], "time": "2021-01-18T20:58:21+00:00" }, { @@ -6078,16 +5908,6 @@ "logging", "psr-3" ], - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", - "type": "tidelift" - } - ], "time": "2020-12-14T12:56:38+00:00" }, { @@ -6306,12 +6126,6 @@ "object", "object graph" ], - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], "time": "2020-11-13T09:40:50+00:00" }, { @@ -8764,20 +8578,6 @@ "x.509", "x509" ], - "funding": [ - { - "url": "https://github.com/terrafrost", - "type": "github" - }, - { - "url": "https://www.patreon.com/phpseclib", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", - "type": "tidelift" - } - ], "time": "2021-01-16T17:35:19+00:00" }, { @@ -8908,12 +8708,6 @@ "predis", "redis" ], - "funding": [ - { - "url": "https://github.com/sponsors/tillkruss", - "type": "github" - } - ], "time": "2020-09-11T19:18:05+00:00" }, { @@ -9666,16 +9460,6 @@ "parser", "validator" ], - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", - "type": "tidelift" - } - ], "time": "2020-11-11T09:19:24+00:00" }, { @@ -9992,16 +9776,6 @@ "mail", "mailer" ], - "funding": [ - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer", - "type": "tidelift" - } - ], "time": "2021-01-12T09:35:59+00:00" }, { @@ -10061,20 +9835,6 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10142,20 +9902,6 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10204,20 +9950,6 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10269,20 +10001,6 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10349,20 +10067,6 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10468,20 +10172,6 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10526,20 +10216,6 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-11-16T17:02:08+00:00" }, { @@ -10589,20 +10265,6 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10688,20 +10350,6 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-11-27T08:42:42+00:00" }, { @@ -10751,20 +10399,6 @@ "configuration", "options" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10827,20 +10461,6 @@ "polyfill", "portable" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-07T16:49:33+00:00" }, { @@ -10904,20 +10524,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-07T16:49:33+00:00" }, { @@ -10988,20 +10594,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-07T16:49:33+00:00" }, { @@ -11069,20 +10661,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-07T17:09:11+00:00" }, { @@ -11146,20 +10724,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-07T16:49:33+00:00" }, { @@ -11211,20 +10775,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -11276,20 +10826,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -11349,20 +10885,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-07T16:49:33+00:00" }, { @@ -11407,20 +10929,6 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -11492,20 +11000,6 @@ "uri", "url" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -11643,20 +11137,6 @@ "interoperability", "standards" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-09-02T16:08:58+00:00" }, { @@ -11721,20 +11201,6 @@ "debug", "dump" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -11789,20 +11255,6 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -12323,16 +11775,6 @@ "keywords": [ "templating" ], - "funding": [ - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/twig/twig", - "type": "tidelift" - } - ], "time": "2021-01-05T10:10:05+00:00" }, { @@ -12443,16 +11885,6 @@ "env", "environment" ], - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", - "type": "tidelift" - } - ], "time": "2021-01-20T14:39:13+00:00" }, { @@ -13515,20 +12947,6 @@ "constructor", "instantiate" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-11-10T18:47:58+00:00" }, { @@ -14253,12 +13671,6 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T08:15:22+00:00" }, { @@ -14781,20 +14193,6 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-18T07:41:31+00:00" }, { @@ -14847,20 +14245,6 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -14951,6 +14335,5 @@ "ext-json": "*", "ext-zip": "*" }, - "platform-dev": [], - "plugin-api-version": "1.1.0" + "platform-dev": [] } diff --git a/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php b/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php new file mode 100644 index 000000000000..9381510a958e --- /dev/null +++ b/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php @@ -0,0 +1,33 @@ +first(); + $cyber->payment_library_id = 2; + $cyber->save(); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} From ee92e156682153fd1f8b346df721de9b0aa19d1d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 22 Jan 2021 21:51:59 +1100 Subject: [PATCH 06/11] Update framework dependencies --- composer.json | 4 ++++ composer.lock | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 08837d4042a5..64c7c67b4d26 100644 --- a/composer.json +++ b/composer.json @@ -183,6 +183,10 @@ { "type": "vcs", "url": "https://github.com/davidbankes/omnipay-firstdata.git" + }, + { + "type": "vcs", + "url": "https://github.com/hillelcoren/omnipay-authorizenet" } ] } diff --git a/composer.lock b/composer.lock index bfe231056bca..e29979251c62 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": "9def12c786458c271816b1e2c24d754f", + "content-hash": "0dd03f115e3c89e9594b6965d0b469f4", "packages": [ { "name": "abdala/omnipay-pagseguro", @@ -14335,5 +14335,6 @@ "ext-json": "*", "ext-zip": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } From b24514784410928fd83f24e3ff0d5d8cf247b88d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 23 Jan 2021 19:52:48 +1100 Subject: [PATCH 07/11] fixes for travos --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 88406aab6677..716e283cd8f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ group: deprecated-2017Q4 php: - 7.2 + - 7.3 addons: hosts: @@ -29,7 +30,7 @@ env: before_install: # set GitHub token and update composer - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; - - composer self-update && composer -V + - composer self-update 1.10.19 && composer -V # - export USE_ZEND_ALLOC=0 - rvm use 1.9.3 --install --fuzzy From 248f95b2955443d439863647c32481f4f2af0fbe Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 23 Jan 2021 20:18:29 +1100 Subject: [PATCH 08/11] Fixes for migration --- .../2021_01_22_101548_remove_cyber_source_gateway.php | 11 ++++++++--- database/seeds/PaymentLibrariesSeeder.php | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php b/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php index 9381510a958e..29ed02b2c691 100644 --- a/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php +++ b/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php @@ -16,9 +16,14 @@ class RemoveCyberSourceGateway extends Migration { /* No longer supported for V2 Omnipay */ - $cyber = Gateway::where('provider', 'Cybersource')->first(); - $cyber->payment_library_id = 2; - $cyber->save(); + + if(Gatway::count() > 0) + { + $cyber = Gateway::where('provider', 'Cybersource')->first(); + $cyber->payment_library_id = 2; + $cyber->save(); + } + } /** diff --git a/database/seeds/PaymentLibrariesSeeder.php b/database/seeds/PaymentLibrariesSeeder.php index 9191164c2531..d4dcc1e3136c 100644 --- a/database/seeds/PaymentLibrariesSeeder.php +++ b/database/seeds/PaymentLibrariesSeeder.php @@ -57,7 +57,7 @@ class PaymentLibrariesSeeder extends Seeder ['name' => 'Cardgate', 'provider' => 'Cardgate'], ['name' => 'Checkout.com', 'provider' => 'CheckoutCom'], ['name' => 'Creditcall', 'provider' => 'Creditcall'], - ['name' => 'Cybersource', 'provider' => 'Cybersource'], + ['name' => 'Cybersource', 'provider' => 'Cybersource', 'payment_library_id' => 2], ['name' => 'ecoPayz', 'provider' => 'Ecopayz'], ['name' => 'Fasapay', 'provider' => 'Fasapay'], ['name' => 'Komoju', 'provider' => 'Komoju'], From fc4cbf335aea1a2735b1df9b7b0af9f91a415575 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 23 Jan 2021 22:15:08 +1100 Subject: [PATCH 09/11] Typo --- .../2021_01_22_101548_remove_cyber_source_gateway.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php b/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php index 29ed02b2c691..57032386759b 100644 --- a/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php +++ b/database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php @@ -17,7 +17,7 @@ class RemoveCyberSourceGateway extends Migration /* No longer supported for V2 Omnipay */ - if(Gatway::count() > 0) + if(Gateway::count() > 0) { $cyber = Gateway::where('provider', 'Cybersource')->first(); $cyber->payment_library_id = 2; From cde03d132bc812ae84f2e811ed7b0c4949214cb9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 25 Jan 2021 21:32:29 +1100 Subject: [PATCH 10/11] Fixes for client / vendor numbering --- app/Traits/GenerateMigrationResources.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index efc3fbe96f82..93a73ac45d4c 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -203,6 +203,16 @@ trait GenerateMigrationResources $clients = []; foreach ($this->account->clients()->withTrashed()->get() as $client) { + + if($this->account->client_number_counter > 0){ + $number = $client->id_number; + $id_number = ''; + } + else{ + $id_number = $client->id_number; + $number = NULL; + } + $clients[] = [ 'id' => $client->id, 'company_id' => $client->account_id, @@ -223,7 +233,8 @@ trait GenerateMigrationResources 'size_id' => $client->size_id, 'is_deleted' => $client->is_deleted, 'vat_number' => $client->vat_number, - 'id_number' => $client->id_number, + 'id_number' => $id_number, + 'number' => $number, 'custom_value1' => $client->custom_value1, 'custom_value2' => $client->custom_value2, 'shipping_address1' => $client->shipping_address1, @@ -1613,6 +1624,7 @@ trait GenerateMigrationResources 'is_deleted' => $vendor->is_deleted, 'vat_number' => $vendor->vat_number, 'id_number' => $vendor->id_number, + 'number' => NULL, 'custom_value1' => $vendor->custom_value1, 'custom_value2' => $vendor->custom_value2, 'custom_value3' => '', From 57185f1917524b8c7dd9e9f217481c44ac253127 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 26 Jan 2021 16:20:04 +1100 Subject: [PATCH 11/11] Refactor client and vendor numbers --- app/Traits/GenerateMigrationResources.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index 93a73ac45d4c..b5d51ea86868 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -204,15 +204,9 @@ trait GenerateMigrationResources foreach ($this->account->clients()->withTrashed()->get() as $client) { - if($this->account->client_number_counter > 0){ $number = $client->id_number; $id_number = ''; - } - else{ - $id_number = $client->id_number; - $number = NULL; - } - + $clients[] = [ 'id' => $client->id, 'company_id' => $client->account_id, @@ -1623,8 +1617,8 @@ trait GenerateMigrationResources //'size_id' => $vendor->size_id, 'is_deleted' => $vendor->is_deleted, 'vat_number' => $vendor->vat_number, - 'id_number' => $vendor->id_number, - 'number' => NULL, + 'id_number' => null, + 'number' => $vendor->id_number, 'custom_value1' => $vendor->custom_value1, 'custom_value2' => $vendor->custom_value2, 'custom_value3' => '',