Merge branch '1.x' into 1.2

craftcms · Nov 1, 2024 · fa70b83 · fa70b83
2 parents f7440e5 + 5f42cd3
commit fa70b83
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 93 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,8 +18,8 @@
 - Deprecated `craft\stripe\models\Settings->$webhookSigningSecret` ([#30](https://github.com/craftcms/stripe/pull/30))
 - Deprecated `craft\stripe\models\Settings->$webhookId` ([#30](https://github.com/craftcms/stripe/pull/30))
 - Added `craft\stripe\fields\Subscriptions`. ([#32](https://github.com/craftcms/stripe/pull/32))
-- Fixed a SQL error that occurred when syncing a subscriptions that were missing a `latest_invoice` value. ([#21](https://github.com/craftcms/stripe/pull/21))
-- Fixed links to stripe dashboard when in live mode. ([#21](https://github.com/craftcms/stripe/pull/21))
+- Fixed a SQL error that occurred when syncing a subscription that didn’t have a `latest_invoice` value. ([#21](https://github.com/craftcms/stripe/pull/21))
+- Fixed links to the Stripe dashboard when in live mode. ([#21](https://github.com/craftcms/stripe/pull/21))
 - Fixed an error that could occur when syncing Customer and Payment Method data. ([#29](https://github.com/craftcms/stripe/pull/29))
 - Fixed an error that could occur when sorting Invoices table by certain columns. ([#31](https://github.com/craftcms/stripe/pull/31))
 - Fixed an error that could occur when trying to view elements as cards. ([#15](https://github.com/craftcms/stripe/pull/15))

diff --git a/package-lock.json b/package-lock.json