Refactor Code impress-org#1384

Code refactor as per WP standard
raftaar1191 · Jul 10, 2017 · 41bf6bf · 41bf6bf
1 parent eae75a4
commit 41bf6bf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/assets/js/frontend/give-ajax.js b/assets/js/frontend/give-ajax.js
@@ -88,16 +88,15 @@ jQuery(document).ready(function ($) {
             give_user_pass: this_form.find('[name=give_user_pass]').val()
         };
 
-		$.post(give_global_vars.ajaxurl, data, function (data) {
-            data = JSON.parse( data );
+		$.post(give_global_vars.ajaxurl, data, function (response) {
 			//user is logged in
-			if ( $.trim( typeof ( data.status ) ) != undefined && data.status == 'success' && typeof ( data.message ) != undefined ) {
+			if ( $.trim( typeof ( response.success ) ) != undefined && response.success == true && typeof ( response.data ) != undefined ) {
 
 				//remove errors
 				this_form.find('.give_errors').remove();
 
                 // Login successfully message.
-                this_form.find( '#give-payment-mode-select' ).after( data.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
@@ -107,7 +106,7 @@ jQuery(document).ready(function ($) {
 				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.message );
+				this_form.find('[id^=give-user-login-submit]').before( response.data );
 			}
 		});
 

diff --git a/assets/js/frontend/give-ajax.min.js b/assets/js/frontend/give-ajax.min.js
diff --git a/assets/js/frontend/give.all.min.js b/assets/js/frontend/give.all.min.js
diff --git a/includes/process-donation.php b/includes/process-donation.php
@@ -207,8 +207,6 @@ function give_check_logged_in_user_for_existing_email( $valid_data, $post ) {
  * @return      void
  */
 function give_process_form_login() {
-	$data = array();
-	$data['status'] = 'error';
 	$is_ajax = isset( $_POST['give_ajax'] );
 
 	$user_data = give_donation_form_validate_user_login();
@@ -224,9 +222,7 @@ function give_process_form_login() {
 				do_action( 'give_ajax_donation_errors' );
 				$message = ob_get_contents();
 			ob_end_clean();
-			$data['message'] = $message;
-			echo wp_json_encode( $data );
-			give_die();
+			wp_send_json_error( $message );
 		} else {
 			wp_redirect( $_SERVER['HTTP_REFERER'] );
 			exit;
@@ -236,19 +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 ) {
-		$data['status'] = 'success';
-		$data['message'] = Give()->notices->print_frontend_notice(
+		$message = Give()->notices->print_frontend_notice(
 			sprintf(
 				/* translators: %s: user first name */
 				esc_html__( 'Welcome %s! You have successfully logged into your account.', 'give' ),
-				$user_data['user_first']
+				( isset( $user_data['user_first'] ) && ! empty( $user_data['user_first'] )  ) ? $user_data['user_first'] : $user_data['user_login']
 			),
 			false,
 			'success'
 		);
 
-		echo wp_json_encode( $data );
-		give_die();
+		wp_send_json_success( $message );
 	} else {
 		wp_redirect( $_SERVER['HTTP_REFERER'] );
 	}