Fixed #1186

-  Save the fieldLayoutId correctly on products and variants.
-  Hard deleting now deletes the variants also

CHANGELOG.md

@@ -15,7 +15,8 @@
 - Fixed the unnecessary logging of a deprecation error. ([#1365](https://github.com/craftcms/commerce/issues/1365))
 - Fixed and error that prevented payments on orders in the control panel. ([#1362](https://github.com/craftcms/commerce/issues/1362)) 
 - Fixed a bug that caused a redirect back to the Edit Customer page instead of the Edit User page editing an address from the Customer Info tab. ([#1368](https://github.com/craftcms/commerce/issues/1368)) 
-
+- Hard deleting a product now correctly hard deletes orphaned variants. ([#1186](https://github.com/craftcms/commerce/issues/1186))
+
 ## 3.1.1 - 2020-04-03
 
 ### Changed

src/elements/Product.php

@@ -785,14 +785,23 @@ public function beforeValidate()
     public function afterDelete()
     {
         $variants = Variant::find()
-            ->productId($this->id)
+            ->productId([$this->id, ':empty:'])
             ->all();
 
         $elementsService = Craft::$app->getElements();
 
         foreach ($variants as $variant) {
+
+            $hardDelete = false;
             $variant->deletedWithProduct = true;
-            $elementsService->deleteElement($variant);
+
+            // The product ID is gone, so it has been hard deleted
+            if (!$variant->productId) {
+                $hardDelete = true;
+                $variant->deletedWithProduct = false;
+            }
+
+            $elementsService->deleteElement($variant, $hardDelete);
         }
 
         parent::afterDelete();
@@ -876,7 +885,7 @@ public function datetimeAttributes(): array
      */
     public function getFieldLayout()
     {
-        return $this->getType()->getFieldLayout();
+        return parent::getFieldLayout() ?? $this->getType()->getFieldLayout();
     }
 
     /**

src/elements/Variant.php

@@ -1010,6 +1010,21 @@ public function beforeValidate()
         return parent::beforeValidate();
     }
 
+    /**
+     * @param bool $isNew
+     * @return bool
+     * @throws InvalidConfigException
+     */
+    public function beforeSave(bool $isNew): bool
+    {
+        // Set the field layout
+        /** @var ProductType $productType */
+        $productType = $this->getProduct()->getType();
+        $this->fieldLayoutId = $productType->getFieldLayout()->id;
+
+        return parent::beforeSave($isNew);
+    }
+
     /**
      * @inheritdoc
      */