Merge branch '5.x' into feature/pt-1930-5x-new-productsvariants-are-n…

…ot-promotable-by-default
craftcms · Jul 11, 2024 · b42b2e6 · b42b2e6
2 parents 078c956 + 1a13c2e
commit b42b2e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/migrations/Install.php b/src/migrations/Install.php
@@ -685,7 +685,7 @@ public function createTables(): void
             'tracked' => $this->boolean()->notNull()->defaultValue(false),
             'minQty' => $this->integer(),
             'maxQty' => $this->integer(),
-            'shippingCategoryId' => $this->integer()->notNull(),
+            'shippingCategoryId' => $this->integer()->null(),
             'dateCreated' => $this->dateTime()->notNull(),
             'dateUpdated' => $this->dateTime()->notNull(),
             'uid' => $this->uid(),

diff --git a/tests/fixtures/data/tax-category.php b/tests/fixtures/data/tax-category.php
@@ -11,7 +11,7 @@
         'name' => 'Another Tax Category',
         'handle' => 'anotherTaxCategory',
         'description' => 'this is another tax category',
-        'default' => '1',
+        'default' => '0',
         'uid' => 'tax--category-1001---------------uid',
     ],
 ];