Merge pull request #327 from addonify/development

Plugin tags updated and cart icon shortcode added

Author: Asok17

README.txt

@@ -1,11 +1,11 @@
 === Addonify Floating Cart For WooCommerce ===
 
 Contributors: addonify
-Tags: cart, ajax, ajax cart, woocommerce, woocommerce cart, floating cart, side cart, woo cart, woocommerce floating cart, woocommerce side cart, fly cart
+Tags: cart, floating cart, side cart, mini cart, woocommerce cart,
 Requires at least: 6.0.0
 Requires PHP: 7.4
-Tested up to: 6.5.3
-Stable tag: 1.2.7
+Tested up to: 6.5.5
+Stable tag: 1.2.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -88,14 +88,30 @@ Yes, we do have documentation guide. Please visit our [documentation site.](http
 
 No, this plugin will not work without WooCommerce.
 
+= Why does not side cart open when product is added into the cart from the product page? =
+
+Because by default, when product is added into the cart from the product page, the product page is re-loaded.
+
 = Does this plugin work with my theme? =
 
-Yes, Addonify Floating Cart should work with all WordPress themes. If it does not work with your theme, let us know by [*creating an issue*](https://github.com/addonify/addonify-floating-cart/issues)
+If your theme is not a block theme, then yes, Addonify Floating Cart should work with your theme. If it does not work with your theme, let us know by [*creating an issue*](https://github.com/addonify/addonify-floating-cart/issues)
+
+= Does this plugin work with WooCommerce blocks? = 
+
+If you are using WooCommerce blocks to display products, then this plugin might not work as expected. This plugin works well with classic WooCommerce product templates.
 
-= On which page floating cart will not be visible? =
+= On which pages floating cart will not be visible? =
 
 Floating cart button and sidebar shopping cart will not be visible on cart and checkout pages.
 
+= Is there any shortcode to display a cart icon anywhere? =
+
+Addonify Floating Cart has a shortcode that can be used to display a cart icon. The shortcode is as below:
+
+```
+[afc_cart_icon id="my-id" class="css-classes" icon="icon-1" display_count="true" count_position="top-right"]
+```
+For more information on shorcode, follow the [documentation](https://docs.addonify.com/kb/floating-cart/)
 
 == Installation ==
 
@@ -116,6 +132,13 @@ Floating cart button and sidebar shopping cart will not be visible on cart and c
 
 == Changelog ==
 
+= 1.2.9 - 15 July, 2024 =
+
+- Added:   ShortCode for displaying cart icon.
+- Updated: Plugin tags.
+- Tested:  Up to WordPress version 6.5.5.
+- Tested:  Up to WooCommerce version 9.0.2.
+
 = 1.2.8 - 23 May, 2024 ==
 
 - Tested: WordPress version 6.5.3.

addonify-floating-cart.php

@@ -10,10 +10,10 @@
  * Plugin Name:       Addonify Floating Cart For WooCommerce
  * Plugin URI:        https://addonify.com/addonify-floating-cart
  * Description:       Addonify Floating Cart is a free WooCommerce addon that adds an interactive sticky shopping cart on your website allowing your visitors no need to go to cart page to manage their cart items.
- * Version:           1.2.8
+ * Version:           1.2.9
  * Requires at least: 6.0.0
  * Requires PHP:      7.4
- * Tested up to:      6.5.3
+ * Tested up to:      6.5.5
  * Author:            Addonify
  * Author URI:        https://addonify.com/
  * License:           GPLv2 or later
@@ -33,7 +33,7 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'ADDONIFY_FLOATING_CART_VERSION', '1.2.8' );
+define( 'ADDONIFY_FLOATING_CART_VERSION', '1.2.9' );
 define( 'ADDONIFY_FLOATING_CART_BASENAME', plugin_basename( __FILE__ ) );
 define( 'ADDONIFY_FLOATING_CART_PATH', plugin_dir_path( __FILE__ ) );
 define( 'ADDONIFY_FLOATING_CART_DB_INITIALS', 'addonify_fc_' );
@@ -82,19 +82,17 @@ function run_addonify_floating_cart() {
 
 		$plugin = new Addonify_Floating_Cart();
 		$plugin->run();
-	} else {
-		if ( version_compare( get_bloginfo( 'version' ), '6.5', '<' ) ) {
-			add_action(
-				'admin_notices',
-				function() {
-					?>
-					<div class="notice notice-error is-dismissible">
-						<p><?php echo esc_html__( 'Addonify Floating Cart requires WooCommerce in order to work.', 'addonify-floating-cart' ); ?></p>
-					</div>
-					<?php
-				}
-			);
-		}
+	} elseif ( version_compare( get_bloginfo( 'version' ), '6.5', '<' ) ) {
+		add_action(
+			'admin_notices',
+			function () {
+				?>
+				<div class="notice notice-error is-dismissible">
+					<p><?php echo esc_html__( 'Addonify Floating Cart requires WooCommerce in order to work.', 'addonify-floating-cart' ); ?></p>
+				</div>
+				<?php
+			}
+		);
 	}
 }
 add_action( 'plugins_loaded', 'run_addonify_floating_cart' );

includes/misc-functions.php

@@ -34,6 +34,42 @@ function addonify_floating_cart_get_cart_modal_toggle_button_icons() {
 }
 
 
+/**
+ * Sanitizes SVG when rendering in the frontend.
+ *
+ * @since 1.0.0
+ * @param string $svg SVG code.
+ * @return string $svg Sanitized SVG code.
+ */
+function addonify_floating_cart_escape_svg( $svg ) {
+
+	$allowed_html = array(
+		'svg'   => array(
+			'class'           => true,
+			'aria-hidden'     => true,
+			'aria-labelledby' => true,
+			'role'            => true,
+			'xmlns'           => true,
+			'width'           => true,
+			'height'          => true,
+			'viewbox'         => true,
+		),
+		'g'     => array(
+			'fill' => true,
+		),
+		'title' => array(
+			'title' => true,
+		),
+		'path'  => array(
+			'd'    => true,
+			'fill' => true,
+		),
+	);
+
+	return wp_kses( $svg, $allowed_html );
+}
+
+
 if ( ! function_exists( 'addonify_floating_cart_default_strings' ) ) {
 	/**
 	 * Translation ready strings displayed at the front-end.

public/assets/build/public.min.css

@@ -356,3 +356,43 @@ a.adfy__woofc-button.secondary,
         color: var(--adfy_woofc_base_link_color_hover);
     }
 }
+
+
+/*
+Shortcode Cart Icon
+*/
+.adfy_fc__woo-trigger-shortcode-button {
+
+    line-height: 1;
+    position: relative;
+    
+    .icon svg {
+        height: 24px;
+        width: 24px;
+    }
+
+    .badge {
+        align-items: center;
+        background-color: var(--adfy_woofc_toggle_button_badge_background_color);
+        border-radius: 20px;
+        box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.1);
+        color: var(--adfy_woofc_toggle_button_badge_text_color);
+        display: inline-flex;
+        font-size: 13px;
+        height: 23px;
+        justify-content: center;
+        line-height: 1;
+        position: absolute;
+        top: -20px;
+        transition: all 0.5s ease-in-out;
+        width: 23px;
+
+        &.top-right {
+            right: -15px;
+        }
+
+        &.top-left {
+            left: -15px;
+        }
+    }
+}

public/assets/build/public.min.css.map

@@ -169,6 +169,8 @@ public function register_ajax_actions() {
 
 		add_action( 'wp_ajax_addonify_floating_cart_refresh_cart_fragments', array( $this, 'refresh_cart_fragments' ) );
 		add_action( 'wp_ajax_nopriv_addonify_floating_cart_refresh_cart_fragments', array( $this, 'refresh_cart_fragments' ) );
+
+		add_shortcode( 'afc_cart_icon', array( $this, 'cart_toggle_button' ) );
 	}
 
 
@@ -341,6 +343,90 @@ public function enqueue_scripts() {
 	}
 
 
+	/**
+	 * Callback function for `add_shortcode( 'afc_cart_toggle_button' )`.
+	 *
+	 * @since 1.2.7
+	 *
+	 * @param array $attrs Shortcode attributes.
+	 */
+	public function cart_toggle_button( $attrs ) {
+
+		if ( is_admin() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
+			return;
+		}
+
+		$default_attrs = array(
+			'icon'                 => 'icon_6',
+			'class'                => '',
+			'display_items_count'  => 'true',
+			'items_count_position' => 'top-right',
+			'id'                   => '',
+		);
+
+		$shortcode_attrs = wp_parse_args( $attrs, $default_attrs );
+
+		$button_attributes = array(
+			'class' => 'adfy_fc__woo-trigger-shortcode-button adfy__show-woofc',
+		);
+
+		if ( isset( $shortcode_attrs['id'] ) && $shortcode_attrs['id'] ) {
+			$button_attributes['id'] = esc_attr( $shortcode_attrs['id'] );
+		}
+
+		if ( isset( $shortcode_attrs['class'] ) && $shortcode_attrs['class'] ) {
+			$button_attributes['class'] .= ' ' . esc_attr( $shortcode_attrs['class'] );
+		}
+
+		$button_svg_icons = addonify_floating_cart_get_cart_modal_toggle_button_icons();
+
+		ob_start();
+		?>
+		<a href="#" <?php echo wc_implode_html_attributes( $button_attributes ); // phpcs:ignore ?>>
+			<?php
+			if (
+				isset( $shortcode_attrs['icon'] ) &&
+				'none' !== $shortcode_attrs['icon'] &&
+				array_key_exists( $shortcode_attrs['icon'], $button_svg_icons )
+			) {
+				?>
+				<span class="icon">
+					<?php echo addonify_floating_cart_escape_svg( $button_svg_icons[ $shortcode_attrs['icon'] ] ); //phpcs:ignore ?>
+				</span>
+				<?php
+			}
+			?>
+
+			<?php
+			if ( isset( $shortcode_attrs['display_items_count'] ) && 'true' === $shortcode_attrs['display_items_count'] ) {
+
+				$cart_count = 0;
+				if ( addonify_floating_cart_get_option( 'cart_badge_items_total_count' ) === 'total_products' ) {
+					$cart_count = count( WC()->cart->get_cart_contents() );
+				} else {
+					$cart_count = WC()->cart->get_cart_contents_count();
+				}
+
+				$count_positions = array(
+					'top-right',
+					'top-left',
+				);
+
+				$count_position = (
+					isset( $shortcode_attrs['items_count_position'] ) &&
+					$shortcode_attrs['items_count_position'] &&
+					in_array( $shortcode_attrs['items_count_position'], $count_positions, true )
+				) ?
+				$shortcode_attrs['items_count_position'] :
+				'top-right';
+				?>
+				<span class="badge <?php echo esc_attr( $count_position ); ?>"><span class="adfy_woofc-badge-count"><?php echo esc_html( $cart_count ); ?></span></span>
+			<?php } ?>
+		</a>
+		<?php
+		return ob_get_clean();
+	}
+
 	/**
 	 * Template for displaying sidebar cart toggle button.
 	 *