Skip to content

Commit 0f35ebd

Browse files
authored
Merge pull request #49 from ihorvansach/34-remove-option-to-merge-guest-cart-v2
34 remove option to merge guest cart v2
2 parents 7db6239 + 9a14167 commit 0f35ebd

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

app/code/Magento/LoginAsCustomer/Model/Login.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ class Login extends \Magento\Framework\Model\AbstractModel
1717
*/
1818
const TIME_FRAME = 60;
1919

20-
const XML_PATH_KEEP_GUEST_CART = 'mfloginascustomer/general/keep_guest_cart';
21-
2220
/**
2321
* Prefix of model events names
2422
*
@@ -189,19 +187,10 @@ public function authenticateCustomer(): \Magento\Customer\Model\Customer
189187
/* Logout if logged in */
190188
$this->_customerSession->logout();
191189
} else {
192-
193190
$quote = $this->cart->getQuote();
194-
195-
$keepItems = $this->scopeConfig->getValue(
196-
self::XML_PATH_KEEP_GUEST_CART,
197-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
198-
);
199-
200-
if (!$keepItems) {
201-
/* Remove items from guest cart */
202-
foreach ($quote->getAllVisibleItems() as $item) {
203-
$this->cart->removeItem($item->getId());
204-
}
191+
/* Remove items from guest cart */
192+
foreach ($quote->getAllVisibleItems() as $item) {
193+
$this->cart->removeItem($item->getId());
205194
}
206195
$this->cart->save();
207196
}

app/code/Magento/LoginAsCustomer/etc/adminhtml/system.xml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,23 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
99
<system>
10-
<section id="mfloginascustomer" translate="label" type="text" sortOrder="1" showInDefault="1" >
10+
<section id="mfloginascustomer" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
1111
<class>separator-top</class>
1212
<label>Login As Customer</label>
1313
<tab>customer</tab>
1414
<resource>Magento_LoginAsCustomer::config_section</resource>
15-
<group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" canRestore="1">
15+
<group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
1616
<label>Login As Customer Information</label>
17-
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" canRestore="1">
17+
<field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
1818
<label>Enable Extension</label>
1919
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
2020
</field>
21-
<field id="disable_page_cache" translate="label" type="select" sortOrder="20" showInDefault="1" canRestore="1">
21+
<field id="disable_page_cache" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
2222
<label>Disable Page Cache For Admin User</label>
2323
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
2424
<comment><![CDATA[If set to "Yes", when login as customer Page Cache will be disabled.]]></comment>
2525
</field>
26-
<field id="keep_guest_cart" translate="label" type="select" sortOrder="30" showInDefault="1" canRestore="1">
27-
<label>Keep Guest Shopping Cart Items</label>
28-
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
29-
<comment><![CDATA[If set to "Yes", after login, guest shopping cart will be merged into customer shopping cart.]]></comment>
30-
</field>
31-
<field id="store_view_login" translate="label" type="select" sortOrder="40" showInDefault="1" canRestore="1">
26+
<field id="store_view_login" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
3227
<label>Store View To Login In</label>
3328
<source_model>Magento\LoginAsCustomer\Model\Config\Source\StoreViewLogin</source_model>
3429
<comment><![CDATA[

0 commit comments

Comments
 (0)