From 2e6366baae9610660dc955f06cf4a0bca36d9f35 Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:46:39 +0200 Subject: [PATCH] PIPRES-328: Version upgrade and changelog (#846) --- LICENSE.md | 4 ++-- changelog.md | 5 +++++ mollie.php | 2 +- upgrade/Upgrade-6.0.4.php | 4 ++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 5092eaaa9..c06d21bb7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2012-2020, Mollie B.V. All rights reserved. +Copyright (c) 2012-2023, Mollie B.V. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, @@ -17,4 +17,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. \ No newline at end of file +DAMAGE. diff --git a/changelog.md b/changelog.md index fcbc852ee..7f0513d2e 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,11 @@ # Changelog # +## Changes in release 6.0.5 ## ++ Recurring order options are now in "Subscriptions" tab ++ Implemented atomic action protection for Mollie API callbacks ++ Overall improvements and bug fixes + ## Changes in release 6.0.4 ## + New payment method: Billie. + Enabled mixed cart for subscription orders. Various products could be coupled with a single subscription product. diff --git a/mollie.php b/mollie.php index a066307bb..b6d1d4900 100755 --- a/mollie.php +++ b/mollie.php @@ -85,7 +85,7 @@ public function __construct() { $this->name = 'mollie'; $this->tab = 'payments_gateways'; - $this->version = '6.0.4'; + $this->version = '6.0.5'; $this->author = 'Mollie B.V.'; $this->need_instance = 1; $this->bootstrap = true; diff --git a/upgrade/Upgrade-6.0.4.php b/upgrade/Upgrade-6.0.4.php index 736f730a9..d6cc57bd2 100644 --- a/upgrade/Upgrade-6.0.4.php +++ b/upgrade/Upgrade-6.0.4.php @@ -92,6 +92,8 @@ function updateOrderStatusNames604(Mollie $module) foreach ($authorizablePaymentStatusShipped->name as $langId => $name) { $authorizablePaymentStatusShipped->name[$langId] = 'Order payment shipped'; } + } else { + $authorizablePaymentStatusShipped->name = 'Order payment shipped'; } $authorizablePaymentStatusShipped->save(); @@ -103,6 +105,8 @@ function updateOrderStatusNames604(Mollie $module) foreach ($authorizablePaymentStatusAuthorized->name as $langId => $name) { $authorizablePaymentStatusAuthorized->name[$langId] = 'Order payment authorized'; } + } else { + $authorizablePaymentStatusAuthorized->name = 'Order payment authorized'; } $authorizablePaymentStatusAuthorized->save();