WIP: Issues 1384

assets/js/frontend/give-ajax.js

@@ -88,20 +88,25 @@ jQuery(document).ready(function ($) {
             give_user_pass: this_form.find('[name=give_user_pass]').val()
         };
 
-		$.post(give_global_vars.ajaxurl, data, function (data) {
-
+		$.post(give_global_vars.ajaxurl, data, function (response) {
 			//user is logged in
-			if ($.trim(data) == 'success') {
+			if ( $.trim( typeof ( response.success ) ) != undefined && response.success == true && typeof ( response.data ) != undefined ) {
+
 				//remove errors
 				this_form.find('.give_errors').remove();
-				//reload the selected gateway so it contains their logged in information
+
+                // Login successfully message.
+                this_form.find( '#give-payment-mode-select' ).after( response.data );
+                this_form.find( '.give_notices.give_errors' ).delay(5000).slideUp();
+
+                //reload the selected gateway so it contains their logged in information
 				give_load_gateway(this_form, this_form.find('.give-gateway-option-selected input').val());
 			} else {
 				//Login failed, show errors
 				this_form.find('[id^=give-login-fields] input[type=submit]').val(complete_purchase_val);
 				this_form.find('.give-loading-animation').fadeOut();
 				this_form.find('.give_errors').remove();
-				this_form.find('[id^=give-user-login-submit]').before(data);
+				this_form.find('[id^=give-user-login-submit]').before( response.data );
 			}
 		});
 

includes/process-donation.php

@@ -207,7 +207,6 @@ function give_check_logged_in_user_for_existing_email( $valid_data, $post ) {
  * @return      void
  */
 function give_process_form_login() {
-
 	$is_ajax = isset( $_POST['give_ajax'] );
 
 	$user_data = give_donation_form_validate_user_login();
@@ -219,8 +218,11 @@ function give_process_form_login() {
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_ajax_donation_errors' );
-			give_die();
+			ob_start();
+				do_action( 'give_ajax_donation_errors' );
+				$message = ob_get_contents();
+			ob_end_clean();
+			wp_send_json_error( $message );
 		} else {
 			wp_redirect( $_SERVER['HTTP_REFERER'] );
 			exit;
@@ -230,8 +232,17 @@ function give_process_form_login() {
 	give_log_user_in( $user_data['user_id'], $user_data['user_login'], $user_data['user_pass'] );
 
 	if ( $is_ajax ) {
-		echo 'success';
-		give_die();
+		$message = Give()->notices->print_frontend_notice(
+			sprintf(
+				/* translators: %s: user first name */
+				esc_html__( 'Welcome %s! You have successfully logged into your account.', 'give' ),
+				( isset( $user_data['user_first'] ) && ! empty( $user_data['user_first'] )  ) ? $user_data['user_first'] : $user_data['user_login']
+			),
+			false,
+			'success'
+		);
+
+		wp_send_json_success( $message );
 	} else {
 		wp_redirect( $_SERVER['HTTP_REFERER'] );
 	}