Changeset 2456188
- Timestamp:
- 01/14/2021 10:16:01 AM (5 years ago)
- Location:
- prosolution-wp-client/trunk
- Files:
-
- 10 edited
-
README.txt (modified) (2 diffs)
-
admin/js/prosolwpclient-setting.js (modified) (4 diffs)
-
includes/class-prosolwpclient-helper.php (modified) (3 diffs)
-
includes/class-prosolwpclient-table-helper.php (modified) (2 diffs)
-
prosolwpclient.php (modified) (2 diffs)
-
public/class-prosolwpclient-public.php (modified) (1 diff)
-
public/templates/prosolwpclientjobapply.php (modified) (5 diffs)
-
public/templates/singlefieldset/modals/prosolwpclientjobapplicationjobmodal.php (modified) (2 diffs)
-
public/templates/singlefieldset/prosolwpclientjobapplicationexperienceinfo.php (modified) (1 diff)
-
public/templates/singlefieldset/prosolwpclientjobapplicationpersonalinfo.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
prosolution-wp-client/trunk/README.txt
r2454627 r2456188 6 6 Tested up to: 4.9.5 7 7 Requires PHP: 5.6 8 Stable tag: 1.7. 08 Stable tag: 1.7.1 9 9 License: GPLv2 or later 10 10 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 66 66 67 67 == Changelog == 68 69 = 1.7.1 = 70 * Fixed frontend process when added url parameter siteid 71 * Fixed additonal site, in admin site tab application form 1st Step when there is no Show following fields 72 * Fixed pre-selected "Profession" at Application Form of Additional Sites 68 73 69 74 = 1.7.0 = -
prosolution-wp-client/trunk/admin/js/prosolwpclient-setting.js
r2454627 r2456188 498 498 }); 499 499 500 function findSingleChecked( ){500 function findSingleChecked(whichsite){ 501 501 var isFindSingleChk = 1; 502 502 for (const [key, field] of Object.entries(fields_section)) { 503 if($(idAppForm+'\\['+ key+'_act\\]').val() == 1 && key !='personaldata' && key !='education' && key !='workexperience'){503 if($(idAppForm+'\\['+whichsite+key+'_act\\]').val() == 1 && key !='personaldata' && key !='education' && key !='workexperience'){ 504 504 isFindSingleChk = 0; 505 505 field.forEach(function(item){ 506 if($(idAppForm+'\\['+ key+'_'+item+'_act\\]').val() == 1){506 if($(idAppForm+'\\['+whichsite+key+'_'+item+'_act\\]').val() == 1){ 507 507 isFindSingleChk = 1; 508 508 } … … 533 533 var current_txtbutton = button_view.html(); 534 534 button_view.addClass('hidden'); 535 535 536 if ( ! button_check.hasClass('process-busy')){ 536 537 button_check.addClass('process-busy'); … … 550 551 button_view.html(data.message); 551 552 button_view.removeClass('hidden'); 553 552 554 if (parseInt(data.error) == 1) { 553 555 button_view.addClass('notvalid'); … … 590 592 }); 591 593 $('form').on('submit', function(e){ 592 var isValid=findSingleChecked( );594 var isValid=findSingleChecked(selsite); 593 595 if(isValid == false) { 594 596 e.preventDefault(); -
prosolution-wp-client/trunk/includes/class-prosolwpclient-helper.php
r2454627 r2456188 21 21 if($issite!=''){ 22 22 $addsite= get_option('prosolwpclient_additionalsite'); 23 if(in_array($issite,$addsite)){ 24 $chkkey=array_search($issite,$addsite); 25 $getkey=explode("_",$chkkey); 26 $issite='site'.substr($getkey[0],7,strlen($getkey[0])).'_'; 23 $getkey=array_keys($addsite); 24 $urlid_arr=array(); 25 26 for($x=0;$x<=count($addsite);$x++){ 27 $chkurlid=substr($getkey[$x],0,7); 28 $pos = strpos($getkey[$x], '_'); 29 $anotherchkurlid=substr($getkey[$x],$pos,strlen($getkey[$x])); 30 31 if($chkurlid=='addsite' && $anotherchkurlid=='_urlid'){ 32 $getsite= substr($getkey[$x],7,$pos-7); 33 $urlid_arr[ $getsite ]= $addsite[ $getkey[$x] ]; 34 } 35 } 36 37 if(in_array($issite,$urlid_arr)){ 38 $chkkey=array_search($issite,$urlid_arr); 39 $issite='site'.$chkkey.'_'; 27 40 } 28 41 } … … 33 46 if($issite!=''){ 34 47 $addsite= get_option('prosolwpclient_additionalsite'); 35 if(in_array($issite,$addsite)){ 48 $getkey=array_keys($addsite); 49 $urlid_arr=array(); 50 51 for($x=0;$x<=count($addsite);$x++){ 52 $chkurlid=substr($getkey[$x],0,7); 53 $pos = strpos($getkey[$x], '_'); 54 $anotherchkurlid=substr($getkey[$x],$pos,strlen($getkey[$x])); 55 56 if($chkurlid=='addsite' && $anotherchkurlid=='_urlid'){ 57 $getsite= substr($getkey[$x],7,$pos-7); 58 $urlid_arr[ $getsite ]= $addsite[ $getkey[$x] ]; 59 } 60 } 61 62 if(in_array($issite,$urlid_arr)){ 36 63 $chkkey=array_search($issite,$addsite); 37 $ getkey=explode("_",$chkkey);38 $issite=substr($ getkey[0],7,strlen($getkey[0]));64 $pos=explode("_",$chkkey); 65 $issite=substr($pos[0],7,strlen($chkkey)-7); 39 66 } 40 67 } … … 48 75 $prosolwpclient_api_config = maybe_unserialize( $prosolwpclient_api_config ); 49 76 } 50 51 77 $api_user = array_key_exists( $issite.'api_user', $prosolwpclient_api_config ) ? sanitize_text_field( $prosolwpclient_api_config[$issite.'api_user'] ) : ''; 52 78 //$api_pass = array_key_exists( 'api_pass', $prosolwpclient_api_config ) ? sanitize_text_field( base64_decode($prosolwpclient_api_config['api_pass'] )) : ''; -
prosolution-wp-client/trunk/includes/class-prosolwpclient-table-helper.php
r2454627 r2456188 118 118 } 119 119 120 //kev121 120 public static function proSol_cleardatasites() { 122 121 $remsite=''; … … 180 179 $country_code_arr = $response_data->id; 181 180 $name_arr = $response_data->name; 182 181 183 182 foreach ( $country_code_arr as $index => $country_code ) { 184 183 $wpdb->insert( -
prosolution-wp-client/trunk/prosolwpclient.php
r2454627 r2456188 17 17 * Plugin URI: https://prosolution.com/produkte-und-services/workexpert.html 18 18 * Description: WordPress client for ProSolution 19 * Version: 1.7. 019 * Version: 1.7.1 20 20 * Author: ProSolution 21 21 * Author URI: https://www.prosolution.com … … 39 39 40 40 defined('PROSOLWPCLIENT_PLUGIN_NAME') or define('PROSOLWPCLIENT_PLUGIN_NAME', 'prosolwpclient'); 41 defined('PROSOLWPCLIENT_PLUGIN_VERSION') or define('PROSOLWPCLIENT_PLUGIN_VERSION', '1.7. 0');41 defined('PROSOLWPCLIENT_PLUGIN_VERSION') or define('PROSOLWPCLIENT_PLUGIN_VERSION', '1.7.1'); 42 42 defined('PROSOLWPCLIENT_BASE_NAME') or define('PROSOLWPCLIENT_BASE_NAME', plugin_basename(__FILE__)); 43 43 defined('PROSOLWPCLIENT_ROOT_PATH') or define('PROSOLWPCLIENT_ROOT_PATH', plugin_dir_path(__FILE__)); -
prosolution-wp-client/trunk/public/class-prosolwpclient-public.php
r2454627 r2456188 1554 1554 ) 1555 1555 ); 1556 //var_dump($ response);1557 //var_dump( is_wp_error($response));1556 //var_dump($header_info); 1557 //var_dump($payload); 1558 1558 $msg = ''; 1559 1559 if ( ! is_wp_error( $response ) ) { -
prosolution-wp-client/trunk/public/templates/prosolwpclientjobapply.php
r2454627 r2456188 39 39 $issite = CBXProSolWpClient_Helper::proSol_getSiteid($hassiteid); 40 40 $siteid = CBXProSolWpClient_Helper::proSol_getSiteidonly($hassiteid); 41 41 42 42 global $wpdb; 43 43 $table_ps_title = $wpdb->prefix . 'title'; … … 394 394 role="button"><?php echo $prosoldes[$issite.'desbtnappformtosearch'] ?></a> 395 395 <?php } ?> 396 <?php 396 <?php 397 397 if($isrec=="on"){ 398 398 $prof_id_mustache = ''; … … 426 426 $prof_id_mustache = join(",",$prof_id_arr); 427 427 $prof_name_mustache = join(",",$prof_name_arr); 428 $prof_showinappli_mustache = join(",",$prof_showinappli_arr); 429 428 $prof_showinappli_mustache = join(",",$prof_showinappli_arr); 430 429 } else{ 431 430 $response_data = sprintf( __( 'Api response failed. Message: %s', 'prosolwpclient' ), $response['body'] ); … … 587 586 588 587 if( $list_opt_appform[$issite.'education_act'] != '0'){ 589 include( 'singlefieldset/prosolwpclientjobapplicationeducationinfo.php' ); 588 include( 'singlefieldset/prosolwpclientjobapplicationeducationinfo.php' ); 590 589 } 591 590 … … 595 594 596 595 if( $list_opt_appform[$issite.'expertise_act'] != '0'){ 597 include( 'singlefieldset/prosolwpclientjobapplicationexpertiseinfo.php' ); 596 include( 'singlefieldset/prosolwpclientjobapplicationexpertiseinfo.php' ); 598 597 } 599 598 600 599 if( $list_opt_appform[$issite.'sidedishes_act'] != '0'){ 601 include( 'singlefieldset/prosolwpclientjobapplicationsidedishesinfo.php' ); 600 include( 'singlefieldset/prosolwpclientjobapplicationsidedishesinfo.php' ); 602 601 } 603 602 -
prosolution-wp-client/trunk/public/templates/singlefieldset/modals/prosolwpclientjobapplicationjobmodal.php
r2437099 r2456188 30 30 <div class="col-md-9 job-modal-section"> 31 31 <ul class="list-unstyled job-profession-groups"> 32 <?php 32 <?php 33 33 if($pstemplate!=1){ 34 34 foreach ( $all_profession as $index => $profession_info ) { … … 38 38 <span class="checkmark-layer"></span> 39 39 </label> 40 </li>'; 40 </li>'; 41 41 } 42 42 } else{ 43 foreach ( $all_profession as $index => $profession_info ) { 43 foreach ( $all_profession as $index => $profession_info ) { 44 44 echo '<li> 45 45 <label class="checkbox-inline"> -
prosolution-wp-client/trunk/public/templates/singlefieldset/prosolwpclientjobapplicationexperienceinfo.php
r2454627 r2456188 12 12 13 13 global $wpdb; 14 $table_ps_profession = $wpdb->prefix . 'profession';15 14 $table_ps_contract = $wpdb->prefix . 'contract'; 16 15 $table_ps_employment = $wpdb->prefix . 'employment'; 17 16 $table_ps_experienceposition = $wpdb->prefix . 'experienceposition'; 18 17 19 $all_profession = $wpdb->get_results( "SELECT * FROM $table_ps_profession as profession WHERE profession.site_id='$siteid' ORDER BY profession.name ASC", ARRAY_A );20 18 $contract_arr = $wpdb->get_results( "SELECT * FROM $table_ps_contract as contract WHERE contract.site_id='$siteid' ORDER BY contract.name ASC", ARRAY_A ); 21 19 $employment_arr = $wpdb->get_results( "SELECT * FROM $table_ps_employment as employment WHERE employment.site_id='$siteid' ORDER BY employment.name ASC", ARRAY_A ); -
prosolution-wp-client/trunk/public/templates/singlefieldset/prosolwpclientjobapplicationpersonalinfo.php
r2454627 r2456188 14 14 $table_ps_profession = $wpdb->prefix . 'profession'; 15 15 $all_profession = $wpdb->get_results( "SELECT * FROM $table_ps_profession as profession WHERE profession.site_id='$siteid' ORDER BY profession.name ASC", ARRAY_A ); 16 16 17 $opt = get_option('prosolwpclient_applicationform'); 17 18 $pol = get_option('prosolwpclient_privacypolicy'); … … 20 21 $fields_section=array('title','federal','phone','mobile','email','nationality','marital','gender','diverse','countrybirth','availfrom','notes'); 21 22 $isrec=0; 22 23 23 24 if($genset[$issite.'enable_recruitment'] == 'on'){ 24 25 $isrec=1; … … 27 28 if( (isset($prof_id_arr) || $prof_id_arr != null) && (isset($prof_name_arr) || $prof_name_arr != null) 28 29 && (isset($prof_showinappli_arr) || $prof_showinappli_arr != null) ){ 29 $all_profession = []; 30 for ($i = 0; $i < count($prof_id_arr); $i++){ 30 $all_profession = []; 31 32 for ($i = 0; $i < count($prof_id_arr); $i++){ 31 33 $all_profession[$i]['professionId'] = $prof_id_arr[$i]; 32 34 $all_profession[$i]['name'] = $prof_name_arr[$i]; 33 } 35 } 36 34 37 } 35 36 38 //new form for recruitment 37 39 array_push($fields_section,'max_distance');
Note: See TracChangeset
for help on using the changeset viewer.