Changeset 3258560

Timestamp:

03/19/2025 01:38:14 PM (13 days ago)

Author:

woobewoo

Message:

version 2.1.4

Location:

woo-currency/trunk

Files:

• classes/helpers/SxGeo.php (modified) (1 diff)
• config.php (modified) (1 diff)
• js/core.js (modified) (1 diff)
• modules/currency/mod.php (modified) (5 diffs)
• readme.txt (modified) (3 diffs)
• wcu.php (modified) (1 diff)

woo-currency/trunk/classes/helpers/SxGeo.php

@@ -26 +26 @@
     protected $m_idx_len;
     protected $db_items;
+    protected $id_len;
+    protected $block_len;
+    protected $max_region;
+    protected $max_city;
+    protected $max_country;
+    protected $pack;
+    protected $b_idx_len;
     protected $country_size;
     protected $db;

woo-currency/trunk/config.php

@@ -49 +49 @@
 
     define('WCU_PLUGIN_INSTALLED', true);
-    define('WCU_VERSION', '2.1.3');
+    define('WCU_VERSION', '2.1.4');
     define('WCU_DEV_VER', 1);
     define('WCU_USER', 'user');

woo-currency/trunk/js/core.js

@@ -390 +390 @@
     window.sessionStorage.clear();
 }
+document.addEventListener('DOMContentLoaded', () => {
+    if (wp && wp.data) {
+        wp.data.subscribe(() => {
+            wcuReplaceShippingCost(100);
+        });
+        jQuery(document.body).on('click', '.wc-block-components-panel__button', function() {
+            wcuReplaceShippingCost(0);
+            wcuReplaceShippingCost(100);
+        });
+    }
+});
+function wcuReplaceShippingCost ( tt ) {
+    if (WCU_DATA.shippingCosts) {
+        setTimeout(function () {
+            for(var key in WCU_DATA.shippingCosts) {
+                var $input = jQuery('.wc-block-components-radio-control__input[value="'+key+'"]');
+                if ($input.length) {
+                    $input.parent().find('.wc-block-formatted-money-amount').html(WCU_DATA.shippingCosts[key]);
+                }
+            }
+        }, tt);
+    }
+}

woo-currency/trunk/modules/currency/mod.php

@@ -29 +29 @@
     public $isYithProductAddon = false;
     public $customCache = null;
+    public $shippingCosts = false;
 
     public static $orderId = null;
@@ -163 +164 @@
         add_filter('woocommerce_hydration_dispatch_request', array($this, 'restApiRequest'), 9999, 4);
     }
-    
     public function enableYithAddonConverter() {
         $this->isYithProductAddon = true;
@@ -288 +288 @@
         add_filter('woocommerce_cart_get_subtotal', array($this, 'getCurrencyPriceCart'), 9999);
         add_filter('woocommerce_cart_get_total', array($this, 'getCurrencyPriceCart'), 9999);
+        add_filter('woocommerce_cart_get_shipping_total', array($this, 'getShippingTotal'), 9999);
+        add_filter('woocommerce_package_rates', array($this, 'calcShippingCosts'), 2);
         add_action('woocommerce_calculate_totals', array($this, 'calcLineSubtotal'), 9999);
+        dispatcherWcu::addFilter('jsInitVariables', array($this, 'addShippingCosts'));
+    }
+    public function addShippingCosts($js) {
+        if (!empty($this->shippingCosts)) {
+            $js['shippingCosts'] = $this->shippingCosts;
+        }
+        return $js;
+    }
+    public function calcShippingCosts($methods) {
+        if (!has_block('woocommerce/cart') && !has_block('woocommerce/checkout')) {
+            return $methods;
+        }
+        $costs = array();
+        foreach ( $methods as $key => $method ) {
+            if (!empty($method->cost)) {
+                $costs[$key] = wc_price($method->cost);
+            }
+        }
+        $this->shippingCosts = $costs;
+        return $methods;
+    }
+    public function getShippingTotal($price) {
+        if (!has_block('woocommerce/cart') && !has_block('woocommerce/checkout') && !$this->isBlocksAPI()) {
+            return $price;
+        }
+        return $this->getModel()->getCurrencyPrice($price, null);
     }
     public function restApiRequest($response, $request, $path, $handler) {
@@ -296 +324 @@
         return $response;
     }
+    public function isBlocksAPI(  ) {
+        $uri = empty($_SERVER['REQUEST_URI']) ? '' : sanitize_text_field($_SERVER['REQUEST_URI']);
+        return strpos( $uri, 'wp-json/wc/store/') && strpos( $uri, '/batch?');
+    }
     public function calcLineSubtotal( $cart ) {
-        if (has_block('woocommerce/cart') || has_block('woocommerce/checkout')) {
+        if (has_block('woocommerce/cart') || has_block('woocommerce/checkout') || $this->isBlocksAPI()) {
+
             foreach ( $cart->get_cart() as $key => $cartItem ) {
                 if (!empty($cartItem['line_subtotal']) && !empty($cart->cart_contents[$key])) {
@@ -316 +349 @@
             }
         }
-        if (!has_block('woocommerce/cart') && !has_block('woocommerce/checkout')) {
+        if (!has_block('woocommerce/cart') && !has_block('woocommerce/checkout') && !$this->isBlocksAPI()) {
             return $price;
         }

woo-currency/trunk/readme.txt

@@ -4 +4 @@
 Donate link: https://woobewoo.com/product/woo-currency/
 Tested up to: 6.7
-Stable tag: 2.1.3
+Stable tag: 2.1.4
  
 WBW Currency Switcher for WooCommerce allows customers to switch products prices to any currencies. Get rates converted in the real-time with dynamic currency switcher
@@ -145 +145 @@
 == Changelog ==
 
+= 2.1.4 =
+ * Fixed shipping total for cart-blocks
+ * Fixed shipping costs for cart-blocks
+ * Minor code fix
+
 = 2.1.3 =
-* Minor code fix
+ * Minor code fix
 
 = 2.1.2 =
-* Added compatibility with Woocommerce Checkout-block
-* Minor code fix
+ * Added compatibility with Woocommerce Checkout-block
+ * Minor code fix
 
 = 2.1.1 =
@@ -156 +161 @@
 
 = 2.1.0 =
-* Minor code fix
+ * Minor code fix
 
 = 2.0.9 =
-* Fixed compatibility with WooCommerce PayPal Payments
+ * Fixed compatibility with WooCommerce PayPal Payments
 
 = 2.0.8 =
-* Minor code fix
+ * Minor code fix
 
 = 2.0.7 =

woo-currency/trunk/wcu.php

@@ -3 +3 @@
  * Plugin Name: WBW Currency Switcher for WooCommerce
  * Description: WBW Currency Switcher for WooCommerce allows the customers switch products prices to any currencies. Get rates converted in the real time with dynamic currency switcher
- * Version: 2.1.3
+ * Version: 2.1.4
  * Author: woobewoo
  * Author URI: https://woobewoo.com
  * WC requires at least: 3.4.0
- * WC tested up to: 9.6.0
+ * WC tested up to: 9.7.1
  * Text Domain: woo-currency
  * Domain Path: /languages