From 7115d03a004255f2517a44c7e13f37699cc88c43 Mon Sep 17 00:00:00 2001
From: shinybrad <83238715+shinybrad@users.noreply.github.com>
Date: Mon, 14 Oct 2024 11:25:06 -0400
Subject: [PATCH 1/4] New translations commerce.php (Italian)

---
 src/translations/it/commerce.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/translations/it/commerce.php b/src/translations/it/commerce.php
index 08fda020fc..5f94d208be 100644
--- a/src/translations/it/commerce.php
+++ b/src/translations/it/commerce.php
@@ -19,7 +19,7 @@
     'Active' => 'Attivo',
     'Add Address' => 'Aggiungi indirizzo',
     'Add Discount' => 'Aggiungi sconto',
-    'Add a coupon' => 'Aggiungi un codice promozionale',
+    'Add a coupon' => 'Aggiungi un coupon',
     'Add a line item' => 'Aggiungi una voce',
     'Add a product' => 'Aggiungi prodotto',
     'Add a variant' => 'Aggiungi variante',
@@ -233,7 +233,7 @@
     'Coupon codes cannot be blank.' => 'I codici promozionali non possono essere vuoti.',
     'Coupon codes must be unique.' => 'I codici promozionali devono essere univoci.',
     'Coupon format is required and must contain at least one `#`.' => 'Il formato dei codici promozionali è obbligatorio e deve contenere almeno un `#`.',
-    'Coupon not valid.' => 'Buono non valido.',
+    'Coupon not valid.' => 'Coupon non valido.',
     'Coupon removed: {explanation}' => 'Coupon rimosso: {explanation}',
     'Coupons' => 'Codici promozionali',
     'Craft Commerce' => 'Craft Commerce',
@@ -409,7 +409,7 @@
     'Enter SKU' => 'Inserisci SKU',
     'Enter a human-friendly name for this tax rate to be used in the control panel.' => 'Inserisci un nome facilmente comprensibile per questa aliquota fiscale da usare nel pannello di controllo.',
     'Enter a percentage like {ex1} or {ex2}.' => 'Inserisci una percentuale come {ex1} o {ex2}.',
-    'Enter coupon code' => 'Inserisci il codice promozionale',
+    'Enter coupon code' => 'Inserisci il codice coupon',
     'Enter price' => 'Inserisci prezzo',
     'Enter reference' => 'Inserisci riferimento',
     'Enter slug' => 'Inserisci URL semantico',
@@ -1021,7 +1021,7 @@
     'This URL will load the cart into the user’s session, making it the active cart.' => 'Questo URL caricherà il carrello nella sessione dell\'utente, rendendolo il carrello attivo.',
     'This action is not allowed for the current user.' => 'Azione non consentita per l’utente corrente.',
     'This coupon is for registered users and limited to {limit} uses.' => 'Questo coupon è riservato agli utenti registrati e limitato a {limit} utilizzi.',
-    'This coupon is limited to {limit} uses.' => 'Questo buono è limitato a {limit} utilizzi.',
+    'This coupon is limited to {limit} uses.' => 'Questo coupon è limitato a {limit} utilizzi.',
     'This coupon requires an email address.' => 'Questo coupon richiede un indirizzo e-mail.',
     'This gateway does not support that functionality.' => 'Questo gateway non supporta tale funzionalità.',
     'This is being overridden by the {setting} config setting in `config/{file}.php`.' => 'Questo è stato escluso dalle impostazioni di configurazione {setting} in `config/{file}.php`.',

From 00194bd8a7d01061d70be69195882c3deeb102eb Mon Sep 17 00:00:00 2001
From: Luke Holder <lukemh@gmail.com>
Date: Wed, 16 Oct 2024 21:11:19 +0800
Subject: [PATCH 2/4] Use same fix as 5.x

---
 src/controllers/SubscriptionsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/SubscriptionsController.php b/src/controllers/SubscriptionsController.php
index 33d478bdd7..838e9ef2e2 100644
--- a/src/controllers/SubscriptionsController.php
+++ b/src/controllers/SubscriptionsController.php
@@ -236,7 +236,7 @@ public function actionSubscribe(): ?Response
             $error = $exception->getMessage();
         }
 
-        if (!$error && $returnUrl) {
+        if ($subscription && $returnUrl) {
             $returnUrl = $this->getView()->renderObjectTemplate($returnUrl, $subscription);
             $subscriptionRecord = SubscriptionRecord::findOne($subscription->id);
             $subscriptionRecord->returnUrl = $returnUrl;

From ef1979bde02a9ea2cb7b574405514c8f9d0b3457 Mon Sep 17 00:00:00 2001
From: Nathaniel Hammond <nathaniel@pixelandtonic.com>
Date: Wed, 16 Oct 2024 16:20:16 +0100
Subject: [PATCH 3/4] Finish 4.6.14

[ci skip]
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f456f3268..3f5652ce3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release Notes for Craft Commerce
 
-## Unreleased
+## 4.6.14 - 2024-10-16
 
 - Fixed a PHP error that could occur when creating a subscription. ([#3710](https://github.com/craftcms/commerce/issues/))
 

From cd0025fe43a2cc8c89ad7b405286888112cec003 Mon Sep 17 00:00:00 2001
From: Nathaniel Hammond <nathaniel@pixelandtonic.com>
Date: Wed, 16 Oct 2024 16:25:41 +0100
Subject: [PATCH 4/4] Finish 4.6.14

[ci skip]
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f5652ce3e..554645cc57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 4.6.14 - 2024-10-16
 
-- Fixed a PHP error that could occur when creating a subscription. ([#3710](https://github.com/craftcms/commerce/issues/))
+- Fixed a PHP error that could occur when creating a subscription. ([#3710](https://github.com/craftcms/commerce/issues/3710))
 
 ## 4.6.13 - 2024-10-02