Skip to content

Commit

Permalink
Merge pull request #411 from Invizo/develop
Browse files Browse the repository at this point in the history
Merge Develop branch with Master
  • Loading branch information
code-with-mehedi authored Jun 2, 2024
2 parents e284e0a + d3c307d commit 6a41780
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
SLUG: storegrowth-sales-booster
VERSION: 1.28.8
VERSION: 1.28.9
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
}

.offer-main-wrap{
width: 100%;
width: auto;
padding: 15px;
background: #fff;
border-radius: 15px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ function extraProducts(product_id, variation_id , check_status, offer_price) {
'data' : passData,
'_ajax_nonce' : bump_save_url.ajd_nonce
}, function (data) {
// location.reload();
location.reload();
});
}
110 changes: 55 additions & 55 deletions Includes/Modules/UpsellOrderBump/templates/bump-product-front-view.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,104 +5,104 @@
* @package Bump design for front.
*/

if ( $_product && $_product->is_type( 'variation' ) ) {
$product_offer_id = $_product->get_parent_id();
$variation_id = $offer_product_id;
} elseif ( $_product && $_product->is_type( 'simple' ) ) {
$product_offer_id = $offer_product_id;
$variation_id = 0;
} else {
return;
if ($_product && $_product->is_type('variation')) {
$product_offer_id = $_product->get_parent_id();
$variation_id = $offer_product_id;
}
if ($_product && $_product->is_type('simple')) {
$product_offer_id = $offer_product_id;
$variation_id = 0;
}

?>

<div class='template-overview-area'>
<hr style="margin-top:<?php echo esc_attr( $bump_info->box_top_margin ); ?>px"/>
<div class="offer-main-wrap"
style="<?php echo 'no_border' !== $bump_info->box_border_style ? 'border:2px ' . esc_attr( $bump_info->box_border_style ) . ' ' . esc_attr( $bump_info->box_border_color ) : ''; ?>">
<hr style="margin-top:<?php echo esc_attr($bump_info->box_top_margin); ?>px"/>
<div class="offer-main-wrap"
style="<?php echo 'no_border' !== $bump_info->box_border_style ? 'border:2px ' . esc_attr($bump_info->box_border_style) . ' ' . esc_attr($bump_info->box_border_color) : ''; ?>">
<div class="dynamic-offer-text"
style="
<?php
echo 'background:' . esc_attr( $bump_info->discount_background_color ) . ';';
echo 'color:' . esc_attr( $bump_info->discount_text_color ) . ';';
echo 'font-size:' . esc_attr( $bump_info->discount_font_size ) . 'px;'
?>
echo 'background:' . esc_attr($bump_info->discount_background_color) . ';';
echo 'color:' . esc_attr($bump_info->discount_text_color) . ';';
echo 'font-size:' . esc_attr($bump_info->discount_font_size) . 'px;'
?>
"
>
<svg width='15' height='15' viewBox='0 0 12 12' fill='none' xmlns='http://www.w3.org/2000/svg'>
<path
fill='<?php echo esc_attr( $bump_info->discount_text_color ); ?>'
fill='<?php echo esc_attr($bump_info->discount_text_color); ?>'
d='M6.35818 0.158203C6.08866 0.158203 5.81928 0.261688 5.61466 0.466306L5.2127 0.868251C4.84967 1.23128 4.35705 1.43443 3.84365 1.43443H3.2095C2.63076 1.43443 2.15787 1.90729 2.15787 2.48604V2.95182V3.12053C2.15787 3.63394 1.95471 4.12619 1.59169 4.48922L1.18974 4.89117C0.780504 5.3004 0.780504 5.96965 1.18974 6.37888L1.59169 6.78083C1.95471 7.14386 2.15787 7.63577 2.15787 8.14918V8.78366C2.15787 9.36241 2.63076 9.83528 3.2095 9.83528H3.84365C4.35705 9.83528 4.84967 10.0388 5.2127 10.4018L5.61466 10.8034C6.02389 11.2126 6.69247 11.2126 7.1017 10.8034L7.504 10.4018C7.86703 10.0388 8.35931 9.83528 8.87271 9.83528H9.50686C10.0856 9.83528 10.5585 9.36241 10.5585 8.78366V8.14918C10.5585 7.63577 10.7634 7.14386 11.1264 6.78083L11.528 6.37888C11.9372 5.96964 11.9372 5.30041 11.528 4.89117L11.1264 4.48922C10.7634 4.12618 10.5585 3.63394 10.5585 3.12053V2.48604C10.5585 1.90729 10.0856 1.43443 9.50686 1.43443H8.87271C8.35931 1.43443 7.86703 1.23128 7.504 0.868251L7.1017 0.466306C6.89709 0.261687 6.6277 0.158204 6.35818 0.158203ZM5.03537 3.41518C5.52954 3.41518 5.93415 3.82012 5.93415 4.31429C5.93415 4.80846 5.52954 5.21341 5.03537 5.21341C4.54119 5.21341 4.13623 4.80846 4.13623 4.31429C4.13623 3.82012 4.54119 3.41518 5.03537 3.41518ZM8.13402 3.65669C8.18088 3.65643 8.22593 3.6748 8.25926 3.70775C8.27581 3.72405 8.28899 3.74346 8.29803 3.76486C8.30708 3.78625 8.31182 3.80923 8.31198 3.83246C8.31214 3.85569 8.30772 3.87873 8.29897 3.90025C8.29022 3.92177 8.27732 3.94136 8.261 3.95789L4.67896 7.56092C4.64604 7.59399 4.60137 7.6127 4.5547 7.61296C4.50804 7.61322 4.46315 7.59502 4.42986 7.56232C4.41325 7.54601 4.40004 7.52659 4.39096 7.50516C4.38188 7.48373 4.37713 7.46071 4.37697 7.43744C4.37681 7.41417 4.38124 7.39109 4.39002 7.36954C4.3988 7.34798 4.41175 7.32837 4.42812 7.31184L8.01015 3.70916C8.04292 3.67603 8.08743 3.65717 8.13402 3.65669ZM5.03537 3.76882C4.73224 3.76882 4.48988 4.0112 4.48988 4.31429C4.48988 4.61739 4.73224 4.85977 5.03537 4.85977C5.33849 4.85977 5.58085 4.61739 5.58085 4.31429C5.58085 4.0112 5.33849 3.76882 5.03537 3.76882ZM7.68134 6.05629C8.17552 6.05629 8.58047 6.46124 8.58047 6.95541C8.58047 7.44958 8.17552 7.85314 7.68134 7.85314C7.18717 7.85314 6.78359 7.44958 6.78359 6.95541C6.78359 6.46124 7.18717 6.05629 7.68134 6.05629ZM7.68134 6.40993C7.37822 6.40993 7.1369 6.65231 7.1369 6.95541C7.1369 7.2585 7.37822 7.50088 7.68134 7.50088C7.98447 7.50088 8.22648 7.2585 8.22648 6.95541C8.22648 6.65231 7.98447 6.40993 7.68134 6.40993Z'
/>
</svg>
<?php
echo 'discount' === $offer_type ? '&nbsp;' . esc_attr( $offer_amount . $bump_info->offer_discount_title ) : esc_attr( $offer_amount ) . '.00' . esc_attr( $bump_info->offer_fixed_price_title );
$fallback_image_url = esc_url( plugin_dir_url( __FILE__ ) . '../assets/images/bump-preview.svg' );
$image_url = 'http://false' !== $bump_info->offer_image_url ? $bump_info->offer_image_url : $fallback_image_url;
?>
echo 'discount' === $offer_type ? '&nbsp;' . esc_attr($offer_amount . $bump_info->offer_discount_title) : esc_attr($offer_amount) . '.00' . esc_attr($bump_info->offer_fixed_price_title);
$fallback_image_url = esc_url(plugin_dir_url(__FILE__) . '../assets/images/bump-preview.svg');
$image_url = 'http://false' !== $bump_info->offer_image_url ? $bump_info->offer_image_url : $fallback_image_url;
?>
</div>
<div class="product-image-and-title">
<div class="offer-product-image-title">
<div class="offer-product-image">
<img src="<?php echo esc_attr( $image_url ); ?>" width='70' alt="" />
<img src="<?php echo esc_attr($image_url); ?>" width='70' alt="" />
</div>
<div class="offer-product-title"
<div class="offer-product-title"
style = "
<?php
echo 'color:' . esc_attr( $bump_info->product_description_text_color ) . ';';
echo 'font-size:' . esc_attr( $bump_info->product_description_font_size ) . 'px;'
?>
echo 'color:' . esc_attr($bump_info->product_description_text_color) . ';';
echo 'font-size:' . esc_attr($bump_info->product_description_font_size) . 'px;'
?>
"
>
<h3 style="color:<?php echo esc_attr( $bump_info->product_description_text_color ); ?>">
<?php echo esc_attr( $bump_info->offer_product_title ); ?>
<h3 style="color:<?php echo esc_attr($bump_info->product_description_text_color); ?>">
<?php echo esc_attr($bump_info->offer_product_title); ?>
</h3>

<?php
// Collect offer product categories.
$product_id = $bump_info->offer_product;
$product_categories = wp_get_post_terms( $product_id, 'product_cat' );
// Collect offer product categories.
$product_id = $bump_info->offer_product;
$product_categories = wp_get_post_terms($product_id, 'product_cat');

$category_names = array();
foreach ( $product_categories as $category ) {
$category_names[] = $category->name;
}
$category_names = array();
foreach ($product_categories as $category) {
$category_names[] = $category->name;
}

// Get categories csv.
$category_names = implode( ', ', $category_names );
?>
// Get categories csv.
$category_names = implode(', ', $category_names);
?>

<?php if ( ! empty( $category_names ) ) : ?>
<p style="color:<?php echo esc_attr( $bump_info->product_description_text_color ); ?>">
<?php echo esc_html( $category_names ); ?>
<?php if (!empty($category_names)): ?>
<p style="color:<?php echo esc_attr($bump_info->product_description_text_color); ?>">
<?php echo esc_html($category_names); ?>
</p>
<?php endif; ?>
<?php endif;?>
</div>
</div>
<div class="offer-price" style = "
<?php
echo 'color:' . esc_attr( $bump_info->product_description_text_color ) . ';';
echo 'font-size:' . esc_attr( $bump_info->product_description_font_size ) . 'px;'
?>
echo 'color:' . esc_attr($bump_info->product_description_text_color) . ';';
echo 'font-size:' . esc_attr($bump_info->product_description_font_size) . 'px;'
?>
">
<span style="text-decoration:line-through"><?php echo esc_html( get_woocommerce_currency_symbol() ) . esc_attr( number_format( (float) $regular_price, 2 ) ); ?></span>
<span style="text-decoration:line-through"><?php echo esc_html(get_woocommerce_currency_symbol()) . esc_attr(number_format((float) $regular_price, 2)); ?></span>
&nbsp;
<span style=""><?php echo esc_html( get_woocommerce_currency_symbol() ) . esc_attr( number_format( (float) $offer_price, 2 ) ); ?></span>
<span style=""><?php echo esc_html(get_woocommerce_currency_symbol()) . esc_attr(number_format((float) $offer_price, 2)); ?></span>
</div>
<div class="product-checkbox-and-excitement-message" >
<input
<input
type = "checkbox"
class = 'custom-checkbox'
value = "<?php echo esc_attr( $product_offer_id ); ?>"
id = "test_<?php echo esc_attr( $product_offer_id ); ?>"
onchange = "extraProducts(<?php echo esc_attr( $product_offer_id ); ?>,<?php echo esc_attr( $variation_id ); ?>,'<?php echo esc_attr( $checked ); ?>', '<?php echo esc_attr( $offer_price ); ?>')"
<?php echo esc_attr( $checked ); ?>
class = 'custom-checkbox'
value = "<?php echo esc_attr($product_offer_id); ?>"
id = "test_<?php echo esc_attr($product_offer_id); ?>"
onchange = "extraProducts(<?php echo esc_attr($product_offer_id); ?>,<?php echo esc_attr($variation_id); ?>,'<?php echo esc_attr($checked); ?>', '<?php echo esc_attr($offer_price); ?>')"
<?php echo esc_attr($checked); ?>
/>
<label for='test_<?php echo esc_attr( $product_offer_id ); ?>'>
<?php esc_html_e( 'Select', 'storegrowth-sales-booster' ); ?>
<label for='test_<?php echo esc_attr($product_offer_id); ?>'>
<?php esc_html_e('Select', 'storegrowth-sales-booster');?>
</label>
</div>
</div>
<hr style="margin-bottom:<?php echo esc_attr( $bump_info->box_bottom_margin ); ?>px"/>
</div>
<hr style="margin-bottom:<?php echo esc_attr($bump_info->box_bottom_margin); ?>px"/>
</div>
10 changes: 7 additions & 3 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
=== StoreGrowth — Best WooCommerce Marketing Solution — Fly Cart, Direct Checkout, Add To Cart Redirect, BOGO, Quick View, Sales Countdown Timer, Floating Notification Bar, Live Sales Notifications, Upsell Order Bump & More to boost sales ===
Contributors: mehedi_csit, invizo
Contributors: invizo
Tags: upsell, sliding cart, side cart, checkout optimization, notification bar, add to cart redirect, Buy now button, woocommerce direct checkout, woocommerce ajax cart, cart popup, sales notification, social proof, fomo, woocommerce notification, Side cart, fly cart, upsell order bump, free shipping bar, stock count progress bar, sales countdown timer.

Requires at least: 5.4
Tested up to: 6.4.1
Stable tag: 1.28.8
Tested up to: 6.5.3
Stable tag: 1.28.9
Requires PHP: 7.0
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -267,6 +267,10 @@ StoreGrowth floating notification bar displays ongoing offers and discounts whil

== Changelog ==

= 1.28.9 - 02 June, 2024 =

fix: paypal checkout button issue

= 1.28.8 - 23 April, 2024 =

fix: countdown timer script issue
Expand Down
2 changes: 1 addition & 1 deletion storegrowth-sales-booster.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: StoreGrowth - Sales Booster For WooCommerce Lite
* Description: Best WooCommerce Direct Checkout, Fly Cart, BOGO, Quick View, Live Sales Notifications, Floating Notification Bar and More Essential Features for Every WooCommerce Site!
* Version: 1.28.8
* Version: 1.28.9
* Author: Invizo
* Author URI: https://invizo.io/
* License: GPL-2.0+
Expand Down

0 comments on commit 6a41780

Please sign in to comment.