Changeset 2768193
- Timestamp:
- 08/09/2022 07:23:33 AM (4 years ago)
- Location:
- caddy
- Files:
-
- 87 added
- 4 edited
-
tags/1.9.2 (added)
-
tags/1.9.2/LICENSE.txt (added)
-
tags/1.9.2/README.txt (added)
-
tags/1.9.2/admin (added)
-
tags/1.9.2/admin/class-caddy-admin.php (added)
-
tags/1.9.2/admin/css (added)
-
tags/1.9.2/admin/css/caddy-admin.css (added)
-
tags/1.9.2/admin/css/caddy-deactivation.css (added)
-
tags/1.9.2/admin/css/caddy-deactivation.min.css (added)
-
tags/1.9.2/admin/img (added)
-
tags/1.9.2/admin/img/caddy-logo.svg (added)
-
tags/1.9.2/admin/img/caddy-trophy.svg (added)
-
tags/1.9.2/admin/img/caddy-welcome.svg (added)
-
tags/1.9.2/admin/img/klaviyo-logo.jpg (added)
-
tags/1.9.2/admin/img/ls-logo.png (added)
-
tags/1.9.2/admin/index.php (added)
-
tags/1.9.2/admin/js (added)
-
tags/1.9.2/admin/js/caddy-admin.js (added)
-
tags/1.9.2/admin/js/caddy-deactivation.js (added)
-
tags/1.9.2/admin/js/caddy-deactivation.min.js (added)
-
tags/1.9.2/admin/partials (added)
-
tags/1.9.2/admin/partials/caddy-addons-page.php (added)
-
tags/1.9.2/admin/partials/caddy-admin-display.php (added)
-
tags/1.9.2/admin/partials/caddy-admin-settings-screen.php (added)
-
tags/1.9.2/admin/partials/caddy-admin-style-screen.php (added)
-
tags/1.9.2/caddy.php (added)
-
tags/1.9.2/includes (added)
-
tags/1.9.2/includes/class-caddy-activator.php (added)
-
tags/1.9.2/includes/class-caddy-cart-widget.php (added)
-
tags/1.9.2/includes/class-caddy-deactivator.php (added)
-
tags/1.9.2/includes/class-caddy-i18n.php (added)
-
tags/1.9.2/includes/class-caddy-loader.php (added)
-
tags/1.9.2/includes/class-caddy-saved-items-widget.php (added)
-
tags/1.9.2/includes/class-caddy.php (added)
-
tags/1.9.2/includes/index.php (added)
-
tags/1.9.2/index.php (added)
-
tags/1.9.2/languages (added)
-
tags/1.9.2/languages/caddy-es_ES.mo (added)
-
tags/1.9.2/languages/caddy-es_ES.po (added)
-
tags/1.9.2/languages/caddy-nl_NL.mo (added)
-
tags/1.9.2/languages/caddy-nl_NL.po (added)
-
tags/1.9.2/languages/caddy.pot (added)
-
tags/1.9.2/public (added)
-
tags/1.9.2/public/class-caddy-public.php (added)
-
tags/1.9.2/public/css (added)
-
tags/1.9.2/public/css/caddy-icons.css (added)
-
tags/1.9.2/public/css/caddy-icons.min.css (added)
-
tags/1.9.2/public/css/caddy-public-fonts.css (added)
-
tags/1.9.2/public/css/caddy-public.css (added)
-
tags/1.9.2/public/css/caddy-public.min.css (added)
-
tags/1.9.2/public/css/caddy-slick.css (added)
-
tags/1.9.2/public/css/caddy-slick.min.css (added)
-
tags/1.9.2/public/fonts (added)
-
tags/1.9.2/public/fonts/cc-public-icons.eot (added)
-
tags/1.9.2/public/fonts/cc-public-icons.svg (added)
-
tags/1.9.2/public/fonts/cc-public-icons.ttf (added)
-
tags/1.9.2/public/fonts/cc-public-icons.woff (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-600.eot (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-600.svg (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-600.ttf (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-600.woff (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-600.woff2 (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-regular.eot (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-regular.svg (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-regular.ttf (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-regular.woff (added)
-
tags/1.9.2/public/fonts/ibm-plex-sans-v7-latin-regular.woff2 (added)
-
tags/1.9.2/public/img (added)
-
tags/1.9.2/public/img/box-emoji.png (added)
-
tags/1.9.2/public/img/loading.gif (added)
-
tags/1.9.2/public/img/sparkles-emoji.png (added)
-
tags/1.9.2/public/img/voltage-emoji.png (added)
-
tags/1.9.2/public/index.php (added)
-
tags/1.9.2/public/js (added)
-
tags/1.9.2/public/js/caddy-public.js (added)
-
tags/1.9.2/public/js/caddy-public.min.js (added)
-
tags/1.9.2/public/js/slick.min.js (added)
-
tags/1.9.2/public/js/tabby.js (added)
-
tags/1.9.2/public/js/tabby.min.js (added)
-
tags/1.9.2/public/js/tabby.polyfills.min.js (added)
-
tags/1.9.2/public/partials (added)
-
tags/1.9.2/public/partials/caddy-public-display.php (added)
-
tags/1.9.2/public/partials/cc-cart-screen.php (added)
-
tags/1.9.2/public/partials/cc-product-recommendations-screen.php (added)
-
tags/1.9.2/public/partials/cc-sfl-screen.php (added)
-
tags/1.9.2/public/partials/cc-window-screen.php (added)
-
tags/1.9.2/uninstall.php (added)
-
trunk/README.txt (modified) (2 diffs)
-
trunk/caddy.php (modified) (2 diffs)
-
trunk/public/class-caddy-public.php (modified) (4 diffs)
-
trunk/public/partials/cc-cart-screen.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
caddy/trunk/README.txt
r2760135 r2768193 7 7 Tested up to: 6.0 8 8 Requires PHP: 7.0 9 Stable tag: v1.9. 29 Stable tag: v1.9.3 10 10 License: GPLv2 or later 11 11 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 94 94 95 95 == Changelog == 96 97 = 1.9.3 = 98 * Fix: Call to a member function is_empty() on null 99 * Fix: Cart object condition check on the cart screen 100 * Improvement: Free shipping total calculation is round-up 101 * Improvement: Convert all the integer value to float for better calculations 96 102 97 103 = 1.9.2 = -
caddy/trunk/caddy.php
r2760135 r2768193 4 4 * Plugin URI: https://usecaddy.com 5 5 * Description: A high performance, conversion-boosting side cart for your WooCommerce store that improves the shopping experience & helps grow your sales. 6 * Version: 1.9. 26 * Version: 1.9.3 7 7 * Author: Tribe Interactive 8 8 * Author URI: https://www.madebytribe.com … … 25 25 */ 26 26 if ( ! defined( 'CADDY_VERSION' ) ) { 27 define( 'CADDY_VERSION', '1.9. 2' );27 define( 'CADDY_VERSION', '1.9.3' ); 28 28 } 29 29 if ( ! defined( 'CADDY_PLUGIN_FILE' ) ) { -
caddy/trunk/public/class-caddy-public.php
r2760126 r2768193 483 483 } 484 484 $cc_cart_subtotal = WC()->cart->get_displayed_subtotal(); 485 $caddy_cart_subtotal = ( int) ( $cc_cart_subtotal - $coupon_discount_amount );485 $caddy_cart_subtotal = (float) ( $cc_cart_subtotal - $coupon_discount_amount ); 486 486 487 487 $this->get_refreshed_fragments(); … … 523 523 $cc_free_shipping_amount = get_option( 'cc_free_shipping_amount' ); 524 524 525 $free_shipping_remaining_amount = absint( $cc_free_shipping_amount ) - absint( $final_cart_subtotal );525 $free_shipping_remaining_amount = floatval( $cc_free_shipping_amount ) - floatval( $final_cart_subtotal ); 526 526 $free_shipping_remaining_amount = ! empty( $free_shipping_remaining_amount ) ? $free_shipping_remaining_amount : 0; 527 527 … … 596 596 597 597 $cart_total = floatval( preg_replace( '#[^\d.]#', '', WC()->cart->get_cart_contents_total() ) ); 598 $subcart_total = ( int) number_format( $cart_total, 2 );599 $cc_free_shipping_amount = ( int) get_option( 'cc_free_shipping_amount' );598 $subcart_total = (float) number_format( $cart_total, 2 ); 599 $cc_free_shipping_amount = (float) get_option( 'cc_free_shipping_amount' ); 600 600 601 601 if ( ! empty( $cc_free_shipping_amount ) ) { … … 876 876 $cc_free_shipping_amount = get_option( 'cc_free_shipping_amount' ); 877 877 878 $free_shipping_remaining_amount = absint( $cc_free_shipping_amount ) - absint( $final_cart_subtotal );878 $free_shipping_remaining_amount = floatval( $cc_free_shipping_amount ) - floatval( $final_cart_subtotal ); 879 879 $free_shipping_remaining_amount = ! empty( $free_shipping_remaining_amount ) ? $free_shipping_remaining_amount : 0; 880 880 -
caddy/trunk/public/partials/cc-cart-screen.php
r2760126 r2768193 5 5 } 6 6 7 $cc_empty_class = ( WC()->cart->is_empty() ) ? ' cc-empty' : ''; 8 7 if ( ! is_object( WC()->cart ) ) { 8 return; 9 } 10 11 $cc_empty_class = ( WC()->cart->is_empty() ) ? ' cc-empty' : ''; 9 12 $cart_total = floatval( preg_replace( '#[^\d.]#', '', WC()->cart->get_cart_contents_total() ) ); 10 13 $cc_free_shipping_amount = get_option( 'cc_free_shipping_amount' ); … … 13 16 $cc_free_shipping_bar = true; 14 17 15 $free_shipping_remaining_amount = absint( $cc_free_shipping_amount ) - absint( $cart_total );18 $free_shipping_remaining_amount = floatval( $cc_free_shipping_amount ) - floatval( $cart_total ); 16 19 $free_shipping_remaining_amount = ! empty( $free_shipping_remaining_amount ) ? $free_shipping_remaining_amount : 0; 17 20
Note: See TracChangeset
for help on using the changeset viewer.