Skip to content

Commit

Permalink
Merge branch 'dev-branch'
Browse files Browse the repository at this point in the history
  • Loading branch information
nithinjohn22 committed Sep 30, 2024
2 parents 50130d4 + b246a8d commit f772ed5
Show file tree
Hide file tree
Showing 14 changed files with 1,086 additions and 6,612 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Changelog

### V 3.4.7 - 2024-09-24
* Fixed: Recaptcha won't reset after submitting the application form.
* Minor bug fixes and code improvements.

### V 3.4.6 - 2024-04-02
* Fixed: Author email template tag is not working properly in job expiry notification.
* Minor bug fixes and code improvements.
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
**Contributors:** awsmin
**Tags:** jobs, job listing, job openings, job board, careers page, jobs page, wp job opening, jobs plugin
**Requires at least:** 4.8
**Tested up to:** 6.4.3
**Tested up to:** 6.6.2
**Requires PHP:** 5.6
**Stable tag:** 3.4
**License:** GPLv2 or later
Expand Down Expand Up @@ -95,6 +95,10 @@ The plugin comes with two layouts - Grid and List which are designed carefully a

## Changelog

**V 3.4.7 - 2024-09-24**
* Fixed: Recaptcha won't reset after submitting the application form.
* Minor bug fixes and code improvements.

**V 3.4.6 - 2024-04-02**
* Fixed: Author email template tag is not working properly in job expiry notification.
* Minor bug fixes and code improvements.
Expand Down
2 changes: 1 addition & 1 deletion assets/js/admin-overview.min.js

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

2 changes: 1 addition & 1 deletion assets/js/admin.min.js

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions assets/js/public/job-application.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ jQuery(document).ready(function($) {
})
.always(function() {
$submitBtn.prop('disabled', false).val(submitBtnText).removeClass('awsm-application-submit-btn-disabled');
if (typeof grecaptcha !== 'undefined') {
grecaptcha.reset();
}
});
}
};
Expand Down
10 changes: 6 additions & 4 deletions assets/js/public/job-listings.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,12 @@ jQuery(function($) {
if ('selectric' in awsmJobsPublic.vendors && awsmJobsPublic.vendors.selectric) {
$elem.selectric({
onInit: function(select, selectric) {
var id = select.id;
var $input = $(selectric.elements.input);
$(select).attr('id', 'selectric-' + id);
$input.attr('id', id);
var id = select.id;
if (selectric && selectric.elements && selectric.elements.input) {
var $input = $(selectric.elements.input);
$(select).attr('id', 'selectric-' + id);
$input.attr('id', id);
}
},
arrowButtonMarkup: '<span class="awsm-selectric-arrow-drop">&#x25be;</span>',
customClass: {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/script.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/script.min.js.map

Large diffs are not rendered by default.

28 changes: 17 additions & 11 deletions inc/class-awsm-job-openings-form.php
Original file line number Diff line number Diff line change
Expand Up @@ -708,10 +708,13 @@ public static function get_expired_notification_content() {
* @return array
*/
public static function get_notification_options( $type ) {
$options = array();
$admin_email = get_option( 'admin_email' );
$hr_email = get_option( 'awsm_hr_email_address' );
$expired_options = self::get_expired_notification_content();
$options = array();
$admin_email = get_option( 'admin_email' );
$hr_email = get_option( 'awsm_hr_email_address' );
$expired_options = self::get_expired_notification_content();
if ( ! class_exists( 'AWSM_Job_Openings_Settings' ) ) {
require_once AWSM_JOBS_PLUGIN_DIR . '/admin/class-awsm-job-openings-settings.php';
}
$default_from_email = AWSM_Job_Openings_Settings::awsm_from_email();

if ( $type === 'applicant' ) {
Expand Down Expand Up @@ -789,13 +792,16 @@ protected function notification_email( $applicant_details, $data = array() ) {
}

if ( $enable ) {
$admin_email = get_option( 'admin_email' );
$hr_mail = get_option( 'awsm_hr_email_address' );
$applicant_email = $applicant_details['awsm_applicant_email'];
$company_name = get_option( 'awsm_job_company_name' );
$from = ( ! empty( $company_name ) ) ? $company_name : get_option( 'blogname' );
$author_id = get_post_field( 'post_author', $applicant_details['awsm_job_id'] );
$author_email = get_the_author_meta( 'user_email', intval( $author_id ) );
$admin_email = get_option( 'admin_email' );
$hr_mail = get_option( 'awsm_hr_email_address' );
$applicant_email = $applicant_details['awsm_applicant_email'];
$company_name = get_option( 'awsm_job_company_name' );
$from = ( ! empty( $company_name ) ) ? $company_name : get_option( 'blogname' );
$author_id = get_post_field( 'post_author', $applicant_details['awsm_job_id'] );
$author_email = get_the_author_meta( 'user_email', intval( $author_id ) );
if ( ! class_exists( 'AWSM_Job_Openings_Settings' ) ) {
require_once AWSM_JOBS_PLUGIN_DIR . '/admin/class-awsm-job-openings-settings.php';
}
$default_from_email = AWSM_Job_Openings_Settings::awsm_from_email();

$tags = $this->get_mail_template_tags(
Expand Down
4 changes: 2 additions & 2 deletions languages/wp-job-openings.pot
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language-Team: AWSM innovations <[email protected]>\n"
"POT-Creation-Date: 2024-04-02 14:55+0000\n"
"POT-Creation-Date: 2024-09-25 09:47+0000\n"
"X-Poedit-Basepath: ..\n"
"X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n"
"X-Poedit-SearchPath-0: .\n"
Expand Down Expand Up @@ -71,7 +71,7 @@ msgstr ""
msgid "ago"
msgstr ""

#: wp-job-openings.php:519, wp-job-openings.php:539, wp-job-openings.php:792, wp-job-openings.php:2011, admin/templates/meta/job-status.php:54
#: wp-job-openings.php:519, wp-job-openings.php:539, wp-job-openings.php:792, wp-job-openings.php:2014, admin/templates/meta/job-status.php:54
msgid "Expired"
msgstr ""

Expand Down
Loading

0 comments on commit f772ed5

Please sign in to comment.