Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/registration issue #1797

Merged
merged 21 commits into from
Aug 13, 2024
+19 −15
Merged

Fix/registration issue #1797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
32f196b
merged
Armanul46 Nov 30, 2023
0637006
merged
Armanul46 Nov 30, 2023
33812da
sync with sovware alpha
Armanul46 Dec 20, 2023
ff29851
merge
Armanul46 Dec 24, 2023
93d07db
sync
Armanul46 Jan 25, 2024
0020a70
sync
Armanul46 Jan 30, 2024
b782177
sync
Armanul46 Feb 5, 2024
c623d45
merge
Armanul46 Feb 5, 2024
b1a2e03
sync
Armanul46 Feb 13, 2024
332ab65
fixed conflict issue
Armanul46 Apr 23, 2024
d2a5fc1
synk
Armanul46 May 6, 2024
e19cbe6
synk
Armanul46 May 7, 2024
222a43f
merge
Armanul46 Jul 1, 2024
3758fc7
merge
Armanul46 Jul 1, 2024
17d028f
sync with alpha
Armanul46 Jul 10, 2024
e699ebe
sync
Armanul46 Jul 30, 2024
b57e02c
sync
Armanul46 Aug 1, 2024
4a8b30f
sync
Armanul46 Aug 4, 2024
bef7c1e
sync with alpha
Armanul46 Aug 10, 2024
c89af52
sync with alpha
Armanul46 Aug 13, 2024
95dfacb
fixed registration issue
Armanul46 Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions assets/js/account.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions assets/src/js/public/components/register-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ jQuery(($) => {
console.log( response );
if( response.success ) {
$('.directorist-register-error').hide();
if( response.redirect_url ) {
$('.directorist-register-error').empty().show().append( response.redirect_message ).css({
'color' : '#009114',
'background-color': '#d9efdc'
});
if( response.data.redirect_url ) {
if( response.data.redirect_message ) {
$('.directorist-register-error').empty().show().append( response.data.redirect_message ).css({
'color' : '#009114',
'background-color': '#d9efdc'
});
}
setTimeout(function () {
window.location.href = response.redirect_url;
window.location.href = response.data.redirect_url;
}, 500)
}
} else {
Expand Down
6 changes: 3 additions & 3 deletions includes/classes/class-user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,15 @@ public function directorist_register_form() {
'redirect_url' => esc_url_raw( ATBDP_Permalink::get_reg_redirection_page_link( $previous_page, array( 'registration_status' => true ) ) ),
'redirect_message' => esc_html( 'Registration completed. Please check your email for confirmation. You will be redirected...', 'directorist' ),
);
wp_send_json( $response );
wp_send_json_success( $response );
} else {
file_put_contents( __DIR__ . '/data.txt', 'status' );
$response = array(
'success' => true,
'redirect_url' => esc_url_raw( ATBDP_Permalink::get_dashboard_page_link( array( 'registration_status' => true ) ) ),
'redirect_message' => esc_html( 'Registration completed. Please check your email for confirmation. You will be redirected...', 'directorist' ),
);
wp_send_json( $response );
wp_send_json_success( $response );
}

exit();
Expand All @@ -248,7 +248,7 @@ public function directorist_register_form() {
'success' => false,
'message' => directorist_get_registration_error_message( 0 )
);
wp_send_json( $response );
wp_send_json_success( $response );
exit();
}
}
Expand Down