checked if quote object contains id before looking for quote items

rav-redchamps · rav-redchamps · commit 2312289f29c2 · 2020-01-22T14:21:56.000+05:30
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
@@ -105,14 +105,13 @@ protected function _prepareCollection()
     {
         $quote = $this->getQuote();
 
-        if ($quote) {
+        if ($quote && $quote->getId()) {
             $collection = $quote->getItemsCollection(false);
+            $collection->addFieldToFilter('parent_item_id', ['null' => true]);
         } else {
             $collection = $this->_dataCollectionFactory->create();
         }
 
-        $collection->addFieldToFilter('parent_item_id', ['null' => true]);
-
         $this->setCollection($collection);
 
         return parent::_prepareCollection();

Original file line number	Diff line number	Diff line change
`@@ -105,14 +105,13 @@ protected function _prepareCollection()`
`105`	`105`	`{`
`106`	`106`	`$quote = $this->getQuote();`
`107`	`107`
`108`		`- if ($quote) {`
	`108`	`+ if ($quote && $quote->getId()) {`
`109`	`109`	`$collection = $quote->getItemsCollection(false);`
	`110`	`+ $collection->addFieldToFilter('parent_item_id', ['null' => true]);`
`110`	`111`	`} else {`
`111`	`112`	`$collection = $this->_dataCollectionFactory->create();`
`112`	`113`	`}`
`113`	`114`
`114`		`- $collection->addFieldToFilter('parent_item_id', ['null' => true]);`
`115`		`-`
`116`	`115`	`$this->setCollection($collection);`
`117`	`116`
`118`	`117`	`return parent::_prepareCollection();`