Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added configuration to enable/disable Clear Shopping Cart action in storefront #28594

Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0ee9280
Created config used for showing/hiding clear cart button on the shopp…
Neos2007 Apr 21, 2020
077a2a5
config-clear-cart-action: Added translation for clear shopping cart b…
Neos2007 Jun 1, 2020
4cf999c
magento/partners-magento2b2b#108: Clear Shopping Cart - Added admin c…
Jun 5, 2020
53a22be
magento/magento2#108: Clear Shopping Cart - Implemented Clear Shoppin…
Jun 5, 2020
6d31101
Merge branch '108_clear-shopping-cart-button-configuration' of github…
Jun 5, 2020
70e3c15
magento/magento2#108: Clear Shopping Cart - Refactor doc for enable_c…
Jun 5, 2020
05470d0
magento/magento2#108: Clear Shopping Cart - Remove unnecessary empty …
Jun 5, 2020
e1fa935
magento/magento2#108: Clear Shopping Cart - Restore removed composer.…
Jun 8, 2020
2c4ee78
Merge branch 'pull-27917' into 108_clear-shopping-cart-button-configu…
Jun 9, 2020
7dad27c
magento/magento2#108: Clear Shopping Cart - Refactor to fix Static Te…
Jun 9, 2020
c1ba0e0
magento/magento2#108: Clear Shopping Cart - Refactor to fix expected …
Jun 9, 2020
0051ec9
magento/magento2#108: Clear Shopping Cart - Refactor _clearCartConfir…
Jun 9, 2020
e9c6dd1
magento/magento2#108: Clear Shopping Cart - Add RWD styling to cart a…
Jun 10, 2020
d57ff13
magento/magento2#108: Clear Shopping Cart - Refactor PHPdoc to fix Co…
Jun 10, 2020
ee29f5f
magento/magento2#108: Clear Shopping Cart - Added admin configuration…
Jun 24, 2020
888a9f3
magento/magento2#108: Clear Shopping Cart - Refactor initial changes …
Jun 24, 2020
b960859
magento/magento2#108: Clear Shopping Cart - Added file header copyright
Jun 24, 2020
e5724ef
Merge branch '2.4-develop' into 108_clear-shopping-cart-button-config…
danmooney2 Jul 7, 2020
e8a36e7
magento/magento2#108: Clear Shopping Cart - Refactor MFTF to include …
Jul 14, 2020
3a097b2
Merge branch '108_clear-shopping-cart-button-configuration' of github…
Jul 14, 2020
d8eeb97
magento/magento2#108: Clear Shopping Cart - Refactor MFTF to include …
Jul 14, 2020
c8c9b9b
Merge branch '2.4-develop' into 108_clear-shopping-cart-button-config…
danmooney2 Jul 14, 2020
35a469b
magento/magento2#108: Clear Shopping Cart - Updated MFTF for code rev…
Jul 20, 2020
09d6b10
Merge branch '108_clear-shopping-cart-button-configuration' of github…
Jul 20, 2020
adfea2a
magento/magento2#108: Clear Shopping Cart - Updated config scope to w…
Jul 20, 2020
b65a287
magento/magento2#108: Clear Shopping Cart - Added integration test fo…
Jul 21, 2020
2f55801
Merge branch '2.4-develop' into 108_clear-shopping-cart-button-config…
joanhe Jul 21, 2020
418c6e8
magento/magento2#108: Clear Shopping Cart - Refactor MFTF and PHP fil…
Jul 22, 2020
c5056cd
Merge branch '108_clear-shopping-cart-button-configuration' of github…
Jul 22, 2020
f6574e4
magento/magento2#108: Clear Shopping Cart - Refactor integration test…
Jul 23, 2020
893ac50
Merge branch '2.4-develop' into 108_clear-shopping-cart-button-config…
joctabio Jul 23, 2020
c08f84b
Merge branch '2.4-develop' into 108_clear-shopping-cart-button-config…
joanhe Jul 23, 2020
d7abed9
magento/magento2#108: Clear Shopping Cart - Update translation file f…
Jul 24, 2020
05e1e77
Merge branch '108_clear-shopping-cart-button-configuration' of github…
Jul 24, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions app/code/Magento/Checkout/Block/Cart/Grid.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ class Grid extends \Magento\Checkout\Block\Cart
*/
const XPATH_CONFIG_NUMBER_ITEMS_TO_DISPLAY_PAGER = 'checkout/cart/number_items_to_display_pager';

/**
* Config settings path to enable clear shopping cart button
*/
const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';

/**
* @var \Magento\Quote\Model\ResourceModel\Quote\Item\Collection
*/
Expand Down Expand Up @@ -174,4 +179,17 @@ private function isPagerDisplayedOnPage()
}
return $this->isPagerDisplayed;
}

/**
* Check if clear shopping cart button is enabled
*
* @return bool
*/
public function isClearShoppingCartEnabled()
{
return (bool) $this->_scopeConfig->getValue(
self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
4 changes: 4 additions & 0 deletions app/code/Magento/Checkout/etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
<label>Show Cross-sell Items in the Shopping Cart</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
<field id="enable_clear_shopping_cart" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
joanhe marked this conversation as resolved.
Show resolved Hide resolved
<label>Enable Clear Shopping Cart</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
</group>
<group id="cart_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1">
<label>My Cart Link</label>
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Checkout/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<redirect_to_cart>0</redirect_to_cart>
<number_items_to_display_pager>20</number_items_to_display_pager>
<crosssell_enabled>1</crosssell_enabled>
<enable_clear_shopping_cart>0</enable_clear_shopping_cart>
</cart>
<cart_link>
<use_qty>1</use_qty>
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/Checkout/i18n/en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ Shipping,Shipping
"Maximum Number of Items to Display in Order Summary","Maximum Number of Items to Display in Order Summary"
"Quote Lifetime (days)","Quote Lifetime (days)"
"After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
"Enable Clear Shopping Cart","Enable Clear Shopping Cart"
"Are you sure you want to remove all items from your Shopping Cart?","Are you sure you want to remove all items from your Shopping Cart?"
joanhe marked this conversation as resolved.
Show resolved Hide resolved
"Number of Items to Display Pager","Number of Items to Display Pager"
"My Cart Link","My Cart Link"
"Display Cart Summary","Display Cart Summary"
Expand Down
19 changes: 10 additions & 9 deletions app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,16 @@
<span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
</a>
<?php endif; ?>
<button type="button"
name="update_cart_action"
data-cart-empty=""
value="empty_cart"
title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
class="action clear" id="empty_cart_button">
<span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
</button>
<?php if ($block->isClearShoppingCartEnabled()) :?>
<button type="button"
name="update_cart_action"
data-cart-empty=""
value="empty_cart"
title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
class="action clear" id="empty_cart_button">
<span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
</button>
<?php endif ?>
<button type="submit"
name="update_cart_action"
data-cart-item-update=""
Expand All @@ -77,4 +79,3 @@
</form>
<?= $block->getChildHtml('checkout.cart.order.actions') ?>
<?= $block->getChildHtml('shopping.cart.table.after') ?>

27 changes: 18 additions & 9 deletions app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,32 @@

define([
'jquery',
'jquery-ui-modules/widget'
], function ($) {
'Magento_Ui/js/modal/confirm',
'jquery-ui-modules/widget',
'mage/translate'
], function ($, confirm) {
'use strict';

$.widget('mage.shoppingCart', {
/** @inheritdoc */
_create: function () {
var items, i, reload;
var items, i, reload, self = this;

$(this.options.emptyCartButton).on('click', $.proxy(function () {
$(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
$(this.options.updateCartActionContainer)
.attr('name', 'update_cart_action').attr('value', 'empty_cart');
confirm({
joanhe marked this conversation as resolved.
Show resolved Hide resolved
content: $.mage.__('Are you sure you want to remove all items from your Shopping Cart?'),
actions: {
confirm: function () {
$(self.options.emptyCartButton).attr('name', 'update_cart_action_temp');
$(self.options.updateCartActionContainer)
.attr('name', 'update_cart_action').attr('value', 'empty_cart');

if ($(this.options.emptyCartButton).parents('form').length > 0) {
$(this.options.emptyCartButton).parents('form').submit();
}
if ($(self.options.emptyCartButton).parents('form').length > 0) {
$(self.options.emptyCartButton).parents('form').submit();
}
}
}
});
}, this));
items = $.find('[data-role="cart-item-qty"]');

Expand Down
10 changes: 8 additions & 2 deletions app/design/frontend/Magento/luma/web/css/source/_extends.less
Original file line number Diff line number Diff line change
Expand Up @@ -1570,10 +1570,16 @@
margin-bottom: @indent__base;

.actions.main {
.continue,
.clear {
.continue {
display: none;
}

.clear {
.lib-button-as-link(
@_margin: 0 @indent__base 0 0
);
font-weight: @font-weight__regular;
}
}
}
}
Expand Down
Loading