Merge pull request #439 from kidunot89/feature/new-cart-mutations

New cart mutations and cart bugfixes.

Author: kidunot89

composer.json

@@ -40,7 +40,7 @@
         "stripe/stripe-php": "^7.28",
         "wp-coding-standards/wpcs": "^2.3",
         "johnpbloch/wordpress": "~5.3",
-        "wp-graphql/wp-graphql": "^1.1.2",
+        "wp-graphql/wp-graphql": "^1.1.4",
         "wp-graphql/wp-graphql-jwt-authentication": "^0.4.1",
         "wpackagist-plugin/woocommerce": "^4.4",
         "wpackagist-plugin/woocommerce-gateway-stripe": "^4.5",
@@ -79,7 +79,7 @@
     },
     "scripts": {
         "installTestEnv": "bash bin/install-test-env.sh",
-        "runWPUnitTest": "vendor/bin/codept run wpunit",
+        "runWPUnitTest": "vendor/bin/codecept run wpunit",
         "dBuild": "env $(sed -e '/^#/d' .env.dist) docker-compose build",
         "dRunApp": "env $(sed -e '/^#/d' .env.dist) docker-compose up testable_app app_db mailhog",
         "dRunTestingDb":"if [ ! \"$(docker ps -a | grep testing_db)\" ]; then env $(sed -e '/^#/d' .env.dist) docker-compose up -d testing_db; fi",

includes/class-type-registry.php

@@ -41,8 +41,10 @@ public function init( \WPGraphQL\Registry\TypeRegistry $type_registry ) {
 		\WPGraphQL\WooCommerce\Type\WPEnum\Products_Orderby_Enum::register();
 		\WPGraphQL\WooCommerce\Type\WPEnum\Orders_Orderby_Enum::register();
 		\WPGraphQL\WooCommerce\Type\WPEnum\Id_Type_Enums::register();
+		\WPGraphQL\WooCommerce\Type\WPEnum\Cart_Error_Type::register();
 
 		// InputObjects.
+		\WPGraphQL\WooCommerce\Type\WPInputObject\Cart_Item_Input::register();
 		\WPGraphQL\WooCommerce\Type\WPInputObject\Customer_Address_Input::register();
 		\WPGraphQL\WooCommerce\Type\WPInputObject\Product_Attribute_Input::register();
 		\WPGraphQL\WooCommerce\Type\WPInputObject\Tax_Rate_Connection_Orderby_Input::register();
@@ -59,6 +61,7 @@ public function init( \WPGraphQL\Registry\TypeRegistry $type_registry ) {
 		// Interfaces.
 		\WPGraphQL\WooCommerce\Type\WPInterface\Product::register_interface( $type_registry );
 		\WPGraphQL\WooCommerce\Type\WPInterface\Product_Attribute::register_interface( $type_registry );
+		\WPGraphQL\WooCommerce\Type\WPInterface\Cart_Error::register_interface( $type_registry );
 
 		// Objects.
 		\WPGraphQL\WooCommerce\Type\WPObject\Coupon_Type::register();
@@ -80,6 +83,7 @@ public function init( \WPGraphQL\Registry\TypeRegistry $type_registry ) {
 		\WPGraphQL\WooCommerce\Type\WPObject\Meta_Data_Type::register();
 		\WPGraphQL\WooCommerce\Type\WPObject\Shipping_Package_Type::register();
 		\WPGraphQL\WooCommerce\Type\WPObject\Shipping_Rate_Type::register();
+		\WPGraphQL\WooCommerce\Type\WPObject\Cart_Error_Types::register();
 
 		// Object fields.
 		\WPGraphQL\WooCommerce\Type\WPObject\Product_Category_Type::register_fields();
@@ -107,6 +111,7 @@ public function init( \WPGraphQL\Registry\TypeRegistry $type_registry ) {
 		\WPGraphQL\WooCommerce\Mutation\Customer_Register::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Customer_Update::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Cart_Add_Item::register_mutation();
+		\WPGraphQL\WooCommerce\Mutation\Cart_Add_Items::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Cart_Update_Item_Quantities::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Cart_Remove_Items::register_mutation();
 		\WPGraphQL\WooCommerce\Mutation\Cart_Restore_Items::register_mutation();
@@ -115,6 +120,7 @@ public function init( \WPGraphQL\Registry\TypeRegistry $type_registry ) {
 		\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\Cart_Fill::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-coupons.php

@@ -24,16 +24,6 @@ class Coupons {
 	public static function register_connections() {
 		// From RootQuery.
 		register_graphql_connection( self::get_connection_config() );
-
-		// From Cart.
-		register_graphql_connection(
-			self::get_connection_config(
-				array(
-					'fromType'      => 'Cart',
-					'fromFieldName' => 'appliedCoupons',
-				)
-			)
-		);
 	}
 
 	/**

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

@@ -79,7 +79,6 @@ public function get_node_by_id( $id ) {
 	public function should_execute() {
 		$post_type_obj = get_post_type_object( 'shop_coupon' );
 		switch ( true ) {
-			case 'appliedCoupons' === $this->info->fieldName:
 			case current_user_can( $post_type_obj->cap->edit_posts ):
 				return true;
 			default:
@@ -145,19 +144,6 @@ public function get_query_args() {
 			$query_args['order'] = ! empty( $last ) ? 'ASC' : 'DESC';
 		}
 
-		if ( is_a( $this->source, \WC_Cart::class ) ) {
-			// @codingStandardsIgnoreLine
-			switch( $this->info->fieldName ) {
-				case 'appliedCoupons':
-					$ids = array();
-					foreach ( $this->source->get_applied_coupons() as $code ) {
-						$ids[] = \wc_get_coupon_id_by_code( $code );
-					}
-					$query_args['post__in'] = ! empty( $ids ) ? $ids : array( '0' );
-					break;
-			}
-		}
-
 		/**
 		 * Filter the $query args to allow folks to customize queries programmatically
 		 *

includes/data/mutation/class-cart-mutation.php

@@ -26,6 +26,7 @@ public static function get_cart_field( $fallback = false ) {
 			'type'    => 'Cart',
 			'resolve' => function ( $payload ) use ( $fallback ) {
 				$cart = ! empty( $payload['cart'] ) ? $payload['cart'] : null;
+
 				if ( is_null( $cart ) && $fallback ) {
 					$cart = Factory::resolve_cart();
 				}
@@ -41,9 +42,19 @@ public static function get_cart_field( $fallback = false ) {
 	 * @param AppContext  $context AppContext instance.
 	 * @param ResolveInfo $info    Query info.
 	 *
+	 * @throws UserError Missing/Invalid input.
+	 *
 	 * @return array
 	 */
 	public static function prepare_cart_item( $input, $context, $info ) {
+		if ( empty( $input['productId'] ) ) {
+			throw new UserError( __( 'No product ID provided', 'wp-graphql-woocommerce' ) );
+		}
+
+		if ( ! \wc_get_product( $input['productId'] ) ) {
+			throw new UserError( __( 'No product found matching the ID provided', 'wp-graphql-woocommerce' ) );
+		}
+
 		$cart_item_args   = array( $input['productId'] );
 		$cart_item_args[] = ! empty( $input['quantity'] ) ? $input['quantity'] : 1;
 		$cart_item_args[] = ! empty( $input['variationId'] ) ? $input['variationId'] : 0;
@@ -145,6 +156,120 @@ public static function prepare_cart_fee( $input, $context, $info ) {
 		return apply_filters( 'graphql_woocommerce_new_cart_fee_data', $cart_item_args, $input, $context, $info );
 	}
 
+
+	/**
+	 * Validates coupon and checks if application is possible
+	 *
+	 * @param string $code    Coupon code.
+	 * @param string $reason  Reason for failure.
+	 *
+	 * @return bool
+	 */
+	public static function validate_coupon( $code, &$reason = '' ) {
+		// Get the coupon.
+		$the_coupon = new \WC_Coupon( $code );
+
+		// Prevent adding coupons by post ID.
+		if ( $the_coupon->get_code() !== $code ) {
+			$reason = __( 'No coupon found with the code provided', 'wp-graphql-woocommerce' );
+			return false;
+		}
+
+		// Check it can be used with cart.
+		if ( ! $the_coupon->is_valid() ) {
+			$reason = $the_coupon->get_error_message();
+			return false;
+		}
+
+		// Check if applied.
+		if ( \WC()->cart->has_discount( $code ) ) {
+			$reason = __( 'This coupon has already been applied to the cart', 'wp-graphql-woocommerce' );
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Validates shipping method by checking comparing against shipping package.
+	 *
+	 * @param string  $shipping_method  Shipping method being validated.
+	 * @param integer $index            Index of the shipping package.
+	 * @param string  $reason           Reason for failure.
+	 *
+	 * @return bool
+	 */
+	public static function validate_shipping_method( $shipping_method, $index, &$reason = '' ) {
+		// Get available shipping packages.
+		$available_packages = \WC()->cart->needs_shipping()
+			? \WC()->shipping()->calculate_shipping( \WC()->cart->get_shipping_packages() )
+			: array();
+
+		if ( ! isset( $available_packages[ $index ] ) ) {
+			$reason = sprintf(
+				/* translators: %d: Package index */
+				__( 'No shipping packages available for corresponding index %d', 'wp-graphql-woocommerce' ),
+				$index
+			);
+
+			return false;
+		}
+
+		$package           = $available_packages[ $index ];
+		$chosen_rate_index = array_search( $shipping_method, wp_list_pluck( $package['rates'], 'id' ), true );
+
+		if ( false !== $chosen_rate_index ) {
+			return true;
+		}
+
+		$product_names = array();
+		foreach ( $package['contents'] as $item_id => $values ) {
+			$product_names[ $item_id ] = \html_entity_decode( $values['data']->get_name() . ' ×' . $values['quantity'] );
+		}
+
+		// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
+		$product_names = apply_filters( 'woocommerce_shipping_package_details_array', $product_names, $package );
+
+		$reason = sprintf(
+			/* translators: %1$s: shipping method ID, %2$s: package contents */
+			__( '"%1$s" is not an available shipping method for shipping package "%2$s"', 'wp-graphql-woocommerce' ),
+			$shipping_method,
+			implode( ', ', $product_names )
+		);
+
+		return false;
+	}
+
+	/**
+	 * Validates and prepares posted shipping methods for the user session.
+	 *
+	 * @param array $posted_shipping_methods  Chosen shipping methods.
+	 *
+	 * @throws UserError  Invalid shipping method.
+	 *
+	 * @return array
+	 */
+	public static function prepare_shipping_methods( $posted_shipping_methods ) {
+		// Get current shipping methods.
+		$chosen_shipping_methods = \WC()->session->get( 'chosen_shipping_methods' );
+
+		// Update current shipping methods.
+		foreach ( $posted_shipping_methods as $package => $chosen_method ) {
+			if ( empty( $chosen_method ) ) {
+				continue;
+			}
+
+			$reason = '';
+			if ( self::validate_shipping_method( $chosen_method, $package, $reason ) ) {
+				$chosen_shipping_methods[ $package ] = $chosen_method;
+			} else {
+				throw new UserError( $reason );
+			}
+		}
+
+		return $chosen_shipping_methods;
+	}
+
 	/**
 	 * Validate CartItemQuantityInput item.
 	 *

includes/mutation/class-cart-add-item.php

@@ -92,15 +92,6 @@ public static function mutate_and_get_payload() {
 		return function( $input, AppContext $context, ResolveInfo $info ) {
 			Cart_Mutation::check_session_token();
 
-			// Retrieve product database ID if relay ID provided.
-			if ( empty( $input['productId'] ) ) {
-				throw new UserError( __( 'No product ID provided', 'wp-graphql-woocommerce' ) );
-			}
-
-			if ( ! \wc_get_product( $input['productId'] ) ) {
-				throw new UserError( __( 'No product found matching the ID provided', 'wp-graphql-woocommerce' ) );
-			}
-
 			// Prepare args for "add_to_cart" from input data.
 			$cart_item_args = Cart_Mutation::prepare_cart_item( $input, $context, $info );