Update the submit a request URL

Author: Marco Pereirinha

php/class-special-offer.php

@@ -73,21 +73,12 @@ public function filtered_settings( $settings ) {
 					'type'    => 'link',
 					'content' => __( 'Get started', 'cloudinary' ),
 					'url'     => static function () {
-						$current_user = wp_get_current_user();
-						$plugin       = get_plugin_instance();
-						$cloud_name   = $plugin->components['connect']->get_cloud_name();
-
-						return add_query_arg(
-							array(
-								'tf_anonymous_requester_email' => $current_user->user_email,
-								'tf_22246877'                  => $current_user->display_name,
-								'tf_360007219560'              => $cloud_name,
-								'tf_360017815680'              => 'help_with_plans',
-								'tf_subject'                   => __( 'Request to Purchase the Small Plan', 'cloudinary' ),
-								'tf_description'               => __( "Hello,\n\nI'm interested in purchasing the Small plan for $29. Could you please provide me with the next steps to complete the purchase?\n\nThank you!", 'cloudinary' ),
-							),
-							'https://support.cloudinary.com/hc/en-us/requests/new'
+						$args = array(
+							'tf_360017815680' => 'help_with_plans',
+							'tf_subject'      => __( 'Request to Purchase the Small Plan', 'cloudinary' ),
+							'tf_description'  => __( "Hello,<br><br>I'm interested in purchasing the Small plan for $29. Could you please provide me with the next steps to complete the purchase?<br><br>Thank you!", 'cloudinary' ),
 						);
+						return Utils::get_support_link( $args );
 					},
 					'target'  => '_blank',
 				),

php/class-utils.php

@@ -449,35 +449,31 @@ public static function upgrade_3_1_9() {
 	/**
 	 * Gets the URL for opening a Support Request.
 	 *
-	 * @param string $reason  The reason option slug.
-	 * @param string $subject The subject for the request.
+	 * @param array $args The arguments.
 	 *
 	 * @return string
 	 */
-	public static function get_support_link( $reason = '', $subject = '' ) {
+	public static function get_support_link( $args = array() ) {
 		$user   = wp_get_current_user();
 		$plugin = get_plugin_instance();
 		$url    = 'https://support.cloudinary.com/hc/en-us/requests/new';
 
-		if ( empty( $reason ) ) {
-			$reason = 'other_help_needed';
-		}
-
-		if ( empty( $subject ) ) {
-			$subject = sprintf(
-			// translators: The plugin version.
+		$default_args = array(
+			'tf_anonymous_requester_email' => $user->user_email,
+			'tf_22246877'                  => $user->display_name,
+			'tf_360007219560'              => $plugin->components['connect']->get_cloud_name(),
+			'tf_360017815680'              => 'other_help_needed',
+			'tf_subject'                   => sprintf(
+				// translators: The plugin version.
 				__( 'I need help with Cloudinary WordPress plugin version %s', 'cloudinary' ),
 				$plugin->version
-			);
-		}
+			),
+			'tf_description'  => __( 'Please, provide more details on your request, and if possible, attach a System Report', 'cloudinary' ),
+		);
 
-		$args = array(
-			'request_anonymous_requester_email'  => $user->display_name,
-			'request_custom_fields_22246877'     => $user->user_email,
-			'request_custom_fields_360007219560' => $plugin->components['connect']->get_cloud_name(),
-			'request_custom_fields_360017815680' => $reason,
-			'request_subject'                    => $subject,
-			'request_description'                => __( 'Please, provide more details on your request, and if possible, attach a System Report', 'cloudinary' ),
+		$args = wp_parse_args(
+			$args,
+			$default_args
 		);
 
 		return add_query_arg( array_filter( $args ), $url );

ui-definitions/settings-pages.php

@@ -333,7 +333,12 @@
 						'type'       => 'tag',
 						'element'    => 'a',
 						'attributes' => array(
-							'href'   => Utils::get_support_link( '-' ),
+							'href'   => static function () {
+								$args = array(
+									'tf_360017815680' => '-',
+								);
+								return Utils::get_support_link( $args );
+							},
 							'target' => '_blank',
 							'rel'    => 'noopener noreferrer',
 							'class'  => array(
@@ -451,12 +456,14 @@
 					'type'        => 'panel',
 					'title'       => __( "I'm having an incompatibility issue with a theme, plugin, or hosting environment, what can I do?", 'cloudinary' ),
 					'collapsible' => 'closed',
-					'content'     => sprintf(
-						// translators: The HTML markup.
-						__( 'We’re compatible with most other plugins so we expect it to work absolutely fine. If you do have any issues, please %1$scontact our support team%2$s who will help resolve your issue.', 'cloudinary' ),
-						'<a href="' . Utils::get_support_link() . '" target="_blank" rel="noopener noreferrer">',
-						'</a>'
-					),
+					'content'     => static function () {
+						return sprintf(
+							// translators: The HTML markup.
+							__( 'We’re compatible with most other plugins so we expect it to work absolutely fine. If you do have any issues, please %1$scontact our support team%2$s who will help resolve your issue.', 'cloudinary' ),
+							'<a href="' . Utils::get_support_link() . '" target="_blank" rel="noopener noreferrer">',
+							'</a>'
+						);
+					},
 				),
 				array(
 					'type'        => 'panel',