Assume packaging weight unit as default unit when displaying reports.

vendidero · Jan 2, 2025 · 889d414 · 889d414
1 parent cee706e
commit 889d414
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Packaging/Report.php b/src/Packaging/Report.php
@@ -259,14 +259,18 @@ public function get_packaging_count( $packaging_id, $country = '' ) {
 	}
 
 	public function get_packaging_weight( $packaging_id, $country = '', $round = true, $unit = '' ) {
+		if ( '' === $unit ) {
+			$unit = wc_gzd_get_packaging_weight_unit();
+		}
+
 		$weight = 0.0;
 
 		if ( '' === $country ) {
 			if ( isset( $this->args['packaging'][ "$packaging_id" ] ) ) {
 				$weight = $this->args['packaging'][ "$packaging_id" ]['weight_in_kg'];
 			}
 		} elseif ( isset( $this->args['countries'][ $country ], $this->args['countries'][ $country ]['packaging'][ "$packaging_id" ] ) ) {
-				$weight = $this->args['countries'][ $country ]['packaging'][ "$packaging_id" ]['weight_in_kg'];
+			$weight = $this->args['countries'][ $country ]['packaging'][ "$packaging_id" ]['weight_in_kg'];
 		}
 
 		$weight = wc_get_weight( $weight, $unit, 'kg' );
@@ -275,6 +279,10 @@ public function get_packaging_weight( $packaging_id, $country = '', $round = tru
 	}
 
 	public function get_total_packaging_weight_by_country( $country, $round = true, $unit = '' ) {
+		if ( '' === $unit ) {
+			$unit = wc_gzd_get_packaging_weight_unit();
+		}
+
 		$weight = 0.0;
 
 		if ( isset( $this->args['countries'][ $country ] ) ) {