|
6 | 6 |
|
7 | 7 | namespace Magento\Quote\Model\ResourceModel;
|
8 | 8 |
|
9 |
| -use Magento\Framework\App\ObjectManager; |
10 |
| -use Magento\Framework\Model\ResourceModel\Db\Context; |
11 | 9 | use Magento\Framework\Model\ResourceModel\Db\VersionControl\AbstractDb;
|
12 | 10 | use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
|
13 | 11 | use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
|
14 |
| -use Magento\Quote\Api\CartRepositoryInterface; |
15 | 12 | use Magento\SalesSequence\Model\Manager;
|
16 | 13 |
|
17 | 14 | /**
|
|
20 | 17 | class Quote extends AbstractDb
|
21 | 18 | {
|
22 | 19 | /**
|
23 |
| - * Sales sequence manager |
24 |
| - * |
25 |
| - * @var Manager |
| 20 | + * @var \Magento\SalesSequence\Model\Manager |
26 | 21 | */
|
27 | 22 | protected $sequenceManager;
|
28 | 23 |
|
29 | 24 | /**
|
30 |
| - * Quote repository interface object |
31 |
| - * |
32 |
| - * @var CartRepositoryInterface |
33 |
| - */ |
34 |
| - private $quoteRepository; |
35 |
| - |
36 |
| - /** |
37 |
| - * @param Context $context |
| 25 | + * @param \Magento\Framework\Model\ResourceModel\Db\Context $context |
38 | 26 | * @param Snapshot $entitySnapshot
|
39 | 27 | * @param RelationComposite $entityRelationComposite
|
40 |
| - * @param Manager $sequenceManager |
| 28 | + * @param \Magento\SalesSequence\Model\Manager $sequenceManager |
41 | 29 | * @param string $connectionName
|
42 |
| - * @param CartRepositoryInterface|null $quoteRepository |
43 | 30 | */
|
44 | 31 | public function __construct(
|
45 |
| - Context $context, |
| 32 | + \Magento\Framework\Model\ResourceModel\Db\Context $context, |
46 | 33 | Snapshot $entitySnapshot,
|
47 | 34 | RelationComposite $entityRelationComposite,
|
48 | 35 | Manager $sequenceManager,
|
49 |
| - $connectionName = null, |
50 |
| - ?CartRepositoryInterface $quoteRepository = null |
| 36 | + $connectionName = null |
51 | 37 | ) {
|
52 | 38 | parent::__construct($context, $entitySnapshot, $entityRelationComposite, $connectionName);
|
53 | 39 | $this->sequenceManager = $sequenceManager;
|
54 |
| - $this->quoteRepository = $quoteRepository ?: ObjectManager::getInstance() |
55 |
| - ->get(CartRepositoryInterface::class); |
56 | 40 | }
|
57 | 41 |
|
58 | 42 | /**
|
@@ -120,17 +104,8 @@ public function loadByCustomerId($quote, $customerId)
|
120 | 104 | $data = $connection->fetchRow($select);
|
121 | 105 |
|
122 | 106 | if ($data) {
|
123 |
| - //Prevent current StoreId of the quote to be overridden |
124 |
| - $currentStoreId = $quote->getStoreId(); |
125 |
| - if ($currentStoreId !== null && $currentStoreId !== (int)$data['store_id']) { |
126 |
| - unset($data['store_id']); |
127 |
| - $quote->setData($data); |
128 |
| - $quote->setOrigData(); |
129 |
| - $this->quoteRepository->save($quote); |
130 |
| - } else { |
131 |
| - $quote->setData($data); |
132 |
| - $quote->setOrigData(); |
133 |
| - } |
| 107 | + $quote->setData($data); |
| 108 | + $quote->setOrigData(); |
134 | 109 | }
|
135 | 110 |
|
136 | 111 | $this->_afterLoad($quote);
|
|
0 commit comments