merge conflict

wp-content/themes/biuro/single-job.php

@@ -59,6 +59,8 @@ get_header();
             </p>
 <?php
         endif;
+
+        $validPosition = date_i18n( 'Y-m-d', strtotime( $pod->field( 'valid' ) ) ) > date('Y-m-d') ? true : false;
 ?>
             <p>
                 <?php _e('Published', 'biuro'); ?>: <?php echo date_i18n( get_option( 'date_format' ), strtotime( $pod->field( 'post_date' ) ) ); ?>
@@ -66,15 +68,24 @@ get_header();
                 <?php _e('Valid till', 'biuro'); ?>: <?php echo date_i18n( get_option( 'date_format' ), strtotime( $pod->field( 'valid' ) ) ); ?>
             </p>
 
+<?php
+    if ($validPosition):
+ ?>
             <div class="c-job--action">
                 <button type="submit" class="js-inititate-position-form o-btn c-btn--main c-btn--fill" name="submit" value="1" data-id="action--form"><?php _e('Candidate', 'biuro'); ?></button>
             </div>
-
+<?php
+    endif;
+ ?>
         </main><!-- .l-main -->
 
         <aside class="l-aside--position">
 <?php
+        if ($validPosition):
             get_template_part( 'template-parts/layout/aside', 'job' );
+        else:
+            get_template_part( 'template-parts/layout/aside', 'job-inactive' );
+        endif;
 ?>
         </aside><!-- .l-aside -->
 

wp-content/themes/biuro/template-parts/layout/aside-job-inactive.php

+<?php _e('Job ad is inactive', 'biuro'); ?>