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

Revert "Fix wc 8.5 alerts" #678

Merged
merged 1 commit into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions scss/bootscore_woocommerce/_wc_ajax_cart.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ Ajax Cart

// Cart alert
// Top margin to first alert only. If grouped product one is out of stock there are two alerts.
.alert:first-child {
.woocommerce-message:first-child,
.woocommerce-error:first-child {
margin-top: var(--#{$prefix}offcanvas-padding-y);
}

.alert {
.woocommerce-message,
.woocommerce-error,
.woocommerce-info {
margin-right: var(--#{$prefix}offcanvas-padding-x);
margin-left: var(--#{$prefix}offcanvas-padding-x);
}
Expand Down
48 changes: 48 additions & 0 deletions scss/bootscore_woocommerce/_wc_alerts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
/*--------------------------------------------------------------
WooCommerce Alerts
--------------------------------------------------------------*/

// Reset icon color in alerts
.woocommerce-error::before,
.woocommerce-info::before,
.woocommerce-message::before,
.wc-stripe-error::before {
color: inherit;
}

// Add alert styles to WooCommerce notices
.woocommerce-error {
@extend .alert;
@extend .alert-danger;
@extend .alert-icon;
@extend .alert-danger-icon;
}

.woocommerce-info,
.woocommerce-noreviews {
@extend .alert;
@extend .alert-info;
@extend .alert-icon;
@extend .alert-info-icon;
}

.woocommerce-message,
.woocommerce-thankyou-order-details {
@extend .alert;
@extend .alert-success;
@extend .alert-icon;
@extend .alert-success-icon;
}

// Add alert to stripe notice
.wc-stripe-error {
@extend .alert;
@extend .alert-danger;
@extend .alert-icon;
@extend .alert-danger-icon;
margin-top: $spacer;
}

// Hide all buttons inside WC alerts
.woocommerce-error a.woocommerce-Button.button,
.woocommerce-info a.woocommerce-Button.button,
.woocommerce-message a.woocommerce-Button.button {
display: none;
}
49 changes: 0 additions & 49 deletions scss/bootscore_woocommerce/_wc_deprecated.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,3 @@ WooCommerce Deprecated
#offcanvas-cart .cart-loader {
display: none !important;
}


// Reset icon color in alerts
.woocommerce-error::before,
.woocommerce-info::before,
.woocommerce-message::before,
.wc-stripe-error::before {
color: inherit;
}

// Add alert styles to WooCommerce notices
.woocommerce-error {
@extend .alert;
@extend .alert-danger;
@extend .alert-icon;
@extend .alert-danger-icon;
}

.woocommerce-info,
.woocommerce-noreviews {
@extend .alert;
@extend .alert-info;
@extend .alert-icon;
@extend .alert-info-icon;
}

.woocommerce-message,
.woocommerce-thankyou-order-details {
@extend .alert;
@extend .alert-success;
@extend .alert-icon;
@extend .alert-success-icon;
}

// Add alert to stripe notice
.wc-stripe-error {
@extend .alert;
@extend .alert-danger;
@extend .alert-icon;
@extend .alert-danger-icon;
margin-top: $spacer;
}

// Hide all buttons inside WC alerts
.woocommerce-error a.woocommerce-Button.button,
.woocommerce-info a.woocommerce-Button.button,
.woocommerce-message a.woocommerce-Button.button {
display: none;
}
2 changes: 1 addition & 1 deletion woocommerce/cart/mini-cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@

<?php else : ?>

<p class="woocommerce-mini-cart__empty-message alert alert-info alert-icon alert-info-icon alert-icon"><?php esc_html_e('No products in the cart.', 'woocommerce'); ?></p>
<p class="woocommerce-mini-cart__empty-message woocommerce-info m-3"><?php esc_html_e('No products in the cart.', 'woocommerce'); ?></p>

<?php endif; ?>

Expand Down
14 changes: 7 additions & 7 deletions woocommerce/inc/ajax-add-to-cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* WooCommerce AJAX cart
*
* @package Bootscore
* @version 5.4.0
* @version 5.3.4
*/


Expand Down Expand Up @@ -79,7 +79,7 @@ function bootscore_product_page_ajax_add_to_cart_js() {
$(document.body).trigger('added_to_cart', [response.fragments, response.cart_hash, $thisbutton]);

// Remove existing notices
$('.alert-success, .alert-danger').remove();
$('.woocommerce-error, .woocommerce-message, .woocommerce-info').remove();

// Add new notices to offcanvas
$('.woocommerce-mini-cart').prepend(response.fragments.notices_html);
Expand All @@ -94,7 +94,7 @@ function bootscore_product_page_ajax_add_to_cart_js() {

e.preventDefault();

$('.alert-success, .alert-danger').remove();
$('.woocommerce-error, .woocommerce-message, .woocommerce-info').remove();

// Get product name from product-title=""
let prod_title = '';
Expand Down Expand Up @@ -149,15 +149,15 @@ function bootscore_product_page_ajax_add_to_cart_js() {
console.log('Error-: ' + response.error);

//Remove existing notices
$('.alert').remove();
$('.woocommerce-error, .woocommerce-message, .woocommerce-info').remove();

let notice = '';
if (response.error == true) {
let message = `<?= sprintf(__('You cannot add another "%s" to your cart.', 'woocommerce'), '{{product_title}}') ?>`;
notice = `<div class="alert alert-danger alert-icon alert-danger-icon">${message.replace('{{product_title}}', prod_title)}</div>`;
notice = `<div class="woocommerce-error">${message.replace('{{product_title}}', prod_title)}</div>`;
} else {
let message = `<?= sprintf(_n('%s has been added to your cart.', '%s have been added to your cart.', 1, 'woocommerce'), '“{{product_title}}”') ?>`;
notice = `<div class="alert alert-success alert-icon alert-success-icon">${message.replace('{{product_title}}', prod_title)}</div>`;
notice = `<div class="woocommerce-message">${message.replace('{{product_title}}', prod_title)}</div>`;
}

// Add new notices to offcanvas
Expand All @@ -183,7 +183,7 @@ function bootscore_product_page_ajax_add_to_cart_js() {

// Hide alert in offcanvas-cart when offcanvas is closed
$('#offcanvas-cart').on('hidden.bs.offcanvas', function () {
$('#offcanvas-cart .alert-danger, #offcanvas-cart .alert-success').remove();
$('#offcanvas-cart .woocommerce-message, #offcanvas-cart .woocommerce-error, #offcanvas-cart .woocommerce-info:not(.woocommerce-mini-cart__empty-message)').remove();
});

// Refresh ajax mini-cart on browser back button
Expand Down
47 changes: 0 additions & 47 deletions woocommerce/notices/error.php

This file was deleted.

34 changes: 0 additions & 34 deletions woocommerce/notices/notice.php

This file was deleted.

34 changes: 0 additions & 34 deletions woocommerce/notices/success.php

This file was deleted.