Merge branch 'master' into pickup-delivery

vendidero · Apr 9, 2024 · 218399b · 218399b
2 parents ffacbd8 + 8ee78db
commit 218399b
Show file tree

Hide file tree

Showing 11 changed files with 257 additions and 163 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-germanized-shipments",
   "title": "Shipments for WooCommerce",
-  "version": "3.0.5",
+  "version": "3.1.1",
   "homepage": "https://vendidero.de",
   "repository": {
     "type": "git",

diff --git a/src/Automation.php b/src/Automation.php
@@ -220,12 +220,11 @@ public static function create_shipments( $order ) {
 
 		if ( $order_shipment = wc_gzd_get_shipment_order( $order ) ) {
 			/**
-			 * Sync existing shipments and items before creating new shipments
+			 * Sync existing shipments before creating new shipments
 			 */
 			foreach ( $order_shipment->get_simple_shipments() as $shipment ) {
 				if ( $shipment->is_editable() ) {
 					$shipment->sync();
-					$shipment->sync_items();
 					$shipment->save();
 				}
 			}

diff --git a/src/Package.php b/src/Package.php
@@ -18,7 +18,7 @@ class Package {
 	 *
 	 * @var string
 	 */
-	const VERSION = '3.0.5';
+	const VERSION = '3.1.1';
 
 	public static $upload_dir_suffix = '';
 
@@ -424,11 +424,15 @@ public static function register_endpoints( $query_vars ) {
 
 	public static function install() {
 		self::init();
+
+		if ( ! self::has_dependencies() ) {
+			return;
+		}
+
 		Install::install();
 	}
 
 	public static function install_integration() {
-		self::init();
 		self::install();
 	}
 
@@ -478,6 +482,14 @@ protected static function generate_key() {
 		return md5( serialize( $key ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
 	}
 
+	public static function is_shipping_debug_mode() {
+		return apply_filters( 'woocommerce_gzd_shipments_is_shipping_debug_mode', 'yes' === get_option( 'woocommerce_shipping_debug_mode', 'no' ) );
+	}
+
+	public static function is_constant_defined( $constant ) {
+		return class_exists( 'Automattic\Jetpack\Constants' ) ? \Automattic\Jetpack\Constants::is_defined( $constant ) : defined( $constant );
+	}
+
 	public static function log( $message, $type = 'info', $source = '' ) {
 		$enable_logging = defined( 'WP_DEBUG' ) && WP_DEBUG ? true : false;
 

diff --git a/src/Packaging.php b/src/Packaging.php
@@ -279,6 +279,12 @@ public function has_inner_dimensions() {
 		return ! empty( $this->get_inner_width( 'edit' ) ) || ! empty( $this->get_inner_length( 'edit' ) ) || ! empty( $this->get_inner_height( 'edit' ) );
 	}
 
+	public function has_shipping_class_restrictions() {
+		$classes = $this->get_available_shipping_classes( 'edit' );
+
+		return ! empty( $classes ) ? true : false;
+	}
+
 	/**
 	 * Returns the available shipping provider names.
 	 *
@@ -315,7 +321,9 @@ public function supports_shipping_class( $shipping_class ) {
 		$classes  = $this->get_available_shipping_classes( 'edit' );
 		$supports = false;
 
-		if ( empty( $classes ) || in_array( $shipping_class, $classes, true ) ) {
+		if ( empty( $shipping_class ) && empty( $classes ) ) {
+			$supports = true;
+		} elseif ( empty( $classes ) || in_array( $shipping_class, $classes, true ) ) {
 			$supports = true;
 		}
 

diff --git a/src/Packing/CartItem.php b/src/Packing/CartItem.php
@@ -48,8 +48,7 @@ public function __construct( $item, $incl_taxes = false ) {
 			$line_subtotal += (int) wc_add_number_precision( $this->item['line_subtotal_tax'] );
 		}
 
-		$this->weight = (int) wc_get_weight( $weight, 'g' );
-
+		$this->weight   = (int) wc_get_weight( $weight, 'g' );
 		$this->total    = $quantity > 0 ? NumberUtil::round( $line_total / $quantity ) : 0;
 		$this->subtotal = $quantity > 0 ? NumberUtil::round( $line_subtotal / $quantity ) : 0;
 	}

diff --git a/src/Packing/Item.php b/src/Packing/Item.php
@@ -60,7 +60,7 @@ public function canBePacked( $box, $already_packed_items, int $proposed_x, int $
 		if ( $product = $this->get_product() ) {
 			$shipping_class = $product->get_shipping_class_id();
 
-			if ( ! empty( $shipping_class ) ) {
+			if ( $box->get_packaging()->has_shipping_class_restrictions() ) {
 				if ( ! $box->get_packaging()->supports_shipping_class( $shipping_class ) ) {
 					$fits = false;
 				}

diff --git a/src/Shipment.php b/src/Shipment.php
@@ -273,13 +273,17 @@ public function get_shipping_zone() {
 	}
 
 	public function is_shipping_domestic() {
-		return Package::is_shipping_domestic(
-			$this->get_country(),
-			array(
-				'sender_country'  => $this->get_sender_country(),
-				'sender_postcode' => $this->get_sender_postcode(),
-				'postcode'        => $this->get_postcode(),
-			)
+		return apply_filters(
+			"{$this->get_general_hook_prefix()}is_shipping_domestic",
+			Package::is_shipping_domestic(
+				$this->get_country(),
+				array(
+					'sender_country'  => $this->get_sender_country(),
+					'sender_postcode' => $this->get_sender_postcode(),
+					'postcode'        => $this->get_postcode(),
+				)
+			),
+			$this
 		);
 	}
 
@@ -290,13 +294,17 @@ public function is_shipping_domestic() {
 	 * @return bool
 	 */
 	public function is_shipping_inner_eu() {
-		if ( Package::is_shipping_inner_eu_country(
-			$this->get_country(),
-			array(
-				'sender_country'  => $this->get_sender_country(),
-				'sender_postcode' => $this->get_sender_postcode(),
-				'postcode'        => $this->get_postcode(),
-			)
+		if ( apply_filters(
+			"{$this->get_general_hook_prefix()}is_shipping_inner_eu",
+			Package::is_shipping_inner_eu_country(
+				$this->get_country(),
+				array(
+					'sender_country'  => $this->get_sender_country(),
+					'sender_postcode' => $this->get_sender_postcode(),
+					'postcode'        => $this->get_postcode(),
+				)
+			),
+			$this
 		) ) {
 			return true;
 		}