|
|
@@ -863,7 +863,7 @@ function frm_kontakt_add_id_koresp(frm){
|
|
|
unset($filter_arr[$v_filter_name]);
|
|
|
}
|
|
|
}
|
|
|
- $zewn_filters = array('waiting-sad', 'sad');
|
|
|
+ $zewn_filters = array('waiting-sad', 'docs-in-sad', 'sad');
|
|
|
$zewn_filters_arr = array();
|
|
|
foreach ($zewn_filters as $v_filter_name) {
|
|
|
if (array_key_exists($v_filter_name, $filter_arr)) {
|
|
|
@@ -2997,12 +2997,13 @@ class WindykacjaStatsHelper {
|
|
|
$filter_arr['tel1'] = array("kontakt tel.", 'desc'=>array("", "Ostatni kontakt tel. ponad 3 m-ce temu"));
|
|
|
$filter_arr['bad_address'] = array("błędny adres");
|
|
|
$filter_arr['wezwanie1'] = array("wezwanie do zapłaty", 'desc'=>array("2 x FVat", "2 faktury"));
|
|
|
- $filter_arr['waiting-wezwanie2'] = array("oczekiwanie na uzbieranie 300 zł (firmy 500 zł)");
|
|
|
- $filter_arr['wezwanie2'] = array("ostateczne wezwanie do zapłaty, rozwiązanie umowy", 'desc'=>array("wezwanie + 14, 300zł", "wezwanie + 14 dni, min. 300zł (firmy 500zł)"));
|
|
|
- $filter_arr['waiting-krd'] = array("min. 60 dni od ostatecznego wezwania");
|
|
|
+ $filter_arr['waiting-wezwanie2'] = array("oczekiwanie 7 dni od terminu płatności");
|
|
|
+ $filter_arr['wezwanie2'] = array("ostateczne wezwanie do zapłaty, rozwiązanie umowy", 'desc'=>array("wezwanie + 14", "wezwanie + 14 dni"));
|
|
|
+ $filter_arr['waiting-krd'] = array("min. 30 dni od ostatecznego wezwania");
|
|
|
$filter_arr['krd'] = array("do przekazania do KRD", 'desc'=>array("wezwanie ost. + 60", "wezwanie ost. + 60 dni"));
|
|
|
$filter_arr['waiting-sad'] = array("przekazano do KRD");
|
|
|
- $filter_arr['sad'] = array("przekazanie sprawy do sądu");// "krd + 14 dni"
|
|
|
+ $filter_arr['docs-in-sad'] = array("przekazać sprawę do sądu");// waiting-sad = 30 dni
|
|
|
+ $filter_arr['sad'] = array("przekazano sprawę do sądu");
|
|
|
$filter_arr['3 m-ce przed'] = array("3 m-ce przed przedawnieniem");// 3 m-ce przed przedawnieniem
|
|
|
$filter_arr['po-terminie'] = array("po terminie");// 3 lata po dacie platnosci faktur
|
|
|
$filter_arr['has_nr_sad'] = array("nr sprawy sąd");
|
|
|
@@ -3105,7 +3106,10 @@ class WindykacjaStatsHelper {
|
|
|
|
|
|
case 'waiting-wezwanie2':// auto -> wezwanie2
|
|
|
if ($user->wezwanie2_DATE == '0000-00-00') {
|
|
|
- if ($saldo <= -300) {// TODO: data od pierwszego wezwania
|
|
|
+ $payTermArr = explode('-', $user->PAY_TERM);// Y-m-d
|
|
|
+ $payTermPlus7dni = date("Y-m-d", mktime(0,0,0, intval($payTermArr[1]), intval($payTermArr[2]) + 7, intval($payTermArr[0])));
|
|
|
+ // TODO: data +7 dni od terminu płatności (PAY_TERM) / mktime ($user->PAY_TERM + 7 dni)
|
|
|
+ if ($user->PAY_TERM != '0000-00-00' && $payTermPlus7dni < date('Y-m-d')) {
|
|
|
$data_arr["A_STATUS"] = "wezwanie2";
|
|
|
}
|
|
|
}
|
|
|
@@ -3114,26 +3118,39 @@ class WindykacjaStatsHelper {
|
|
|
case 'wezwanie2':// wymaga `PAY_TERM`, `wezwanie2_DATE`, `ID_KORESP`
|
|
|
break;
|
|
|
|
|
|
- case 'waiting-krd':// auto -> krd jesli minelo 60 dni od wystawienia wezwanie2
|
|
|
+ case 'waiting-krd':// auto -> krd jesli minelo 30 dni od wystawienia wezwanie2
|
|
|
if ($user->wezwanie2_DATE != '0000-00-00') {
|
|
|
$wzw2 = new stdClass();
|
|
|
$wzw2->Y = intval(substr($user->wezwanie2_DATE, 0, 4));
|
|
|
$wzw2->m = intval(substr($user->wezwanie2_DATE, 5, 2));
|
|
|
$wzw2->d = intval(substr($user->wezwanie2_DATE, 8, 2));
|
|
|
- $wzw2->plus_60 = date("Y-m-d", mktime(0,0,0, $wzw2->m, $wzw2->d + 60, $wzw2->Y));
|
|
|
- if ($wzw2->plus_60 < date("Y-m-d")) {
|
|
|
+ $wzw2->plus_30 = date("Y-m-d", mktime(0,0,0, $wzw2->m, $wzw2->d + 30, $wzw2->Y));
|
|
|
+ if ($wzw2->plus_30 < date("Y-m-d")) {
|
|
|
$data_arr["A_STATUS"] = "krd";
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
|
|
|
+ case 'waiting-sad':// auto -> sad jesli minelo 30 dni od wpisania do krd (wpis_w_krd_DATE)
|
|
|
+ if ($user->wpis_w_krd_DATE != '0000-00-00') {
|
|
|
+ $krdDate = new stdClass();
|
|
|
+ $krdDate->Y = intval(substr($user->wpis_w_krd_DATE, 0, 4));
|
|
|
+ $krdDate->m = intval(substr($user->wpis_w_krd_DATE, 5, 2));
|
|
|
+ $krdDate->d = intval(substr($user->wpis_w_krd_DATE, 8, 2));
|
|
|
+ $krdDate->plus_30 = date("Y-m-d", mktime(0,0,0, $krdDate->m, $krdDate->d + 30, $krdDate->Y));
|
|
|
+ if ($krdDate->plus_30 < date("Y-m-d")) {
|
|
|
+ $data_arr["A_STATUS"] = "docs-in-sad";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
+
|
|
|
default:
|
|
|
|
|
|
}
|
|
|
|
|
|
// zmiana statusu na czysty - WAITING
|
|
|
if ($saldo >= 0 || $data_arr["PAY_FVAT"] < 2) {
|
|
|
- if (!in_array($user->A_STATUS, array('waiting-sad', 'sad'))) {
|
|
|
+ if (!in_array($user->A_STATUS, array('waiting-sad', 'docs-in-sad', 'sad'))) {
|
|
|
$data_arr["A_STATUS"] = "WAITING";
|
|
|
$data_arr["wezwanie2_DATE"] = '0000-00-00';
|
|
|
$data_arr["wezwanie1_DATE"] = '0000-00-00';
|
|
|
@@ -3982,6 +3999,7 @@ class WindykacjaStatsModel {
|
|
|
, w.`PAY_FVAT`
|
|
|
, w.`wezwanie1_DATE`
|
|
|
, w.`wezwanie2_DATE`
|
|
|
+ , w.`wpis_w_krd_DATE`
|
|
|
, w.`ID_KORESP`
|
|
|
, w.`LAST_PAY_DATE`
|
|
|
, w.`BAD_ADDRESS`
|