ACPT-1191: Fix Quote related issues on Application Server

Author: aa-kashk

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php

@@ -209,24 +209,6 @@ protected function _beforeSave(AbstractModel $object)
         return parent::_beforeSave($object);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function save(\Magento\Framework\Model\AbstractModel $object)
-    {
-        $this->pillPut->put();
-        return parent::save($object);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function delete(\Magento\Framework\Model\AbstractModel $object)
-    {
-        $this->pillPut->put();
-        return parent::delete($object);
-    }
-
     /**
      * @inheritdoc
      *
@@ -263,6 +245,7 @@ protected function _afterSave(AbstractModel $object)
             $object
         );
         $this->getConfig()->clear();
+        $this->pillPut->put();
         return parent::_afterSave($object);
     }
 
@@ -277,6 +260,7 @@ protected function _afterSave(AbstractModel $object)
     protected function _afterDelete(AbstractModel $object)
     {
         $this->getConfig()->clear();
+        $this->pillPut->put();
         return $this;
     }
 

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -42,7 +42,6 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderInterfaceFactory as OrderFactory;
 use Magento\Sales\Api\OrderManagementInterface as OrderManagement;
-use Magento\Store\Model\StoreManager;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -783,6 +782,5 @@ private function rollbackAddresses(
     public function _resetState(): void
     {
         $this->addressesToSync = [];
-        $this->storeManager = ObjectManager::getInstance()->get(StoreManager::class);
     }
 }

app/code/Magento/Store/Model/StoreManager.php

@@ -18,7 +18,8 @@
  */
 class StoreManager implements
     \Magento\Store\Model\StoreManagerInterface,
-    \Magento\Store\Api\StoreWebsiteRelationInterface
+    \Magento\Store\Api\StoreWebsiteRelationInterface,
+    ResetAfterRequestInterface
 {
     /**
      * Application run code
@@ -329,4 +330,12 @@ public function __debugInfo()
     {
         return ['currentStoreId' => $this->currentStoreId];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->reinitStores();
+    }
 }