Merge branch 'ACP2E-3236' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-08-29-2024

Author: chittima

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -526,6 +526,13 @@ public function save(ProductInterface $product, $saveOptions = false)
         $assignToCategories = false;
         $tierPrices = $product->getData('tier_price');
         $productDataToChange = $product->getData();
+
+        if (!$product->getSku()) {
+            throw new CouldNotSaveException(
+                __("The \"%1\" attribute value is empty. Set the attribute and try again.", "sku")
+            );
+        }
+
         try {
             $existingProduct = $product->getId() ?
                 $this->getById($product->getId()) :

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -1568,4 +1568,18 @@ public function testSaveExistingWithMediaGalleryEntries(): void
         $this->model->save($this->product);
         $this->assertEquals($expectedResult, $this->initializedProduct->getMediaGallery('images'));
     }
+
+    /**
+     * @return void
+     */
+    public function testSaveCouldNotSaveException(): void
+    {
+        $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class);
+        $productData = [
+            'name' => 'Simple Product',
+            'price' => 100
+        ];
+        $this->product->setData($productData);
+        $this->model->save($this->product);
+    }
 }

app/code/Magento/Catalog/i18n/en_US.csv

@@ -319,6 +319,7 @@ Category,Category
 "Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
 "The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
 "The "%1" attribute value is empty.","The "%1" attribute value is empty."
+"The ""%1"" attribute value is empty. Set the attribute and try again.","The ""%1"" attribute value is empty. Set the attribute and try again."
 "SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
 "Please enter a valid number in this field.","Please enter a valid number in this field."
 "We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."