Merge branch '5.x' into 5.3

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     name: ci
     uses: craftcms/.github/.github/workflows/ci.yml@v3
     with:
-      php_version: '8.2'
+      php_version: '["8.2", "8.3"]'
       craft_version: '5'
       node_version: '20'
       jobs: '["ecs", "phpstan", "prettier", "tests"]'

CHANGELOG.md

@@ -1,8 +1,10 @@
 # Release Notes for Craft Commerce
 
-## Unreleased
+## 5.2.7 - 2024-11
 
-- Fixed a bug where users could access the Commerce user screen when the current user didn’t have permission. 
+- Fixed an error that occurred on the Orders index page when running Craft CMS 5.5.4 or later. ([#3793](https://github.com/craftcms/commerce/issues/3793))
+- Fixed a bug where a structured product type’s “Max Levels” setting wasn’t being respected. ([#3785](https://github.com/craftcms/commerce/issues/3785))
+- Fixed an information disclosure vulnerability.
 
 ## 5.2.6 - 2024-11-26
 

src/Plugin.php

@@ -257,7 +257,7 @@ public static function editions(): array
     /**
      * @inheritDoc
      */
-    public string $schemaVersion = '5.2.0.5';
+    public string $schemaVersion = '5.2.7.0';
 
     /**
      * @inheritdoc

src/migrations/m241128_174712_fix_maxLevels_structured_productTypes.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace craft\commerce\migrations;
+
+use craft\commerce\db\Table;
+use craft\db\Migration;
+use craft\db\Query;
+use craft\db\Table as CraftTable;
+
+/**
+ * m241128_174712_fix_maxLevels_structured_productTypes migration.
+ */
+class m241128_174712_fix_maxLevels_structured_productTypes extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        // Get all product types from Commerce project config
+        $structuredProductTypesWithMaxLevels = (new Query())
+            ->from(Table::PRODUCTTYPES)
+            ->where(['isStructure' => true])
+            ->andWhere(['not', ['maxLevels' => null]])
+            ->collect();
+
+        // Loop through and update the `maxLevels` column in the `structures` table
+        $structuredProductTypesWithMaxLevels->each(function($productType) {
+            $this->update(CraftTable::STRUCTURES, ['maxLevels' => $productType['maxLevels']], ['id' => $productType['structureId']]);
+        });
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        echo "m241128_174712_fix_maxLevels_structured_productTypes cannot be reverted.\n";
+        return false;
+    }
+}

src/services/Plans.php

@@ -129,6 +129,7 @@ public function getPlansByGatewayId(int $gatewayId): array
      *
      * @return Plan[]
      * @deprecated in 4.0. Use [[getPlansByGatewayId]] instead.
+     * TODO: remove in 6.0
      */
     public function getAllGatewayPlans(int $gatewayId): array
     {

src/services/ProductTypes.php

@@ -475,7 +475,7 @@ public function handleChangedProductType(ConfigEvent $event): void
                 $structureUid = $data['structure']['uid'];
                 $structure = Craft::$app->getStructures()->getStructureByUid($structureUid, true) ?? new Structure(['uid' => $structureUid]);
                 $isNewStructure = empty($structure->id);
-                $structure->maxLevels = $data['structure']['maxLevels'] ?? null;
+                $structure->maxLevels = $data['maxLevels'] ?? null;
                 Craft::$app->getStructures()->saveStructure($structure);
                 $productTypeRecord->structureId = $structure->id;
             } else {

src/templates/orders/_index.twig

@@ -22,8 +22,8 @@
 
 {% block initJs %}
     Craft.elementIndex = Craft.createElementIndex('{{ elementType|e("js") }}', $('#page-container'), {
-        elementTypeName: '{{ elementInstance.displayName()|e("js") }}',
-        elementTypePluralName: '{{ elementInstance.pluralDisplayName()|e("js") }}',
+        elementTypeName: '{{ elementDisplayName ?? (elementInstance.displayName())|e("js") }}',
+        elementTypePluralName: '{{ elementPluralDisplayName ?? (elementInstance.pluralDisplayName())|e("js") }}',
         context: '{{ context }}',
         storageKey: 'elementindex.{{ elementType|e("js") }}',
         toolbarSelector: '#toolbar',