Updates to 3.3.0

Author: Woo

changelog.txt

@@ -1,5 +1,8 @@
 *** Table Rate Shipping Changelog ***
 
+2024-07-16 - version 3.3.0
+* Add - Compatibility with WooPayments Multi-currency tool.
+
 2024-07-02 - version 3.2.2
 * Tweak - WordPress 6.6 and WooCommerce 9.0 compatibility.
 

includes/class-wc-shipping-table-rate.php

@@ -1169,6 +1169,37 @@ public function get_normalized_shipping_rates() {
 		return $shipping_rates;
 	}
 
+	/**
+	 * Convert the product price to the base currency using WooCommerce Payments Multi-Currency.
+	 *
+	 * @param float $total_price Total product price.
+	 * @return float  Converted price in base currency.
+	 */
+	private function maybe_convert_to_base_currency( $total_price ) {
+		if ( ! class_exists( 'WCPay\MultiCurrency\MultiCurrency' ) ) {
+			return $total_price;
+		}
+
+		$multi_currency    = WCPay\MultiCurrency\MultiCurrency::instance();
+		$selected_currency = $multi_currency->get_selected_currency();
+		$base_currency     = $multi_currency->get_default_currency();
+
+		// If the selected currency is the same as the base currency, return the original price.
+		if ( $selected_currency->get_code() === $base_currency->get_code() ) {
+			return $total_price;
+		}
+
+		try {
+			$converted_price = $multi_currency->get_raw_conversion( (float) $total_price, $base_currency->get_code(), $selected_currency->get_code() );
+		} catch ( Exception $e ) {
+			// Log the error for better debugging.
+			wc_get_logger()->error( $e->getMessage(), array( 'source' => 'woocommerce-table-rate-shipping' ) );
+			return $total_price;
+		}
+
+		return $converted_price;
+	}
+
 	/**
 	 * Retrieve the product price from a line item.
 	 *
@@ -1180,7 +1211,7 @@ public function get_normalized_shipping_rates() {
 	public function get_product_price( $_product, $qty = 1, $item = array() ) {
 
 		/**
-		 * Filter to let third party use the product price  with discounts or without discounts to calculate Min-Max conditions.
+		 * Filter to let third party use the product price with discounts or without discounts to calculate Min-Max conditions.
 		 *
 		 * @param boolean minmax_after_discount option value.
 		 * @param array Cart item.
@@ -1190,6 +1221,9 @@ public function get_product_price( $_product, $qty = 1, $item = array() ) {
 		if ( apply_filters( 'woocommerce_table_rate_compare_price_limits_after_discounts', wc_string_to_bool( $this->minmax_after_discount ), $item ) && isset( $item['line_total'] ) ) {
 			$row_base_price = $item['line_total'] + ( wc_string_to_bool( $this->minmax_with_tax ) && isset( $item['line_tax'] ) ? $item['line_tax'] : 0 );
 
+			// Convert to base currency if needed.
+			$row_base_price = $this->maybe_convert_to_base_currency( $row_base_price );
+
 			/**
 			 * Filter to let third party modify the row base price.
 			 *
@@ -1203,6 +1237,9 @@ public function get_product_price( $_product, $qty = 1, $item = array() ) {
 		} elseif ( isset( $item['line_subtotal'] ) ) {
 			$row_base_price = $item['line_subtotal'] + ( wc_string_to_bool( $this->minmax_with_tax ) && isset( $item['line_subtotal_tax'] ) ? $item['line_subtotal_tax'] : 0 );
 
+			// Convert to base currency if needed.
+			$row_base_price = $this->maybe_convert_to_base_currency( $row_base_price );
+
 			/**
 			 * Filter to let third party modify the row base price.
 			 *
@@ -1215,13 +1252,17 @@ public function get_product_price( $_product, $qty = 1, $item = array() ) {
 			return apply_filters( 'woocommerce_table_rate_package_row_base_price', $row_base_price, $_product, $qty );
 		}
 
+		// Default price calculation.
 		$row_base_price = $_product->get_price() * $qty;
 
-		// From Issue #134 : Adding a compatibility product price for Measurement Price Calculator plugin by SkyVerge.
+		// From Issue #134: Adding a compatibility product price for Measurement Price Calculator plugin by SkyVerge.
 		if ( class_exists( 'WC_Measurement_Price_Calculator_Loader' ) && isset( $item['pricing_item_meta_data']['_price'] ) ) {
 			$row_base_price = $item['pricing_item_meta_data']['_price'] * $qty;
 		}
 
+		// Convert to base currency if needed.
+		$row_base_price = $this->maybe_convert_to_base_currency( $row_base_price );
+
 		/**
 		 * Filter to let third party modify the row base price.
 		 *

languages/woocommerce-table-rate-shipping.pot

@@ -2,10 +2,10 @@
 # This file is distributed under the GNU General Public License v3.0.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce Table Rate Shipping 3.2.2\n"
+"Project-Id-Version: WooCommerce Table Rate Shipping 3.3.0\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/woocommerce-table-rate-shipping\n"
-"POT-Creation-Date: 2024-07-02 11:06:58+00:00\n"
+"POT-Creation-Date: 2024-07-16 22:56:05+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -228,7 +228,7 @@ msgstr ""
 msgid "Class Priorities"
 msgstr ""
 
-#: includes/class-wc-shipping-table-rate.php:1386
+#: includes/class-wc-shipping-table-rate.php:1427
 #. translators: %s: message
 msgid ""
 "You have overlapping shipping rates defined, which may offer multiple "

woocommerce-table-rate-shipping.php

@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce Table Rate Shipping
  * Plugin URI: https://woocommerce.com/products/table-rate-shipping/
  * Description: Table rate shipping lets you define rates depending on location vs shipping class, price, weight, or item count.
- * Version: 3.2.2
+ * Version: 3.3.0
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
  * Text Domain: woocommerce-table-rate-shipping
@@ -13,8 +13,8 @@
  * Domain Path: /languages
  * Requires Plugins: woocommerce
  * Tested up to: 6.6
- * WC tested up to: 9.0
- * WC requires at least: 8.8
+ * WC tested up to: 9.1
+ * WC requires at least: 8.9
  *
  * Woo: 18718:3034ed8aff427b0f635fe4c86bbf008a
  *
@@ -26,7 +26,7 @@
 }
 
 if ( ! defined( 'TABLE_RATE_SHIPPING_VERSION' ) ) {
-	define( 'TABLE_RATE_SHIPPING_VERSION', '3.2.2' ); // WRCS: DEFINED_VERSION.
+	define( 'TABLE_RATE_SHIPPING_VERSION', '3.3.0' ); // WRCS: DEFINED_VERSION.
 }
 
 if ( ! defined( 'TABLE_RATE_SHIPPING_DEBUG' ) ) {