Merge remote-tracking branch 'origin/MC-36953' into 2.4-develop-pr39

Author: serhii-balko

app/code/Magento/Sales/Model/ResourceModel/Order.php

@@ -53,12 +53,12 @@ protected function _construct()
 
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param Attribute $attribute
-     * @param Manager $sequenceManager
      * @param Snapshot $entitySnapshot
      * @param RelationComposite $entityRelationComposite
+     * @param Attribute $attribute
+     * @param Manager $sequenceManager
      * @param StateHandler $stateHandler
-     * @param string $connectionName
+     * @param string|null $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -137,6 +137,8 @@ protected function calculateItems(\Magento\Sales\Model\Order $object)
     }
 
     /**
+     * Before save
+     *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      */
@@ -152,15 +154,15 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
             ];
             $object->setStoreName(implode(PHP_EOL, $name));
             $object->setTotalItemCount($this->calculateItems($object));
+            $object->setData(
+                'protect_code',
+                substr(
+                    hash('sha256', uniqid(Random::getRandomNumber(), true) . ':' . microtime(true)),
+                    5,
+                    32
+                )
+            );
         }
-        $object->setData(
-            'protect_code',
-            substr(
-                hash('sha256', uniqid(Random::getRandomNumber(), true) . ':' . microtime(true)),
-                5,
-                32
-            )
-        );
         $isNewCustomer = !$object->getCustomerId() || $object->getCustomerId() === true;
         if ($isNewCustomer && $object->getCustomer()) {
             $object->setCustomerId($object->getCustomer()->getId());
@@ -169,7 +171,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php

@@ -74,6 +74,21 @@ public function testAclNoAccess()
         parent::testAclNoAccess();
     }
 
+    /**
+     * Checks that order protect code is not changing after invoice submitting
+     *
+     * @return void
+     */
+    public function testOrderProtectCodePreserveAfterInvoiceSave(): void
+    {
+        $order = $this->prepareRequest();
+        $protectCode = $order->getProtectCode();
+        $this->dispatch($this->uri);
+        $invoicedOrder = $this->getOrder('100000001');
+
+        $this->assertEquals($protectCode, $invoicedOrder->getProtectCode());
+    }
+
     /**
      * @param array $params
      * @return \Magento\Sales\Api\Data\OrderInterface|null