Resolve merge conflicts

Author: iamprazol

assets/js/modules/membership/frontend/user-registration-membership-frontend.js

@@ -702,12 +702,23 @@
 				payment_type: "unpaid",
 				info: response.data.pg_data.data,
 				username: prepare_members_data.username,
-				context: "hide_message"
+				context: "hide_message",
+				message: response.data.message || ""
 			};
 
-			if (response.data.is_renewing) {
+			var shouldRedirect =
+				!!response.data.is_renewing ||
+				!!response.data.is_upgrading ||
+				!!response.data.is_purchasing_multiple;
+
+			var redirectUrl =
+				$("#urm-redirect-url").val() ||
+				response.data.redirect_url ||
+				window.location.href;
+
+			if (shouldRedirect) {
 				ur_membership_ajax_utils.show_default_response(
-					window.location.href,
+					redirectUrl,
 					bank_data
 				);
 			} else {
@@ -729,7 +740,9 @@
 
 			var url_params = $.param(thank_you_data).toString();
 			window.setTimeout(function () {
-				window.location.replace(url + "?" + url_params);
+				var hasQuery = url.indexOf("?") !== -1;
+				var concatenator = hasQuery ? "&" : "?";
+				window.location.replace(url + concatenator + url_params);
 			}, timeout);
 		},
 		validate_coupon: function ($this) {

modules/membership/includes/Templates/thank-you-page.php

@@ -1,6 +1,7 @@
 <?php
 
 $bank_data         = ( isset( $_GET['info'] ) && ! empty( $_GET['info'] ) ) ? wp_kses_post( $_GET['info'] ) : '';
+$bank_data 			= 'Free' === $bank_data ? false : true;
 $transaction_id    = ( isset( $_GET['transaction_id'] ) && ! empty( $_GET['transaction_id'] ) ) ? wp_kses_post( $_GET['transaction_id'] ) : '';
 $username          = ( isset( $_GET['username'] ) && ! empty( $_GET['username'] ) ) ? wp_kses_post( $_GET['username'] ) : '';
 $main_content      = ! empty( $attributes['header'] ) ? wp_kses_post( $attributes['header'] ) : sprintf(