fixed race condition in id koresp - generate wezwanie in WindykacjaPanel

SE/superedit-USERS2_WINDYKACJA_STATUS.php

@@ -2228,7 +2228,7 @@ body{font-family:arial;line-height:1.4;}
 						// TODO: mv to ::get_koresp_file($id_koresp);
 						$id_koresp = intval($v_doc->get('ID_KORESP'));
 						$found_files = array();
-						{
+						if(0){// turn off - old server
 							$CNF = new stdClass();
 							$CNF->koresp_dir = '/home/samba/BIALL-NET/PISMA/OUT';
 							$CNF->koresp_www_path = '/se-dev/PISMA/OUT';
@@ -2251,6 +2251,7 @@ body{font-family:arial;line-height:1.4;}
 								break;
 
 							case 'waiting-wezwanie2':
+								// TODO: get('LAST_ID_KORESP_WEZWANIE1')
 								$out_tr['add'] = "wezwanie do zapłaty - ID_KORESP: <b>".$v_doc->get('ID_KORESP')."</b> <em>(termin: ".$v_doc->get('PAY_TERM').")</em> ";
 								break;
 
@@ -3000,8 +3001,17 @@ table td {border-width:1px;border-color:#333;}
 		<?php
 
 		echo'<div style="background:#fff;border:none;margin:5px;padding:20px 40px 10px 40px;page-break-after:always;font-size:small;">';
+		$id_koresp = 0;
 		if ($user->ID_KORESP) {
-			$koresp = DB::get_by_id('IN7_DZIENNIK_KORESP', $user->ID_KORESP);
+			$id_koresp = $user->ID_KORESP;
+			if ($user->LAST_ID_KORESP_WEZWANIE1 && !$wezwanie_ostateczne) {
+				$id_koresp = $user->LAST_ID_KORESP_WEZWANIE1;
+			} else if ($user->LAST_ID_KORESP_WEZWANIE2 && $wezwanie_ostateczne) {
+				$id_koresp = $user->LAST_ID_KORESP_WEZWANIE2;
+			}
+		}
+		if ($id_koresp > 0) {//$user->ID_KORESP) {// TODO: if $user->LAST_ID_KORESP_WEZWANIE1 or LAST_ID_KORESP_WEZWANIE2
+			$koresp = DB::get_by_id('IN7_DZIENNIK_KORESP', $id_koresp);
 			if ($koresp) {
 				echo '<div style="text-align:right;font-weight:bold;">';
 					echo $koresp->ID_PROJECT . '-' .$koresp->ID . "/" . substr(date("Y"), 2);
@@ -4487,6 +4497,7 @@ SQL;
 						return $user;
 					}
 					$data_arr["ID_KORESP"] = $new_id_koresp;
+					$data_arr["LAST_ID_KORESP_WEZWANIE1"] = $new_id_koresp;
 					$data_arr["A_STATUS"] = "waiting-wezwanie2";
 					$data_arr["wezwanie1_DATE"] = V::get('wezwanie1_DATE' ,'', $data);
 					$data_arr["PAY_TERM"] = V::get('PAY_TERM' ,'', $data);
@@ -4505,6 +4516,7 @@ SQL;
 						return $user;
 					}
 					$data_arr["ID_KORESP"] = $new_id_koresp;
+					$data_arr["LAST_ID_KORESP_WEZWANIE2"] = $new_id_koresp;
 					$data_arr["A_STATUS"] = "waiting-krd";
 					$data_arr["wezwanie2_DATE"] = V::get('wezwanie2_DATE' ,'', $data);
 					$data_arr["PAY_TERM"] = V::get('PAY_TERM' ,'', $data);
@@ -5082,6 +5094,8 @@ class WindykacjaStatsModel {
 				, w.`wezwanie2_DATE`
 				, w.`wpis_w_krd_DATE`
 				, w.`ID_KORESP`
+				, w.`LAST_ID_KORESP_WEZWANIE1`
+				, w.`LAST_ID_KORESP_WEZWANIE2`
 				, w.`LAST_PAY_DATE`
 				, w.`LAST_PAY_VALUE`
 				, w.`LAST_FVAT_PAY_TERM`