Merge pull request #182 from kidunot89/new-mutation/update-shipping-method

Improved shipping support

Author: kidunot89

bin/testing-entrypoint.sh

@@ -68,11 +68,8 @@ chmod 777 ${TESTS_OUTPUT}
 # Run tests
 run_tests ${SUITES}
 
-# Fix codecoverage permissions and clean coverage.xml
+# Clean coverage.xml and clean up PCOV configurations.
 if [ -f "${TESTS_OUTPUT}/coverage.xml" ] && [[ "$COVERAGE" == "1" ]]; then
-    echo 'Setting "coverage.xml" permissions'.
-    chmod 777 -R "$TESTS_OUTPUT"/coverage.xml
-
     echo 'Cleaning coverage.xml for deployment'.
     pattern="$PROJECT_DIR/"
     sed -i "s~$pattern~~g" "$TESTS_OUTPUT"/coverage.xml
@@ -85,6 +82,14 @@ if [ -f "${TESTS_OUTPUT}/coverage.xml" ] && [[ "$COVERAGE" == "1" ]]; then
     fi
 fi
 
+# Set public test result files permissions.
+if [ -n "$(ls "$TESTS_OUTPUT")" ]; then
+    echo 'Setting result files permissions'.
+    chmod 777 -R "$TESTS_OUTPUT"/*
+fi
+
+
+# Check results and exit accordingly.
 if [ -f "${TESTS_OUTPUT}/failed" ]; then
     echo "Uh oh, some went wrong."
     exit 1

includes/class-type-registry.php

@@ -72,6 +72,8 @@ public function init( \WPGraphQL\Registry\TypeRegistry $type_registry ) {
 		\WPGraphQL\WooCommerce\Type\WPObject\Variation_Attribute_Type::register();
 		\WPGraphQL\WooCommerce\Type\WPObject\Payment_Gateway_Type::register();
 		\WPGraphQL\WooCommerce\Type\WPObject\Meta_Data_Type::register();
+		\WPGraphQL\WooCommerce\Type\WPObject\Shipping_Package_Type::register();
+		\WPGraphQL\WooCommerce\Type\WPObject\Shipping_Rate_Type::register();
 
 		// Object fields.
 		\WPGraphQL\WooCommerce\Type\WPObject\Product_Category_Type::register_fields();
@@ -103,6 +105,7 @@ public function init( \WPGraphQL\Registry\TypeRegistry $type_registry ) {
 		\WPGraphQL\WooCommerce\Mutation\Cart_Apply_Coupon::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Cart_Remove_Coupons::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Cart_Add_Fee::register_mutation();
+		\WPGraphQL\WooCommerce\Mutation\Cart_Update_Shipping_Method::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Order_Create::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Order_Update::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Order_Delete::register_mutation();

includes/connection/class-order-items.php

@@ -49,7 +49,6 @@ public static function register_connections() {
 		register_graphql_connection(
 			self::get_connection_config(
 				array(
-					'toType'        => 'FeeLine',
 					'toType'        => 'CouponLine',
 					'fromFieldName' => 'couponLines',
 				)
@@ -69,7 +68,7 @@ public static function register_connections() {
 	 *
 	 * @return array
 	 */
-	public static function get_connection_config( $args = [] ) {
+	public static function get_connection_config( $args = array() ) {
 		$defaults = array(
 			'fromType'       => 'Order',
 			'toType'         => 'LineItem',

includes/connection/class-payment-gateways.php

@@ -32,7 +32,7 @@ public static function register_connections() {
 	 *
 	 * @return array
 	 */
-	public static function get_connection_config( $args = [] ) {
+	public static function get_connection_config( $args = array() ) {
 		$defaults = array(
 			'fromType'       => 'RootQuery',
 			'toType'         => 'PaymentGateway',

includes/connection/class-products.php

@@ -118,7 +118,7 @@ public static function register_connections() {
 	 *
 	 * @return array
 	 */
-	public static function get_connection_config( $args = [] ) {
+	public static function get_connection_config( $args = array() ) {
 		$defaults = array(
 			'fromType'       => 'RootQuery',
 			'toType'         => 'Product',

includes/data/class-factory.php

@@ -51,7 +51,7 @@ public static function resolve_customer( $id, AppContext $context ) {
 		}
 		$customer_id = absint( $id );
 		$loader      = $context->getLoader( 'wc_customer' );
-		$loader->buffer( [ $customer_id ] );
+		$loader->buffer( array( $customer_id ) );
 		return new Deferred(
 			function () use ( $loader, $customer_id ) {
 				return $loader->load( $customer_id );
@@ -74,7 +74,7 @@ public static function resolve_crud_object( $id, AppContext $context ) {
 		}
 		$object_id = absint( $id );
 		$loader    = $context->getLoader( 'wc_post_crud' );
-		$loader->buffer( [ $object_id ] );
+		$loader->buffer( array( $object_id ) );
 		return new Deferred(
 			function () use ( $loader, $object_id ) {
 				return $loader->load( $object_id );
@@ -166,6 +166,21 @@ public static function resolve_shipping_method( $id ) {
 		return new Shipping_Method( $method );
 	}
 
+	/**
+	 * Resolves woocommerce cart.
+	 *
+	 * @return \WC_Cart
+	 */
+	public static function resolve_cart() {
+		do_action( 'woocommerce_before_calculate_totals', \WC()->cart );
+
+		new \WC_Cart_Totals( \WC()->cart );
+
+		do_action( 'woocommerce_after_calculate_totals', \WC()->cart );
+
+		return \WC()->cart;
+	}
+
 	/**
 	 * Resolves a cart item by key.
 	 *
@@ -174,9 +189,7 @@ public static function resolve_shipping_method( $id ) {
 	 * @return object
 	 */
 	public static function resolve_cart_item( $id ) {
-		$item = WC()->cart->get_cart_item( $id );
-
-		return $item;
+		return self::resolve_cart()->get_cart_item( $id );
 	}
 
 	/**
@@ -187,10 +200,8 @@ public static function resolve_cart_item( $id ) {
 	 * @return object
 	 */
 	public static function resolve_cart_fee( $id ) {
-		$fees = WC()->cart->get_fees();
-
-		if ( ! empty( $fees[ $id ] ) ) {
-			return $fees[ $id ];
+		if ( ! empty( self::resolve_cart()->get_fees()[ $id ] ) ) {
+			return self::resolve_cart()->get_fees()[ $id ];
 		}
 
 		return null;

includes/data/connection/class-product-connection-resolver.php

@@ -147,7 +147,7 @@ public function get_query_args() {
 		/**
 		 * Collect the input_fields and sanitize them to prepare them for sending to the WP_Query
 		 */
-		$input_fields = [];
+		$input_fields = array();
 		if ( ! empty( $this->args['where'] ) ) {
 			$input_fields = $this->sanitize_input_fields( $this->args['where'] );
 		}

includes/data/connection/class-wc-terms-connection-resolver.php

@@ -48,10 +48,10 @@ public static function get_query_args( $query_args = array(), $source, $args, $c
 					break;
 				case is_a( $source, Product::class ):
 					// @codingStandardsIgnoreLine
-					if ( 'categories' === $info->fieldName ) {
+					if ( 'productCategories' === $info->fieldName ) {
 						$query_args['term_taxonomy_id'] = $source->category_ids;
 					// @codingStandardsIgnoreLine
-					} elseif ( 'tags' === $info->fieldName ) {
+					} elseif ( 'productTags' === $info->fieldName ) {
 						$query_args['term_taxonomy_id'] = $source->tag_ids;
 					}
 					break;

includes/model/class-coupon.php

@@ -26,13 +26,13 @@ class Coupon extends Crud_CPT {
 	 */
 	public function __construct( $id ) {
 		$this->data                = new \WC_Coupon( $id );
-		$allowed_restricted_fields = [
+		$allowed_restricted_fields = array(
 			'isRestricted',
 			'isPrivate',
 			'isPublic',
 			'id',
 			'couponId',
-		];
+		);
 
 		parent::__construct( $allowed_restricted_fields, 'shop_coupon', $id );
 	}

includes/model/class-customer.php

@@ -27,14 +27,14 @@ class Customer extends Model {
 	 */
 	public function __construct( $id ) {
 		$this->data                = new \WC_Customer( $id );
-		$allowed_restricted_fields = [
+		$allowed_restricted_fields = array(
 			'isRestricted',
 			'isPrivate',
 			'isPublic',
 			'id',
 			'customerId',
 			'displayName',
-		];
+		);
 
 		$restricted_cap = apply_filters( 'customer_restricted_cap', 'list_users' );