Merge branch '1.3' into feature/42-stripe-data-reset-command

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Fixed getting a default price for a Product element. ([#40](https://github.com/craftcms/stripe/pull/40))
+- Fixed an issue that could occur when installing or running migration on MariaDB. ([#51](https://github.com/craftcms/stripe/issues/51))
+- Fixed a styling issue with Stripe’s element’s meta card footer.
 - Added `stripe/data/reset` CLI command. ([#42](https://github.com/craftcms/stripe/issues/42))
 
 ## 1.2.0.2 - 2024-11-08

src/elements/Product.php

@@ -596,15 +596,21 @@ public function getData(): array
     public function getDefaultPrice(): Price|null
     {
         if (!isset($this->_defaultPrice)) {
-            if ($this->getData()['default_price'] === null) {
+            $defaultPriceId = $this->getData()['default_price'];
+            if ($defaultPriceId === null) {
                 return null;
             }
 
+            // depending on whether we're expanding a default_price when getting a product from Stripe, this will be a string or an array
+            if (is_array($defaultPriceId)) {
+                $defaultPriceId = $defaultPriceId['id'];
+            }
+
             /** @var ElementCollection<int|string, Price> $prices */
             $prices = $this->getPrices();
 
             $price = $prices
-                ->filter(fn(Price $price) => $price->stripeId === $this->getData()['default_price'])
+                ->filter(fn(Price $price) => $price->stripeId === $defaultPriceId)
                 ->first();
 
             if (!$price) {

src/migrations/Install.php

@@ -193,7 +193,7 @@ private function createGeneratedColumns(): void
         // latestInvoiceId
         $this->execute("ALTER TABLE " . Table::SUBSCRIPTIONDATA . " ADD COLUMN " .
             $db->quoteColumnName('latestInvoiceId') . " VARCHAR(255) GENERATED ALWAYS AS (" .
-            $qb->jsonExtract('data', ['latest_invoice']) . ") STORED NULL;");
+            $qb->jsonExtract('data', ['latest_invoice']) . ") STORED;");
         // startDate
         $this->execute("ALTER TABLE " . Table::SUBSCRIPTIONDATA . " ADD COLUMN " .
             $db->quoteColumnName('startDate') . " VARCHAR(255) GENERATED ALWAYS AS (" .

src/migrations/m240819_121818_loosen_aux_data_uniq.php

@@ -27,7 +27,7 @@ public function safeUp(): bool
         // Step 3: Recreate the virtual column as nullable: https://docs.stripe.com/api/subscriptions/object#subscription_object-latest_invoice
         $this->execute("ALTER TABLE " . $tableName . " ADD COLUMN " .
             $this->db->quoteColumnName('[[latestInvoiceId]]') . " VARCHAR(255) GENERATED ALWAYS AS (" .
-            $this->db->getQueryBuilder()->jsonExtract('data', ['latest_invoice']) . ") STORED NULL");
+            $this->db->getQueryBuilder()->jsonExtract('data', ['latest_invoice']) . ") STORED");
 
         // Step 4: Create a new non-unique index
         $this->createIndex(null, $tableName, ['latestInvoiceId'], unique: false);